From d0d5cb831f83f1ba3d617476e054fc220e17ec71 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Wed, 1 Nov 2006 22:47:06 +0000 Subject: [PATCH] Some old code removed; enable inclusion from outside UQM. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2489 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/netplay/packet.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sc2/src/sc2code/netplay/packet.h b/sc2/src/sc2code/netplay/packet.h index cbdbc78e1..36a12ad7f 100644 --- a/sc2/src/sc2code/netplay/packet.h +++ b/sc2/src/sc2code/netplay/packet.h @@ -44,6 +44,7 @@ typedef enum PacketType { } PacketType; +#ifndef PACKET_H_STANDALONE #include "netconnection.h" #include "types.h" @@ -65,6 +66,7 @@ typedef struct { } PacketTypeData; extern PacketTypeData packetTypeData[]; +#endif // When adding new packets, be sure to have all the fields properly aligned, @@ -207,16 +209,6 @@ typedef struct { uint16 padding; } Packet_SelectShip; -typedef enum { - PK_THRUST, - PK_LEFT, - PK_RIGHT, - PK_FIRE, - PK_SPECIAL, - - PK_NUM -} PacketKey; - typedef struct { PacketHeader header; uint8 state; /* Actually BATTLE_INPUT_STATE */ @@ -236,6 +228,7 @@ typedef struct { } Packet_Checksum; +#ifndef PACKET_H_STANDALONE void Packet_delete(Packet *packet); Packet_Init *Packet_Init_create(void); Packet_Ping *Packet_Ping_create(uint32 id); @@ -255,6 +248,7 @@ Packet_SelectShip *Packet_SelectShip_create(uint16 ship); Packet_BattleInput *Packet_BattleInput_create(uint8 state); Packet_FrameCount *Packet_FrameCount_create(uint32 frameCount); Packet_Checksum *Packet_Checksum_create(uint32 frameNr, uint32 checksum); +#endif #endif /* _PACKET_H */