STARTREK: Minor fixes to LOVE mission

scummvm · Aug 9, 2018 · dee2635 · dee2635
1 parent 62cd8e4
commit dee2635
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/engines/startrek/rooms/love0.cpp b/engines/startrek/rooms/love0.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;
 }

diff --git a/engines/startrek/rooms/love5.cpp b/engines/startrek/rooms/love5.cpp
@@ -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() {