1 files changed, 66 insertions, 66 deletions

diff --git a/engines/startrek/rooms/demon3.cpp b/engines/startrek/rooms/demon3.cpp
index f862838483..e30a5fc671 100644
--- a/engines/startrek/rooms/demon3.cpp
+++ b/engines/startrek/rooms/demon3.cpp
@@ -29,36 +29,36 @@ void Room::demon3Tick1() {
 	loadActorAnim(8, "light", 0xab, 0x03, 0);
 
 	_roomVar.demon.boulder1Shot = true;
-	if (!_vm->_awayMission.demon.boulder1Gone) {
+	if (!_awayMission->demon.boulder1Gone) {
 		loadActorAnim(9, "bldr1", 0x26, 0, 0);
 		_roomVar.demon.boulder1Shot = false;
 	}
-	if (!_vm->_awayMission.demon.boulder2Gone) {
+	if (!_awayMission->demon.boulder2Gone) {
 		loadActorAnim(10, "bldr2", 0x22, 0, 0);
 	}
-	if (!_vm->_awayMission.demon.boulder3Gone) {
+	if (!_awayMission->demon.boulder3Gone) {
 		loadActorAnim(11, "bldr3", 0x22, 0, 0);
 	}
-	if (!_vm->_awayMission.demon.boulder4Gone) {
+	if (!_awayMission->demon.boulder4Gone) {
 		loadActorAnim(12, "bldr4", 0x22, 0, 0);
 	}
 
-	if (_vm->_awayMission.demon.doorOpened) {
+	if (_awayMission->demon.doorOpened) {
 		loadActorAnim(14, "door2", 0x82, 0x0c, 0);
 	} else {
 		loadMapFile("demon3a");
 	}
 
-	if (!_vm->_awayMission.demon.healedMiner && _vm->_awayMission.demon.boulder4Gone)
+	if (!_awayMission->demon.healedMiner && _awayMission->demon.boulder4Gone)
 		loadActorAnim(13, "miner", 0xda, 0x6c, 0);
-	if (_vm->_awayMission.redshirtDead && !_vm->_awayMission.demon.field45)
+	if (_awayMission->redshirtDead && !_awayMission->demon.field45)
 		loadActorAnim(OBJECT_REDSHIRT, "deadre", 0x46, 0xa0, 0);
 
-	if (_vm->_awayMission.demon.field41 == 0)
-		_vm->_awayMission.demon.field41++;
+	if (_awayMission->demon.field41 == 0)
+		_awayMission->demon.field41++;
 
-	if (!_vm->_awayMission.demon.field56) {
-		_vm->_awayMission.demon.field56 = true;
+	if (!_awayMission->demon.field56) {
+		_awayMission->demon.field56 = true;
 		playMidiMusicTracks(0, -1);
 	}
 }
@@ -67,10 +67,10 @@ void Room::demon3Tick1() {
 void Room::demon3Timer0Expired() {
 	_roomVar.demon.boulder1Shot = true;
 	loadActorAnim2(9, "drbldr", 0x26, 0, 0);
-	_vm->_awayMission.timers[1] = 13;
-	_vm->_awayMission.demon.boulder1Gone = true;
-	_vm->_awayMission.demon.numBouldersGone++;
-	_vm->_awayMission.disableInput = true;
+	_awayMission->timers[1] = 13;
+	_awayMission->demon.boulder1Gone = true;
+	_awayMission->demon.numBouldersGone++;
+	_awayMission->disableInput = true;
 	playMidiMusicTracks(2, -1);
 	playVoc("BOULDERK");
 }
@@ -84,12 +84,12 @@ void Room::demon3Timer1Expired() {
 
 // Door just opened
 void Room::demon3Timer3Expired() {
-	if (_vm->_awayMission.demon.repairedHand) {
+	if (_awayMission->demon.repairedHand) {
 		showText(TX_DEM3N008);
 		loadActorAnim(14, "door", 0x82, 0xc, 0);
 		loadMapFile("demon3");
-		_vm->_awayMission.demon.doorOpened = true;
-		_vm->_awayMission.demon.missionScore += 2;
+		_awayMission->demon.doorOpened = true;
+		_awayMission->demon.missionScore += 2;
 	} else {
 		showText(TX_DEM3N007);
 	}
@@ -101,7 +101,7 @@ void Room::demon3FinishedAnimation1() {
 	loadActorStandAnim(OBJECT_SPOCK);
 	walkCrewman(OBJECT_MCCOY, 0x9c, 0xb2, 5);
 	_roomVar.demon.inFiringPosition = false;
-	_vm->_awayMission.redshirtDead = true;
+	_awayMission->redshirtDead = true;
 }
 
 // Just destroyed boulder 4 (revealing the miner)
@@ -114,7 +114,7 @@ void Room::demon3FinishedWalking5() {
 	playSoundEffectIndex(0x04);
 	showText(TX_SPEAKER_MCCOY, TX_DEM3_019);
 
-	_vm->_awayMission.disableInput = false;
+	_awayMission->disableInput = false;
 }
 
 void Room::demon3McCoyInFiringPosition() {
@@ -142,7 +142,7 @@ void Room::demon3KirkInFiringPosition() {
 }
 
 void Room::demon3CrewmanInFiringPosition() {
-	if (_roomVar.demon.kirkInPosition && _roomVar.demon.spockInPosition && _roomVar.demon.mccoyInPosition && (_vm->_awayMission.redshirtDead || _roomVar.demon.redshirtInPosition))
+	if (_roomVar.demon.kirkInPosition && _roomVar.demon.spockInPosition && _roomVar.demon.mccoyInPosition && (_awayMission->redshirtDead || _roomVar.demon.redshirtInPosition))
 		demon3PullOutPhaserAndFireAtBoulder();
 }
 
@@ -191,12 +191,12 @@ void Room::demon3FireAtBoulder() {
 	loadActorAnim(17, _roomVar.demon.boulderAnim, 0, 0, 0);
 	playSoundEffectIndex(0x06);
 	if (!_roomVar.demon.boulder1Shot)
-		_vm->_awayMission.timers[0] = 1;
-	_vm->_awayMission.disableInput = false;
+		_awayMission->timers[0] = 1;
+	_awayMission->disableInput = false;
 }
 
 void Room::demon3UsePhaserOnRedshirt() {
-	if (!_vm->_awayMission.redshirtDead)
+	if (!_awayMission->redshirtDead)
 		return;
 	showText(TX_SPEAKER_MCCOY, TX_DEM3_013);
 }
@@ -206,10 +206,10 @@ void Room::demon3UseStunPhaserOnBoulder() {
 }
 
 void Room::demon3UsePhaserOnBoulder1() {
-	if (_roomVar.demon.shootingBoulder || _vm->_awayMission.demon.boulder1Gone)
+	if (_roomVar.demon.shootingBoulder || _awayMission->demon.boulder1Gone)
 		return;
-	_vm->_awayMission.demon.boulder1Gone = true;
-	_vm->_awayMission.demon.numBouldersGone++;
+	_awayMission->demon.boulder1Gone = true;
+	_awayMission->demon.numBouldersGone++;
 	_roomVar.demon.boulderBeingShot = 1;
 	_roomVar.demon.boulder1Shot = true;
 	strcpy(_roomVar.demon.boulderAnim, "s0r3s2");
@@ -217,21 +217,21 @@ void Room::demon3UsePhaserOnBoulder1() {
 }
 
 void Room::demon3UsePhaserOnBoulder2() {
-	if (_roomVar.demon.shootingBoulder || _vm->_awayMission.demon.boulder2Gone)
+	if (_roomVar.demon.shootingBoulder || _awayMission->demon.boulder2Gone)
 		return;
-	_vm->_awayMission.demon.boulder2Gone = true;
-	_vm->_awayMission.demon.numBouldersGone++;
+	_awayMission->demon.boulder2Gone = true;
+	_awayMission->demon.numBouldersGone++;
 	_roomVar.demon.boulderBeingShot = 2;
 	strcpy(_roomVar.demon.boulderAnim, "s0r3s3");
 	demon3BoulderCommon();
 }
 
 void Room::demon3UsePhaserOnBoulder3() {
-	if (_vm->_awayMission.demon.boulder1Gone) {
-		if (_roomVar.demon.shootingBoulder || _vm->_awayMission.demon.boulder3Gone)
+	if (_awayMission->demon.boulder1Gone) {
+		if (_roomVar.demon.shootingBoulder || _awayMission->demon.boulder3Gone)
 			return;
-		_vm->_awayMission.demon.boulder3Gone = true;
-		_vm->_awayMission.demon.numBouldersGone++;
+		_awayMission->demon.boulder3Gone = true;
+		_awayMission->demon.numBouldersGone++;
 		_roomVar.demon.boulderBeingShot = 3;
 		strcpy(_roomVar.demon.boulderAnim, "s0r3s1");
 		demon3BoulderCommon();
@@ -241,14 +241,14 @@ void Room::demon3UsePhaserOnBoulder3() {
 }
 
 void Room::demon3UsePhaserOnBoulder4() {
-	if (_vm->_awayMission.demon.boulder2Gone) {
-		if (_roomVar.demon.shootingBoulder || _vm->_awayMission.demon.boulder4Gone)
+	if (_awayMission->demon.boulder2Gone) {
+		if (_roomVar.demon.shootingBoulder || _awayMission->demon.boulder4Gone)
 			return;
-		_vm->_awayMission.demon.boulder4Gone = true;
-		_vm->_awayMission.demon.numBouldersGone++;
+		_awayMission->demon.boulder4Gone = true;
+		_awayMission->demon.numBouldersGone++;
 		_roomVar.demon.boulderBeingShot = 4;
 		strcpy(_roomVar.demon.boulderAnim, "s0r3s4");
-		_vm->_awayMission.demon.foundMiner = true;
+		_awayMission->demon.foundMiner = true;
 		demon3BoulderCommon();
 	} else {
 		// BUGFIX: In the original, the audio didn't play, despite the file existing (and
@@ -258,7 +258,7 @@ void Room::demon3UsePhaserOnBoulder4() {
 }
 
 void Room::demon3BoulderCommon() {
-	_vm->_awayMission.disableInput = true;
+	_awayMission->disableInput = true;
 	Common::Point pos = getActorPos(OBJECT_KIRK);
 	if (!(pos.x == 0x79 && pos.y == 0xa0)) {
 		_roomVar.demon.inFiringPosition = false;
@@ -273,7 +273,7 @@ void Room::demon3BoulderCommon() {
 		walkCrewman(OBJECT_KIRK, 0x79, 0xa0, 1);
 		walkCrewman(OBJECT_SPOCK, 0xae, 0xb4, 2);
 		walkCrewman(OBJECT_MCCOY, 0xd6, 0xb8, 3);
-		if (!_vm->_awayMission.redshirtDead)
+		if (!_awayMission->redshirtDead)
 			walkCrewman(OBJECT_REDSHIRT, 0x46, 0xa0, 4);
 
 		_roomVar.demon.shootingBoulder = true;
@@ -294,7 +294,7 @@ void Room::demon3UseSTricorderOnPanel() {
 }
 
 void Room::demon3UseSTricorderOnBoulder() {
-	if (_vm->_awayMission.demon.foundMiner)
+	if (_awayMission->demon.foundMiner)
 		return;
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
@@ -302,7 +302,7 @@ void Room::demon3UseSTricorderOnBoulder() {
 }
 
 void Room::demon3UseMTricorderOnBoulder() {
-	if (_vm->_awayMission.demon.foundMiner)
+	if (_awayMission->demon.foundMiner)
 		return;
 	loadActorAnim2(OBJECT_MCCOY, "mscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
@@ -310,17 +310,17 @@ void Room::demon3UseMTricorderOnBoulder() {
 }
 
 void Room::demon3UseCrewmanOnPanel() {
-	if (_vm->_awayMission.demon.numBouldersGone != 4 || _vm->_awayMission.redshirtDead)
+	if (_awayMission->demon.numBouldersGone != 4 || _awayMission->redshirtDead)
 		return;
 	showText(TX_SPEAKER_EVERTS, TX_DEM3_031);
 	demon3UseRedshirtOnPanel();
 }
 
 void Room::demon3UseRedshirtOnPanel() {
-	if (_vm->_awayMission.redshirtDead)
+	if (_awayMission->redshirtDead)
 		return;
 
-	if (_vm->_awayMission.demon.numBouldersGone != 4)
+	if (_awayMission->demon.numBouldersGone != 4)
 		showText(TX_SPEAKER_EVERTS, TX_DEM3_030);
 	else
 		walkCrewman(OBJECT_REDSHIRT, 0xd8, 0x70, 8);
@@ -331,18 +331,18 @@ void Room::demon3RedshirtReachedPanel() {
 }
 
 void Room::demon3RedshirtUsedPanel() {
-	if (!_vm->_awayMission.demon.foundMiner)
+	if (!_awayMission->demon.foundMiner)
 		return;
 
-	_vm->_awayMission.demon.field41++;
-	if (_vm->_awayMission.demon.field41 == 5) {
+	_awayMission->demon.field41++;
+	if (_awayMission->demon.field41 == 5) {
 		playVoc("EFX3");
 		showText(TX_SPEAKER_EVERTS, TX_DEM3_A32);
 
 		loadActorAnim2(OBJECT_REDSHIRT, "rkille", -1, -1, 3);
 		playSoundEffectIndex(0x06);
-		_vm->_awayMission.redshirtDead = true;
-		_vm->_awayMission.demon.field45 = true;
+		_awayMission->redshirtDead = true;
+		_awayMission->demon.field45 = true;
 	} else {
 		const int textTable[] = {
 			TX_DEM3N005,
@@ -356,7 +356,7 @@ void Room::demon3RedshirtUsedPanel() {
 			TX_NULL,
 			TX_BLANK
 		};
-		text[1] = textTable[_vm->_awayMission.demon.field41 - 1];
+		text[1] = textTable[_awayMission->demon.field41 - 1];
 		showText(text);
 		walkCrewman(OBJECT_REDSHIRT, 0xbe, 0x9b, 0);
 	}
@@ -394,8 +394,8 @@ void Room::demon3UsePhaserOnDoor() {
 }
 
 void Room::demon3UseHandOnPanel() {
-	if (_vm->_awayMission.demon.numBouldersGone == 4) {
-		if (_vm->_awayMission.demon.doorOpened)
+	if (_awayMission->demon.numBouldersGone == 4) {
+		if (_awayMission->demon.doorOpened)
 			return;
 		walkCrewman(OBJECT_KIRK, 0xd8, 0x70, 7);
 	} else {
@@ -405,13 +405,13 @@ void Room::demon3UseHandOnPanel() {
 
 void Room::demon3KirkReachedHandPanel() {
 	loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 6);
-	_vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_W;
+	_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_W;
 	playVoc("MUR4E1");
 }
 
 void Room::demon3KirkUsedHandPanel() {
 	loadActorAnim(15, "panel", 0xd6, 0x3d, 0);
-	_vm->_awayMission.timers[3] = 10;
+	_awayMission->timers[3] = 10;
 	playVoc("SE0FORCE");
 }
 
@@ -419,7 +419,7 @@ void Room::demon3UseMTricorderOnMiner() {
 	loadActorAnim2(OBJECT_MCCOY, "mscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
 
-	if (_vm->_awayMission.demon.minerDead) {
+	if (_awayMission->demon.minerDead) {
 		showText(TX_SPEAKER_MCCOY, TX_DEM3_022);
 	} else {
 		showText(TX_SPEAKER_MCCOY, TX_DEM3_023);
@@ -427,7 +427,7 @@ void Room::demon3UseMTricorderOnMiner() {
 }
 
 void Room::demon3UseMedkitOnMiner() {
-	if (_vm->_awayMission.demon.healedMiner) {
+	if (_awayMission->demon.healedMiner) {
 		showText(TX_SPEAKER_MCCOY, TX_DEM3_015);
 	} else {
 		walkCrewman(OBJECT_MCCOY, 0xe6, 0x7b, 6);
@@ -441,13 +441,13 @@ void Room::demon3McCoyReachedMiner() {
 }
 
 void Room::demon3McCoyFinishedHealingMiner() {
-	if (_vm->_awayMission.demon.minerDead) {
+	if (_awayMission->demon.minerDead) {
 		showText(TX_SPEAKER_MCCOY, TX_DEM3_022);
 	} else {
 		showText(TX_SPEAKER_MCCOY, TX_DEM3_021);
-		_vm->_awayMission.demon.healedMiner = true;
+		_awayMission->demon.healedMiner = true;
 		loadActorAnim2(13, "drmine", 0xda, 0x6c, 0);
-		_vm->_awayMission.demon.missionScore += 2;
+		_awayMission->demon.missionScore += 2;
 		walkCrewman(OBJECT_MCCOY, 0x104, 0x96, 0);
 	}
 }
@@ -457,7 +457,7 @@ void Room::demon3GetMiner() {
 }
 
 void Room::demon3TalkToMiner() {
-	if (!_vm->_awayMission.demon.healedMiner)
+	if (!_awayMission->demon.healedMiner)
 		return;
 	showText(TX_SPEAKER_KANDREY, TX_DEM3_F21);
 }
@@ -473,7 +473,7 @@ void Room::demon3TalkToSpock() {
 }
 
 void Room::demon3TalkToMccoy() {
-	if (_vm->_awayMission.redshirtDead) {
+	if (_awayMission->redshirtDead) {
 		showText(TX_SPEAKER_MCCOY, TX_DEM3_014);
 	} else {
 		showText(TX_SPEAKER_MCCOY, TX_DEM3_025);
@@ -503,7 +503,7 @@ void Room::demon3LookAtMccoy() {
 }
 
 void Room::demon3LookAtRedshirt() {
-	if (_vm->_awayMission.redshirtDead) {
+	if (_awayMission->redshirtDead) {
 		showText(TX_DEM3N017);
 		// NOTE: there's an alternate string that isn't used? (TX_DEM3N018)
 	} else {
@@ -516,7 +516,7 @@ void Room::demon3LookAnywhere() {
 }
 
 void Room::demon3LookAtMiner() {
-	if (_vm->_awayMission.demon.healedMiner) {
+	if (_awayMission->demon.healedMiner) {
 		showText(TX_DEM3N000);
 	} else {
 		showText(TX_DEM3N006);
@@ -544,7 +544,7 @@ void Room::demon3LookAtStructure() {
 }
 
 void Room::demon3LookAtDoor() {
-	if (_vm->_awayMission.demon.doorOpened) {
+	if (_awayMission->demon.doorOpened) {
 		showText(TX_DEM3N014);
 	} else {
 		showText(TX_DEM3N012);