From 2c9c1e2eb8e74a6f8d9765993365648555ddf9b0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 30 Mar 2016 21:10:18 +0300 Subject: Add missing checks. --- src/emap/packets_struct.h | 264 +++++++++++++++++++++++----------------------- 1 file changed, 132 insertions(+), 132 deletions(-) (limited to 'src/emap/packets_struct.h') diff --git a/src/emap/packets_struct.h b/src/emap/packets_struct.h index 52b0dc5..1d218b5 100644 --- a/src/emap/packets_struct.h +++ b/src/emap/packets_struct.h @@ -27,222 +27,222 @@ #include "common/mmo.h" struct packet_idle_unit_old { - short PacketType; + short PacketType; #if PACKETVER >= 20091103 - short PacketLength; - unsigned char objecttype; + short PacketLength; + unsigned char objecttype; #endif //#if PACKETVER >= 20131223 -// unsigned int AID; +// unsigned int AID; //#endif - unsigned int GID; - short speed; - short bodyState; - short healthState; + unsigned int GID; + short speed; + short bodyState; + short healthState; #if PACKETVER < 20080102 - short effectState; + short effectState; #else - int effectState; + int effectState; #endif - short job; - short head; + short job; + short head; #if PACKETVER < 7 - short weapon; + short weapon; #else - int weapon; + int weapon; #endif - short accessory; + short accessory; #if PACKETVER < 7 - short shield; + short shield; #endif - short accessory2; - short accessory3; - short headpalette; - short bodypalette; - short headDir; + short accessory2; + short accessory3; + short headpalette; + short bodypalette; + short headDir; #if PACKETVER >= 20101124 - short robe; + short robe; #endif - unsigned int GUID; - short GEmblemVer; - short honor; + unsigned int GUID; + short GEmblemVer; + short honor; #if PACKETVER > 7 - int virtue; + int virtue; #else - short virtue; -#endif - uint8 isPKModeON; - unsigned char sex; - unsigned char PosDir[3]; - unsigned char xSize; - unsigned char ySize; - unsigned char state; - short clevel; + short virtue; +#endif + uint8 isPKModeON; + unsigned char sex; + unsigned char PosDir[3]; + unsigned char xSize; + unsigned char ySize; + unsigned char state; + short clevel; #if PACKETVER >= 20080102 - short font; + short font; #endif #if PACKETVER >= 20120221 - int maxHP; - int HP; - unsigned char isBoss; + int maxHP; + int HP; + unsigned char isBoss; #endif #if PACKETVER >= 20150513 - short body; + short body; #endif } __attribute__((packed)); struct packet_spawn_unit_old { - short PacketType; + short PacketType; #if PACKETVER >= 20091103 - short PacketLength; - unsigned char objecttype; + short PacketLength; + unsigned char objecttype; #endif //#if PACKETVER >= 20131223 -// unsigned int AID; +// unsigned int AID; //#endif - unsigned int GID; - short speed; - short bodyState; - short healthState; + unsigned int GID; + short speed; + short bodyState; + short healthState; #if PACKETVER < 20080102 - short effectState; + short effectState; #else - int effectState; + int effectState; #endif - short job; - short head; + short job; + short head; #if PACKETVER < 7 - short weapon; + short weapon; #else - int weapon; + int weapon; #endif - short accessory; + short accessory; #if PACKETVER < 7 - short shield; + short shield; #endif - short accessory2; - short accessory3; - short headpalette; - short bodypalette; - short headDir; + short accessory2; + short accessory3; + short headpalette; + short bodypalette; + short headDir; #if PACKETVER >= 20101124 - short robe; + short robe; #endif - unsigned int GUID; - short GEmblemVer; - short honor; + unsigned int GUID; + short GEmblemVer; + short honor; #if PACKETVER > 7 - int virtue; + int virtue; #else - short virtue; -#endif - uint8 isPKModeON; - unsigned char sex; - unsigned char PosDir[3]; - unsigned char xSize; - unsigned char ySize; - short clevel; + short virtue; +#endif + uint8 isPKModeON; + unsigned char sex; + unsigned char PosDir[3]; + unsigned char xSize; + unsigned char ySize; + short clevel; #if PACKETVER >= 20080102 - short font; + short font; #endif #if PACKETVER >= 20120221 - int maxHP; - int HP; - unsigned char isBoss; + int maxHP; + int HP; + unsigned char isBoss; #endif #if PACKETVER >= 20150513 - short body; + short body; #endif } __attribute__((packed)); struct packet_unit_walking_old { - short PacketType; + short PacketType; #if PACKETVER >= 20091103 - short PacketLength; + short PacketLength; #endif #if PACKETVER > 20071106 - unsigned char objecttype; + unsigned char objecttype; #endif //#if PACKETVER >= 20131223 -// unsigned int AID; +// unsigned int AID; //#endif - unsigned int GID; - short speed; - short bodyState; - short healthState; + unsigned int GID; + short speed; + short bodyState; + short healthState; #if PACKETVER < 7 - short effectState; + short effectState; #else - int effectState; + int effectState; #endif - short job; - short head; + short job; + short head; #if PACKETVER < 7 - short weapon; + short weapon; #else - int weapon; + int weapon; #endif - short accessory; - unsigned int moveStartTime; + short accessory; + unsigned int moveStartTime; #if PACKETVER < 7 - short shield; + short shield; #endif - short accessory2; - short accessory3; - short headpalette; - short bodypalette; - short headDir; + short accessory2; + short accessory3; + short headpalette; + short bodypalette; + short headDir; #if PACKETVER >= 20101124 - short robe; + short robe; #endif - unsigned int GUID; - short GEmblemVer; - short honor; + unsigned int GUID; + short GEmblemVer; + short honor; #if PACKETVER > 7 - int virtue; + int virtue; #else - short virtue; -#endif - uint8 isPKModeON; - unsigned char sex; - unsigned char MoveData[6]; - unsigned char xSize; - unsigned char ySize; - short clevel; + short virtue; +#endif + uint8 isPKModeON; + unsigned char sex; + unsigned char MoveData[6]; + unsigned char xSize; + unsigned char ySize; + short clevel; #if PACKETVER >= 20080102 - short font; + short font; #endif #if PACKETVER >= 20120221 - int maxHP; - int HP; - unsigned char isBoss; + int maxHP; + int HP; + unsigned char isBoss; #endif #if PACKETVER >= 20150513 - short body; + short body; #endif } __attribute__((packed)); struct packet_damage_old { - short PacketType; - unsigned int GID; - unsigned int targetGID; - unsigned int startTime; - int attackMT; - int attackedMT; + short PacketType; + unsigned int GID; + unsigned int targetGID; + unsigned int startTime; + int attackMT; + int attackedMT; #if PACKETVER < 20071113 - short damage; + short damage; #else - int damage; + int damage; #endif //#if PACKETVER >= 20131223 -// unsigned char is_sp_damaged; +// unsigned char is_sp_damaged; //#endif - short count; - unsigned char action; + short count; + unsigned char action; #if PACKETVER < 20071113 - short leftDamage; + short leftDamage; #else - int leftDamage; + int leftDamage; #endif } __attribute__((packed)); -- cgit v1.2.3-60-g2f50