diff options
| author | Matthew Stewart | 2018-06-14 02:19:14 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | 6e322ebfc5279ee16076b07b82a1dc2c44122b26 (patch) | |
| tree | 2203059dba594b0871082f063730c0fc1b87db69 /engines/startrek/rooms/tug2.cpp | |
| parent | 3d27a9a92cc7bcf88f58aa8f4b2639573bb5e697 (diff) | |
| download | scummvm-rg350-6e322ebfc5279ee16076b07b82a1dc2c44122b26.tar.gz scummvm-rg350-6e322ebfc5279ee16076b07b82a1dc2c44122b26.tar.bz2 scummvm-rg350-6e322ebfc5279ee16076b07b82a1dc2c44122b26.zip | |
STARTREK: TUG3 (mission 2 finished)
Diffstat (limited to 'engines/startrek/rooms/tug2.cpp')
| -rw-r--r-- | engines/startrek/rooms/tug2.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engines/startrek/rooms/tug2.cpp b/engines/startrek/rooms/tug2.cpp index e89aff79fd..3c6aad2ed5 100644 --- a/engines/startrek/rooms/tug2.cpp +++ b/engines/startrek/rooms/tug2.cpp @@ -481,7 +481,7 @@ void Room::tug2UseKillPhaserOnGuard1() { else { loadActorAnim2(OBJECT_KIRK, "kdrawe", -1, -1, 24); _vm->_awayMission.tug.kirkPhaserDrawn = true; - _vm->_awayMission.tug.field4a = true; + _vm->_awayMission.tug.brigElasiPhasersOnKill = true; } } } @@ -509,7 +509,7 @@ void Room::tug2UseKillPhaserOnGuard2() { else { loadActorAnim2(OBJECT_KIRK, "kdrawe", -1, -1, 25); _vm->_awayMission.tug.kirkPhaserDrawn = true; - _vm->_awayMission.tug.field4a = true; + _vm->_awayMission.tug.brigElasiPhasersOnKill = true; } } } @@ -624,7 +624,7 @@ void Room::tug2Timer0Expired() { return; _roomVar.tug2.elasiPhaserOnKill = 0; - if (_vm->_awayMission.tug.field4a) + if (_vm->_awayMission.tug.brigElasiPhasersOnKill) _roomVar.tug2.elasiPhaserOnKill = 1; switch (_vm->_awayMission.tug.field4b) { @@ -659,14 +659,14 @@ void Room::tug2Timer0Expired() { case 2: // Guard shoots spock (or kirk) _vm->_awayMission.tug.field4b++; - _roomVar.tug2._1ec4 = 0; - if (_vm->_awayMission.tug.field4a) - _roomVar.tug2._1ec4 = 1; + _roomVar.tug2.shootKirkOverride = false; + if (_vm->_awayMission.tug.brigElasiPhasersOnKill) + _roomVar.tug2.shootKirkOverride = true; tug2DetermineElasiShooter(); - if (_roomVar.tug2._1ec4 == 0) - _roomVar.tug2.shootingTarget = OBJECT_SPOCK; - else + if (_roomVar.tug2.shootKirkOverride) _roomVar.tug2.shootingTarget = OBJECT_KIRK; + else + _roomVar.tug2.shootingTarget = OBJECT_SPOCK; _vm->_awayMission.timers[0] = 60; tug2GuardShootsCrewman(); break; @@ -683,16 +683,16 @@ void Room::tug2Timer0Expired() { case 4: _vm->_awayMission.tug.field4b++; - if (_roomVar.tug2._1ec4 == 0) { + if (_roomVar.tug2.shootKirkOverride) { tug2DetermineElasiShooter(); - _roomVar.tug2.shootingTarget = OBJECT_KIRK; - _vm->_awayMission.timers[2] = 40; // TODO + _roomVar.tug2.shootingTarget = OBJECT_SPOCK; + _vm->_awayMission.timers[2] = 40; tug2GuardShootsCrewman(); } - else if (_roomVar.tug2._1ec4 == 1) { + else if (_roomVar.tug2.shootKirkOverride) { tug2DetermineElasiShooter(); - _roomVar.tug2.shootingTarget = OBJECT_SPOCK; - _vm->_awayMission.timers[2] = 40; + _roomVar.tug2.shootingTarget = OBJECT_KIRK; + _vm->_awayMission.timers[2] = 40; // TODO tug2GuardShootsCrewman(); } break; |