aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMatthew Stewart2018-06-25 00:56:32 -0400
committerEugene Sandulenko2018-08-09 08:37:30 +0200
commitc3bd0347ada48ab5188d058104c884f3a0d61c21 (patch)
treed1f74d5f491744f346ebec99a89d17039ea78bf2 /engines
parent14639d85f72a87fbcb5185a6d1b8477666d3850a (diff)
downloadscummvm-rg350-c3bd0347ada48ab5188d058104c884f3a0d61c21.tar.gz
scummvm-rg350-c3bd0347ada48ab5188d058104c884f3a0d61c21.tar.bz2
scummvm-rg350-c3bd0347ada48ab5188d058104c884f3a0d61c21.zip
STARTREK: More minor fixes to LOVE mission
Diffstat (limited to 'engines')
-rw-r--r--engines/startrek/awaymission.cpp3
-rw-r--r--engines/startrek/events.cpp2
-rw-r--r--engines/startrek/rooms/love1.cpp6
-rw-r--r--engines/startrek/rooms/love4.cpp2
-rw-r--r--engines/startrek/rooms/lovea.cpp1
5 files changed, 6 insertions, 8 deletions
diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index a5cf80a5f8..ebdaa561ae 100644
--- a/engines/startrek/awaymission.cpp
+++ b/engines/startrek/awaymission.cpp
@@ -355,7 +355,7 @@ checkSelectedAction:
}
else if (_awayMission.activeAction == ACTION_LOOK)
showInventoryIcons(false);
- else if (_awayMission.activeAction == ACTION_USE && (_awayMission.crewDownBitset & 1) == 0)
+ else if (_awayMission.activeAction == ACTION_USE && (_awayMission.crewDownBitset & (1 << OBJECT_KIRK)) == 0)
showInventoryIcons(true);
break;
@@ -412,7 +412,6 @@ checkSelectedAction:
_awayMission.activeAction = ACTION_LOOK;
goto checkSelectedAction;
-
default:
break;
}
diff --git a/engines/startrek/events.cpp b/engines/startrek/events.cpp
index b80659c315..88bca9d6ed 100644
--- a/engines/startrek/events.cpp
+++ b/engines/startrek/events.cpp
@@ -49,8 +49,6 @@ void StarTrekEngine::pollSystemEvents() {
break;
case Common::EVENT_LBUTTONDOWN:
- // TODO: what happens when mouse click is outside normal screen bounds?
- // (apparently this can happen)
trekEvent.type = TREKEVENT_LBUTTONDOWN;
addEventToQueue(trekEvent);
break;
diff --git a/engines/startrek/rooms/love1.cpp b/engines/startrek/rooms/love1.cpp
index bdcbb6a167..23a6e2a242 100644
--- a/engines/startrek/rooms/love1.cpp
+++ b/engines/startrek/rooms/love1.cpp
@@ -328,9 +328,9 @@ void Room::love1GetFromNozzle() {
void Room::love1KirkReachedNozzleToGet() {
if (_vm->_awayMission.love.bottleInNozzle == 0)
- loadActorAnim2(OBJECT_KIRK, "kusemn", -1, -1, 11);
- else
showText(TX_LOV1N011);
+ else
+ loadActorAnim2(OBJECT_KIRK, "kusemn", -1, -1, 11);
}
void Room::love1KirkGotBottleFromNozzle() {
@@ -463,7 +463,7 @@ void Room::love1UseDishesOnChamber() {
void Room::love1KirkReachedChamberToPut() {
if (_vm->_awayMission.love.chamberHasDish)
- showText(TX_LOV1_014); // TODO: test
+ showText(TX_SPEAKER_MCCOY, TX_LOV1_014); // TODO: test
else {
loadActorAnim(OBJECT_CHAMBER, "s3r2d5", 0xb4, 0x75, 1);
playSoundEffectIndex(SND_DOOR1);
diff --git a/engines/startrek/rooms/love4.cpp b/engines/startrek/rooms/love4.cpp
index 6aad01eb80..cc05f72b5d 100644
--- a/engines/startrek/rooms/love4.cpp
+++ b/engines/startrek/rooms/love4.cpp
@@ -236,7 +236,7 @@ void Room::love4MccoyCuredRomulan1() {
showText(TX_LOV4N005);
if (!_roomVar.love.gaveWaterToRomulans)
- showText(TX_LOV4_023);
+ showText(TX_SPEAKER_MCCOY, TX_LOV4_023);
_vm->_awayMission.disableInput = false;
}
diff --git a/engines/startrek/rooms/lovea.cpp b/engines/startrek/rooms/lovea.cpp
index 59e0bb7eff..9805123394 100644
--- a/engines/startrek/rooms/lovea.cpp
+++ b/engines/startrek/rooms/lovea.cpp
@@ -148,6 +148,7 @@ void Room::loveaFinishedCuringSpock() {
showText(TX_SPEAKER_SPOCK, TX_LOV5_038);
showText(TX_SPEAKER_MCCOY, TX_LOV5_027);
showText(TX_SPEAKER_SPOCK, TX_LOV5C001);
+ _vm->_awayMission.love.spockCured = true;
}