mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-26 03:30:46 +00:00
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
This commit is contained in:
parent
2528fd3bf5
commit
e4caa58cf2
3 changed files with 3 additions and 5 deletions
|
@ -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 267
|
#define BYTEVERSION_JF 270
|
||||||
|
|
||||||
#define BYTEVERSION_13 27
|
#define BYTEVERSION_13 27
|
||||||
#define BYTEVERSION_14 116
|
#define BYTEVERSION_14 116
|
||||||
|
|
|
@ -164,8 +164,6 @@ local DUKEPLAYER_STRUCT = [[
|
||||||
|
|
||||||
uint32_t interface_toggle_flag;
|
uint32_t interface_toggle_flag;
|
||||||
|
|
||||||
uint8_t palette;
|
|
||||||
|
|
||||||
uint16_t max_actors_killed, actors_killed;
|
uint16_t max_actors_killed, actors_killed;
|
||||||
uint16_t gotweapon, zoom;
|
uint16_t gotweapon, zoom;
|
||||||
|
|
||||||
|
@ -226,6 +224,7 @@ local DUKEPLAYER_STRUCT = [[
|
||||||
int8_t last_weapon, cheat_phase, weapon_pos, wantweaponfire;
|
int8_t last_weapon, cheat_phase, weapon_pos, wantweaponfire;
|
||||||
int8_t const curr_weapon;
|
int8_t const curr_weapon;
|
||||||
|
|
||||||
|
uint8_t palette;
|
||||||
palette_t pals;
|
palette_t pals;
|
||||||
|
|
||||||
const char name[32];
|
const char name[32];
|
||||||
|
|
|
@ -165,8 +165,6 @@ typedef struct {
|
||||||
|
|
||||||
uint32_t interface_toggle_flag;
|
uint32_t interface_toggle_flag;
|
||||||
|
|
||||||
uint8_t palette;
|
|
||||||
|
|
||||||
uint16_t max_actors_killed, actors_killed;
|
uint16_t max_actors_killed, actors_killed;
|
||||||
uint16_t gotweapon, zoom;
|
uint16_t gotweapon, zoom;
|
||||||
|
|
||||||
|
@ -213,6 +211,7 @@ typedef struct {
|
||||||
int8_t numloogs, loogcnt, scream_voice;
|
int8_t numloogs, loogcnt, scream_voice;
|
||||||
int8_t last_weapon, cheat_phase, weapon_pos, wantweaponfire, curr_weapon;
|
int8_t last_weapon, cheat_phase, weapon_pos, wantweaponfire, curr_weapon;
|
||||||
|
|
||||||
|
uint8_t palette;
|
||||||
palette_t pals;
|
palette_t pals;
|
||||||
|
|
||||||
char name[32];
|
char name[32];
|
||||||
|
|
Loading…
Reference in a new issue