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
This commit is contained in:
helixhorned 2012-06-03 19:20:23 +00:00
parent 3a3284e2a3
commit 6fc99bcdf3
3 changed files with 3 additions and 3 deletions

View file

@ -161,7 +161,7 @@ typedef struct {
#else #else
/* 64-bit */ /* 64-bit */
# ifndef LUNATIC # ifndef LUNATIC
const int8_t filler[12]; // XXX: should be 16, schedule with next BYTEVERSION/savegame version bump! const int8_t filler[16];
# else # else
/* no padding */ /* no padding */
#endif #endif

View file

@ -57,7 +57,7 @@ extern "C" {
#define VOLUMEONE (g_Shareware == 1) #define VOLUMEONE (g_Shareware == 1)
// increase by 3, because atomic GRP adds 1, and Shareware adds 2 // 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_13 27
#define BYTEVERSION_14 116 #define BYTEVERSION_14 116

View file

@ -9787,7 +9787,7 @@ int32_t app_main(int32_t argc, const char **argv)
ENetCallbacks callbacks = { NULL, NULL, NULL }; ENetCallbacks callbacks = { NULL, NULL, NULL };
#endif #endif
// Bassert(sizeof(actor_t)==128); // fails with x86_64 Bassert(sizeof(actor_t)==128);
Bassert(offsetof(actor_t, bposx) == sizeof(netactor_t)); Bassert(offsetof(actor_t, bposx) == sizeof(netactor_t));
#ifdef GEKKO #ifdef GEKKO