summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-06-19 15:14:10 +0200
committerHaru <haru@dotalux.com>2015-06-19 15:14:44 +0200
commitf444c3d53ba473641a8f21601784f83f84cc5ea2 (patch)
tree0605d01f777b6463a972e27eced92b6ebbbe86ea
parent21c9aae7458fe88394c20d07d4eb940b4e07351f (diff)
downloadhercules-f444c3d53ba473641a8f21601784f83f84cc5ea2.tar.gz
hercules-f444c3d53ba473641a8f21601784f83f84cc5ea2.tar.bz2
hercules-f444c3d53ba473641a8f21601784f83f84cc5ea2.tar.xz
hercules-f444c3d53ba473641a8f21601784f83f84cc5ea2.zip
Cleaned up HPMDataCheck includes
Fixes some plugin load failures Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--src/char/HPMchar.c12
-rw-r--r--src/login/HPMlogin.c16
-rw-r--r--src/map/HPMmap.c38
3 files changed, 51 insertions, 15 deletions
diff --git a/src/char/HPMchar.c b/src/char/HPMchar.c
index 05429fbb8..2d4c570d7 100644
--- a/src/char/HPMchar.c
+++ b/src/char/HPMchar.c
@@ -25,15 +25,27 @@
#include "char/loginif.h"
#include "char/mapif.h"
#include "char/pincode.h"
+#include "common/HPMi.h"
#include "common/conf.h"
+#include "common/console.h"
+#include "common/core.h"
#include "common/db.h"
#include "common/des.h"
#include "common/ers.h"
+#include "common/malloc.h"
#include "common/mapindex.h"
#include "common/mmo.h"
+#include "common/nullpo.h"
+#include "common/showmsg.h"
#include "common/socket.h"
+#include "common/spinlock.h"
+#include "common/sql.h"
#include "common/strlib.h"
#include "common/sysinfo.h"
+#include "common/timer.h"
+#include "common/utils.h"
+
+// HPMDataCheck comes after all the other includes
#include "common/HPMDataCheck.h"
#endif
diff --git a/src/login/HPMlogin.c b/src/login/HPMlogin.c
index 0a7729da8..129f88c38 100644
--- a/src/login/HPMlogin.c
+++ b/src/login/HPMlogin.c
@@ -9,16 +9,28 @@
#include "common/cbasetypes.h"
#if 0 // TODO (HPMDataCheck is disabled for the time being)
+#include "login/account.h"
+#include "login/login.h"
+#include "common/HPMi.h"
#include "common/conf.h"
+#include "common/console.h"
+#include "common/core.h"
#include "common/db.h"
#include "common/des.h"
#include "common/ers.h"
-#include "common/mapindex.h"
+#include "common/malloc.h"
#include "common/mmo.h"
+#include "common/nullpo.h"
+#include "common/showmsg.h"
#include "common/socket.h"
+#include "common/spinlock.h"
+#include "common/sql.h"
#include "common/strlib.h"
#include "common/sysinfo.h"
-#include "login/login.h"
+#include "common/timer.h"
+#include "common/utils.h"
+
+// HPMDataCheck comes after all the other includes
#include "common/HPMDataCheck.h"
#endif
diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c
index 8e3048210..7600d3d0c 100644
--- a/src/map/HPMmap.c
+++ b/src/map/HPMmap.c
@@ -5,9 +5,32 @@
#include "HPMmap.h"
+#include "common/HPM.h"
+#include "common/cbasetypes.h"
+
+#include "common/HPMi.h"
+#include "common/conf.h"
+#include "common/console.h"
+#include "common/core.h"
+#include "common/db.h"
+#include "common/des.h"
+#include "common/ers.h"
+#include "common/malloc.h"
+#include "common/mapindex.h"
+#include "common/mmo.h"
+#include "common/nullpo.h"
+#include "common/showmsg.h"
+#include "common/socket.h"
+#include "common/spinlock.h"
+#include "common/sql.h"
+#include "common/strlib.h"
+#include "common/sysinfo.h"
+#include "common/timer.h"
+#include "common/utils.h"
#include "map/atcommand.h"
#include "map/battle.h"
#include "map/battleground.h"
+#include "map/buyingstore.h"
#include "map/channel.h"
#include "map/chat.h"
#include "map/chrif.h"
@@ -28,6 +51,7 @@
#include "map/mercenary.h"
#include "map/mob.h"
#include "map/npc.h"
+#include "map/packets_struct.h"
#include "map/party.h"
#include "map/path.h"
#include "map/pc.h"
@@ -42,20 +66,8 @@
#include "map/trade.h"
#include "map/unit.h"
#include "map/vending.h"
-#include "common/HPM.h"
-#include "common/cbasetypes.h"
-#include "common/conf.h"
-#include "common/db.h"
-#include "common/des.h"
-#include "common/ers.h"
-#include "common/malloc.h"
-#include "common/mapindex.h"
-#include "common/mmo.h"
-#include "common/showmsg.h"
-#include "common/socket.h"
-#include "common/strlib.h"
-#include "common/sysinfo.h"
+// HPMDataCheck comes after all the other includes
#include "common/HPMDataCheck.h"
#include <stdio.h>