From f54c233bf7350bf7270be591d98988bc5aec4228 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Sun, 6 Feb 2005 19:32:53 +0000 Subject: [PATCH] . git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1516 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/src/sc2code/comm/mycon/myconc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 52a180e1c..bfde9955a 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.4: +- Enable the other insults against the Mycon (bug #559), from Nic. - Colormap format (.ct files) changed to allow for richer graphics. First step towards importing some of the original DOS gfx. See bug #314 for more info. -Alex diff --git a/sc2/src/sc2code/comm/mycon/myconc.c b/sc2/src/sc2code/comm/mycon/myconc.c index 3dca4b288..aa0ffa668 100644 --- a/sc2/src/sc2code/comm/mycon/myconc.c +++ b/sc2/src/sc2code/comm/mycon/myconc.c @@ -258,6 +258,7 @@ CombatIsInevitable (RESPONSE_REF R) else NPCPhrase (BYE_AND_DIE_HOMEWORLD); } + MadeChoice = 0; } static void