From 6fc99bcdf30fbf637b7ed17fc43927182fd0880d Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 3 Jun 2012 19:20:23 +0000
Subject: [PATCH] Bump BYTEVERSION, correct actor_t size on x64, add
 assert(sizeof(actor_t)==128).

r2727 made old savegames incompatible, as an array with MAXVOLUMES*MAXLEVELS
is saved in Gv_WriteSave().

git-svn-id: https://svn.eduke32.com/eduke32@2730 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/actors.h | 2 +-
 polymer/eduke32/source/duke3d.h | 2 +-
 polymer/eduke32/source/game.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/polymer/eduke32/source/actors.h b/polymer/eduke32/source/actors.h
index 4da8e116b..0f3a23de6 100644
--- a/polymer/eduke32/source/actors.h
+++ b/polymer/eduke32/source/actors.h
@@ -161,7 +161,7 @@ typedef struct {
 #else
     /* 64-bit */
 # ifndef LUNATIC
-    const int8_t filler[12];  // XXX: should be 16, schedule with next BYTEVERSION/savegame version bump!
+    const int8_t filler[16];
 # else
     /* no padding */
 #endif
diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index 579027e79..3ee2735a8 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -57,7 +57,7 @@ extern "C" {
 #define VOLUMEONE           (g_Shareware == 1)
 
 // increase by 3, because atomic GRP adds 1, and Shareware adds 2
-#define BYTEVERSION_JF      243
+#define BYTEVERSION_JF      246
 
 #define BYTEVERSION_13      27
 #define BYTEVERSION_14      116
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 7c277c8e6..bf89fa8da 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -9787,7 +9787,7 @@ int32_t app_main(int32_t argc, const char **argv)
     ENetCallbacks callbacks = { NULL, NULL, NULL };
 #endif
 
-//    Bassert(sizeof(actor_t)==128);  // fails with x86_64
+    Bassert(sizeof(actor_t)==128);
     Bassert(offsetof(actor_t, bposx) == sizeof(netactor_t));
 
 #ifdef GEKKO