[Scummvm-git-logs] scummvm master -> 39019336f55247baec50947b82a51e6e0048652b

[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:
39019336f5 DGDS: Fix Duplicated Condition GCC Compiler Warning


Commit: 39019336f55247baec50947b82a51e6e0048652b
    https://github.com/scummvm/scummvm/commit/39019336f55247baec50947b82a51e6e0048652b
Author: D G Turner (digitall at scummvm.org)
Date: 2024-10-06T00:25:18+01:00

Commit Message:
DGDS: Fix Duplicated Condition GCC Compiler Warning

This warning is emitted if -Wduplicated-cond is passed to the compiler.

This looks to be a minor cut and paste error, though needs to be checked
that the colors are correct way round for blade vs. enemy hit.

Changed paths:
    engines/dgds/dragon_arcade.cpp


diff --git a/engines/dgds/dragon_arcade.cpp b/engines/dgds/dragon_arcade.cpp
index f9490834d01..f40c5526065 100644
--- a/engines/dgds/dragon_arcade.cpp
+++ b/engines/dgds/dragon_arcade.cpp
@@ -2531,7 +2531,7 @@ void DragonArcade::runThenDrawBulletsInFlight() {
 		int16 y = _bullets[i]._y;
 		if (_bullets[i]._state == kBulletHittingBlade) {
 			drawBulletHitCircles(x, y, false);
-		} else if (_bullets[i]._state == kBulletHittingBlade) {
+		} else if (_bullets[i]._state == kBulletHittingEnemy) {
 			drawBulletHitCircles(x, y, true);
 		} else if (_bullets[i]._state == kBulletFlying) {
 			int16 frameno;