From e4caa58cf28f13a29394338afd8cad4e9e96eae5 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Wed, 2 Jan 2013 22:33:22 +0000 Subject: [PATCH] Move DukePlayer_t's .palette down so that 2-byte-sized members are 2-byte-aligned. Bump BYTEVERSION. git-svn-id: https://svn.eduke32.com/eduke32@3363 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/duke3d.h | 2 +- polymer/eduke32/source/lunatic/defs.ilua | 3 +-- polymer/eduke32/source/player.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h index 29b6d1f8e..9774e5e29 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 267 +#define BYTEVERSION_JF 270 #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 e7bfba988..6935b6e7a 100644 --- a/polymer/eduke32/source/lunatic/defs.ilua +++ b/polymer/eduke32/source/lunatic/defs.ilua @@ -164,8 +164,6 @@ local DUKEPLAYER_STRUCT = [[ uint32_t interface_toggle_flag; - uint8_t palette; - uint16_t max_actors_killed, actors_killed; uint16_t gotweapon, zoom; @@ -226,6 +224,7 @@ local DUKEPLAYER_STRUCT = [[ int8_t last_weapon, cheat_phase, weapon_pos, wantweaponfire; int8_t const curr_weapon; + uint8_t palette; palette_t pals; const char name[32]; diff --git a/polymer/eduke32/source/player.h b/polymer/eduke32/source/player.h index 57406bd2a..58cca1593 100644 --- a/polymer/eduke32/source/player.h +++ b/polymer/eduke32/source/player.h @@ -165,8 +165,6 @@ typedef struct { uint32_t interface_toggle_flag; - uint8_t palette; - uint16_t max_actors_killed, actors_killed; uint16_t gotweapon, zoom; @@ -213,6 +211,7 @@ typedef struct { int8_t numloogs, loogcnt, scream_voice; int8_t last_weapon, cheat_phase, weapon_pos, wantweaponfire, curr_weapon; + uint8_t palette; palette_t pals; char name[32];