summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-05-14 15:52:58 +0200
committerHaru <haru@dotalux.com>2016-05-14 15:52:58 +0200
commita0af4fab16345921dcbf8ca7b7f831e97e3d757d (patch)
tree78e714ffe21603a718f9cb497c5d20f4abf190ff
parent578b9d8a266a43372717ded4fddbcdbb58b5c810 (diff)
downloadhercules-a0af4fab16345921dcbf8ca7b7f831e97e3d757d.tar.gz
hercules-a0af4fab16345921dcbf8ca7b7f831e97e3d757d.tar.bz2
hercules-a0af4fab16345921dcbf8ca7b7f831e97e3d757d.tar.xz
hercules-a0af4fab16345921dcbf8ca7b7f831e97e3d757d.zip
Replaced 'unsigned char' with 'uint8' (guaranteed size) in all packed structs
Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--src/map/packets_struct.h154
1 files changed, 77 insertions, 77 deletions
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 888d893b6..f479e1de6 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -318,7 +318,7 @@ struct EQUIPSLOTINFO {
struct NORMALITEM_INFO {
short index;
unsigned short ITID;
- unsigned char type;
+ uint8 type;
#if PACKETVER < 20120925
uint8 IsIdentified;
#endif
@@ -336,9 +336,9 @@ struct NORMALITEM_INFO {
#endif
#if PACKETVER >= 20120925
struct {
- unsigned char IsIdentified : 1;
- unsigned char PlaceETCTab : 1;
- unsigned char SpareBits : 6;
+ uint8 IsIdentified : 1;
+ uint8 PlaceETCTab : 1;
+ uint8 SpareBits : 6;
} Flag;
#endif
} __attribute__((packed));
@@ -346,13 +346,13 @@ struct NORMALITEM_INFO {
struct RndOptions {
short index;
short value;
- unsigned char param;
+ uint8 param;
} __attribute__((packed));
struct EQUIPITEM_INFO {
short index;
unsigned short ITID;
- unsigned char type;
+ uint8 type;
#if PACKETVER < 20120925
uint8 IsIdentified;
#endif
@@ -366,7 +366,7 @@ struct EQUIPITEM_INFO {
#if PACKETVER < 20120925
uint8 IsDamaged;
#endif
- unsigned char RefiningLevel;
+ uint8 RefiningLevel;
struct EQUIPSLOTINFO slot;
#if PACKETVER >= 20071002
int HireExpireDate;
@@ -378,15 +378,15 @@ struct EQUIPITEM_INFO {
unsigned short wItemSpriteNumber;
#endif
#if PACKETVER >= 20150226
- unsigned char option_count;
+ uint8 option_count;
struct RndOptions option_data[5];
#endif
#if PACKETVER >= 20120925
struct {
- unsigned char IsIdentified : 1;
- unsigned char IsDamaged : 1;
- unsigned char PlaceETCTab : 1;
- unsigned char SpareBits : 5;
+ uint8 IsIdentified : 1;
+ uint8 IsDamaged : 1;
+ uint8 PlaceETCTab : 1;
+ uint8 SpareBits : 5;
} Flag;
#endif
} __attribute__((packed));
@@ -394,14 +394,14 @@ struct EQUIPITEM_INFO {
struct packet_authok {
short PacketType;
unsigned int startTime;
- unsigned char PosDir[3];
- unsigned char xSize;
- unsigned char ySize;
+ uint8 PosDir[3];
+ uint8 xSize;
+ uint8 ySize;
#if PACKETVER >= 20080102
short font;
#endif
#if PACKETVER >= 20141022
- unsigned char sex;
+ uint8 sex;
#endif
} __attribute__((packed));
@@ -416,7 +416,7 @@ struct packet_sc_notick {
short PacketType;
short index;
unsigned int AID;
- unsigned char state;
+ uint8 state;
} __attribute__((packed));
struct packet_additem {
@@ -426,15 +426,15 @@ struct packet_additem {
unsigned short nameid;
uint8 IsIdentified;
uint8 IsDamaged;
- unsigned char refiningLevel;
+ uint8 refiningLevel;
struct EQUIPSLOTINFO slot;
#if PACKETVER >= 20120925
unsigned int location;
#else
unsigned short location;
#endif
- unsigned char type;
- unsigned char result;
+ uint8 type;
+ uint8 result;
#if PACKETVER >= 20061218
int HireExpireDate;
#endif
@@ -456,15 +456,15 @@ struct packet_dropflooritem {
uint8 IsIdentified;
short xPos;
short yPos;
- unsigned char subX;
- unsigned char subY;
+ uint8 subX;
+ uint8 subY;
short count;
} __attribute__((packed));
struct packet_idle_unit2 {
#if PACKETVER < 20091103
short PacketType;
#if PACKETVER >= 20071106
- unsigned char objecttype;
+ uint8 objecttype;
#endif
unsigned int GID;
short speed;
@@ -486,11 +486,11 @@ struct packet_idle_unit2 {
short honor;
short virtue;
uint8 isPKModeON;
- unsigned char sex;
- unsigned char PosDir[3];
- unsigned char xSize;
- unsigned char ySize;
- unsigned char state;
+ uint8 sex;
+ uint8 PosDir[3];
+ uint8 xSize;
+ uint8 ySize;
+ uint8 state;
short clevel;
#else // ! PACKETVER < 20091103
UNAVAILABLE_STRUCT;
@@ -501,7 +501,7 @@ struct packet_spawn_unit2 {
#if PACKETVER < 20091103
short PacketType;
#if PACKETVER >= 20071106
- unsigned char objecttype;
+ uint8 objecttype;
#endif
unsigned int GID;
short speed;
@@ -519,10 +519,10 @@ struct packet_spawn_unit2 {
short bodypalette;
short headDir;
uint8 isPKModeON;
- unsigned char sex;
- unsigned char PosDir[3];
- unsigned char xSize;
- unsigned char ySize;
+ uint8 sex;
+ uint8 PosDir[3];
+ uint8 xSize;
+ uint8 ySize;
#else // ! PACKETVER < 20091103
UNAVAILABLE_STRUCT;
#endif // PACKETVER < 20091103
@@ -532,7 +532,7 @@ struct packet_spawn_unit {
short PacketType;
#if PACKETVER >= 20091103
short PacketLength;
- unsigned char objecttype;
+ uint8 objecttype;
#endif
#if PACKETVER >= 20131223
unsigned int AID;
@@ -574,10 +574,10 @@ struct packet_spawn_unit {
short virtue;
#endif
uint8 isPKModeON;
- unsigned char sex;
- unsigned char PosDir[3];
- unsigned char xSize;
- unsigned char ySize;
+ uint8 sex;
+ uint8 PosDir[3];
+ uint8 xSize;
+ uint8 ySize;
short clevel;
#if PACKETVER >= 20080102
short font;
@@ -585,7 +585,7 @@ struct packet_spawn_unit {
#if PACKETVER >= 20120221
int maxHP;
int HP;
- unsigned char isBoss;
+ uint8 isBoss;
#endif
#if PACKETVER >= 20150513
short body;
@@ -599,7 +599,7 @@ struct packet_unit_walking {
short PacketLength;
#endif
#if PACKETVER > 20071106
- unsigned char objecttype;
+ uint8 objecttype;
#endif
#if PACKETVER >= 20131223
unsigned int AID;
@@ -642,10 +642,10 @@ struct packet_unit_walking {
short virtue;
#endif
uint8 isPKModeON;
- unsigned char sex;
- unsigned char MoveData[6];
- unsigned char xSize;
- unsigned char ySize;
+ uint8 sex;
+ uint8 MoveData[6];
+ uint8 xSize;
+ uint8 ySize;
short clevel;
#if PACKETVER >= 20080102
short font;
@@ -653,7 +653,7 @@ struct packet_unit_walking {
#if PACKETVER >= 20120221
int maxHP;
int HP;
- unsigned char isBoss;
+ uint8 isBoss;
#endif
#if PACKETVER >= 20150513
short body;
@@ -665,7 +665,7 @@ struct packet_idle_unit {
short PacketType;
#if PACKETVER >= 20091103
short PacketLength;
- unsigned char objecttype;
+ uint8 objecttype;
#endif
#if PACKETVER >= 20131223
unsigned int AID;
@@ -707,11 +707,11 @@ struct packet_idle_unit {
short virtue;
#endif
uint8 isPKModeON;
- unsigned char sex;
- unsigned char PosDir[3];
- unsigned char xSize;
- unsigned char ySize;
- unsigned char state;
+ uint8 sex;
+ uint8 PosDir[3];
+ uint8 xSize;
+ uint8 ySize;
+ uint8 state;
short clevel;
#if PACKETVER >= 20080102
short font;
@@ -719,7 +719,7 @@ struct packet_idle_unit {
#if PACKETVER >= 20120221
int maxHP;
int HP;
- unsigned char isBoss;
+ uint8 isBoss;
#endif
#if PACKETVER >= 20150513
short body;
@@ -731,7 +731,7 @@ struct packet_status_change {
short PacketType;
short index;
unsigned int AID;
- unsigned char state;
+ uint8 state;
#if PACKETVER >= 20120618
unsigned int Total;
#endif
@@ -747,14 +747,14 @@ struct packet_status_change_end {
short PacketType;
short index;
unsigned int AID;
- unsigned char state;
+ uint8 state;
} __attribute__((packed));
struct packet_status_change2 {
short PacketType;
short index;
unsigned int AID;
- unsigned char state;
+ uint8 state;
unsigned int Left;
int val1;
int val2;
@@ -782,13 +782,13 @@ struct packet_maptypeproperty2 {
struct packet_bgqueue_ack {
short PacketType;
- unsigned char type;
+ uint8 type;
char bg_name[NAME_LENGTH];
} __attribute__((packed));
struct packet_bgqueue_notice_delete {
short PacketType;
- unsigned char type;
+ uint8 type;
char bg_name[NAME_LENGTH];
} __attribute__((packed));
@@ -816,7 +816,7 @@ struct packet_bgqueue_revoke_req {
struct packet_bgqueue_battlebegin_ack {
short PacketType;
- unsigned char result;
+ uint8 result;
char bg_name[NAME_LENGTH];
char game_name[NAME_LENGTH];
} __attribute__((packed));
@@ -842,7 +842,7 @@ struct packet_script_clear {
struct packet_package_item_announce {
short PacketType;
short PacketLength;
- unsigned char type;
+ uint8 type;
unsigned short ItemID;
char len;
char Name[NAME_LENGTH];
@@ -854,7 +854,7 @@ struct packet_package_item_announce {
struct packet_item_drop_announce {
short PacketType;
short PacketLength;
- unsigned char type;
+ uint8 type;
unsigned short ItemID;
char len;
char Name[NAME_LENGTH];
@@ -926,12 +926,12 @@ struct packet_roulette_info_ack {
struct packet_roulette_close_ack {
short PacketType;
- unsigned char Result;
+ uint8 Result;
} __attribute__((packed));
struct packet_roulette_generate_ack {
short PacketType;
- unsigned char Result;
+ uint8 Result;
unsigned short Step;
unsigned short Idx;
unsigned short AdditionItemID;
@@ -942,12 +942,12 @@ struct packet_roulette_generate_ack {
struct packet_roulette_itemrecv_req {
short PacketType;
- unsigned char Condition;
+ uint8 Condition;
} __attribute__((packed));
struct packet_roulette_itemrecv_ack {
short PacketType;
- unsigned char Result;
+ uint8 Result;
unsigned short AdditionItemID;
} __attribute__((packed));
@@ -1002,7 +1002,7 @@ struct packet_equipitem_ack {
#if PACKETVER >= 20100629
unsigned short wItemSpriteNumber;
#endif
- unsigned char result;
+ uint8 result;
} __attribute__((packed));
struct packet_unequipitem_ack {
@@ -1013,7 +1013,7 @@ struct packet_unequipitem_ack {
#else
unsigned short wearLocation;
#endif
- unsigned char result;
+ uint8 result;
} __attribute__((packed));
struct packet_viewequip_ack {
@@ -1030,7 +1030,7 @@ struct packet_viewequip_ack {
#endif
short headpalette;
short bodypalette;
- unsigned char sex;
+ uint8 sex;
struct EQUIPITEM_INFO list[MAX_INVENTORY];
} __attribute__((packed));
@@ -1051,14 +1051,14 @@ struct packet_skill_entry {
#if PACKETVER >= 20121212
int job;
#else
- unsigned char job;
+ uint8 job;
#endif
#if PACKETVER >= 20110718
char RadiusRange;
#endif
- unsigned char isVisible;
+ uint8 isVisible;
#if PACKETVER >= 20130731
- unsigned char level;
+ uint8 level;
#endif
} __attribute__((packed));
@@ -1068,9 +1068,9 @@ struct packet_graffiti_entry {
unsigned int creatorAID;
short xPos;
short yPos;
- unsigned char job;
- unsigned char isVisible;
- unsigned char isContens;
+ uint8 job;
+ uint8 isVisible;
+ uint8 isContens;
char msg[80];
} __attribute__((packed));
@@ -1087,10 +1087,10 @@ struct packet_damage {
int damage;
#endif
#if PACKETVER >= 20131223
- unsigned char is_sp_damaged;
+ uint8 is_sp_damaged;
#endif
short count;
- unsigned char action;
+ uint8 action;
#if PACKETVER < 20071113
short leftDamage;
#else
@@ -1119,7 +1119,7 @@ struct packet_npc_market_purchase {
struct packet_npc_market_result_ack {
short PacketType;
short PacketLength;
- unsigned char result;
+ uint8 result;
struct {
unsigned short ITID;
unsigned short qty;
@@ -1133,7 +1133,7 @@ struct packet_npc_market_open {
/* inner struct figured by Ind after some annoying hour of debugging (data Thanks to Yommy) */
struct {
unsigned short nameid;
- unsigned char type;
+ uint8 type;
unsigned int price;
unsigned int qty;
unsigned short view;