From fb7c826d20d2c31e15823f34bfff9c1bf8356459 Mon Sep 17 00:00:00 2001 From: avolkov Date: Fri, 29 Aug 2003 20:35:44 +0000 Subject: [PATCH] Syreen ships will now activate when Talana says they are available; bug #264 git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1147 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/comm/syreen/syreenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sc2/src/sc2code/comm/syreen/syreenc.c b/sc2/src/sc2code/comm/syreen/syreenc.c index f94433d17..fd02ccce8 100644 --- a/sc2/src/sc2code/comm/syreen/syreenc.c +++ b/sc2/src/sc2code/comm/syreen/syreenc.c @@ -312,7 +312,7 @@ AfterAmbush (RESPONSE_REF R) { NPCPhrase (DO_THIS_AFTER_AMBUSH); - ActivateStarShip (SYREEN_SHIP, 0); + DISABLE_PHRASE (what_now_after_ambush); } else if (PLAYER_SAID (R, what_about_you)) { @@ -352,7 +352,7 @@ AfterAmbush (RESPONSE_REF R) { 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); if (PHRASE_ENABLED (whats_up_after_ambush)) Response (whats_up_after_ambush, AfterAmbush); @@ -726,6 +726,7 @@ Intro (void) { case 0: NPCPhrase (HELLO_AFTER_AMBUSH_1); + ActivateStarShip (SYREEN_SHIP, 0); break; case 1: NPCPhrase (HELLO_AFTER_AMBUSH_2);