From faa4fe4222436e21f47ff688436cd3fa9c9ade85 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 14 Sep 2002 00:23:06 +0000 Subject: [PATCH] pack some structures for ipx compatibility - courtesy of Werner Augustin --- main/multi.h | 8 ++++---- main/network.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/multi.h b/main/multi.h index 18efb116..47bba24d 100644 --- a/main/multi.h +++ b/main/multi.h @@ -1,4 +1,4 @@ -/* $Id: multi.h,v 1.7 2002-08-31 05:27:50 btb Exp $ */ +/* $Id: multi.h,v 1.8 2002-09-14 00:23:06 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -257,7 +257,7 @@ extern bitmap_index multi_player_textures[MAX_NUM_NET_PLAYERS][N_PLAYER_SHIP_TEX #define NETGAME_NAME_LEN 15 -enum comp_type {DOS,WIN_32,WIN_95,MAC}; +enum __pack__ comp_type {DOS,WIN_32,WIN_95,MAC}; // sigh...the socket structure member was moved away from it's friends. // I'll have to create a union for appletalk network info with just @@ -287,14 +287,14 @@ typedef struct netplayer_info { ubyte rank; -} netplayer_info; +} __pack__ netplayer_info; typedef struct AllNetPlayers_info { char type; int Security; struct netplayer_info players[MAX_PLAYERS+4]; -} AllNetPlayers_info; +} __pack__ AllNetPlayers_info; typedef struct netgame_info { ubyte type; diff --git a/main/network.h b/main/network.h index 25ce916b..b498d7a7 100644 --- a/main/network.h +++ b/main/network.h @@ -1,4 +1,4 @@ -/* $Id: network.h,v 1.9 2002-08-31 03:21:41 btb Exp $ */ +/* $Id: network.h,v 1.10 2002-09-14 00:23:06 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -52,7 +52,7 @@ typedef struct sequence_packet { int Security; ubyte pad1[3]; netplayer_info player; -} sequence_packet; +} __pack__ sequence_packet; #define NET_XDATA_SIZE 454 -- 2.39.2