diff options
| author | Strangerke | 2018-08-10 07:31:07 +0200 |
|---|---|---|
| committer | Strangerke | 2018-08-10 07:31:07 +0200 |
| commit | 0355ebdacfd9ff207fb7998c76dd0a98eb5bc2bb (patch) | |
| tree | ad38e58908cfd8d518fa99f13a486028eb7eb571 /engines/startrek/awaymission.cpp | |
| parent | 2c11e4d2aaee8500a4021b095e62233e6c18953b (diff) | |
| download | scummvm-rg350-0355ebdacfd9ff207fb7998c76dd0a98eb5bc2bb.tar.gz scummvm-rg350-0355ebdacfd9ff207fb7998c76dd0a98eb5bc2bb.tar.bz2 scummvm-rg350-0355ebdacfd9ff207fb7998c76dd0a98eb5bc2bb.zip | |
STARTREK: Reduce a couple of variable scope, add a CHECKME
Diffstat (limited to 'engines/startrek/awaymission.cpp')
| -rw-r--r-- | engines/startrek/awaymission.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp index 9b4d936f05..9edf121083 100644 --- a/engines/startrek/awaymission.cpp +++ b/engines/startrek/awaymission.cpp @@ -179,7 +179,6 @@ void StarTrekEngine::initAwayCrewPositions(int warpEntryIndex) { void StarTrekEngine::handleAwayMissionEvents() { TrekEvent event; - int clickedObject = -1; if (popNextEvent(&event)) { switch (event.type) { @@ -244,13 +243,13 @@ void StarTrekEngine::handleAwayMissionEvents() { case Common::KEYCODE_i: if (_awayMission.activeAction == ACTION_USE) { hideInventoryIcons(); - clickedObject = showInventoryMenu(50, 50, true); + int clickedObject = showInventoryMenu(50, 50, true); if (clickedObject == -1) clickedObject = -2; awayMissionUseObject(clickedObject); } else if (_awayMission.activeAction == ACTION_LOOK) { hideInventoryIcons(); - clickedObject = showInventoryMenu(50, 50, true); + int clickedObject = showInventoryMenu(50, 50, true); if (clickedObject == -1) clickedObject = -2; awayMissionGetLookOrTalk(clickedObject); @@ -410,6 +409,7 @@ void StarTrekEngine::awayMissionUseObject(int16 clickedObject) { tryWalkToHotspot = true; else if (_awayMission.activeObject == OBJECT_MCCOY && _room->actionHasCode(ACTION_USE, OBJECT_IMEDKIT, _awayMission.passiveObject, 0)) tryWalkToHotspot = true; + // CHECKME: Identical to the previous check, thus never used else if (_awayMission.activeObject == OBJECT_MCCOY && _room->actionHasCode(ACTION_USE, OBJECT_IMEDKIT, _awayMission.passiveObject, 0)) tryWalkToHotspot = true; else if (_awayMission.activeObject == OBJECT_SPOCK && _room->actionHasCode(ACTION_USE, OBJECT_ISTRICOR, _awayMission.passiveObject, 0)) |