From 441e2ed220b934948a21e6011c5a04d141eb9651 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 15 Dec 2012 11:28:56 +0000
Subject: [PATCH] Fix savegame loading.  Bump BYTEVERSION.

git-svn-id: https://svn.eduke32.com/eduke32@3295 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/duke3d.h   |  2 +-
 polymer/eduke32/source/gamevars.c | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index dfba0385d..96b1ec8a6 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -57,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define VOLUMEONE           (g_Shareware == 1)
 
 // increase by 3, because atomic GRP adds 1, and Shareware adds 2
-#define BYTEVERSION_JF      264
+#define BYTEVERSION_JF      267
 
 #define BYTEVERSION_13      27
 #define BYTEVERSION_14      116
diff --git a/polymer/eduke32/source/gamevars.c b/polymer/eduke32/source/gamevars.c
index 01763e856..3989e33d0 100644
--- a/polymer/eduke32/source/gamevars.c
+++ b/polymer/eduke32/source/gamevars.c
@@ -157,7 +157,12 @@ int32_t Gv_ReadSave(int32_t fil, int32_t newbehav)
     if (kdfread(&g_gameArrayCount,sizeof(g_gameArrayCount),1,fil) != 1) goto corrupt;
     for (i=0; i<g_gameArrayCount; i++)
     {
-        if (kdfread(&(aGameArrays[i]),sizeof(gamearray_t),1,fil) != 1) goto corrupt;
+        if (aGameArrays[i].dwFlags&GAMEARRAY_READONLY)
+            continue;
+
+        // read for .size and .dwFlags (the rest are pointers):
+        if (kdfread(&aGameArrays[i],sizeof(gamearray_t),1,fil) != 1) goto corrupt;
+
         aGameArrays[i].szLabel = (char *)Bcalloc(MAXARRAYLABEL,sizeof(uint8_t));
         if (kdfread(aGameArrays[i].szLabel,sizeof(uint8_t) * MAXARRAYLABEL, 1, fil) != 1) goto corrupt;
         hash_add(&h_arrays, aGameArrays[i].szLabel, i, 1);
@@ -275,7 +280,12 @@ void Gv_WriteSave(FILE *fil, int32_t newbehav)
 
     for (i=0; i<g_gameArrayCount; i++)
     {
-        dfwrite(&(aGameArrays[i]),sizeof(gamearray_t),1,fil);
+        if (aGameArrays[i].dwFlags&GAMEARRAY_READONLY)
+            continue;
+
+        // write for .size and .dwFlags (the rest are pointers):
+        dfwrite(&aGameArrays[i],sizeof(gamearray_t),1,fil);
+
         dfwrite(aGameArrays[i].szLabel,sizeof(uint8_t) * MAXARRAYLABEL, 1, fil);
         dfwrite(aGameArrays[i].plValues, GAR_ELTSZ * aGameArrays[i].size, 1, fil);
     }
@@ -1664,9 +1674,6 @@ static void Gv_AddSystemVars(void)
     Gv_NewVar("rendmode", 0, GAMEVAR_READONLY | GAMEVAR_SYSTEM);
 #endif
 
-    // must be first!
-    Gv_NewArray(".LOCALS_BASE", NULL, 0, GAMEARRAY_OFINT);
-
     Gv_NewArray("tilesizx", (void *)tilesizx, MAXTILES, GAMEARRAY_READONLY|GAMEARRAY_OFSHORT);
     Gv_NewArray("tilesizy", (void *)tilesizy, MAXTILES, GAMEARRAY_READONLY|GAMEARRAY_OFSHORT);
 }