TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove object_rw::pad, pad2

Browse source 
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
<fdaa09d7f9>,
this is acceptable to clean up the code.

Reported-by: derhass <http://www.dxx-rebirth.com/frm/index.php/topic,1986.msg21232.html>
Approved-by: zico <fdaa09d7f9 (commitcomment-10575014)>
This commit is contained in:
Kp 2015-04-04 23:20:12 +00:00
parent df9ce26dfb
commit efc5b071de
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/main/object.h
View file

@ -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