summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-06-19 14:40:39 +0200
committerHaru <haru@dotalux.com>2015-06-19 14:40:39 +0200
commit21c9aae7458fe88394c20d07d4eb940b4e07351f (patch)
tree38d8e09d4b53a6a32e0491dc75da06f29a6d03ef /src/map
parent4faa45ac7ed47d8a51068f8323405f4f3df80edb (diff)
downloadhercules-21c9aae7458fe88394c20d07d4eb940b4e07351f.tar.gz
hercules-21c9aae7458fe88394c20d07d4eb940b4e07351f.tar.bz2
hercules-21c9aae7458fe88394c20d07d4eb940b4e07351f.tar.xz
hercules-21c9aae7458fe88394c20d07d4eb940b4e07351f.zip
Fixed some conditionally-declared packet structures causing plugin build failures
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/packets_struct.h12
1 files 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