diff options
| author | Matthew Stewart | 2018-07-24 21:33:37 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | b8c244da875f676dcc401ecff1e165baeb2d4ab7 (patch) | |
| tree | 882bd452ae766739a4118fd7ad29c55ac15e69ba /engines/startrek/rooms/demon0.cpp | |
| parent | fe98dbb69d1f8222eeb391111f59670658b0daad (diff) | |
| download | scummvm-rg350-b8c244da875f676dcc401ecff1e165baeb2d4ab7.tar.gz scummvm-rg350-b8c244da875f676dcc401ecff1e165baeb2d4ab7.tar.bz2 scummvm-rg350-b8c244da875f676dcc401ecff1e165baeb2d4ab7.zip | |
STARTREK: Clean up room-specific vars in mission 1
Diffstat (limited to 'engines/startrek/rooms/demon0.cpp')
| -rw-r--r-- | engines/startrek/rooms/demon0.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/startrek/rooms/demon0.cpp b/engines/startrek/rooms/demon0.cpp index e16e88427c..189509a3cf 100644 --- a/engines/startrek/rooms/demon0.cpp +++ b/engines/startrek/rooms/demon0.cpp @@ -65,40 +65,40 @@ void Room::demon0TouchedWarp0() { void Room::demon0WalkToBottomDoor() { _vm->_awayMission.disableInput = 1; - _rdfData[0xcd] = 1; // FIXME + _roomVar.demon.movingToBottomDoor = true; _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E; walkCrewman(OBJECT_KIRK, 243, 158, 1); } void Room::demon0TouchedHotspot1() { - if (_rdfData[0xcd] != 1) // FIXME: not portable to mac/amiga? + if (!_roomVar.demon.movingToBottomDoor) return; loadActorAnim2(9, "s0r0d1", 254, 153, 1); playSoundEffectIndex(0x05); } void Room::demon0ReachedBottomDoor() { - if (++_rdfData[0xca] != 2) // FIXME + if (++_roomVar.demon.bottomDoorCounter != 2) return; loadRoomIndex(5, 0); } void Room::demon0WalkToTopDoor() { _vm->_awayMission.disableInput = 1; - _rdfData[0xcc] = 1; // FIXME + _roomVar.demon.movingToTopDoor = true; _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E; walkCrewman(OBJECT_KIRK, 157, 134, 2); } void Room::demon0TouchedHotspot0() { - if (_rdfData[0xcc] != 1) // FIXME: not portable to mac/amiga? + if (!_roomVar.demon.movingToTopDoor) return; loadActorAnim2(10, "s0r0d2", 158, 130, 2); playSoundEffectIndex(0x05); } void Room::demon0ReachedTopDoor() { - if (++_rdfData[0xcb] != 2) // FIXME + if (++_roomVar.demon.topDoorCounter != 2) return; loadRoomIndex(6, 3); } |