From 50f71c8c808381a4147cebddb67c1b982d9d3ee3 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Fri, 4 Oct 2019 08:00:54 +0100 Subject: STARTREK: Fix GCC Duplicated Condition Warning These are flagged by GCC if -Wduplicated-cond is enabled. --- engines/startrek/rooms/veng2.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3