Selaa lähdekoodia

Small signedness cleanup

Lemongrass3110 4 vuotta sitten
vanhempi
commit
d929a87d9d
2 muutettua tiedostoa jossa 17 lisäystä ja 17 poistoa
  1. 1 1
      src/map/clif.cpp
  2. 16 16
      src/map/packets.hpp

+ 1 - 1
src/map/clif.cpp

@@ -21000,7 +21000,7 @@ void clif_guild_storage_log( struct map_session_data* sd, std::vector<struct gui
 		log.clear();
 	}
 
-	guild_storage_log.packetType = 0x9DA;
+	guild_storage_log.packetType = HEADER_ZC_ACK_GUILDSTORAGE_LOG;
 	guild_storage_log.PacketLength = size;
 	guild_storage_log.result = result;
 	guild_storage_log.amount = (uint16)log.size();

+ 16 - 16
src/map/packets.hpp

@@ -22,7 +22,7 @@
 #endif
 #define MAX_ACHIEVEMENT_DB MAX_ACHIEVEMENT_OBJECTIVES
 
-#define DEFINE_PACKET_HEADER(name, id) const uint16 HEADER_##name = id;
+#define DEFINE_PACKET_HEADER(name, id) const int16 HEADER_##name = id;
 
 #include "packets_struct.hpp"
 
@@ -38,8 +38,6 @@ const int16 MAX_STORAGE_ITEM_PACKET_EQUIP = ( ( INT16_MAX - ( sizeof( struct ZC_
 #undef MAX_ACHIEVEMENT_DB
 #undef MAX_PACKET_POS
 
-#undef DEFINE_PACKET_HEADER
-
 // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #if !defined( sun ) && ( !defined( __NETBSD__ ) || __NetBSD_Version__ >= 600000000 )
 	#pragma pack( push, 1 )
@@ -178,19 +176,21 @@ struct PACKET_ZC_ACK_GUILDSTORAGE_LOG{
 	#pragma pack( pop )
 #endif
 
-const uint16 HEADER_CZ_REQMAKINGITEM = 0x18e;
-const uint16 HEADER_CZ_REQ_MAKINGARROW = 0x1ae;
-const uint16 HEADER_CZ_REQ_ITEMREPAIR = 0x1fd;
-const uint16 HEADER_CZ_REQ_MAKINGITEM = 0x25b;
-const uint16 HEADER_CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO = 0x9ac;
-const uint16 HEADER_ZC_ACK_CASH_BARGAIN_SALE_ITEM_INFO = 0x9ad;
-const uint16 HEADER_CZ_REQ_APPLY_BARGAIN_SALE_ITEM = 0x9ae;
-const uint16 HEADER_CZ_REQ_REMOVE_BARGAIN_SALE_ITEM = 0x9b0;
-const uint16 HEADER_ZC_NOTIFY_BARGAIN_SALE_SELLING = 0x9b2;
-const uint16 HEADER_ZC_NOTIFY_BARGAIN_SALE_CLOSE = 0x9b3;
-const uint16 HEADER_ZC_ACK_COUNT_BARGAIN_SALE_ITEM = 0x9c4;
-const uint16 HEADER_PACKET_ZC_ACK_GUILDSTORAGE_LOG = 0x9da;
-const uint16 HEADER_CZ_REQ_APPLY_BARGAIN_SALE_ITEM2 = 0xa3d;
+DEFINE_PACKET_HEADER(CZ_REQMAKINGITEM, 0x18e)
+DEFINE_PACKET_HEADER(CZ_REQ_MAKINGARROW, 0x1ae)
+DEFINE_PACKET_HEADER(CZ_REQ_ITEMREPAIR, 0x1fd)
+DEFINE_PACKET_HEADER(CZ_REQ_MAKINGITEM, 0x25b)
+DEFINE_PACKET_HEADER(CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO, 0x9ac)
+DEFINE_PACKET_HEADER(ZC_ACK_CASH_BARGAIN_SALE_ITEM_INFO, 0x9ad)
+DEFINE_PACKET_HEADER(CZ_REQ_APPLY_BARGAIN_SALE_ITEM, 0x9ae)
+DEFINE_PACKET_HEADER(CZ_REQ_REMOVE_BARGAIN_SALE_ITEM, 0x9b0)
+DEFINE_PACKET_HEADER(ZC_NOTIFY_BARGAIN_SALE_SELLING, 0x9b2)
+DEFINE_PACKET_HEADER(ZC_NOTIFY_BARGAIN_SALE_CLOSE, 0x9b3)
+DEFINE_PACKET_HEADER(ZC_ACK_COUNT_BARGAIN_SALE_ITEM, 0x9c4)
+DEFINE_PACKET_HEADER(ZC_ACK_GUILDSTORAGE_LOG, 0x9da)
+DEFINE_PACKET_HEADER(CZ_REQ_APPLY_BARGAIN_SALE_ITEM2, 0xa3d)
+
+#undef DEFINE_PACKET_HEADER
 
 #pragma warning( pop )