Permalink
Browse files

STARTREK: TRIAL0

  • Loading branch information...
Drenn1 authored and sev- committed Jul 6, 2018
1 parent 6fa0efa commit 0f3efc0e55d07fe77f5defb5b40053c1b403694f
@@ -262,6 +262,12 @@ struct AwayMission {
bool showedSnakeToTlaoxac; // 0x35
int16 missionScore; // 0x36
} feather;

struct {
int16 field29; // 0x29
int16 field2b; // 0x2b
int16 missionScore; // 0x5f
} trial;
};
};
// Size: 0x129 bytes
@@ -52,6 +52,12 @@ MODULE_OBJS = \
rooms/feather5.o \
rooms/feather6.o \
rooms/feather7.o \
rooms/trial0.o \
rooms/trial1.o \
rooms/trial2.o \
rooms/trial3.o \
rooms/trial4.o \
rooms/trial5.o \



@@ -87,6 +87,12 @@ Room::Room(StarTrekEngine *vm, const Common::String &name) : _vm(vm) {
ADD_ROOM(feather5);
ADD_ROOM(feather6);
ADD_ROOM(feather7);
ADD_ROOM(trial0);
ADD_ROOM(trial1);
ADD_ROOM(trial2);
ADD_ROOM(trial3);
ADD_ROOM(trial4);
ADD_ROOM(trial5);

if (_roomActionList == nullptr) {
warning("Room \"%s\" unimplemented", name.c_str());
@@ -1716,6 +1716,58 @@ class Room {
void feather7KirkSatDown();
void feather7ReadyToBeamOut();


// TRIAL0
void trial0Tick1();
void trial0Tick40();
void trial0Timer0Expired();
void trial0WalkToRoomCenter();
void trial0ReachedRoomCenter();
void trial0LookAtWindow();
void trial0LookAtVlict();
void trial0LookAtGuard();
void trial0LookAtBench();
void trial0LookAtSeal();
void trial0LookAtKirk();
void trial0LookAtSpock();
void trial0LookAtMccoy();
void trial0LookAtRedshirt();
void trial0LookAtQuetzecoatl();
void trial0TalkToVlict();
void trial0TalkToGuard();
void trial0TalkToQuetzecoatl();
void trial0TalkToMccoy();
void trial0TalkToSpock();
void trial0TalkToRedshirt();
void trial0UsePhaserOrRock();
void trial0UseSnakeOnVlict();
void trial0UseSnakeOnGuard();
void trial0UseMTricorderOnQuetzecoatl();
void trial0UseMTricorderOnVlict();
void trial0UseMTricorderAnywhere();
void trial0UseSTricorderOnWindow();
void trial0UseSTricorderAnywhere();
void trial0UseCommunicator();
void trial0UseCrewmanOnKlingon();
void trial0UseMccoyOnVlict();
void trial0UseMccoyOnGuard();
void trial0UseMedkitAnywhere();

// TRIAL1
void trial1Tick1();

// TRIAL2
void trial2Tick1();

// TRIAL3
void trial3Tick1();

// TRIAL4
void trial4Tick1();

// TRIAL5
void trial5Tick1();

private:
// Room-specific variables. This is memset'ed to 0 when the room is initialized.
union {
@@ -203,6 +203,7 @@ void Room::feather6UseKnifeAnywhere() {
}

void Room::feather6UseKnifeOnMccoy() {
// BUG: Stragey could be dead...
showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
}

@@ -1785,6 +1785,11 @@ extern const int feather1NumActions, feather2NumActions, feather3NumA
extern const RoomAction feather5ActionList[], feather6ActionList[], feather7ActionList[];
extern const int feather5NumActions, feather6NumActions, feather7NumActions;

extern const RoomAction trial0ActionList[], trial1ActionList[], trial2ActionList[], trial3ActionList[];
extern const int trial0NumActions, trial1NumActions, trial2NumActions, trial3NumActions;
extern const RoomAction trial4ActionList[], trial5ActionList[];
extern const int trial4NumActions, trial5NumActions;

}

#endif
Oops, something went wrong.

0 comments on commit 0f3efc0

Please sign in to comment.