RPi: fix network protocol incompatibilities when WORDS_NEED_ALIGNMENT is defined
I got a bug report about erros connecting from RPI builds to normal games on desktop machines. Unfortunately, this patch also changes the savegame format (which was incompatible to normal desktop builds before, too). This is discussed in more detail in: http://www.dxx-rebirth.com/frm/index.php/topic,1986.msg21232.html#msg21232
This commit is contained in:
parent
df9ce26dfb
commit
fdaa09d7f9
|
@ -351,7 +351,7 @@ 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
|
||||
#if defined(WORDS_NEED_ALIGNMENT) && !defined(RPI)
|
||||
short pad;
|
||||
#endif
|
||||
short next,prev; // id of next and previous connected object in Objects, -1 = no connection
|
||||
|
@ -394,7 +394,7 @@ struct object_rw
|
|||
vclip_info_rw vclip_info; // vclip
|
||||
} __pack__ rtype;
|
||||
|
||||
#ifdef WORDS_NEED_ALIGNMENT
|
||||
#if defined(WORDS_NEED_ALIGNMENT) && !defined(RPI)
|
||||
short pad2;
|
||||
#endif
|
||||
} __pack__;
|
||||
|
|
Loading…
Reference in a new issue