diff options
| author | Matthew Stewart | 2018-07-27 20:32:29 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | 8970909318c158b18eb5612f26db1d4db941160f (patch) | |
| tree | 90e18c918e1cdca7b9fb6b9e6bf8b13c7ff4ed52 /engines/startrek/rooms/demon2.cpp | |
| parent | 42b228144ad5f19c412e24a8c98e536908748f95 (diff) | |
| download | scummvm-rg350-8970909318c158b18eb5612f26db1d4db941160f.tar.gz scummvm-rg350-8970909318c158b18eb5612f26db1d4db941160f.tar.bz2 scummvm-rg350-8970909318c158b18eb5612f26db1d4db941160f.zip | |
STARTREK: Reorganize includes in room.h
This should avoid the costly rebuild of everything in the 'rooms/'
folder, at least sometimes...
Diffstat (limited to 'engines/startrek/rooms/demon2.cpp')
| -rw-r--r-- | engines/startrek/rooms/demon2.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/startrek/rooms/demon2.cpp b/engines/startrek/rooms/demon2.cpp index 4e8f8b248e..d31f417a44 100644 --- a/engines/startrek/rooms/demon2.cpp +++ b/engines/startrek/rooms/demon2.cpp @@ -37,8 +37,8 @@ void Room::demon2ReachedCave() { } void Room::demon2TouchedWarp1() { - _vm->_awayMission.demon.enteredFrom = 2; - _vm->_awayMission.rdfStillDoDefaultAction = true; + _awayMission->demon.enteredFrom = 2; + _awayMission->rdfStillDoDefaultAction = true; } void Room::demon2LookAtCave() { @@ -141,18 +141,18 @@ void Room::demon2UseMTricorderOnBerries() { loadActorAnim2(OBJECT_MCCOY, "mscane", -1, -1, 0); playSoundEffectIndex(0x04); - if (_vm->_awayMission.demon.curedChub) + if (_awayMission->demon.curedChub) showText(TX_SPEAKER_MCCOY, TX_DEM2_013); - else if (_vm->_awayMission.demon.madeHypoDytoxin) + else if (_awayMission->demon.madeHypoDytoxin) showText(TX_SPEAKER_MCCOY, TX_DEM2_009); - else if (_vm->_awayMission.demon.knowAboutHypoDytoxin) + else if (_awayMission->demon.knowAboutHypoDytoxin) showText(TX_SPEAKER_MCCOY, TX_DEM2_010); else showText(TX_SPEAKER_MCCOY, TX_DEM2_012); } void Room::demon2GetBerries() { - if (_vm->_awayMission.demon.gotBerries) + if (_awayMission->demon.gotBerries) showText(TX_SPEAKER_MCCOY, TX_DEM2_014); else walkCrewman(OBJECT_KIRK, 0xe8, 0x97, 1); @@ -166,8 +166,8 @@ void Room::demon2ReachedBerries() { void Room::demon2PickedUpBerries() { showText(TX_DEM2N013); giveItem(OBJECT_IBERRY); - _vm->_awayMission.demon.gotBerries = true; - _vm->_awayMission.demon.missionScore += 1; + _awayMission->demon.gotBerries = true; + _awayMission->demon.missionScore += 1; } } |