[Scummvm-git-logs] scummvm master -> 9fb9f3aeb637679602b5fb62e7dd1f85b80e2e53

[Strangerke]

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:
9fb9f3aeb6 CHEWY: Remove dead code in action_iib_sib()


Commit: 9fb9f3aeb637679602b5fb62e7dd1f85b80e2e53
    https://github.com/scummvm/scummvm/commit/9fb9f3aeb637679602b5fb62e7dd1f85b80e2e53
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2022-03-17T22:33:17+01:00

Commit Message:
CHEWY: Remove dead code in action_iib_sib()

Changed paths:
    engines/chewy/object.cpp


diff --git a/engines/chewy/object.cpp b/engines/chewy/object.cpp
index eced7999196..342f43f74e5 100644
--- a/engines/chewy/object.cpp
+++ b/engines/chewy/object.cpp
@@ -298,15 +298,10 @@ int16 Object::action_iib_sib(int16 maus_obj_nr, int16 test_obj_nr) {
 			}
 		}
 	}
-	if (action_flag == OBJECT_1) {
 
-		if (!calc_rmo_flip_flop(maus_obj_nr))
-			action_flag = NO_ACTION;
-	} else if (action_flag == OBJECT_2) {
+	if (action_flag == OBJECT_2 && !calc_rsi_flip_flop(test_obj_nr))
+		action_flag = NO_ACTION;
 
-		if (!calc_rsi_flip_flop(test_obj_nr))
-			action_flag = NO_ACTION;
-	}
 	return action_flag;
 }