adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dialog fix.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1729 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-05-10 13:29:09 +00:00
parent be53c36924
commit adf5d137bf
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/pkunk/pkunkc.c
+6
View File
@@ -276,11 +276,14 @@ DiscussConquer (RESPONSE_REF R)
} }
else if (PLAYER_SAID (R, conquer_because_1)) else if (PLAYER_SAID (R, conquer_because_1))
{ {
#if 0
NPCPhrase (NOT_CONQUER_10); NPCPhrase (NOT_CONQUER_10);
NPCPhrase (GLOBAL_ALLIANCE_NAME + name_1); NPCPhrase (GLOBAL_ALLIANCE_NAME + name_1);
NPCPhrase (NOT_CONQUER_11); NPCPhrase (NOT_CONQUER_11);
NPCPhrase (GLOBAL_ALLIANCE_NAME + name_1); NPCPhrase (GLOBAL_ALLIANCE_NAME + name_1);
NPCPhrase (NOT_CONQUER_12); NPCPhrase (NOT_CONQUER_12);
#endif
NPCPhrase (NOT_CONQUER_1);
DISABLE_PHRASE (conquer_because_1); DISABLE_PHRASE (conquer_because_1);
} }
@@ -293,6 +296,7 @@ DiscussConquer (RESPONSE_REF R)
if (PHRASE_ENABLED (conquer_because_1)) if (PHRASE_ENABLED (conquer_because_1))
{ {
#if 0
UNICODE buf[80]; UNICODE buf[80];
GetAllianceName (buf, name_1); GetAllianceName (buf, name_1);
@@ -303,6 +307,8 @@ DiscussConquer (RESPONSE_REF R)
(RESPONSE_REF)-1 (RESPONSE_REF)-1
); );
DoResponsePhrase (conquer_because_1, DiscussConquer, shared_phrase_buf); DoResponsePhrase (conquer_because_1, DiscussConquer, shared_phrase_buf);
#endif
Response(conquer_because_1, DiscussConquer);
} }
if (PHRASE_ENABLED (conquer_because_2)) if (PHRASE_ENABLED (conquer_because_2))
Response (conquer_because_2, DiscussConquer); Response (conquer_because_2, DiscussConquer);
sc2/src/sc2code/comm/pkunk/strings.h
+3
View File
@@ -100,9 +100,12 @@ enum
we_conquer, we_conquer,
WHY_CONQUER, WHY_CONQUER,
conquer_because_1, conquer_because_1,
#if 0
NOT_CONQUER_10, NOT_CONQUER_10,
NOT_CONQUER_11, NOT_CONQUER_11,
NOT_CONQUER_12, NOT_CONQUER_12,
#endif
NOT_CONQUER_1,
conquer_because_2, conquer_because_2,
NOT_CONQUER_2, NOT_CONQUER_2,
must_conquer, must_conquer,