Permalink
Browse files

STARTREK: Minor fixes to LOVE mission

  • Loading branch information...
Drenn1 authored and sev- committed Jun 25, 2018
1 parent 62cd8e4 commit dee26355b1606ac9a23275b9c6f5233966e876a0
Showing with 7 additions and 1 deletion.
  1. +4 −1 engines/startrek/rooms/love0.cpp
  2. +3 −0 engines/startrek/rooms/love5.cpp
@@ -33,11 +33,13 @@
namespace StarTrek {

void Room::love0Tick1() {
// BUGFIX: moved this out of the if statement below.
playVoc("LOV0LOOP");

if (!_vm->_awayMission.love.alreadyStartedMission) {
_vm->_awayMission.love.canister1 = CANTYPE_O2;
_vm->_awayMission.love.canister2 = CANTYPE_H2;
_vm->_awayMission.love.alreadyStartedMission = true;
playVoc("LOV0LOOP"); // FIXME: no audio after first entry?
}

if (_vm->_awayMission.love.releasedHumanLaughingGas)
@@ -48,6 +50,7 @@ void Room::love0Tick1() {

loadActorAnim(OBJECT_DOOR2, "s3r0d2a", 0xe6, 0x80, 0);
loadActorAnim(OBJECT_DOOR1, "s3r0d1a", 0x123, 0x8d, 0);

_roomVar.love.cmnXPosToCureSpock = 0xf4;
_roomVar.love.cmnYPosToCureSpock = 0x8f;
}
@@ -56,6 +56,9 @@ void Room::love5Tick1() {
if (_vm->_awayMission.love.releasedRomulanLaughingGas)
_vm->_awayMission.timers[1] = getRandomWordInRange(200, 400);
_vm->_awayMission.timers[2] = 200;

_roomVar.love.cmnXPosToCureSpock = 0x89;
_roomVar.love.cmnXPosToCureSpock = 0xb9;
}

void Room::love5TouchedWarp1() {

0 comments on commit dee2635

Please sign in to comment.