Permalink
Browse files

STARTREK: Talk to miner action in Demon3

  • Loading branch information...
Drenn1 authored and sev- committed May 28, 2018
1 parent 30c41ae commit a6b87e84e7ef782f179f8c6a7abbdf9a1d388cf5
@@ -288,6 +288,7 @@ class Room {
void demon3McCoyReachedMiner();
void demon3McCoyFinishedHealingMiner();
void demon3GetMiner();
void demon3TalkToMiner();
void demon3TalkToKirk();
void demon3TalkToSpock();
void demon3TalkToMccoy();
@@ -466,6 +466,12 @@ void Room::demon3GetMiner() {
showText(TX_SPEAKER_MCCOY, TX_DEM3_017);
}

void Room::demon3TalkToMiner() {
if (!_vm->_awayMission.demon.healedMiner)
return;
showText(TX_SPEAKER_KANDREY, TX_DEM3_F21);
}

void Room::demon3TalkToKirk() {
showText(TX_SPEAKER_KIRK, TX_DEM3_002);
showText(TX_SPEAKER_SPOCK, TX_DEM3_029);
@@ -282,6 +282,7 @@ RoomAction demon3ActionList[] = {
{ Action(ACTION_FINISHED_ANIMATION, 7, 0, 0), &Room::demon3McCoyFinishedHealingMiner },

{ Action(ACTION_GET, 13, 0, 0), &Room::demon3GetMiner },
{ Action(ACTION_TALK, 13, 0, 0), &Room::demon3TalkToMiner },

{ Action(ACTION_TALK, OBJECT_KIRK, 0, 0), &Room::demon3TalkToKirk },
{ Action(ACTION_TALK, OBJECT_SPOCK, 0, 0), &Room::demon3TalkToSpock },
@@ -36,6 +36,8 @@ enum GameStringIDs {

TX_SPEAKER_ANGIVEN,
TX_SPEAKER_SIGN,
TX_SPEAKER_KLINGON,
TX_SPEAKER_KANDREY,
TX_DEM0_016,
TX_DEM0_039,
TX_DEM0_017,
@@ -94,7 +96,6 @@ enum GameStringIDs {
TX_DEM0C001, // "C" = "Custom" (no ID originally assigned)


TX_SPEAKER_KLINGON,
TX_DEM1_011,
TX_DEM1N020,
TX_DEM1_025,
@@ -258,6 +259,8 @@ const char * const g_gameStrings[] = {

"Prel. Angiven",
"Sign",
"Klingon",
"Brother Kandrey",
"#DEM0\\DEM0_016#Captain, the flora on this planet is very interesting. I wonder how useful it may be for medicinal purposes.",
"#DEM0\\DEM0_039#Aw, Captain, please don't melt the snow. I've never seen it before.",
"#DEM0\\DEM0_017#Quite the vandal aren't we, Jim?",
@@ -316,7 +319,6 @@ const char * const g_gameStrings[] = {
"All mining equipment use this road.",


"Klingon",
"#DEM1\\DEM1_011#The fire fight is over, Jim. I think you can put that away now.",
"#DEM1\\DEM1N020#You see a small explosion, and the Klingon's hand falls to the ground with a dull thud.",
"#DEM1\\DEM1_025#I guess they don't make Klingons like they used to, Sir.",

0 comments on commit a6b87e8

Please sign in to comment.