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

Thraddash dialog fix (bug #486)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1236 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2003-09-15 17:13:31 +00:00
parent 490108dfe6
commit e00ce8ec3b
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/content/comm/thradd/thradd.txt
+6 -3
View File
@@ -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. Once again, Great Teacher, you have shown your wisdom. We thank you.
From this day forward, we are the Fat Obstreperous Jerks! From this day forward, we are the Fat Obstreperous Jerks!
#(the_slave_empire) #(the_slave_empire0)
It will be It will be `The Glorious Slave Empire of
#(the_slave_empire1)
'!
#(OK_SLAVE) thrad098.ogg #(OK_SLAVE) thrad098.ogg
Ulp! Well... you're the one with the big starship Ulp! Well... you're the one with the big starship
@@ -851,7 +854,7 @@ Fat Obstreperous Jerks
Culture Twenty Culture Twenty
#(SLAVE_EMPIRE) thrad101.ogg #(SLAVE_EMPIRE) thrad101.ogg
The Glorious Slave Empire of The Glorious Slave Empire
#(name_1) #(name_1)
The New Alliance of Free Stars The New Alliance of Free Stars
sc2/src/sc2code/comm/thradd/strings.h
+2 -1
View File
@@ -160,7 +160,8 @@ enum
OK_CULTURE_20, OK_CULTURE_20,
fat, fat,
OK_FAT, OK_FAT,
the_slave_empire, the_slave_empire0,
the_slave_empire1,
OK_SLAVE, OK_SLAVE,
FAT_JERKS, FAT_JERKS,
CULTURE, CULTURE,
sc2/src/sc2code/comm/thradd/thraddc.c
+9 -2
View File
@@ -430,7 +430,7 @@ ThraddDemeanor (RESPONSE_REF R)
SET_GAME_STATE (THRADD_CULTURE, 2); 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); SET_GAME_STATE (THRADD_CULTURE, 3);
@@ -473,9 +473,16 @@ ThraddCulture (RESPONSE_REF R)
} }
NPCPhrase (WHAT_NAME_FOR_CULTURE); 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 (you_decide, ThraddDemeanor);
Response (fat, ThraddDemeanor); Response (fat, ThraddDemeanor);
Response (the_slave_empire, ThraddDemeanor); DoResponsePhrase (the_slave_empire0, ThraddDemeanor, shared_phrase_buf);
} }
static void static void