From efc5b071deae5a503dd5f872a432bb12b746e925 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 4 Apr 2015 23:20:12 +0000 Subject: [PATCH] Remove object_rw::pad, pad2 The presence of these fields breaks network compatibility between aligned and unaligned users. Removing these fields breaks the ability to use aligned savegames. Per discussion in , this is acceptable to clean up the code. Reported-by: derhass Approved-by: zico --- common/main/object.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/common/main/object.h b/common/main/object.h index 73d27ae05..3777c68f9 100644 --- a/common/main/object.h +++ b/common/main/object.h @@ -351,9 +351,6 @@ struct object_rw int signature; // Every object ever has a unique signature... ubyte type; // what type of object this is... robot, weapon, hostage, powerup, fireball ubyte id; // which form of object...which powerup, robot, etc. -#ifdef WORDS_NEED_ALIGNMENT - short pad; -#endif short next,prev; // id of next and previous connected object in Objects, -1 = no connection ubyte control_type; // how this object is controlled ubyte movement_type; // how this object moves @@ -393,10 +390,6 @@ struct object_rw polyobj_info_rw pobj_info; // polygon model vclip_info_rw vclip_info; // vclip } __pack__ rtype; - -#ifdef WORDS_NEED_ALIGNMENT - short pad2; -#endif } __pack__; #endif