zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rearrange {net,}actor_t for 4-byte alignment of int32_t members.

Browse source 
Bump BYTEVERSION.

git-svn-id: https://svn.eduke32.com/eduke32@3261 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-12-09 13:24:46 +00:00
parent fc048658dc
commit f2a9af0bae
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
polymer/eduke32/source/actors.h
View file

@ -98,24 +98,24 @@ typedef struct {
int8_t filler[6]; // 6b int8_t filler[6]; // 6b
} projectile_t; } projectile_t;
// (+ 40 8 6 16 16 4 8 6 4 20) // (+ 40 16 16 4 8 6 8 6 4 20)
typedef struct { typedef struct {
int32_t t_data[10]; // 40b sometimes used to hold offsets to con code int32_t t_data[10]; // 40b sometimes used to hold offsets to con code
#ifdef LUNATIC #ifdef LUNATIC
// TODO: rearrange for better packing when enabling Lunatic // total: 16b
struct move mv; struct move mv;
struct action ac; struct action ac;
const int16_t padding_; const int16_t padding_;
#endif #endif
int16_t picnum,ang,extra,owner; //8b
int16_t movflag,tempang,timetosleep; //6b
int32_t flags, bposx,bposy,bposz; //16b int32_t flags, bposx,bposy,bposz; //16b
int32_t floorz,ceilingz,lastvx,lastvy; //16b int32_t floorz,ceilingz,lastvx,lastvy; //16b
int32_t lasttransport; //4b 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 actorstayput, dispicnum, shootzvel, cgg; // 8b
int16_t lightId, lightcount, lightmaxrange; //6b int16_t lightId, lightcount, lightmaxrange; //6b
@ -156,13 +156,13 @@ typedef struct {
const int16_t padding_; const int16_t padding_;
#endif #endif
int16_t picnum,ang,extra,owner; //8b
int16_t movflag,tempang,timetosleep; // 6b
int32_t flags, bposx,bposy,bposz; //16b int32_t flags, bposx,bposy,bposz; //16b
int32_t floorz,ceilingz,lastvx,lastvy; //16b int32_t floorz,ceilingz,lastvx,lastvy; //16b
int32_t lasttransport; //4b 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 actorstayput, dispicnum, shootzvel, cgg; // 8b
} netactor_t; } netactor_t;

2
polymer/eduke32/source/duke3d.h
View file

@ -57,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#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 261 #define BYTEVERSION_JF 264
#define BYTEVERSION_13 27 #define BYTEVERSION_13 27
#define BYTEVERSION_14 116 #define BYTEVERSION_14 116

8
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -135,15 +135,15 @@ local ACTOR_STRUCT = [[
const struct action ac; const struct action ac;
const int16_t _padding[1]; 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; const int16_t picnum;
int16_t ang, extra; int16_t ang, extra;
const int16_t owner; const int16_t owner;
int16_t movflag,tempang,timetosleep; //6b 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 const int16_t lightId, lightcount, lightmaxrange, cgg; //8b
int16_t actorstayput; int16_t actorstayput;
const int16_t dispicnum; const int16_t dispicnum;