From e5a97d91373e20815c4f093803dc569112e0c922 Mon Sep 17 00:00:00 2001
From: Matthew Stewart
Date: Tue, 29 May 2018 16:51:05 -0400
Subject: STARTREK: Demon5

---
 engines/startrek/awaymission.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/startrek/awaymission.cpp')

diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index 0265f4ed60..e118b3d9c5 100644
--- a/engines/startrek/awaymission.cpp
+++ b/engines/startrek/awaymission.cpp
@@ -71,7 +71,7 @@ void StarTrekEngine::loadRoom(const Common::String &missionName, int roomIndex)
 	_roomIndex = roomIndex;
 
 	_roomFrameCounter = 0;
-	_awayMission.transitioningIntoRoom = 0;
+	_awayMission.disableInput = false;
 
 	_gfx->fadeoutScreen();
 	_sound->stopAllVocSounds();
@@ -130,7 +130,7 @@ void StarTrekEngine::initAwayCrewPositions(int warpEntryIndex) {
 
 		_kirkActor->triggerActionWhenAnimFinished = true;
 		_kirkActor->finishedAnimActionParam = 0xff;
-		_awayMission.transitioningIntoRoom = 1;
+		_awayMission.disableInput = true;
 		_warpHotspotsActive = false;
 		break;
 	case 4: // Crew is beaming in.
@@ -142,7 +142,7 @@ void StarTrekEngine::initAwayCrewPositions(int warpEntryIndex) {
 		}
 		_kirkActor->triggerActionWhenAnimFinished = true;
 		_kirkActor->finishedAnimActionParam = 0xff;
-		_awayMission.transitioningIntoRoom = 1;
+		_awayMission.disableInput = true;
 		playSoundEffectIndex(0x09);
 		_warpHotspotsActive = false;
 		break;
@@ -175,7 +175,7 @@ void StarTrekEngine::handleAwayMissionEvents() {
 			break;
 
 		case TREKEVENT_LBUTTONDOWN:
-			if (_awayMission.transitioningIntoRoom != 0)
+			if (_awayMission.disableInput)
 				break;
 
 			switch (_awayMission.activeAction) {
@@ -317,7 +317,7 @@ checkShowInventory:
 			break;
 
 		case TREKEVENT_RBUTTONDOWN: // TODO: also triggered by key press?
-			if (_awayMission.transitioningIntoRoom)
+			if (_awayMission.disableInput)
 				break;
 			hideInventoryIcons();
 			playSoundEffectIndex(0x07);
@@ -396,7 +396,7 @@ void StarTrekEngine::handleAwayMissionAction() {
 	Action action = _actionQueue.pop();
 
 	if ((action.type == ACTION_FINISHED_ANIMATION || action.type == ACTION_FINISHED_WALKING) && action.b1 == 0xff) {
-		_awayMission.transitioningIntoRoom = 0;
+		_awayMission.disableInput = false;
 		_warpHotspotsActive = true;
 		return;
 	}
-- 
cgit v1.2.3