Permalink
Browse files

STARTREK: VENG4

  • Loading branch information...
Drenn1 committed Aug 8, 2018
1 parent 879919a commit 2fe284fc2607b9be8b3477a2f9b0a23c3caa5e45
@@ -620,6 +620,10 @@ struct AwayMission {
} sins;

struct {
bool usedMedkitOnBrittany; // 0x29
bool talkedToBrittany; // 0x2a
bool brittanyDead; // 0x2b
bool lookedAtBrittany; // 0x2c
bool enteredRoom0FirstTime; // 0x2d
int16 missionScore; // 0x2e
bool bridgeCrewmanDead; // 0x30
@@ -668,14 +672,16 @@ struct AwayMission {
bool putSupportBeamInSickbayHallway; // 0x53
bool clearedDebris; // 0x54
bool lookedAtTurbolift2Door; // 0x55
bool kirkSuggestedReestablishingPower; // 0x56
bool kirkShouldSuggestReestablishingPower; // 0x56
bool tookHypoFromSickbay; // 0x57
bool tookDrillFromSickbay; // 0x58
bool havePowerPack; // 0x5a
bool tookCableFromSickbayHallway; // 0x5f
bool tookMolecularSaw; // 0x60
bool readEngineeringJournal; // 0x61
bool examinedTorpedoControl; // 0x66
bool field68; // 0x68
bool field69; // 0x69
bool getPointsForHealingBrittany; // 0x69
bool readAllLogs; // 0x6a
bool field6b; // 0x6b
bool field6c; // 0x6c
@@ -2638,9 +2638,46 @@ class Room {
void veng3ReachedCable();
void veng3PickedUpCable();
void veng3UseMccoyOnDeadGuy();
// TODO: Common code

// VENG4
void veng4Tick1();
void veng4TalkToKirk();
void veng4TalkToMccoy();
void veng4TalkToSpock();
void veng4TalkToRedshirt();
void veng4UseMccoyOnDeadGuy();
void veng4UseHypoOnBrittany();
void veng4UseMedkitOnBrittany();
void veng4UseMTricorderOnBrittany();
void veng4UseMccoyOnBrittany();
void veng4MccoyReachedBrittany();
void veng4UsedMedkitOnBrittany();
void veng4MccoyScannedBrittany();
void veng4TalkToBrittany();
void veng4LookAtDeadGuy();
void veng4LookAtRightBedReadings();
void veng4LookAtDoorHotspot();
void veng4LookAtKirk();
void veng4LookAtSpock();
void veng4LookAtMccoy();
void veng4LookAtRedshirt();
void veng4LookAtLeftBed();
void veng4LookAtLeftBedReadings();
void veng4LookAtBrittany();
void veng4LookAtDrill();
void veng4LookAtHypo();
void veng4LookAtDoorObject();
void veng4LookAnywhere();
void veng4GetHypo();
void veng4ReachedHypo();
void veng4PickedUpHypo();
void veng4GetDrill();
void veng4ReachedDrill();
void veng4PickedUpDrill();
void veng4TouchedHotspot0();
void veng4WalkToDoor();
// TODO: common code

// VENG5
void veng5Tick1();
@@ -2970,10 +3007,15 @@ class Room {
struct {
// veng1
byte doorOpenCounter; // 0xca
bool walkingToDoor; // 0xcb

// veng2
byte numCrewmenReadyToBeamOut; // 0xca

// veng4
bool usingMedkitOnBrittany;

// venga (common)
bool walkingToDoor; // 0xcb (veng1), 0xca (veng4)
} veng;

} _roomVar;
@@ -599,7 +599,7 @@ void Room::veng2CrewmanInPositionToBeamOut() {
_awayMission->veng.missionScore = 16;
if (_awayMission->veng.field68)
_awayMission->veng.missionScore += 1;
if (_awayMission->veng.field69)
if (_awayMission->veng.getPointsForHealingBrittany)
_awayMission->veng.missionScore += 1;
if (_awayMission->veng.readAllLogs)
_awayMission->veng.missionScore += 1;
@@ -121,9 +121,9 @@ void Room::veng3Tick1() {
}

void Room::veng3Tick15() {
if (_awayMission->veng.kirkSuggestedReestablishingPower && !_awayMission->veng.impulseEnginesOn) {
if (_awayMission->veng.kirkShouldSuggestReestablishingPower && !_awayMission->veng.impulseEnginesOn) {
showText(TX_SPEAKER_KIRK, TX_VEN0_010);
_awayMission->veng.kirkSuggestedReestablishingPower = true;
_awayMission->veng.kirkShouldSuggestReestablishingPower = false;
}
}

Oops, something went wrong.

0 comments on commit 2fe284f

Please sign in to comment.