From f2a9af0bae97d099718b614efa23e8e47823f07a Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 9 Dec 2012 13:24:46 +0000
Subject: [PATCH] Rearrange {net,}actor_t for 4-byte alignment of int32_t
 members.

Bump BYTEVERSION.

git-svn-id: https://svn.eduke32.com/eduke32@3261 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/actors.h          | 16 ++++++++--------
 polymer/eduke32/source/duke3d.h          |  2 +-
 polymer/eduke32/source/lunatic/defs.ilua |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/polymer/eduke32/source/actors.h b/polymer/eduke32/source/actors.h
index b7e52fe86..57566d33e 100644
--- a/polymer/eduke32/source/actors.h
+++ b/polymer/eduke32/source/actors.h
@@ -98,24 +98,24 @@ typedef struct {
     int8_t filler[6]; // 6b
 } projectile_t;
 
-// (+ 40 8 6 16 16 4 8 6 4 20)
+// (+ 40 16 16 4 8 6 8 6 4 20)
 typedef struct {
     int32_t t_data[10];  // 40b sometimes used to hold offsets to con code
 
 #ifdef LUNATIC
-    // TODO: rearrange for better packing when enabling Lunatic
+    // total: 16b
     struct move mv;
     struct action ac;
     const int16_t padding_;
 #endif
 
-    int16_t picnum,ang,extra,owner; //8b
-    int16_t movflag,tempang,timetosleep; //6b
-
     int32_t flags, bposx,bposy,bposz; //16b
     int32_t floorz,ceilingz,lastvx,lastvy; //16b
     int32_t lasttransport; //4b
 
+    int16_t picnum,ang,extra,owner; //8b
+    int16_t movflag,tempang,timetosleep; //6b
+
     int16_t actorstayput, dispicnum, shootzvel, cgg; // 8b
     int16_t lightId, lightcount, lightmaxrange; //6b
 
@@ -156,13 +156,13 @@ typedef struct {
     const int16_t padding_;
 #endif
 
-    int16_t picnum,ang,extra,owner; //8b
-    int16_t movflag,tempang,timetosleep; // 6b
-
     int32_t flags, bposx,bposy,bposz; //16b
     int32_t floorz,ceilingz,lastvx,lastvy; //16b
     int32_t lasttransport; //4b
 
+    int16_t picnum,ang,extra,owner; //8b
+    int16_t movflag,tempang,timetosleep; // 6b
+
     int16_t actorstayput, dispicnum, shootzvel, cgg; // 8b
 
 } netactor_t;
diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index a241d037c..391701e31 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      261
+#define BYTEVERSION_JF      264
 
 #define BYTEVERSION_13      27
 #define BYTEVERSION_14      116
diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua
index 97d9d053e..c3079bf69 100644
--- a/polymer/eduke32/source/lunatic/defs.ilua
+++ b/polymer/eduke32/source/lunatic/defs.ilua
@@ -135,15 +135,15 @@ local ACTOR_STRUCT = [[
     const struct action ac;
     const int16_t _padding[1];
 
+    int32_t flags, bposx,bposy,bposz; //16b
+    int32_t floorz,ceilingz,lastvx,lastvy; //16b
+    int32_t lasttransport; //4b
+
     const int16_t picnum;
     int16_t ang, extra;
     const int16_t owner;
     int16_t movflag,tempang,timetosleep; //6b
 
-    int32_t flags, bposx,bposy,bposz; //16b
-    int32_t floorz,ceilingz,lastvx,lastvy; //16b
-    int32_t lasttransport; //4b
-
     const int16_t lightId, lightcount, lightmaxrange, cgg; //8b
     int16_t actorstayput;
     const int16_t dispicnum;