From e00ce8ec3bab0ace78870386eecc805e67610e01 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 15 Sep 2003 17:13:31 +0000
Subject: [PATCH] Thraddash dialog fix (bug #486)

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1236 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/content/comm/thradd/thradd.txt    |  9 ++++++---
 sc2/src/sc2code/comm/thradd/strings.h |  3 ++-
 sc2/src/sc2code/comm/thradd/thraddc.c | 11 +++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/sc2/content/comm/thradd/thradd.txt b/sc2/content/comm/thradd/thradd.txt
index ace5866f4..c31af05a6 100755
--- a/sc2/content/comm/thradd/thradd.txt
+++ b/sc2/content/comm/thradd/thradd.txt
@@ -837,8 +837,11 @@ because surely only fools would let themselves be known by such a name!
 Once again, Great Teacher, you have shown your wisdom. We thank you.
 From this day forward, we are the Fat Obstreperous Jerks!
 
-#(the_slave_empire)
-It will be 
+#(the_slave_empire0)
+It will be `The Glorious Slave Empire of 
+
+#(the_slave_empire1)
+'!
 
 #(OK_SLAVE)	thrad098.ogg
 Ulp!  Well... you're the one with the big starship
@@ -851,7 +854,7 @@ Fat Obstreperous Jerks
 Culture Twenty
 
 #(SLAVE_EMPIRE)	thrad101.ogg
-The Glorious Slave Empire of 
+The Glorious Slave Empire
 
 #(name_1)
 The New Alliance of Free Stars 
diff --git a/sc2/src/sc2code/comm/thradd/strings.h b/sc2/src/sc2code/comm/thradd/strings.h
index 539113353..35f40c0c4 100644
--- a/sc2/src/sc2code/comm/thradd/strings.h
+++ b/sc2/src/sc2code/comm/thradd/strings.h
@@ -160,7 +160,8 @@ enum
 	OK_CULTURE_20,
 	fat,
 	OK_FAT,
-	the_slave_empire,
+	the_slave_empire0,
+	the_slave_empire1,
 	OK_SLAVE,
 	FAT_JERKS,
 	CULTURE,
diff --git a/sc2/src/sc2code/comm/thradd/thraddc.c b/sc2/src/sc2code/comm/thradd/thraddc.c
index 80ce9cad2..927aa3423 100644
--- a/sc2/src/sc2code/comm/thradd/thraddc.c
+++ b/sc2/src/sc2code/comm/thradd/thraddc.c
@@ -430,7 +430,7 @@ ThraddDemeanor (RESPONSE_REF R)
 
 		SET_GAME_STATE (THRADD_CULTURE, 2);
 	}
-	else if (PLAYER_SAID (R, the_slave_empire))
+	else if (PLAYER_SAID (R, the_slave_empire0))
 	{
 		SET_GAME_STATE (THRADD_CULTURE, 3);
 
@@ -473,9 +473,16 @@ ThraddCulture (RESPONSE_REF R)
 	}
 	NPCPhrase (WHAT_NAME_FOR_CULTURE);
 
+	construct_response (
+			shared_phrase_buf,
+			the_slave_empire0,
+			GLOBAL_SIS (CommanderName),
+			the_slave_empire1,
+			0);
+
 	Response (you_decide, ThraddDemeanor);
 	Response (fat, ThraddDemeanor);
-	Response (the_slave_empire, ThraddDemeanor);
+	DoResponsePhrase (the_slave_empire0, ThraddDemeanor, shared_phrase_buf);
 }
 
 static void