From fdaa09d7f9ff38c2ea9e8321374067c4f8c4fc0f Mon Sep 17 00:00:00 2001 From: derhass Date: Tue, 17 Mar 2015 22:37:01 +0100 Subject: [PATCH] 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 --- common/main/object.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/main/object.h b/common/main/object.h index 73d27ae05..2120cc8e9 100644 --- a/common/main/object.h +++ b/common/main/object.h @@ -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__;