[Scummvm-git-logs] scummvm master -> 50f71c8c808381a4147cebddb67c1b982d9d3ee3

[digitall]

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

Summary:
ee79aba82d SCUMM: Fix GCC Duplicated Condition Warning
50f71c8c80 STARTREK: Fix GCC Duplicated Condition Warning


Commit: ee79aba82d23d033f2677ac9f5f85c85189252f3
    https://github.com/scummvm/scummvm/commit/ee79aba82d23d033f2677ac9f5f85c85189252f3
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-04T07:58:10+01:00

Commit Message:
SCUMM: Fix GCC Duplicated Condition Warning

These are flagged by GCC if -Wduplicated-cond is enabled.

Changed paths:
    engines/scumm/debugger.cpp


diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 4dff43c..48c5017 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -303,12 +303,15 @@ bool ScummDebugger::Cmd_ImportRes(int argc, const char** argv) {
 		if (_vm->_game.features & GF_SMALL_HEADER) {
 			size = file.readUint16LE();
 			file.seek(-2, SEEK_CUR);
-		} else if (_vm->_game.features & GF_SMALL_HEADER) { // FIXME: This never was executed
+#if 0
+		// FIXME: This never was executed due to duplicated if condition
+		} else if (_vm->_game.features & GF_SMALL_HEADER) {
 			if (_vm->_game.version == 4)
 				file.seek(8, SEEK_CUR);
 			size = file.readUint32LE();
 			file.readUint16LE();
 			file.seek(-6, SEEK_CUR);
+#endif
 		} else {
 			file.readUint32BE();
 			size = file.readUint32BE();


Commit: 50f71c8c808381a4147cebddb67c1b982d9d3ee3
    https://github.com/scummvm/scummvm/commit/50f71c8c808381a4147cebddb67c1b982d9d3ee3
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-04T08:00:54+01:00

Commit Message:
STARTREK: Fix GCC Duplicated Condition Warning

These are flagged by GCC if -Wduplicated-cond is enabled.

Changed paths:
    engines/startrek/rooms/veng2.cpp


diff --git a/engines/startrek/rooms/veng2.cpp b/engines/startrek/rooms/veng2.cpp
index 63caab1..0c0b9ce 100644
--- a/engines/startrek/rooms/veng2.cpp
+++ b/engines/startrek/rooms/veng2.cpp
@@ -638,8 +638,11 @@ void Room::veng2UseSTricorderOnTorpedoControl() {
 			showText(TX_SPEAKER_SPOCK, TX_VEN2_064);
 	} else if (_awayMission->veng.tricordersPluggedIntoComputer != 3)
 		showText(TX_SPEAKER_SPOCK, TX_VEN2_055);
-	else if (_awayMission->veng.poweredSystem != 1) // Unused, since the same condition was above
+#if 0
+	// FIXME: Unused, since the same condition is above. Fix needed?
+	else if (_awayMission->veng.poweredSystem != 1)
 		showText(TX_SPEAKER_SPOCK, TX_VEN2_065);
+#endif
 	else if (!_awayMission->veng.torpedoLoaded) {
 		showText(TX_SPEAKER_SPOCK, TX_VEN2_068);
 		if (!_awayMission->veng.elasiShipDecloaked)