From f59fefe33da01fdc94b7efb58cf95bd6a1031531 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 16 Apr 2006 21:15:12 +0000
Subject: [PATCH] Fix for weapon switch option issue with demo playback

git-svn-id: https://svn.eduke32.com/eduke32@34 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/config.c   | 1 +
 polymer/eduke32/source/gameexec.c | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c
index d500a61d2..faeed4feb 100644
--- a/polymer/eduke32/source/config.c
+++ b/polymer/eduke32/source/config.c
@@ -631,6 +631,7 @@ void CONFIG_ReadSetup( void )
         SCRIPT_GetNumber( scripthandle, "Controls","AutoAim",&AutoAim);         // JBF 20031125
         ps[0].auto_aim = AutoAim;
         SCRIPT_GetNumber( scripthandle, "Controls","WeaponSwitchMode",&ud.weaponswitch);
+        ps[0].weaponswitch = ud.weaponswitch;
         glusetexcache = glusetexcachecompression = -1;
         SCRIPT_GetNumber( scripthandle, "Screen Setup", "GLUseCompressedTextureCache", &glusetexcache);
         SCRIPT_GetNumber( scripthandle, "Screen Setup", "GLUseTextureCacheCompression", &glusetexcachecompression);
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index 46576f287..db32cf801 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -3564,17 +3564,14 @@ char parse(void)
     case CON_SIZETO:
         insptr++;
 
-        j = (*insptr++-g_sp->xrepeat)<<1;
+        j = (*(insptr++)-g_sp->xrepeat)<<1;
         g_sp->xrepeat += ksgn(j);
 
-        if( ( g_sp->picnum == APLAYER && g_sp->yrepeat < 36 ) || *insptr < g_sp->yrepeat || ((g_sp->yrepeat*(tilesizy[g_sp->picnum]+8))<<2) < (hittype[g_i].floorz - hittype[g_i].ceilingz) )
+        if( ( g_sp->picnum == APLAYER && g_sp->yrepeat < 36 ) || *insptr++ < g_sp->yrepeat || ((g_sp->yrepeat*(tilesizy[g_sp->picnum]+8))<<2) < (hittype[g_i].floorz - hittype[g_i].ceilingz) )
         {
             j = ((*insptr)-g_sp->yrepeat)<<1;
             if( klabs(j) ) g_sp->yrepeat += ksgn(j);
         }
-
-        insptr++;
-
         break;
     case CON_SIZEAT:
         insptr++;