From 8970909318c158b18eb5612f26db1d4db941160f Mon Sep 17 00:00:00 2001 From: Matthew Stewart Date: Fri, 27 Jul 2018 20:32:29 -0400 Subject: STARTREK: Reorganize includes in room.h This should avoid the costly rebuild of everything in the 'rooms/' folder, at least sometimes... --- engines/startrek/rooms/mudd3.cpp | 158 +++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 79 deletions(-) (limited to 'engines/startrek/rooms/mudd3.cpp') diff --git a/engines/startrek/rooms/mudd3.cpp b/engines/startrek/rooms/mudd3.cpp index 792e749f30..eb02450f9b 100644 --- a/engines/startrek/rooms/mudd3.cpp +++ b/engines/startrek/rooms/mudd3.cpp @@ -42,24 +42,24 @@ namespace StarTrek { void Room::mudd3Tick1() { playVoc("MUD3LOOP"); - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_W; - if (_vm->_awayMission.mudd.databaseDestroyed) { + if (_awayMission->mudd.databaseDestroyed) { loadActorAnim(OBJECT_9, "s4lbpb", 0xa2, 0x9f); // FIXME: is this supposed to be in this if statement? - if (!_vm->_awayMission.mudd.tookRepairTool) + if (!_awayMission->mudd.tookRepairTool) loadActorAnim(OBJECT_REPAIR_TOOL, "s4lbdv", 0xb7, 0xa8); } - _vm->_awayMission.mudd.muddInDatabaseRoom = false; + _awayMission->mudd.muddInDatabaseRoom = false; - if (!_vm->_awayMission.mudd.muddVisitedDatabaseRoom && _vm->_awayMission.mudd.translatedAlienLanguage && !_vm->_awayMission.mudd.muddUnavailable) { - _vm->_awayMission.mudd.muddVisitedDatabaseRoom = true; + if (!_awayMission->mudd.muddVisitedDatabaseRoom && _awayMission->mudd.translatedAlienLanguage && !_awayMission->mudd.muddUnavailable) { + _awayMission->mudd.muddVisitedDatabaseRoom = true; loadActorAnim(OBJECT_MUDD, "s4lbhs", 0xa2, 0x9f); playMidiMusicTracks(3); - _vm->_awayMission.mudd.muddInDatabaseRoom = true; - _vm->_awayMission.timers[2] = 10; + _awayMission->mudd.muddInDatabaseRoom = true; + _awayMission->timers[2] = 10; } } @@ -71,7 +71,7 @@ void Room::mudd3UseCommunicator() { void Room::mudd3LookAtScreen() { // BUGFIX: the condition was flipped in the original; the more "vague" description // should be shown before the alien language is understood. - if (_vm->_awayMission.mudd.translatedAlienLanguage) + if (_awayMission->mudd.translatedAlienLanguage) showText(TX_SPEAKER_SPOCK, TX_MUD3_038); else showText(TX_MUD3N017); @@ -86,18 +86,18 @@ void Room::mudd3UseSTricorderOnScreen() { // BUGFIX: Event was actually "use screen on kirk", which makes no sense. void Room::mudd3UseKirkOnScreen() { - if (!_vm->_awayMission.mudd.translatedAlienLanguage) { + if (!_awayMission->mudd.translatedAlienLanguage) { showText(TX_MUD3N011); showText(TX_SPEAKER_SPOCK, TX_MUD3_037); } } void Room::mudd3UseSpockOnSphere() { - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S; + _awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S; loadActorStandAnim(OBJECT_SPOCK); - if (_vm->_awayMission.mudd.computerDataErasedOrDestroyed) { - if (!_vm->_awayMission.mudd.databaseDestroyed) { + if (_awayMission->mudd.computerDataErasedOrDestroyed) { + if (!_awayMission->mudd.databaseDestroyed) { showText(TX_MUD3N000); showText(TX_SPEAKER_SPOCK, TX_MUD3_052); showText(TX_SPEAKER_KIRK, TX_MUD3_012); @@ -107,11 +107,11 @@ void Room::mudd3UseSpockOnSphere() { showText(TX_SPEAKER_SPOCK, TX_MUD3_048); showText(TX_SPEAKER_KIRK, TX_MUD3_008); showText(TX_SPEAKER_SPOCK, TX_MUD3_051); - } else if (_vm->_awayMission.mudd.translatedAlienLanguage) { - if (_vm->_awayMission.mudd.accessedAlienDatabase) + } else if (_awayMission->mudd.translatedAlienLanguage) { + if (_awayMission->mudd.accessedAlienDatabase) showText(TX_SPEAKER_SPOCK, TX_MUD3_035); else { - _vm->_awayMission.mudd.accessedAlienDatabase = true; + _awayMission->mudd.accessedAlienDatabase = true; showText(TX_SPEAKER_SPOCK, TX_MUD3_054); showText(TX_SPEAKER_MCCOY, TX_MUD3_032); @@ -120,23 +120,23 @@ void Room::mudd3UseSpockOnSphere() { showText(TX_SPEAKER_SPOCK, TX_MUD3_046); showText(TX_SPEAKER_KIRK, TX_MUD3_007); - _vm->_awayMission.mudd.missionScore++; + _awayMission->mudd.missionScore++; playVoc("LSHAIANS"); loadActorAnim(OBJECT_ALIEN_IMAGE, "s4lbap", 0x32, 0x64); - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_W; - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W; - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W; - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_W; loadActorStandAnim(OBJECT_KIRK); loadActorStandAnim(OBJECT_SPOCK); loadActorStandAnim(OBJECT_MCCOY); loadActorStandAnim(OBJECT_REDSHIRT); - _vm->_awayMission.disableInput = true; - _vm->_awayMission.timers[3] = 40; + _awayMission->disableInput = true; + _awayMission->timers[3] = 40; } - } else if (_vm->_awayMission.mudd.discoveredBase3System) { + } else if (_awayMission->mudd.discoveredBase3System) { showText(TX_SPEAKER_SPOCK, TX_MUD3_043); showText(TX_SPEAKER_MCCOY, TX_MUD3_022); showText(TX_SPEAKER_SPOCK, TX_MUD3_056); @@ -145,14 +145,14 @@ void Room::mudd3UseSpockOnSphere() { _roomVar.mudd.suggestedUsingTricorders = true; } else { showText(TX_SPEAKER_SPOCK, TX_MUD3_044); - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W; walkCrewman(OBJECT_SPOCK, 0xcd, 0x87); } } // Finished looking at alien image void Room::mudd3Timer3Expired() { - _vm->_awayMission.disableInput = false; + _awayMission->disableInput = false; showText(TX_SPEAKER_MCCOY, TX_MUD3_027); showText(TX_SPEAKER_SPOCK, TX_MUD3_053); @@ -162,21 +162,21 @@ void Room::mudd3Timer3Expired() { void Room::mudd3UseMccoyOnSphere() { // ENHANCEMENT: Turn to face south - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S; + _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S; loadActorStandAnim(OBJECT_MCCOY); showText(TX_SPEAKER_MCCOY, TX_MUD3_021); - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W; walkCrewman(OBJECT_MCCOY, 0xec, 0x84); } void Room::mudd3UseRedshirtOnSphere() { // ENHANCEMENT: Turn to face south - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_S; + _awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_S; loadActorStandAnim(OBJECT_REDSHIRT); showText(TX_SPEAKER_BUCHERT, TX_MUD3_068); // BUGFIX: original played McCoy's audio by mistake - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_W; walkCrewman(OBJECT_REDSHIRT, 0xec, 0x84); } @@ -184,36 +184,36 @@ void Room::mudd3UseMTricorderOnSphere() { if (_roomVar.mudd.tricordersUnavailable) showText(TX_SPEAKER_SPOCK, TX_MUD3_039); // BUGFIX: speaker is Spock else { - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S; + _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S; loadActorStandAnim(OBJECT_MCCOY); - if (!_vm->_awayMission.mudd.translatedAlienLanguage && _roomVar.mudd.suggestedUsingTricorders && _vm->_awayMission.mudd.discoveredBase3System) { - _vm->_awayMission.disableInput = true; + if (!_awayMission->mudd.translatedAlienLanguage && _roomVar.mudd.suggestedUsingTricorders && _awayMission->mudd.discoveredBase3System) { + _awayMission->disableInput = true; - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S; + _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S; walkCrewman(OBJECT_MCCOY, 0xac, 0x88); - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S; + _awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S; walkCrewmanC(OBJECT_SPOCK, 0xa5, 0x8c, &Room::mudd3ReadyToHookUpTricorders); } else { showText(TX_SPEAKER_MCCOY, TX_MUD3_021); - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W; walkCrewman(OBJECT_MCCOY, 0xec, 0x84); } } } void Room::mudd3UseSTricorderOnSphere() { - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S; + _awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S; loadActorStandAnim(OBJECT_SPOCK); if (_roomVar.mudd.tricordersUnavailable) showText(TX_SPEAKER_SPOCK, TX_MUD3_039); // BUGFIX: speaker is Spock - else if (_vm->_awayMission.mudd.translatedAlienLanguage || (_vm->_awayMission.mudd.discoveredBase3System && !_roomVar.mudd.suggestedUsingTricorders)) { + else if (_awayMission->mudd.translatedAlienLanguage || (_awayMission->mudd.discoveredBase3System && !_roomVar.mudd.suggestedUsingTricorders)) { showText(TX_SPEAKER_SPOCK, TX_MUD3_041); - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W; walkCrewman(OBJECT_SPOCK, 0xcd, 0x87); - } else if (_vm->_awayMission.mudd.discoveredBase3System && _roomVar.mudd.suggestedUsingTricorders) { // Hooking up tricorders - _vm->_awayMission.disableInput = true; - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S; + } else if (_awayMission->mudd.discoveredBase3System && _roomVar.mudd.suggestedUsingTricorders) { // Hooking up tricorders + _awayMission->disableInput = true; + _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S; walkCrewmanC(OBJECT_MCCOY, 0xca, 0x88, &Room::mudd3ReadyToHookUpTricorders); } else { // No idea how to access it showText(TX_SPEAKER_SPOCK, TX_MUD3_042); @@ -225,7 +225,7 @@ void Room::mudd3ReadyToHookUpTricorders() { showText(TX_SPEAKER_SPOCK, TX_MUD3_018); _roomVar.mudd.tricordersUnavailable = true; - _vm->_awayMission.timers[1] = 50; + _awayMission->timers[1] = 50; loadActorAnim2(OBJECT_SPOCK, "sscans"); playSoundEffectIndex(SND_TRICORDER); @@ -235,14 +235,14 @@ void Room::mudd3Timer1Expired() { // Tricorders ready for use again showText(TX_SPEAKER_SPOCK, TX_MUD3_040); showText(TX_SPEAKER_SPOCK, TX_MUD3_034); - _vm->_awayMission.disableInput = false; + _awayMission->disableInput = false; _roomVar.mudd.tricordersUnavailable = false; _roomVar.mudd.suggestedUsingTricorders = false; - _vm->_awayMission.mudd.translatedAlienLanguage = true; - _vm->_awayMission.mudd.missionScore++; + _awayMission->mudd.translatedAlienLanguage = true; + _awayMission->mudd.missionScore++; - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W; - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W; + _awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W; walkCrewman(OBJECT_SPOCK, 0xcd, 0x87); walkCrewman(OBJECT_MCCOY, 0xec, 0x84); } @@ -256,14 +256,14 @@ void Room::mudd3Timer2Expired() { TX_BLANK }; - _vm->_awayMission.mudd.computerDataErasedOrDestroyed = true; + _awayMission->mudd.computerDataErasedOrDestroyed = true; showText(TX_SPEAKER_MUDD, TX_MUD3_065); int choice = showText(choices); if (choice == 0) { // Allow him to access the database (he ends up erasing it) showText(TX_SPEAKER_MUDD, TX_MUD3_066); - _vm->_awayMission.mudd.muddErasedDatabase = true; + _awayMission->mudd.muddErasedDatabase = true; // ENHANCEMENT: Add a few lines to make it clear that Mudd erased the databanks. // Otherwise, the end of the mission when you confront Mudd doesn't make sense @@ -274,34 +274,34 @@ void Room::mudd3Timer2Expired() { } else { // Don't allow it (he destroys it by accident) showText(TX_SPEAKER_MUDD, TX_MUD3_064); - _vm->_awayMission.timers[4] = 98; - _vm->_awayMission.disableInput = 2; + _awayMission->timers[4] = 98; + _awayMission->disableInput = 2; playMidiMusicTracks(26); loadActorAnim(OBJECT_MUDD, "s4lbhb", 0xa2, 0x9f); } } void Room::mudd3Timer4Expired() { - _vm->_awayMission.mudd.databaseDestroyed = true; + _awayMission->mudd.databaseDestroyed = true; showText(TX_SPEAKER_MUDD, TX_MUD3_063); showText(TX_SPEAKER_MCCOY, TX_MUD3_031); - _vm->_awayMission.disableInput = false; + _awayMission->disableInput = false; } void Room::mudd3UseMemoryDiskOnSphere() { // ENHANCEMENT: Turn to face south - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S; + _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S; loadActorStandAnim(OBJECT_KIRK); - if (_vm->_awayMission.mudd.databaseDestroyed) + if (_awayMission->mudd.databaseDestroyed) showText(TX_MUD3N014); - else if (_vm->_awayMission.mudd.translatedAlienLanguage && !_vm->_awayMission.mudd.muddErasedDatabase) { + else if (_awayMission->mudd.translatedAlienLanguage && !_awayMission->mudd.muddErasedDatabase) { showText(TX_MUD3N020); - if (!_vm->_awayMission.mudd.gotPointsForDownloadingData) { - _vm->_awayMission.mudd.missionScore += 3; - _vm->_awayMission.mudd.gotPointsForDownloadingData = true; + if (!_awayMission->mudd.gotPointsForDownloadingData) { + _awayMission->mudd.missionScore += 3; + _awayMission->mudd.gotPointsForDownloadingData = true; } } else showText(TX_MUD3N019); @@ -309,31 +309,31 @@ void Room::mudd3UseMemoryDiskOnSphere() { void Room::mudd3GetRepairTool() { - if (_vm->_awayMission.mudd.tookRepairTool) + if (_awayMission->mudd.tookRepairTool) showText(TX_MUD3N018); // NOTE: unused, since the object disappears, can't be selected again else { - _vm->_awayMission.disableInput = true; - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; + _awayMission->disableInput = true; + _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; walkCrewmanC(OBJECT_KIRK, 0xba, 0xc1, &Room::mudd3ReachedRepairTool); } } void Room::mudd3ReachedRepairTool() { - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; + _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; loadActorAnimC(OBJECT_KIRK, "kusemn", -1, -1, &Room::mudd3PickedUpRepairTool); } void Room::mudd3PickedUpRepairTool() { - _vm->_awayMission.disableInput = false; + _awayMission->disableInput = false; loadActorStandAnim(OBJECT_REPAIR_TOOL); - _vm->_awayMission.mudd.tookRepairTool = true; - _vm->_awayMission.mudd.missionScore++; + _awayMission->mudd.tookRepairTool = true; + _awayMission->mudd.missionScore++; giveItem(OBJECT_IDOOVER); } void Room::mudd3LookAtSphere() { // ENHANCEMENT: Turn to face south - _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S; + _awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S; loadActorStandAnim(OBJECT_KIRK); showText(TX_MUD3N015); @@ -341,7 +341,7 @@ void Room::mudd3LookAtSphere() { void Room::mudd3WalkToNorthDoor() { _roomVar.mudd.walkingToDoor = true; - _vm->_awayMission.disableInput = true; + _awayMission->disableInput = true; walkCrewman(OBJECT_KIRK, 0xb8, 0x70); } @@ -354,7 +354,7 @@ void Room::mudd3TouchedHotspot0() { // Triggers north door void Room::mudd3WalkToEastDoor() { _roomVar.mudd.walkingToDoor = true; - _vm->_awayMission.disableInput = true; + _awayMission->disableInput = true; walkCrewman(OBJECT_KIRK, 0x121, 0x81); } @@ -365,28 +365,28 @@ void Room::mudd3TouchedHotspot1() { } void Room::mudd3LookAtKirk() { - if (!_vm->_awayMission.mudd.muddInDatabaseRoom) + if (!_awayMission->mudd.muddInDatabaseRoom) showText(TX_MUD3N005); else showText(TX_MUD3N004); } void Room::mudd3LookAtSpock() { - if (!_vm->_awayMission.mudd.muddInDatabaseRoom) + if (!_awayMission->mudd.muddInDatabaseRoom) showText(TX_MUD3N012); else showText(TX_MUD3N002); } void Room::mudd3LookAtMccoy() { - if (!_vm->_awayMission.mudd.muddInDatabaseRoom) + if (!_awayMission->mudd.muddInDatabaseRoom) showText(TX_MUD3N010); else showText(TX_MUD3N009); } void Room::mudd3LookAtRedshirt() { - if (!_vm->_awayMission.mudd.muddInDatabaseRoom) + if (!_awayMission->mudd.muddInDatabaseRoom) showText(TX_MUD3N007); else showText(TX_MUD3N006); @@ -397,7 +397,7 @@ void Room::mudd3LookAtMudd() { } void Room::mudd3TalkToKirk() { - if (!_vm->_awayMission.mudd.muddInDatabaseRoom) { + if (!_awayMission->mudd.muddInDatabaseRoom) { showText(TX_SPEAKER_KIRK, TX_MUD3_014); showText(TX_SPEAKER_SPOCK, TX_MUD3_057); showText(TX_SPEAKER_MCCOY, TX_MUD3_025); @@ -406,7 +406,7 @@ void Room::mudd3TalkToKirk() { } void Room::mudd3TalkToSpock() { - if (!_vm->_awayMission.mudd.muddInDatabaseRoom) { + if (!_awayMission->mudd.muddInDatabaseRoom) { showText(TX_SPEAKER_SPOCK, TX_MUD3_055); showText(TX_SPEAKER_MCCOY, TX_MUD3_033); showText(TX_SPEAKER_KIRK, TX_MUD3_011); @@ -415,7 +415,7 @@ void Room::mudd3TalkToSpock() { } void Room::mudd3TalkToMccoy() { - if (!_vm->_awayMission.mudd.muddInDatabaseRoom) + if (!_awayMission->mudd.muddInDatabaseRoom) showText(TX_SPEAKER_MCCOY, TX_MUD3_023); else { showText(TX_SPEAKER_MCCOY, TX_MUD3_030); @@ -424,7 +424,7 @@ void Room::mudd3TalkToMccoy() { } void Room::mudd3TalkToRedshirt() { - if (!_vm->_awayMission.mudd.muddInDatabaseRoom) { + if (!_awayMission->mudd.muddInDatabaseRoom) { showText(TX_SPEAKER_BUCHERT, TX_MUD3_070); showText(TX_SPEAKER_KIRK, TX_MUD3_016); showText(TX_SPEAKER_BUCHERT, TX_MUD3_071); @@ -435,7 +435,7 @@ void Room::mudd3TalkToRedshirt() { void Room::mudd3TalkToMudd() { // ENHANCEMENT: the 2nd part of the if condition is new; whether he physically // destroys the database or does through software, he should give this reaction. - if (_vm->_awayMission.mudd.databaseDestroyed || _vm->_awayMission.mudd.muddErasedDatabase) { + if (_awayMission->mudd.databaseDestroyed || _awayMission->mudd.muddErasedDatabase) { showText(TX_SPEAKER_MUDD, TX_MUD3_060); showText(TX_SPEAKER_MCCOY, TX_MUD3_029); showText(TX_SPEAKER_MUDD, TX_MUD3_061); -- cgit v1.2.3