diff options
| author | D G Turner | 2019-10-04 08:00:54 +0100 |
|---|---|---|
| committer | D G Turner | 2019-10-04 08:00:54 +0100 |
| commit | 50f71c8c808381a4147cebddb67c1b982d9d3ee3 (patch) | |
| tree | 2a0628abfab0d7cf36619fa17e9de4e28e1d1a9a | |
| parent | ee79aba82d23d033f2677ac9f5f85c85189252f3 (diff) | |
| download | scummvm-rg350-50f71c8c808381a4147cebddb67c1b982d9d3ee3.tar.gz scummvm-rg350-50f71c8c808381a4147cebddb67c1b982d9d3ee3.tar.bz2 scummvm-rg350-50f71c8c808381a4147cebddb67c1b982d9d3ee3.zip | |
STARTREK: Fix GCC Duplicated Condition Warning
These are flagged by GCC if -Wduplicated-cond is enabled.
| -rw-r--r-- | engines/startrek/rooms/veng2.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/startrek/rooms/veng2.cpp b/engines/startrek/rooms/veng2.cpp index 63caab14a4..0c0b9ceffc 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) |