summaryrefslogtreecommitdiff
path: root/src/map/clif.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-15 02:28:24 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-15 02:28:24 +0300
commit94df0300da69e3dde9bc05f32137dd90c43040e8 (patch)
tree53b540f7483533a281ffb66e0c39765a8f65508a /src/map/clif.h
parent6795414243a08d47bc111e23c9c0f09218260ccf (diff)
parentd95f3b14d78305ea48834212684c73086555f74f (diff)
downloadhercules-94df0300da69e3dde9bc05f32137dd90c43040e8.tar.gz
hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.tar.bz2
hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.tar.xz
hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.zip
Merge pull request #643 from HerculesWS/hpmfixes_v2
HPM Compatibility Improvements
Diffstat (limited to 'src/map/clif.h')
-rw-r--r--src/map/clif.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/clif.h b/src/map/clif.h
index c827406ca..66a749818 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -7,7 +7,7 @@
#include "map/map.h"
#include "map/packets_struct.h"
-#include "common/cbasetypes.h"
+#include "common/hercules.h"
#include "common/mmo.h"
#include <stdarg.h>
@@ -558,11 +558,6 @@ struct merge_item {
};
/**
- * Vars
- **/
-struct s_packet_db packet_db[MAX_PACKET_DB + 1];
-
-/**
* Clif.c Interface
**/
struct clif_interface {
@@ -1322,10 +1317,15 @@ struct clif_interface {
void (*pNPCMarketPurchase) (int fd, struct map_session_data *sd);
};
-struct clif_interface *clif;
-
#ifdef HERCULES_CORE
+/**
+ * Vars
+ **/
+extern struct s_packet_db packet_db[MAX_PACKET_DB + 1];
+
void clif_defaults(void);
#endif // HERCULES_CORE
+HPShared struct clif_interface *clif;
+
#endif /* MAP_CLIF_H */