Skip to content

Commit

Permalink
STARTREK: Clean up room-specific vars in mission 1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Stewmath @sev-
Stewmath authored and sev- committed Aug 9, 2018
1 parent fe98dbb commit b8c244d
Show file tree
Hide file tree
Showing 7 changed files with 177 additions and 174 deletions.
31 changes: 17 additions & 14 deletions engines/startrek/room.h
View file
Expand Up @@ -2140,13 +2140,20 @@ class Room {
// Room-specific variables. This is memset'ed to 0 when the room is initialized.
union {
struct {
// demon0
byte bottomDoorCounter; // 0xca
byte topDoorCounter; // 0xcb
bool movingToTopDoor; // 0xcc
bool movingToBottomDoor; // 0xcd

// demon1
bool klingonShot[3]; // 0xca
int numKlingonsKilled;
byte attackIndex;
bool kirkShooting;
char d6[10];
} demon1;

struct {
// demon3
bool shootingBoulder; // 0xca
bool boulder1Shot; // 0xcb
byte boulderBeingShot; // 0xcc
Expand All @@ -2158,18 +2165,16 @@ class Room {
bool kirkPhaserOut; // 0xd3
char boulderAnim[10]; // 0xd4
int16 usedPhaserOnDoor; // 0xd6
} demon3;

struct {
// demon4
bool triedToShootNauian; // 0xca
bool nauianEmerged; // 0xcb
bool disabledSecurity; // 0xcc
bool cd; // 0xcd
byte crewReadyToBeamOut; // 0xce
int16 crewmanUsingPanel; // 0xcf
} demon4;

struct {
// demon5
bool scannedRoberts; // 0xca
bool scannedChub; // 0xcb
bool scannedGrisnash; // 0xcc
Expand All @@ -2180,17 +2185,16 @@ class Room {
bool talkedToChub; // 0xd1
bool talkedToGrisnash; // 0xd2
bool talkedToStephen; // 0xd3
byte doorCounter; // 0xd4
bool movingToDoor; // 0xd5
} demon5;

struct {
// demon6
bool insultedStephenRecently; // 0xca
bool stephenInRoom; // 0xcb
bool caseOpened; // 0xcd
byte doorCounter; // 0xce
bool movingToDoor; // 0xcf
} demon6;

// common
bool movingToDoor;
byte doorCounter;
} demon;

struct {
byte shootingObject; // 0x1ec1
Expand All @@ -2199,7 +2203,6 @@ class Room {
byte shootKirkOverride; // 0x1ec4
} tug2;


struct {
// love0
bool heardSummaryOfVirus; // 0xda
Expand Down
12 changes: 6 additions & 6 deletions engines/startrek/rooms/demon0.cpp
View file
Expand Up @@ -65,40 +65,40 @@ void Room::demon0TouchedWarp0() {

void Room::demon0WalkToBottomDoor() {
_vm->_awayMission.disableInput = 1;
_rdfData[0xcd] = 1; // FIXME
_roomVar.demon.movingToBottomDoor = true;
_vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E;
walkCrewman(OBJECT_KIRK, 243, 158, 1);
}

void Room::demon0TouchedHotspot1() {
if (_rdfData[0xcd] != 1) // FIXME: not portable to mac/amiga?
if (!_roomVar.demon.movingToBottomDoor)
return;
loadActorAnim2(9, "s0r0d1", 254, 153, 1);
playSoundEffectIndex(0x05);
}

void Room::demon0ReachedBottomDoor() {
if (++_rdfData[0xca] != 2) // FIXME
if (++_roomVar.demon.bottomDoorCounter != 2)
return;
loadRoomIndex(5, 0);
}

void Room::demon0WalkToTopDoor() {
_vm->_awayMission.disableInput = 1;
_rdfData[0xcc] = 1; // FIXME
_roomVar.demon.movingToTopDoor = true;
_vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E;
walkCrewman(OBJECT_KIRK, 157, 134, 2);
}

void Room::demon0TouchedHotspot0() {
if (_rdfData[0xcc] != 1) // FIXME: not portable to mac/amiga?
if (!_roomVar.demon.movingToTopDoor)
return;
loadActorAnim2(10, "s0r0d2", 158, 130, 2);
playSoundEffectIndex(0x05);
}

void Room::demon0ReachedTopDoor() {
if (++_rdfData[0xcb] != 2) // FIXME
if (++_roomVar.demon.topDoorCounter != 2)
return;
loadRoomIndex(6, 3);
}
Expand Down
102 changes: 51 additions & 51 deletions engines/startrek/rooms/demon1.cpp
View file
Expand Up @@ -54,15 +54,15 @@ void Room::demon1Tick1() {
loadActorAnim(9, "klg2d2", 0xaa, 0x7c, 0);
loadActorAnim(10, "klg3d2", 0, 0, 0);

_rdfData[0xca] = 1; // FIXME
_rdfData[0xcb] = 1;
_rdfData[0xcc] = 1;
_roomVar.demon1.numKlingonsKilled = 3;
_roomVar.demon.klingonShot[0] = true;
_roomVar.demon.klingonShot[1] = true;
_roomVar.demon.klingonShot[2] = true;
_roomVar.demon.numKlingonsKilled = 3;
}
}

void Room::demon1WalkToCave() {
if (_roomVar.demon1.numKlingonsKilled != 3)
if (_roomVar.demon.numKlingonsKilled != 3)
return;
walkCrewman(OBJECT_KIRK, 0xa3, 0x56, 2);
}
Expand Down Expand Up @@ -103,42 +103,42 @@ void Room::demon1Timer1Expired() {
int shooter;
Common::String anim;

if (_rdfData[0xca] != 1) {
if (!_roomVar.demon.klingonShot[0]) {
anim = "klg1f";
shooter = 8;

switch (_roomVar.demon1.attackIndex) {
switch (_roomVar.demon.attackIndex) {
case 0:
strcpy(_roomVar.demon1.d6, "klg1fr");
strcpy(_roomVar.demon.d6, "klg1fr");
break;
case 1:
strcpy(_roomVar.demon1.d6, "klg1fm");
strcpy(_roomVar.demon.d6, "klg1fm");
break;
case 2:
strcpy(_roomVar.demon1.d6, "klg1fs");
strcpy(_roomVar.demon.d6, "klg1fs");
break;
case 3:
strcpy(_roomVar.demon1.d6, "klg1fk");
strcpy(_roomVar.demon.d6, "klg1fk");
break;
default:
// TODO
return;
}
} else if (_rdfData[0xcb] != 1) {
} else if (!_roomVar.demon.klingonShot[1]) {
anim = "klg2f";
shooter = 9;
switch (_roomVar.demon1.attackIndex) {
switch (_roomVar.demon.attackIndex) {
case 0:
strcpy(_roomVar.demon1.d6, "klg2fr");
strcpy(_roomVar.demon.d6, "klg2fr");
break;
case 1:
strcpy(_roomVar.demon1.d6, "klg2fm");
strcpy(_roomVar.demon.d6, "klg2fm");
break;
case 2:
strcpy(_roomVar.demon1.d6, "klg2fs");
strcpy(_roomVar.demon.d6, "klg2fs");
break;
case 3:
strcpy(_roomVar.demon1.d6, "klg2fk");
strcpy(_roomVar.demon.d6, "klg2fk");
break;
default:
// TODO
Expand All @@ -147,18 +147,18 @@ void Room::demon1Timer1Expired() {
} else {
anim = "klg3f";
shooter = 10;
switch (_roomVar.demon1.attackIndex) {
switch (_roomVar.demon.attackIndex) {
case 0:
strcpy(_roomVar.demon1.d6, "klg3fr");
strcpy(_roomVar.demon.d6, "klg3fr");
break;
case 1:
strcpy(_roomVar.demon1.d6, "klg3fm");
strcpy(_roomVar.demon.d6, "klg3fm");
break;
case 2:
strcpy(_roomVar.demon1.d6, "klg3fs");
strcpy(_roomVar.demon.d6, "klg3fs");
break;
case 3:
strcpy(_roomVar.demon1.d6, "klg3fk");
strcpy(_roomVar.demon.d6, "klg3fk");
break;
default:
// TODO
Expand All @@ -170,21 +170,21 @@ void Room::demon1Timer1Expired() {
}

void Room::demon1KlingonFinishedAimingWeapon() {
loadActorAnim(11, _roomVar.demon1.d6, 0, 0, 0);
loadActorAnim(11, _roomVar.demon.d6, 0, 0, 0);
playSoundEffectIndex(0x06);

_roomVar.demon1.attackIndex++;
_roomVar.demon.attackIndex++;
int crewman;
if (_roomVar.demon1.attackIndex == 1) {
if (_roomVar.demon.attackIndex == 1) {
loadActorAnim2(OBJECT_REDSHIRT, "rstunn", -1, -1, 0);
crewman = OBJECT_REDSHIRT;
} else if (_roomVar.demon1.attackIndex == 2) {
} else if (_roomVar.demon.attackIndex == 2) {
loadActorAnim2(OBJECT_SPOCK, "sstunn", -1, -1, 0);
crewman = OBJECT_SPOCK;
} else if (_roomVar.demon1.attackIndex == 3) {
} else if (_roomVar.demon.attackIndex == 3) {
loadActorAnim2(OBJECT_MCCOY, "mstune", -1, -1, 0);
crewman = OBJECT_MCCOY;
} else if (_roomVar.demon1.attackIndex == 4) {
} else if (_roomVar.demon.attackIndex == 4) {
loadActorAnim2(OBJECT_KIRK, "kstunn", -1, -1, 1);
crewman = OBJECT_KIRK;
}
Expand All @@ -202,27 +202,27 @@ void Room::demon1KirkShot() {
}

void Room::demon1UsePhaserOnAnything() {
if (_roomVar.demon1.numKlingonsKilled == 3)
if (_roomVar.demon.numKlingonsKilled == 3)
showText(TX_SPEAKER_MCCOY, TX_DEM1_011);
}

void Room::demon1UsePhaserOnKlingon1() {
if (_rdfData[0xca] != 0)
if (_roomVar.demon.klingonShot[0])
return;
_vm->_awayMission.disableInput = 1;
_rdfData[0xca] = 1;
_roomVar.demon.klingonShot[0] = true;

if (_roomVar.demon1.kirkShooting) {
if (_roomVar.demon.kirkShooting) {
demon1ShootKlingon1();
} else {
loadActorAnim2(OBJECT_KIRK, "kfiren", -1, -1, 3);
_roomVar.demon1.kirkShooting = true;
_roomVar.demon.kirkShooting = true;
}
}

void Room::demon1ShootKlingon1() {
_roomVar.demon1.numKlingonsKilled++;
if (_roomVar.demon1.numKlingonsKilled == 3) {
_roomVar.demon.numKlingonsKilled++;
if (_roomVar.demon.numKlingonsKilled == 3) {
_vm->_awayMission.timers[1] = 0;
_vm->_awayMission.timers[5] = 180;
_vm->_awayMission.timers[6] = 1;
Expand All @@ -246,7 +246,7 @@ void Room::demon1KlingonDropsHand() {

showText(TX_SPEAKER_EVERTS, TX_DEM1_025);

if (_roomVar.demon1.numKlingonsKilled == 3)
if (_roomVar.demon.numKlingonsKilled == 3)
return;

showText(TX_SPEAKER_KLINGON, TX_DEM1_F23);
Expand All @@ -255,22 +255,22 @@ void Room::demon1KlingonDropsHand() {
}

void Room::demon1UsePhaserOnKlingon2() {
if (_rdfData[0xcb] != 0)
if (_roomVar.demon.klingonShot[1])
return;
_vm->_awayMission.disableInput = 1;
_rdfData[0xcb] = 1;
_roomVar.demon.klingonShot[1] = true;

if (_roomVar.demon1.kirkShooting) {
if (_roomVar.demon.kirkShooting) {
demon1ShootKlingon2();
} else {
loadActorAnim2(OBJECT_KIRK, "kfiren", -1, -1, 4);
_roomVar.demon1.kirkShooting = true;
_roomVar.demon.kirkShooting = true;
}
}

void Room::demon1ShootKlingon2() {
_roomVar.demon1.numKlingonsKilled++;
if (_roomVar.demon1.numKlingonsKilled == 3) {
_roomVar.demon.numKlingonsKilled++;
if (_roomVar.demon.numKlingonsKilled == 3) {
_vm->_awayMission.timers[1] = 0;
_vm->_awayMission.timers[5] = 180;
_vm->_awayMission.timers[6] = 1;
Expand All @@ -284,22 +284,22 @@ void Room::demon1ShootKlingon2() {
}

void Room::demon1UsePhaserOnKlingon3() {
if (_rdfData[0xcc] != 0)
if (_roomVar.demon.klingonShot[2])
return;
_vm->_awayMission.disableInput = 1;
_rdfData[0xcc] = 1;
_roomVar.demon.klingonShot[2] = true;

if (_roomVar.demon1.kirkShooting) {
if (_roomVar.demon.kirkShooting) {
demon1ShootKlingon3();
} else {
loadActorAnim2(OBJECT_KIRK, "kfiren", -1, -1, 5);
_roomVar.demon1.kirkShooting = true;
_roomVar.demon.kirkShooting = true;
}
}

void Room::demon1ShootKlingon3() {
_roomVar.demon1.numKlingonsKilled++;
if (_roomVar.demon1.numKlingonsKilled == 3) {
_roomVar.demon.numKlingonsKilled++;
if (_roomVar.demon.numKlingonsKilled == 3) {
_vm->_awayMission.timers[1] = 0;
_vm->_awayMission.timers[5] = 180;
_vm->_awayMission.timers[6] = 1;
Expand Down Expand Up @@ -377,7 +377,7 @@ void Room::demon1UseSTricorderOnKlingon1() {

playSoundEffectIndex(0x04);

if (_roomVar.demon1.numKlingonsKilled == 3 && !_vm->_awayMission.demon.tookKlingonHand && _rdfData[0xcf] != 1) {
if (_roomVar.demon.numKlingonsKilled == 3 && !_vm->_awayMission.demon.tookKlingonHand && _rdfData[0xcf] != 1) {
showText(TX_SPEAKER_SPOCK, TX_DEM1_018);
_rdfData[0xcf] = 1;
} else {
Expand Down Expand Up @@ -413,7 +413,7 @@ void Room::demon1UseMTricorderOnCrewman() {
}

void Room::demon1GetHand() {
if (_roomVar.demon1.numKlingonsKilled != 3)
if (_roomVar.demon.numKlingonsKilled != 3)
return;
walkCrewman(OBJECT_KIRK, 0x104, 0x8e, 1);
}
Expand Down Expand Up @@ -511,7 +511,7 @@ void Room::demon1LookAtRedshirt() {
void Room::demon1TalkToKirk() {
if (_vm->_awayMission.crewDownBitset & (1 << OBJECT_KIRK))
demon1TalkToUnconsciousCrewman();
else if (_roomVar.demon1.numKlingonsKilled == 3)
else if (_roomVar.demon.numKlingonsKilled == 3)
showText(TX_SPEAKER_KIRK, TX_DEM1_001);
}

Expand Down

0 comments on commit b8c244d

Please sign in to comment.