From 21c9aae7458fe88394c20d07d4eb940b4e07351f Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 19 Jun 2015 14:40:39 +0200 Subject: Fixed some conditionally-declared packet structures causing plugin build failures Signed-off-by: Haru --- src/map/packets_struct.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 875eed075..231321c88 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -360,8 +360,8 @@ struct packet_dropflooritem { unsigned char subY; short count; } __attribute__((packed)); -#if PACKETVER < 20091103 struct packet_idle_unit2 { +#if PACKETVER < 20091103 short PacketType; #if PACKETVER >= 20071106 unsigned char objecttype; @@ -392,8 +392,13 @@ struct packet_idle_unit2 { unsigned char ySize; unsigned char state; short clevel; +#else // ! PACKETVER < 20091103 + char UNUSED; +#endif // PACKETVER < 20091103 } __attribute__((packed)); + struct packet_spawn_unit2 { +#if PACKETVER < 20091103 short PacketType; #if PACKETVER >= 20071106 unsigned char objecttype; @@ -418,8 +423,11 @@ struct packet_spawn_unit2 { unsigned char PosDir[3]; unsigned char xSize; unsigned char ySize; +#else // ! PACKETVER < 20091103 + char UNUSED; +#endif // PACKETVER < 20091103 } __attribute__((packed)); -#endif + struct packet_spawn_unit { short PacketType; #if PACKETVER >= 20091103 -- cgit v1.2.3-70-g09d2