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

Syreen ships will now activate when Talana says they are available; bug #264

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1147 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2003-08-29 20:35:44 +00:00
parent 358ff17e0f
commit fb7c826d20
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/syreen/syreenc.c
+3 -2
View File
@@ -312,7 +312,7 @@ AfterAmbush (RESPONSE_REF R)
{ {
NPCPhrase (DO_THIS_AFTER_AMBUSH); NPCPhrase (DO_THIS_AFTER_AMBUSH);
ActivateStarShip (SYREEN_SHIP, 0); DISABLE_PHRASE (what_now_after_ambush);
} }
else if (PLAYER_SAID (R, what_about_you)) else if (PLAYER_SAID (R, what_about_you))
{ {
@@ -352,7 +352,7 @@ AfterAmbush (RESPONSE_REF R)
{ {
Response (what_about_us, Foreplay); Response (what_about_us, Foreplay);
} }
if (!(ActivateStarShip (SYREEN_SHIP, CHECK_ALLIANCE) & GOOD_GUY)) if (PHRASE_ENABLED (what_now_after_ambush))
Response (what_now_after_ambush, AfterAmbush); Response (what_now_after_ambush, AfterAmbush);
if (PHRASE_ENABLED (whats_up_after_ambush)) if (PHRASE_ENABLED (whats_up_after_ambush))
Response (whats_up_after_ambush, AfterAmbush); Response (whats_up_after_ambush, AfterAmbush);
@@ -726,6 +726,7 @@ Intro (void)
{ {
case 0: case 0:
NPCPhrase (HELLO_AFTER_AMBUSH_1); NPCPhrase (HELLO_AFTER_AMBUSH_1);
ActivateStarShip (SYREEN_SHIP, 0);
break; break;
case 1: case 1:
NPCPhrase (HELLO_AFTER_AMBUSH_2); NPCPhrase (HELLO_AFTER_AMBUSH_2);