Permalink
Browse files

STARTREK: FEATHER3

  • Loading branch information...
Drenn1 authored and sev- committed Jul 4, 2018
1 parent ae3be7b commit 1e60b6f96bd2733544b1340c6db1e4c550e2ab1e
@@ -42,12 +42,6 @@ enum ActionTypes {
ACTION_TOUCHED_HOTSPOT = 7, // Second kind of "hotspot" only relevant when an object touches them
ACTION_TIMER_EXPIRED = 8,

ACTION_DONE_ANIM = 10,
ACTION_DONE_WALK = 12,

// TODO: Remove these two as redundant.
// They're only here because I don't want to mess up the spacing in function_map.h by
// find/replacing the old name.
ACTION_FINISHED_ANIMATION = 10,
ACTION_FINISHED_WALKING = 12,

@@ -250,7 +250,13 @@ struct AwayMission {

bool gotRock; // 0x2b
bool gotSnake; // 0x2c
bool tookKnife; // 0x2d
bool field2e; // 0x2e
byte numRocksThrownAtTlaoxac; // 0x2f
bool holeBlocked; // 0x31
bool tlaoxacTestPassed; // 0x32
bool knockedOutTlaoxac; // 0x33
bool showedSnakeToTlaoxac; // 0x35
int16 missionScore; // 0x36
} feather;
};
@@ -145,7 +145,7 @@ Room::Room(StarTrekEngine *vm, const Common::String &name) : _vm(vm) {
}
else if (name == "FEATHER3") {
_roomActionList = feather3ActionList;
_numRoomActions = sizeof(feather3ActionList) / sizeof(RoomAction);
_numRoomActions = feather3NumActions;
}
else if (name == "FEATHER4") {
_roomActionList = feather4ActionList;
@@ -1521,6 +1521,51 @@ class Room {

// FEATHER3
void feather3Tick1();
void feather3Tick40();
void feather3TouchedHotspot0();
void feather3UseSpockOnTlaoxac();
void feather3UseMccoyOnTlaoxac();
void feather3UseRedshirtOnTlaoxac();
void feather3UseCrewmanOnLeftExit();
void feather3UseCommunicator();
void feather3UseSnakeOnKirk();
void feather3UseSnakeOnSpock();
void feather3UseSnakeOnRedshirt();
void feather3KirkReachedRedshirtWithSnake();
void feather3UseSnakeOnMccoy();
void feather3UseSnakeOnTlaoxac();
void feather3UseKnifeOnSpock();
void feather3UseKnifeOnMccoy();
void feather3UseKnifeOnRedshirt();
void feather3UseRockOnTlaoxac();
void feather3KirkReachedPositionToThrowRock();
void feather3Timer4Expired();
void feather3Timer2Expired();
void feather3Timer3Expired();
void feather3TlaoxacKnockedOutFromRockThrow();
void feather3UsePhaser();
void feather3TalkToMccoy();
void feather3TalkToSpock();
void feather3TalkToRedshirt();
void feather3TalkToTlaoxac();
void feather3TlaoxacKilledRedshirt();
void feather3UseMTricorderOnTlaoxac();
void feather3UseMedkitOnTlaoxac();
void feather3UseMedkitOnRedshirt();
void feather3UseMedkitAnywhere();
void feather3UseMTricorderOnLight();
void feather3UseSTricorderOnLight();
void feather3UseSTricorderAnywhere();
void feather3GetKnife();
void feather3ReachedKnife();
void feather3Timer1Expired();
void feather3PickedUpKnife();
void feather3LookAtSpock();
void feather3LookAtRedshirt();
void feather3LookAtTlaoxac();
void feather3LookAtLight();
void feather3LookAtMccoy();
void feather3LookAtKnife();

// FEATHER4
void feather4Tick1();
@@ -1658,11 +1703,11 @@ class Room {
byte snakeInHole; // 0xca
bool scannedSnake; // 0xcb
bool crewEscaped[4]; // 0xcc
byte kirkEscaped; // 0xcc
byte spockEscaped; // 0xcd
byte mccoyEscaped; // 0xce
byte cf; // 0xcf
byte crewmanClimbingVine;

// feather2
bool showedSnakeToTlaoxac; // 0xca
bool tlaoxacUnconscious; // 0xcb
} feather;


Oops, something went wrong.

0 comments on commit 1e60b6f

Please sign in to comment.