Dialog fixes

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1751 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-05-14 16:12:16 +00:00
parent 6cda8256c0
commit 5a6a555976
2 changed files with 4 additions and 13 deletions
+2 -8
View File
@@ -428,9 +428,7 @@ Friendly (RESPONSE_REF R)
memset (Resp, 0, sizeof (Resp)); memset (Resp, 0, sizeof (Resp));
if (PLAYER_SAID (R, report0)) if (PLAYER_SAID (R, report0))
{ {
NPCPhrase (NOTHING_NEW0); NPCPhrase (NOTHING_NEW);
NPCPhrase (GLOBAL_PLAYER_NAME);
NPCPhrase (NOTHING_NEW1);
DISABLE_PHRASE (report0); DISABLE_PHRASE (report0);
} }
@@ -555,11 +553,7 @@ Intro (void)
if (GET_GAME_STATE (SHOFIXTI_STACK2) > 2) if (GET_GAME_STATE (SHOFIXTI_STACK2) > 2)
{ {
NPCPhrase (FRIENDLY_HELLO0); NPCPhrase (FRIENDLY_HELLO);
NPCPhrase (GLOBAL_PLAYER_NAME);
NPCPhrase (FRIENDLY_HELLO1);
NPCPhrase (GLOBAL_SHIP_NAME);
NPCPhrase (FRIENDLY_HELLO2);
Friendly ((RESPONSE_REF)0); Friendly ((RESPONSE_REF)0);
} }
+2 -5
View File
@@ -112,13 +112,10 @@ enum
SWITCH_BROKE, SWITCH_BROKE,
bye, bye,
GOODBYE, GOODBYE,
FRIENDLY_HELLO0, FRIENDLY_HELLO,
FRIENDLY_HELLO1,
FRIENDLY_HELLO2,
report0, report0,
report1, report1,
NOTHING_NEW0, NOTHING_NEW,
NOTHING_NEW1,
OUT_TAKES, OUT_TAKES,
}; };