Skip to content

Commit 3913b51

Browse files
committed
Add missing import of packetsmacro in packet definition headers
Without this header, HPMHookGen would sometimes generated incomplete/invalid results due to not being able to properly expand macros such as DEFINE_PACKET_ID
1 parent 38bb5cf commit 3913b51

File tree

4 files changed

+5
-0
lines changed

4 files changed

+5
-0
lines changed

src/char/packets_hc_struct.h

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "common/hercules.h"
2424
#include "common/mmo.h"
2525
#include "common/packetsstatic_len.h"
26+
#include "common/packetsmacro.h"
2627

2728
/* Packets Structs */
2829
#if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute

src/common/HPMDataCheck.h

+2
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,8 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
264264
{ "PACKET_CHARMAP_AGENCY_JOIN_PARTY", sizeof(struct PACKET_CHARMAP_AGENCY_JOIN_PARTY), SERVER_TYPE_ALL },
265265
{ "PACKET_CHARMAP_GUILD_EMBLEM", sizeof(struct PACKET_CHARMAP_GUILD_EMBLEM), SERVER_TYPE_ALL },
266266
{ "PACKET_CHARMAP_GUILD_INFO", sizeof(struct PACKET_CHARMAP_GUILD_INFO), SERVER_TYPE_ALL },
267+
{ "PACKET_CHARMAP_GUILD_INFO_EMBLEM", sizeof(struct PACKET_CHARMAP_GUILD_INFO_EMBLEM), SERVER_TYPE_ALL },
268+
{ "PACKET_CHARMAP_GUILD_INFO_EMPTY", sizeof(struct PACKET_CHARMAP_GUILD_INFO_EMPTY), SERVER_TYPE_ALL },
267269
#else
268270
#define COMMON_CHARMAPPACKETS_H
269271
#endif // COMMON_CHARMAPPACKETS_H

src/common/charmappackets.h

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#define COMMON_CHARMAPPACKETS_H
2424

2525
#include "common/hercules.h"
26+
#include "common/packetsmacro.h"
2627

2728
/* Packets Structs */
2829
#if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute

src/map/packets_struct.h

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "common/cbasetypes.h"
2727
#include "common/mmo.h"
2828
#include "common/packetsstatic_len.h"
29+
#include "common/packetsmacro.h"
2930

3031
// Packet DB
3132
#define MAX_PACKET_POS 20

0 commit comments

Comments
 (0)