From adf5d137bf4d5a0ccc77debe0782fce41153204b Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Tue, 10 May 2005 13:29:09 +0000
Subject: [PATCH] Dialog fix.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1729 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/comm/pkunk/pkunkc.c  | 6 ++++++
 sc2/src/sc2code/comm/pkunk/strings.h | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/sc2/src/sc2code/comm/pkunk/pkunkc.c b/sc2/src/sc2code/comm/pkunk/pkunkc.c
index 52210728d..aeccc731e 100644
--- a/sc2/src/sc2code/comm/pkunk/pkunkc.c
+++ b/sc2/src/sc2code/comm/pkunk/pkunkc.c
@@ -276,11 +276,14 @@ DiscussConquer (RESPONSE_REF R)
 	}
 	else if (PLAYER_SAID (R, conquer_because_1))
 	{
+#if 0
 		NPCPhrase (NOT_CONQUER_10);
 		NPCPhrase (GLOBAL_ALLIANCE_NAME + name_1);
 		NPCPhrase (NOT_CONQUER_11);
 		NPCPhrase (GLOBAL_ALLIANCE_NAME + name_1);
 		NPCPhrase (NOT_CONQUER_12);
+#endif
+		NPCPhrase (NOT_CONQUER_1);
 
 		DISABLE_PHRASE (conquer_because_1);
 	}
@@ -293,6 +296,7 @@ DiscussConquer (RESPONSE_REF R)
 
 	if (PHRASE_ENABLED (conquer_because_1))
 	{
+#if 0
 		UNICODE buf[80];
 
 		GetAllianceName (buf, name_1);
@@ -303,6 +307,8 @@ DiscussConquer (RESPONSE_REF R)
 				(RESPONSE_REF)-1
 				);
 		DoResponsePhrase (conquer_because_1, DiscussConquer, shared_phrase_buf);
+#endif
+		Response(conquer_because_1, DiscussConquer);
 	}
 	if (PHRASE_ENABLED (conquer_because_2))
 		Response (conquer_because_2, DiscussConquer);
diff --git a/sc2/src/sc2code/comm/pkunk/strings.h b/sc2/src/sc2code/comm/pkunk/strings.h
index c74608dae..f814a0191 100644
--- a/sc2/src/sc2code/comm/pkunk/strings.h
+++ b/sc2/src/sc2code/comm/pkunk/strings.h
@@ -100,9 +100,12 @@ enum
 	we_conquer,
 	WHY_CONQUER,
 	conquer_because_1,
+#if 0
 	NOT_CONQUER_10,
 	NOT_CONQUER_11,
 	NOT_CONQUER_12,
+#endif
+	NOT_CONQUER_1,
 	conquer_because_2,
 	NOT_CONQUER_2,
 	must_conquer,