STARTREK: SINS1

2 files changed, 301 insertions, 5 deletions

diff --git a/engines/startrek/rooms/sins0.cpp b/engines/startrek/rooms/sins0.cpp
index bd93f25033..8dfabdc73e 100644
--- a/engines/startrek/rooms/sins0.cpp
+++ b/engines/startrek/rooms/sins0.cpp
@@ -86,7 +86,7 @@ void Room::sins0Tick1() {
 
 	if (_vm->_awayMission.sins.field3e)
 		loadActorAnim2(OBJECT_DOOR, "s0dr2", 0, 0);
-	if (_vm->_awayMission.sins.field3d)
+	if (_vm->_awayMission.sins.openedDoor)
 		loadActorAnim2(OBJECT_DOOR, "s0dr1", 0, 0);
 
 	playMidiMusicTracks(MIDITRACK_27, -3);
@@ -231,7 +231,7 @@ void Room::sins0UseMTricorderOnCrewman() {
 }
 
 void Room::sins0UseCommunicator() {
-	if (!_vm->_awayMission.sins.field43) {
+	if (!_vm->_awayMission.sins.scottyInformedKirkAboutVirus) {
 		showText(TX_SPEAKER_KIRK,  TX_SIN0_004);
 		showText(TX_SPEAKER_SCOTT, TX_SIN0_S01);
 		showText(TX_SPEAKER_KIRK,  TX_SIN0_002);
diff --git a/engines/startrek/rooms/sins1.cpp b/engines/startrek/rooms/sins1.cpp
index fc7827a142..8d94b4aea5 100644
--- a/engines/startrek/rooms/sins1.cpp
+++ b/engines/startrek/rooms/sins1.cpp
@@ -22,20 +22,316 @@
 
 #include "startrek/room.h"
 
-#define OBJECT_8 8
+#define OBJECT_DOOR 8
+#define OBJECT_9 9
 
-#define HOTSPOT_20 0x20
+#define HOTSPOT_DOOR 0x20
+#define HOTSPOT_KEYPAD 0x21
+#define HOTSPOT_PANEL 0x22
+#define HOTSPOT_LENS 0x23
+#define HOTSPOT_24 0x24 // Unused hotspot; just a sliver on the right side of the door?
 
 namespace StarTrek {
 
 extern const RoomAction sins1ActionList[] = {
-	{ {ACTION_TICK, 1,  0, 0}, &Room::sins1Tick1 },
+	{ {ACTION_TICK, 1, 0, 0}, &Room::sins1Tick1 },
+	{ {ACTION_LOOK, 0xff, 0, 0}, &Room::sins1LookAnywhere },
+	{ {ACTION_LOOK, OBJECT_DOOR,    0, 0}, &Room::sins1LookAtLock },
+	{ {ACTION_LOOK, HOTSPOT_DOOR,   0, 0}, &Room::sins1LookAtDoor },
+	{ {ACTION_LOOK, HOTSPOT_PANEL,  0, 0}, &Room::sins1LookAtPanel },
+	{ {ACTION_LOOK, HOTSPOT_KEYPAD, 0, 0}, &Room::sins1LookAtKeypad },
+	{ {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_PANEL,  0}, &Room::sins1UseSTricorderOnPanel },
+	{ {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_KEYPAD, 0}, &Room::sins1UseSTricorderOnKeypad },
+	{ {ACTION_USE, OBJECT_ISTRICOR, OBJECT_DOOR,    0}, &Room::sins1UseSTricorderOnLock },
+	{ {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_DOOR,   0}, &Room::sins1UseSTricorderOnDoor },
+	{ {ACTION_USE, OBJECT_ISTRICOR, 0xff,           0}, &Room::sins1UseSTricorderAnywhere },
+	{ {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_LENS,   0}, &Room::sins1UseSTricorderOnLens },
+	{ {ACTION_USE, OBJECT_IS8ROCKS, HOTSPOT_DOOR,   0}, &Room::sins1UseRockOnDoor },
+
+	{ {ACTION_USE, OBJECT_REDSHIRT, HOTSPOT_KEYPAD, 0}, &Room::sins1UseRedshirtOnKeypad },
+	{ {ACTION_USE, OBJECT_MCCOY,    HOTSPOT_KEYPAD, 0}, &Room::sins1UseMccoyOnKeypad },
+	{ {ACTION_USE, OBJECT_KIRK,     HOTSPOT_KEYPAD, 0}, &Room::sins1UseKirkOnKeypad },
+	{ {ACTION_USE, OBJECT_SPOCK,    HOTSPOT_KEYPAD, 0}, &Room::sins1UseSpockOnKeypad },
+	{ {ACTION_DONE_WALK, 6,                      0, 0}, &Room::sins1SpockReachedKeypad },
+	{ {ACTION_DONE_ANIM, 8,                      0, 0}, &Room::sins1EnteredCorrectCode },
+	{ {ACTION_DONE_ANIM, 1,                      0, 0}, &Room::sins1DoorDoneOpening },
+	{ {ACTION_DONE_ANIM, 7,                      0, 0}, &Room::sins1EnteredIncorrectCode },
+	{ {ACTION_DONE_ANIM, 9,                      0, 0}, &Room::sins1EnteredSacredSofNumber },
+	{ {ACTION_USE, OBJECT_IPHASERS, HOTSPOT_DOOR,   0}, &Room::sins1UsePhaserOnDoor },
+	{ {ACTION_USE, OBJECT_IPHASERK, HOTSPOT_DOOR,   0}, &Room::sins1UsePhaserOnDoor },
+	{ {ACTION_DONE_ANIM, 2,                      0, 0}, &Room::sins1DoorUsedLaser },
+
+	{ {ACTION_TICK, 40,              0, 0}, &Room::sins1Tick40 },
+	{ {ACTION_TALK, OBJECT_KIRK,     0, 0}, &Room::sins1TalkToKirk },
+	{ {ACTION_TALK, OBJECT_SPOCK,    0, 0}, &Room::sins1TalkToSpock },
+	{ {ACTION_TALK, OBJECT_MCCOY,    0, 0}, &Room::sins1TalkToMccoy },
+	{ {ACTION_TALK, OBJECT_REDSHIRT, 0, 0}, &Room::sins1TalkToRedshirt },
+	{ {ACTION_LOOK, OBJECT_KIRK,     0, 0}, &Room::sins1LookAtKirk },
+	{ {ACTION_LOOK, OBJECT_SPOCK,    0, 0}, &Room::sins1LookAtSpock },
+	{ {ACTION_LOOK, OBJECT_MCCOY,    0, 0}, &Room::sins1LookAtMccoy },
+	{ {ACTION_LOOK, OBJECT_REDSHIRT, 0, 0}, &Room::sins1LookAtRedshirt },
+	{ {ACTION_LOOK, HOTSPOT_LENS,    0, 0}, &Room::sins1LookAtLens },
+
+	{ {ACTION_USE, OBJECT_ICOMM,    0xff,            0}, &Room::sins1UseCommunicator },
+	{ {ACTION_USE, OBJECT_IMEDKIT,  OBJECT_KIRK,     0}, &Room::sins1UseMedkitOnCrewman },
+	{ {ACTION_USE, OBJECT_IMEDKIT,  OBJECT_SPOCK,    0}, &Room::sins1UseMedkitOnCrewman },
+	{ {ACTION_USE, OBJECT_IMEDKIT,  OBJECT_MCCOY,    0}, &Room::sins1UseMedkitOnCrewman },
+	{ {ACTION_USE, OBJECT_IMEDKIT,  OBJECT_REDSHIRT, 0}, &Room::sins1UseMedkitOnCrewman },
+	{ {ACTION_USE, OBJECT_IMTRICOR, OBJECT_KIRK,     0}, &Room::sins1UseMTricorderOnCrewman },
+	{ {ACTION_USE, OBJECT_IMTRICOR, OBJECT_SPOCK,    0}, &Room::sins1UseMTricorderOnCrewman },
+	{ {ACTION_USE, OBJECT_IMTRICOR, OBJECT_MCCOY,    0}, &Room::sins1UseMTricorderOnCrewman },
+	{ {ACTION_USE, OBJECT_IMTRICOR, OBJECT_REDSHIRT, 0}, &Room::sins1UseMTricorderOnCrewman },
+
+	{ {ACTION_WALK, HOTSPOT_DOOR, 0, 0}, &Room::sins1WalkToDoor },
+	{ {ACTION_WALK, OBJECT_DOOR,  0, 0}, &Room::sins1WalkToDoor },
 };
 
 extern const int sins1NumActions = sizeof(sins1ActionList) / sizeof(RoomAction);
 
 
 void Room::sins1Tick1() {
+	playVoc("SIN1LOOP");
+
+	if (!_vm->_awayMission.sins.scottyInformedKirkAboutVirus)
+		// BUGFIX: Set this to 2, not 1 (disable input even after walking animation is done)
+		_vm->_awayMission.disableInput = 2;
+
+	if (_vm->_awayMission.sins.openedDoor) {
+		loadActorAnim2(OBJECT_DOOR, "s1dro", 0, 0);
+		loadMapFile("sins12");
+	} else
+		loadMapFile("sins1");
+
+	if (_vm->_awayMission.sins.field3e)
+		loadActorAnim2(OBJECT_DOOR, "s1ndro", 0, 0);
+
+	_vm->_awayMission.sins.field32 = 1;
+	_vm->_awayMission.sins.field31 = 1;
+
+	playMidiMusicTracks(MIDITRACK_27, -3);
+
+	if (!_vm->_awayMission.sins.enteredRoom1FirstTime) {
+		playMidiMusicTracks(MIDITRACK_1, -2);
+		_vm->_awayMission.sins.enteredRoom1FirstTime = true;
+	}
+}
+
+void Room::sins1LookAnywhere() {
+	showText(TX_SIN1N001);
+}
+
+void Room::sins1LookAtLock() {
+	showText(TX_SIN1N009);
+}
+
+void Room::sins1LookAtDoor() {
+	// NOTE: This function had two implementations (one unused).
+	if (true)
+		showText(TX_SIN1N010);
+	else
+		showText(TX_SIN1N008);
+}
+
+void Room::sins1LookAtPanel() {
+	showText(TX_SIN1N003);
+}
+
+void Room::sins1LookAtKeypad() {
+	showText(TX_SIN1N011);
+}
+
+void Room::sins1UseSTricorderOnPanel() {
+	spockScan(DIR_N, TX_SIN1_010);
+}
+
+void Room::sins1UseSTricorderOnKeypad() {
+	spockScan(DIR_N, TX_SIN1_021);
+}
+
+void Room::sins1UseSTricorderOnLock() {
+	spockScan(DIR_N, TX_SIN1_009);
+}
+
+void Room::sins1UseSTricorderOnDoor() {
+	if (!_vm->_awayMission.sins.openedDoor)
+		spockScan(DIR_N, TX_SIN1_019);
+}
+
+void Room::sins1UseSTricorderAnywhere() {
+	spockScan(DIR_S, TX_SIN1_024);
+}
+
+void Room::sins1UseSTricorderOnLens() {
+	if (!_vm->_awayMission.sins.doorLaserFiredOnce)
+		spockScan(DIR_N, TX_SIN1_022);
+	else // BUGFIX: Original didn't do the tricorder animation, etc. in this case
+		spockScan(DIR_N, TX_SIN1_023);
+}
+
+void Room::sins1UseRockOnDoor() {
+	showText(TX_SIN1N007);
+}
+
+void Room::sins1UseRedshirtOnKeypad() {
+	if (!_vm->_awayMission.sins.openedDoor)
+		showText(TX_SPEAKER_MOSHER, TX_SIN1_028);
+}
+
+void Room::sins1UseMccoyOnKeypad() {
+	if (!_vm->_awayMission.sins.openedDoor)
+		showText(TX_SPEAKER_MCCOY, TX_SIN1_012);
+}
+
+void Room::sins1UseKirkOnKeypad() {
+	if (!_vm->_awayMission.sins.openedDoor) {
+		showText(TX_SPEAKER_KIRK, TX_SIN1_001);
+		sins1UseSpockOnKeypad();
+	}
+}
+
+void Room::sins1UseSpockOnKeypad() {
+	if (!_vm->_awayMission.sins.openedDoor) {
+		_vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_N;
+		walkCrewmanC(OBJECT_SPOCK, 0xfd, 0xad, &Room::sins1SpockReachedKeypad);
+	}
+}
+
+void Room::sins1SpockReachedKeypad() {
+	int ans = showKeypad("01210");
+
+	if (ans == 1 || ans == 2) {
+		playVoc("EFX14S");
+		loadActorAnimC(OBJECT_SPOCK, "susehn", -1, -1, &Room::sins1EnteredSacredSofNumber);
+	} else if (ans == 3) {
+		playVoc("EFX14S");
+		loadActorAnimC(OBJECT_SPOCK, "susehn", -1, -1, &Room::sins1EnteredCorrectCode);
+	} else {
+		playVoc("EFX14S");
+		loadActorAnimC(OBJECT_SPOCK, "susehn", -1, -1, &Room::sins1EnteredIncorrectCode);
+	}
+}
+
+void Room::sins1EnteredCorrectCode() {
+	_vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W;
+	walkCrewman(OBJECT_SPOCK, 0xf3, 0xad);
+	_vm->_awayMission.sins.openedDoor = true;
+	loadMapFile("sins12");
+	loadActorAnimC(OBJECT_DOOR, "s1door", 0, 0, &Room::sins1DoorDoneOpening);
+	playVoc("HUGEDOO2");
+}
+
+void Room::sins1DoorDoneOpening() {
+	showText(TX_SPEAKER_SPOCK, TX_SIN1_011);
+}
+
+void Room::sins1EnteredIncorrectCode() {
+	_vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W;
+	walkCrewman(OBJECT_SPOCK, 0xf3, 0xad);
+	showText(TX_SPEAKER_SPOCK, TX_SIN1_017);
+}
+
+void Room::sins1EnteredSacredSofNumber() {
+	// Entered a sacred Sof number, which is wrong since this is a Lucr base
+	_vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W;
+	walkCrewman(OBJECT_SPOCK, 0xf3, 0xad);
+	loadActorAnimC(OBJECT_9, "s1ph1", 0, 0, &Room::sins1DoorUsedLaser);
+	playSoundEffectIndex(SND_PHASSHOT);
+}
+
+void Room::sins1UsePhaserOnDoor() {
+	showText(TX_SPEAKER_SPOCK, TX_SIN1_016);
+}
+
+void Room::sins1DoorUsedLaser() {
+	loadActorStandAnim(OBJECT_9);
+	showText(TX_SPEAKER_SPOCK, TX_SIN1_018);
+
+	_vm->_awayMission.sins.field33 = true;
+	_vm->_awayMission.sins.doorLaserFiredOnce = true;
+}
+
+void Room::sins1Tick40() {
+	if (!_vm->_awayMission.sins.scottyInformedKirkAboutVirus) {
+		showText(TX_SPEAKER_SCOTT, TX_SIN1_S10);
+		showText(TX_SPEAKER_KIRK,  TX_SIN1_007);
+		showText(TX_SPEAKER_SCOTT, TX_SIN1_S18);
+		showText(TX_SPEAKER_KIRK,  TX_SIN1_005);
+		showText(TX_SPEAKER_SCOTT, TX_SIN1_S85);
+		showText(TX_SPEAKER_KIRK,  TX_SIN1_003);
+		showText(TX_SPEAKER_SCOTT, TX_SIN1_S17);
+
+		_vm->_awayMission.sins.scottyInformedKirkAboutVirus = true;
+		_vm->_awayMission.disableInput = false;
+	}
+}
+
+void Room::sins1TalkToKirk() {
+	showText(TX_SPEAKER_KIRK,  TX_SIN1_006);
+	showText(TX_SPEAKER_SPOCK, TX_SIN1_027);
+}
+
+void Room::sins1TalkToSpock() {
+	// NOTE: This function has two implementations. The first (used) one talks about where
+	// the energy source is coming from. The second (unused) one says to "carefully
+	// consider what we know about this culture".
+	if (true)
+		showText(TX_SPEAKER_SPOCK, TX_SIN1_020);
+	else
+		showText(TX_SPEAKER_SPOCK, TX_SIN1_025);
+}
+
+void Room::sins1TalkToMccoy() {
+	showText(TX_SPEAKER_MCCOY, TX_SIN1_015);
+}
+
+void Room::sins1TalkToRedshirt() {
+	showText(TX_SPEAKER_MOSHER, TX_SIN1_030);
+	showText(TX_SPEAKER_SPOCK,  TX_SIN1_026);
+	showText(TX_SPEAKER_MOSHER, TX_SIN1_029);
+}
+
+void Room::sins1LookAtKirk() {
+	showText(TX_SIN1N005);
+}
+
+void Room::sins1LookAtSpock() {
+	showText(TX_SIN1N004);
+}
+
+void Room::sins1LookAtMccoy() {
+	showText(TX_SIN1N006);
+}
+
+void Room::sins1LookAtRedshirt() {
+	showText(TX_SIN1N002);
+}
+
+void Room::sins1LookAtLens() {
+	showText(TX_SIN1N000);
+}
+
+void Room::sins1UseCommunicator() {
+	if (!_vm->_awayMission.sins.field44) {
+		showText(TX_SPEAKER_KIRK,  TX_SIN1_008);
+		showText(TX_SPEAKER_SCOTT, TX_SIN1_S51);
+		showText(TX_SPEAKER_KIRK,  TX_SIN1_002);
+		showText(TX_SPEAKER_SCOTT, TX_SIN1_S20);
+		showText(TX_SPEAKER_KIRK,  TX_SIN1_004);
+	} else
+		showText(TX_SPEAKER_UHURA, TX_SIN1U070);
+}
+
+void Room::sins1UseMedkitOnCrewman() {
+	showText(TX_SPEAKER_MCCOY, TX_SIN1_014);
+}
+
+void Room::sins1UseMTricorderOnCrewman() {
+	mccoyScan(DIR_S, TX_SIN1_013);
+}
+
+void Room::sins1WalkToDoor() {
+	if (_vm->_awayMission.sins.openedDoor)
+		walkCrewman(OBJECT_KIRK, 0x98, 0x9e, 5); // NOTE: Callback 5 not defined
 }
 
 }