aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/rooms/love1.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/startrek/rooms/love1.cpp')
-rw-r--r--engines/startrek/rooms/love1.cpp148
1 files changed, 74 insertions, 74 deletions
diff --git a/engines/startrek/rooms/love1.cpp b/engines/startrek/rooms/love1.cpp
index 6398b38dc5..bdcbb6a167 100644
--- a/engines/startrek/rooms/love1.cpp
+++ b/engines/startrek/rooms/love1.cpp
@@ -59,33 +59,33 @@ void Room::love1Tick1() {
switch (_vm->_awayMission.love.bottleInNozzle) {
case BOTTLETYPE_N2O:
- strcpy(_roomVar.love1.bottleAnimation, "btle1");
- _roomVar.love1.itemInNozzle = OBJECT_IN2O;
+ strcpy(_roomVar.love.bottleAnimation, "btle1");
+ _roomVar.love.itemInNozzle = OBJECT_IN2O;
goto common;
case BOTTLETYPE_NH3:
- strcpy(_roomVar.love1.bottleAnimation, "btle2");
- _roomVar.love1.itemInNozzle = OBJECT_INH3;
+ strcpy(_roomVar.love.bottleAnimation, "btle2");
+ _roomVar.love.itemInNozzle = OBJECT_INH3;
goto common;
case BOTTLETYPE_H2O:
- strcpy(_roomVar.love1.bottleAnimation, "btle3");
- _roomVar.love1.itemInNozzle = OBJECT_IH2O;
+ strcpy(_roomVar.love.bottleAnimation, "btle3");
+ _roomVar.love.itemInNozzle = OBJECT_IH2O;
goto common;
case BOTTLETYPE_RLG:
- strcpy(_roomVar.love1.bottleAnimation, "btle4");
- _roomVar.love1.itemInNozzle = OBJECT_IRLG;
+ strcpy(_roomVar.love.bottleAnimation, "btle4");
+ _roomVar.love.itemInNozzle = OBJECT_IRLG;
goto common;
common:
- loadActorAnim(OBJECT_BOTTLE, _roomVar.love1.bottleAnimation, 0xa3, 0x72, 0);
+ loadActorAnim(OBJECT_BOTTLE, _roomVar.love.bottleAnimation, 0xa3, 0x72, 0);
// fall through
case BOTTLETYPE_NONE:
- if (_vm->_awayMission.love.field2c)
- _vm->_awayMission.timers[0] = getRandomWordInRange(200, 400);
break;
}
- if (_vm->_awayMission.love.field2d)
+ if (_vm->_awayMission.love.releasedHumanLaughingGas)
+ _vm->_awayMission.timers[0] = getRandomWordInRange(200, 400);
+ if (_vm->_awayMission.love.releasedRomulanLaughingGas)
_vm->_awayMission.timers[1] = getRandomWordInRange(200, 400);
_vm->_awayMission.timers[2] = 200;
@@ -93,18 +93,18 @@ common:
loadActorAnim(OBJECT_DOOR1, "s3r2d1a", 0, 0, 0);
loadActorAnim(OBJECT_DOOR2, "s3r2d2a", 0, 0, 0);
- _roomVar.love1._1d2a = 0x90;
- _roomVar.love1._1d2b = 0xa7;
+ _roomVar.love.cmnXPosToCureSpock = 0x90;
+ _roomVar.love.cmnYPosToCureSpock = 0xa7;
}
void Room::love1WalkToDoor3() {
_vm->_awayMission.disableInput = true;
- _roomVar.love1.walkingToDoor = true;
+ _roomVar.love.walkingToDoor = true;
walkCrewman(OBJECT_KIRK, 0xd9, 0x81, 15);
}
void Room::love1OpenDoor3() {
- if (_roomVar.love1.walkingToDoor) {
+ if (_roomVar.love.walkingToDoor) {
loadActorAnim(OBJECT_DOOR3, "s3r2d3", 0xdb, 0x7e, 2);
playSoundEffectIndex(SND_DOOR1);
}
@@ -112,19 +112,19 @@ void Room::love1OpenDoor3() {
// Door 3 opened, or door 3 reached (both must occur before transition happens)
void Room::love1ReachedDoor3() {
- _roomVar.love1.door3OpenCounter++;
- if (_roomVar.love1.door3OpenCounter == 2)
+ _roomVar.love.doorOpenCounter++;
+ if (_roomVar.love.doorOpenCounter == 2)
loadRoomIndex(3, 1);
}
void Room::love1WalkToDoor1() {
_vm->_awayMission.disableInput = true;
- _roomVar.love1.walkingToDoor = true;
+ _roomVar.love.walkingToDoor = true;
walkCrewman(OBJECT_KIRK, 0x42, 0x97, 16);
}
void Room::love1OpenDoor1() {
- if (_roomVar.love1.walkingToDoor) {
+ if (_roomVar.love.walkingToDoor) {
loadActorAnim(OBJECT_DOOR1, "s3r2d1", 0, 0, 3);
playSoundEffectIndex(SND_DOOR1);
}
@@ -132,19 +132,19 @@ void Room::love1OpenDoor1() {
// Door 1 opened, or door 1 reached
void Room::love1ReachedDoor1() {
- _roomVar.love1.door1OpenCounter++;
- if (_roomVar.love1.door1OpenCounter == 2)
+ _roomVar.love.doorOpenCounter++;
+ if (_roomVar.love.doorOpenCounter == 2)
loadRoomIndex(0, 2);
}
void Room::love1WalkToDoor2() {
_vm->_awayMission.disableInput = true;
- _roomVar.love1.walkingToDoor = true;
+ _roomVar.love.walkingToDoor = true;
walkCrewman(OBJECT_KIRK, 0x79, 0x85, 17);
}
void Room::love1OpenDoor2() {
- if (_roomVar.love1.walkingToDoor) {
+ if (_roomVar.love.walkingToDoor) {
loadActorAnim(OBJECT_DOOR2, "s3r2d2", 0, 0, 4);
playSoundEffectIndex(SND_DOOR1);
}
@@ -152,8 +152,8 @@ void Room::love1OpenDoor2() {
// Door 2 opened, or door 2 reached
void Room::love1ReachedDoor2() {
- _roomVar.love1.door2OpenCounter++;
- if (_roomVar.love1.door2OpenCounter == 2)
+ _roomVar.love.doorOpenCounter++;
+ if (_roomVar.love.doorOpenCounter == 2)
loadRoomIndex(2, 0);
}
@@ -355,13 +355,13 @@ void Room::love1KirkGotBottleFromNozzle() {
_vm->_awayMission.love.bottleInNozzle = BOTTLETYPE_NONE;
loadActorStandAnim(OBJECT_BOTTLE);
showText(TX_LOV1N007);
- _roomVar.love1.itemInNozzle = 0;
+ _roomVar.love.itemInNozzle = 0;
}
void Room::love1UseN2OOnNozzle() {
if (_vm->_awayMission.love.bottleInNozzle == BOTTLETYPE_NONE) {
- _roomVar.love1.itemInNozzle = OBJECT_IN2O;
- strcpy(_roomVar.love1.bottleAnimation, "btle1");
+ _roomVar.love.itemInNozzle = OBJECT_IN2O;
+ strcpy(_roomVar.love.bottleAnimation, "btle1");
_vm->_awayMission.love.bottleInNozzle = BOTTLETYPE_N2O;
walkCrewman(OBJECT_KIRK, 0xa6, 0x90, 3);
}
@@ -369,8 +369,8 @@ void Room::love1UseN2OOnNozzle() {
void Room::love1UseH2OOnNozzle() {
if (_vm->_awayMission.love.bottleInNozzle == BOTTLETYPE_NONE) {
- _roomVar.love1.itemInNozzle = OBJECT_IH2O;
- strcpy(_roomVar.love1.bottleAnimation, "btle3");
+ _roomVar.love.itemInNozzle = OBJECT_IH2O;
+ strcpy(_roomVar.love.bottleAnimation, "btle3");
_vm->_awayMission.love.bottleInNozzle = BOTTLETYPE_H2O;
walkCrewman(OBJECT_KIRK, 0xa6, 0x90, 3);
}
@@ -378,8 +378,8 @@ void Room::love1UseH2OOnNozzle() {
void Room::love1UseNH3OnNozzle() {
if (_vm->_awayMission.love.bottleInNozzle == BOTTLETYPE_NONE) {
- _roomVar.love1.itemInNozzle = OBJECT_INH3;
- strcpy(_roomVar.love1.bottleAnimation, "btle2");
+ _roomVar.love.itemInNozzle = OBJECT_INH3;
+ strcpy(_roomVar.love.bottleAnimation, "btle2");
_vm->_awayMission.love.bottleInNozzle = BOTTLETYPE_NH3;
walkCrewman(OBJECT_KIRK, 0xa6, 0x90, 3);
}
@@ -387,8 +387,8 @@ void Room::love1UseNH3OnNozzle() {
void Room::love1UseRLGOnNozzle() {
if (_vm->_awayMission.love.bottleInNozzle == BOTTLETYPE_NONE) {
- _roomVar.love1.itemInNozzle = OBJECT_IRLG;
- strcpy(_roomVar.love1.bottleAnimation, "btle4");
+ _roomVar.love.itemInNozzle = OBJECT_IRLG;
+ strcpy(_roomVar.love.bottleAnimation, "btle4");
_vm->_awayMission.love.bottleInNozzle = BOTTLETYPE_RLG;
walkCrewman(OBJECT_KIRK, 0xa6, 0x90, 3);
}
@@ -399,8 +399,8 @@ void Room::love1KirkReachedNozzleToPut() {
}
void Room::love1KirkPutBottleInNozzle() {
- loadActorAnim(OBJECT_BOTTLE, _roomVar.love1.bottleAnimation, 0xa3, 0x72, 0);
- loseItem(_roomVar.love1.itemInNozzle);
+ loadActorAnim(OBJECT_BOTTLE, _roomVar.love.bottleAnimation, 0xa3, 0x72, 0);
+ loseItem(_roomVar.love.itemInNozzle);
}
void Room::love1UseAnthingOnNozzle() {
@@ -431,7 +431,7 @@ void Room::love1MccoyReachedReplicator() {
}
void Room::love1MccoyUsedReplicator() {
- if (_roomVar.love1.itemInNozzle == OBJECT_INH3) {
+ if (_roomVar.love.itemInNozzle == OBJECT_INH3) {
loadActorStandAnim(OBJECT_DISH_IN_CHAMBER);
loadActorAnim2(OBJECT_CHAMBER, "s3r2d6", 0xb4, 0x75, 7);
playSoundEffectIndex(SND_DOOR1);
@@ -502,41 +502,41 @@ void Room::love1KirkGotPolyberylcarbonate() {
}
void Room::love1UseKirkOnFreezer() {
- _roomVar.love1.crewmanUsingFreezerRetY = 0xa0;
- _roomVar.love1.crewmanUsingFreezerRetX = 0x96;
- _roomVar.love1.crewmanUsingDevice = OBJECT_KIRK;
- walkCrewman(_roomVar.love1.crewmanUsingDevice, 0x71, 0x8e, 7);
+ _roomVar.love.crewmanUsingFreezerRetY = 0xa0;
+ _roomVar.love.crewmanUsingFreezerRetX = 0x96;
+ _roomVar.love.crewmanUsingDevice = OBJECT_KIRK;
+ walkCrewman(_roomVar.love.crewmanUsingDevice, 0x71, 0x8e, 7);
_vm->_awayMission.disableInput = true;
}
void Room::love1UseRedshirtOnFreezer() {
- _roomVar.love1.crewmanUsingFreezerRetY = 0x89;
- _roomVar.love1.crewmanUsingFreezerRetX = 0x95;
- _roomVar.love1.crewmanUsingDevice = OBJECT_REDSHIRT;
- walkCrewman(_roomVar.love1.crewmanUsingDevice, 0x71, 0x8e, 7);
+ _roomVar.love.crewmanUsingFreezerRetY = 0x89;
+ _roomVar.love.crewmanUsingFreezerRetX = 0x95;
+ _roomVar.love.crewmanUsingDevice = OBJECT_REDSHIRT;
+ walkCrewman(_roomVar.love.crewmanUsingDevice, 0x71, 0x8e, 7);
_vm->_awayMission.disableInput = true;
}
void Room::love1UseSpockOnFreezer() {
- _roomVar.love1.crewmanUsingFreezerRetY = 0xa9;
- _roomVar.love1.crewmanUsingFreezerRetX = 0x61;
- _roomVar.love1.crewmanUsingDevice = OBJECT_SPOCK;
- walkCrewman(_roomVar.love1.crewmanUsingDevice, 0x71, 0x8e, 7);
+ _roomVar.love.crewmanUsingFreezerRetY = 0xa9;
+ _roomVar.love.crewmanUsingFreezerRetX = 0x61;
+ _roomVar.love.crewmanUsingDevice = OBJECT_SPOCK;
+ walkCrewman(_roomVar.love.crewmanUsingDevice, 0x71, 0x8e, 7);
_vm->_awayMission.disableInput = true;
}
void Room::love1UseMccoyOnFreezer() {
- _roomVar.love1.crewmanUsingFreezerRetY = 0x98;
- _roomVar.love1.crewmanUsingFreezerRetX = 0xbf;
- _roomVar.love1.crewmanUsingDevice = OBJECT_MCCOY;
- walkCrewman(_roomVar.love1.crewmanUsingDevice, 0x71, 0x8e, 7);
+ _roomVar.love.crewmanUsingFreezerRetY = 0x98;
+ _roomVar.love.crewmanUsingFreezerRetX = 0xbf;
+ _roomVar.love.crewmanUsingDevice = OBJECT_MCCOY;
+ walkCrewman(_roomVar.love.crewmanUsingDevice, 0x71, 0x8e, 7);
_vm->_awayMission.disableInput = true;
}
void Room::love1CrewmanReachedFreezer() {
- Common::String useAnim = _vm->getCrewmanAnimFilename(_roomVar.love1.crewmanUsingDevice, "usehw");
+ Common::String useAnim = _vm->getCrewmanAnimFilename(_roomVar.love.crewmanUsingDevice, "usehw");
- loadActorAnim2(_roomVar.love1.crewmanUsingDevice, useAnim, -1, -1, 16);
+ loadActorAnim2(_roomVar.love.crewmanUsingDevice, useAnim, -1, -1, 16);
}
void Room::love1CrewmanOpenedOrClosedFreezer() {
@@ -548,7 +548,7 @@ void Room::love1CrewmanOpenedOrClosedFreezer() {
playSoundEffectIndex(SND_DOOR1);
_vm->_awayMission.love.freezerOpen = !_vm->_awayMission.love.freezerOpen;
- walkCrewman(_roomVar.love1.crewmanUsingDevice, _roomVar.love1.crewmanUsingFreezerRetX, _roomVar.love1.crewmanUsingFreezerRetY, 0);
+ walkCrewman(_roomVar.love.crewmanUsingDevice, _roomVar.love.crewmanUsingFreezerRetX, _roomVar.love.crewmanUsingFreezerRetY, 0);
_vm->_awayMission.disableInput = false;
}
@@ -589,30 +589,30 @@ void Room::love1FinishedUsingArbitraryItemOnDistillator() {
}
void Room::love1UseKirkOnLadder() {
- _roomVar.love1.crewmanUsingDevice = OBJECT_KIRK;
- _vm->_awayMission.crewDirectionsAfterWalk[_roomVar.love1.crewmanUsingDevice] = DIR_N;
- walkCrewman(_roomVar.love1.crewmanUsingDevice, 0x102, 0x89, 1);
+ _roomVar.love.crewmanUsingDevice = OBJECT_KIRK;
+ _vm->_awayMission.crewDirectionsAfterWalk[_roomVar.love.crewmanUsingDevice] = DIR_N;
+ walkCrewman(_roomVar.love.crewmanUsingDevice, 0x102, 0x89, 1);
_vm->_awayMission.disableInput = true;
}
void Room::love1UseSpockOnLadder() {
- _roomVar.love1.crewmanUsingDevice = OBJECT_SPOCK;
- _vm->_awayMission.crewDirectionsAfterWalk[_roomVar.love1.crewmanUsingDevice] = DIR_N;
- walkCrewman(_roomVar.love1.crewmanUsingDevice, 0x102, 0x89, 1);
+ _roomVar.love.crewmanUsingDevice = OBJECT_SPOCK;
+ _vm->_awayMission.crewDirectionsAfterWalk[_roomVar.love.crewmanUsingDevice] = DIR_N;
+ walkCrewman(_roomVar.love.crewmanUsingDevice, 0x102, 0x89, 1);
_vm->_awayMission.disableInput = true;
}
void Room::love1UseMccoyOnLadder() {
- _roomVar.love1.crewmanUsingDevice = OBJECT_MCCOY;
- _vm->_awayMission.crewDirectionsAfterWalk[_roomVar.love1.crewmanUsingDevice] = DIR_N;
- walkCrewman(_roomVar.love1.crewmanUsingDevice, 0x102, 0x89, 1);
+ _roomVar.love.crewmanUsingDevice = OBJECT_MCCOY;
+ _vm->_awayMission.crewDirectionsAfterWalk[_roomVar.love.crewmanUsingDevice] = DIR_N;
+ walkCrewman(_roomVar.love.crewmanUsingDevice, 0x102, 0x89, 1);
_vm->_awayMission.disableInput = true;
}
void Room::love1UseRedshirtOnLadder() {
- _roomVar.love1.crewmanUsingDevice = OBJECT_REDSHIRT;
- _vm->_awayMission.crewDirectionsAfterWalk[_roomVar.love1.crewmanUsingDevice] = DIR_N;
- walkCrewman(_roomVar.love1.crewmanUsingDevice, 0x102, 0x89, 1);
+ _roomVar.love.crewmanUsingDevice = OBJECT_REDSHIRT;
+ _vm->_awayMission.crewDirectionsAfterWalk[_roomVar.love.crewmanUsingDevice] = DIR_N;
+ walkCrewman(_roomVar.love.crewmanUsingDevice, 0x102, 0x89, 1);
_vm->_awayMission.disableInput = true;
}
@@ -630,19 +630,19 @@ void Room::love1CrewmanReachedLadder() {
loadActorAnim(OBJECT_PHASERSHOT, "s3r2s2", 0xf3, 0x89, 0);
playSoundEffectIndex(SND_PHASSHOT);
- Common::String anim = _vm->getCrewmanAnimFilename(_roomVar.love1.crewmanUsingDevice, "killw");
- loadActorAnim(_roomVar.love1.crewmanUsingDevice, anim, 0x102, 0x89, 6);
- _roomVar.love1.dyingSpeaker = speakers[_roomVar.love1.crewmanUsingDevice];
+ Common::String anim = _vm->getCrewmanAnimFilename(_roomVar.love.crewmanUsingDevice, "killw");
+ loadActorAnim(_roomVar.love.crewmanUsingDevice, anim, 0x102, 0x89, 6);
+ _roomVar.love.dyingSpeaker = speakers[_roomVar.love.crewmanUsingDevice];
}
}
void Room::love1CrewmanDiedFromPhaser() {
- if (_roomVar.love1.crewmanUsingDevice == OBJECT_REDSHIRT) {
+ if (_roomVar.love.crewmanUsingDevice == OBJECT_REDSHIRT) {
_vm->_awayMission.disableInput = false;
showText(TX_SPEAKER_FERRIS, TX_LOV1_024);
_vm->_awayMission.redshirtDead = true;
} else {
- showText(_roomVar.love1.dyingSpeaker, TX_LOV1_025);
+ showText(_roomVar.love.dyingSpeaker, TX_LOV1_025);
showGameOverMenu();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 15:14:22 +0000