From e3dedb19ee1d81a3889d07f0a91882eec537cdce Mon Sep 17 00:00:00 2001 From: terminx Date: Sat, 25 May 2013 20:25:39 +0000 Subject: [PATCH] Fixes a crash after killing the boss in Duke 0.99 and fixes the issue with WGR2 SVN being detected as 0.99 due to malformed definelevelname statements git-svn-id: https://svn.eduke32.com/eduke32@3815 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/gamedef.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 3f8d772e7..7605f0b43 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -4391,9 +4391,9 @@ static int32_t C_ParseCommand(int32_t loop) continue; case CON_ACTIVATE: - *g_scriptPtr = CON_OPERATEACTIVATORS; + *(g_scriptPtr-1) = CON_OPERATEACTIVATORS; C_GetNextValue(LABEL_DEFINE); - *g_scriptPtr++ = g_iThisActorID; + *g_scriptPtr++ = 0; continue; case CON_DRAGPOINT: @@ -5625,7 +5625,7 @@ repeatcase: while (*textptr == ' ' || *textptr == '\t') textptr++; // cheap hack, 0.99 doesn't have the 3D Realms time - if (*(textptr+2) == ':') + if (*(textptr+2) == ':' && g_scriptVersion == 10) { MapInfo[j *MAXLEVELS+k].designertime = (((*(textptr+0)-'0')*10+(*(textptr+1)-'0'))*REALGAMETICSPERSEC*60)+