From 227ab8ec10e3ebc617f14116b9a77bad5dda44a6 Mon Sep 17 00:00:00 2001 From: avolkov Date: Sun, 8 May 2011 00:49:48 +0000 Subject: [PATCH] Do not reset Syreen HELLO stack when discovering the vault; fixes bug #891 git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3600 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 ++ sc2/src/uqm/comm/syreen/syreenc.c | 7 +++++++ sc2/src/uqm/planets/generate/genvault.c | 1 - 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 47b935de4..fd72b164b 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.7: +- Syreen dialog tree no longer resets after visiting the Syreen Vault + for the very first time (bug #891) - Alex - Fixed lander report at the Syreen Vault inconsistency (bug #1121) - Alex - Added lander reports for Supox ruins and Ultron. The reports text is new content from TFB. (bug #1120) - Alex diff --git a/sc2/src/uqm/comm/syreen/syreenc.c b/sc2/src/uqm/comm/syreen/syreenc.c index 332732bd2..17632cae8 100644 --- a/sc2/src/uqm/comm/syreen/syreenc.c +++ b/sc2/src/uqm/comm/syreen/syreenc.c @@ -694,6 +694,7 @@ PlanAmbush (RESPONSE_REF R) NPCPhrase (OK_FOUND_VAULT); SET_GAME_STATE (MYCON_AMBUSH, 1); + // This is redundant but left here for clarity SET_GAME_STATE (SYREEN_HOME_VISITS, 0); Response (whats_my_reward, Foreplay); @@ -818,6 +819,12 @@ Intro (void) else if (GET_GAME_STATE (SHIP_VAULT_UNLOCKED)) { PlanAmbush ((RESPONSE_REF)0); + // XXX: PlanAmbush() sets SYREEN_HOME_VISITS=0, but then this value + // is immediately reset to NumVisits just below. The intent was to + // reset the HELLO stack so that is what we will do here as well. + // Note that it is completely redundant because genvault.c resets + // SYREEN_HOME_VISITS when it sets SHIP_VAULT_UNLOCKED=1. + NumVisits = 0; } else { diff --git a/sc2/src/uqm/planets/generate/genvault.c b/sc2/src/uqm/planets/generate/genvault.c index ecaa4cfae..e6985a266 100644 --- a/sc2/src/uqm/planets/generate/genvault.c +++ b/sc2/src/uqm/planets/generate/genvault.c @@ -118,7 +118,6 @@ GenerateVault_pickupEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (!GET_GAME_STATE (KNOW_SYREEN_VAULT)) { SET_GAME_STATE (KNOW_SYREEN_VAULT, 1); - SET_GAME_STATE (SYREEN_HOME_VISITS, 0); } }