Permalink
Browse files

STARTREK: More minor fixes to LOVE mission

  • Loading branch information...
Drenn1 authored and sev- committed Jun 25, 2018
1 parent 14639d8 commit c3bd0347ada48ab5188d058104c884f3a0d61c21
@@ -355,7 +355,7 @@ void StarTrekEngine::handleAwayMissionEvents() {
}
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 @@ void StarTrekEngine::handleAwayMissionEvents() {
_awayMission.activeAction = ACTION_LOOK;
goto checkSelectedAction;


default:
break;
}
@@ -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;
@@ -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);
@@ -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;
}
@@ -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;
}


0 comments on commit c3bd034

Please sign in to comment.