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

[digitall]

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:
d107ac0dc8 STARTREK: Fix GCC Duplicated Branch Warning


Commit: d107ac0dc8258d9523f9ee48d82e8e8aea6a4490
    https://github.com/scummvm/scummvm/commit/d107ac0dc8258d9523f9ee48d82e8e8aea6a4490
Author: D G Turner (digitall at scummvm.org)
Date: 2021-10-29T19:03:27+01:00

Commit Message:
STARTREK: Fix GCC Duplicated Branch Warning

Changed paths:
    engines/startrek/space.cpp


diff --git a/engines/startrek/space.cpp b/engines/startrek/space.cpp
index 815c010ff5..b0b56b08ad 100644
--- a/engines/startrek/space.cpp
+++ b/engines/startrek/space.cpp
@@ -146,8 +146,11 @@ bool compareR3Objects(R3 *obj1, R3 *obj2) {
 	int32 diff = obj1->field54 - obj2->field54;
 	if (diff < 0)
 		return true;
+// FIXME: Original had distinct value for diff == 0, rather than bool
+#if 0
 	else if (diff == 0)
-		return false; // original would have a distinct value for this
+		return false;
+#endif
 	else
 		return false;
 }