[Scummvm-git-logs] scummvm master -> b196b75943058cff22e0ac0958ac33c2c35f08b6

sev- noreply at scummvm.org
Wed Nov 20 22:19:13 UTC 2024


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b196b75943 TSAGE: BLUEFORCE: Fix errorneous condition


Commit: b196b75943058cff22e0ac0958ac33c2c35f08b6
    https://github.com/scummvm/scummvm/commit/b196b75943058cff22e0ac0958ac33c2c35f08b6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-20T23:18:17+01:00

Commit Message:
TSAGE: BLUEFORCE: Fix errorneous condition

It was always true

Changed paths:
    engines/tsage/blue_force/blueforce_scenes1.cpp


diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index ef2437064f4..fe05783688f 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -2677,7 +2677,7 @@ void Scene160::Action2::signal() {
 
 void Scene160::Action2::process(Event &event) {
 	if ((event.handled) || ((event.eventType != EVENT_BUTTON_DOWN)
-			&& (event.eventType != EVENT_KEYPRESS || event.eventType != EVENT_CUSTOM_ACTIONSTART)))
+			&& (event.eventType != EVENT_KEYPRESS && event.eventType != EVENT_CUSTOM_ACTIONSTART)))
 		return;
 
 	if (_actionIndex == 25) {




More information about the Scummvm-git-logs mailing list