From d5ba66cad5eea7882e3bce80050bd323a5ec2fea Mon Sep 17 00:00:00 2001 From: gewlitys Date: Fri, 4 Jul 2003 23:44:51 +0000 Subject: [PATCH] Fixed Fwiffo join_us_refusals initialization (bug #405) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1017 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/src/sc2code/comm/spathi/spathic.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index fc6d884a1..d61bca47c 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.3: +- Fixed Fwiffo join_us_refusals initialization (bug #405) -Mika - Fix Druuge transactions to not elevate crew costs baselessly (bug #235), from ghakko - Fixed glitches and NULL Stamp draw attempt in menu code (bug #26) -Mika diff --git a/sc2/src/sc2code/comm/spathi/spathic.c b/sc2/src/sc2code/comm/spathi/spathic.c index 593104a55..dfe91d1c3 100644 --- a/sc2/src/sc2code/comm/spathi/spathic.c +++ b/sc2/src/sc2code/comm/spathi/spathic.c @@ -190,6 +190,8 @@ ExitConversation (RESPONSE_REF Response) } } +static BYTE join_us_refusals; + static void SpathiOnPluto (RESPONSE_REF R) { @@ -309,8 +311,6 @@ SpathiOnPluto (RESPONSE_REF R) } else if (PLAYER_SAID (R, join_us)) { - static BYTE join_us_refusals; - if (join_us_refusals == 0) { NPCPhrase (WONT_JOIN_1); @@ -692,6 +692,8 @@ Intro (void) Manner = GET_GAME_STATE (SPATHI_MANNER); if (GET_GAME_STATE (FOUND_PLUTO_SPATHI) == 1) { + join_us_refusals = 0; + NPCPhrase (SORRY_ABOUT_THAT); /* if already know password from Melnorme,