From ca007f2d9a0da4f183b1b7325cbd9916ce3196b4 Mon Sep 17 00:00:00 2001 From: mcmartin Date: Fri, 25 Apr 2003 00:54:13 +0000 Subject: [PATCH] The AWARE_OF_SAMATRA flag is now written as well as checked, closes #113; from Nic git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@931 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 ++ sc2/src/sc2code/comm/blackur/blackurc.c | 1 + sc2/src/sc2code/comm/talkpet/talkpet.c | 1 + sc2/src/sc2code/comm/urquan/urquanc.c | 1 + 4 files changed, 5 insertions(+) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index f2c3a8dab..72d968a97 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.3: +- AWARE_OF_SAMATRA flag is now written as well as read (closes #113), + from Nic - Subtitle drawing is now cached (closes #313) -Mika - Fix glitch and lockup in dialogs when rewinding (bugs #311 and #272), from chmmravatar diff --git a/sc2/src/sc2code/comm/blackur/blackurc.c b/sc2/src/sc2code/comm/blackur/blackurc.c index 7588663fe..7584b1a09 100644 --- a/sc2/src/sc2code/comm/blackur/blackurc.c +++ b/sc2/src/sc2code/comm/blackur/blackurc.c @@ -458,6 +458,7 @@ Intro (void) { NPCPhrase (HELLO_SAMATRA); + SET_GAME_STATE (AWARE_OF_SAMATRA, 1); SET_GAME_STATE (BATTLE_SEGUE, 1); } else diff --git a/sc2/src/sc2code/comm/talkpet/talkpet.c b/sc2/src/sc2code/comm/talkpet/talkpet.c index d2f70a967..135eeffaa 100644 --- a/sc2/src/sc2code/comm/talkpet/talkpet.c +++ b/sc2/src/sc2code/comm/talkpet/talkpet.c @@ -657,6 +657,7 @@ Intro (void) { SET_GAME_STATE (SHIP_TO_COMPEL, 0); SET_GAME_STATE (READY_TO_CONFUSE_URQUAN, 0); + SET_GAME_STATE (AWARE_OF_SAMATRA, 1); if (GET_GAME_STATE (CHMMR_BOMB_STATE) != 3) { NPCPhrase (HAVENT_GOT_EVERYTHING); diff --git a/sc2/src/sc2code/comm/urquan/urquanc.c b/sc2/src/sc2code/comm/urquan/urquanc.c index fd0584f8e..b520a1799 100644 --- a/sc2/src/sc2code/comm/urquan/urquanc.c +++ b/sc2/src/sc2code/comm/urquan/urquanc.c @@ -458,6 +458,7 @@ Intro (void) { NPCPhrase (HELLO_SAMATRA); + SET_GAME_STATE (AWARE_OF_SAMATRA, 1); SET_GAME_STATE (BATTLE_SEGUE, 1); } else