summaryrefslogtreecommitdiff
path: root/src/map/intif.c
diff options
context:
space:
mode:
authorpanikon <panikon@zoho.com>2014-05-10 06:08:56 -0300
committerpanikon <panikon@zoho.com>2014-05-10 06:08:56 -0300
commit94657284973f4037596bae468ebfbee5c217e02b (patch)
treec99c1e3a39ad41183f2d70eb093df54ca60ad0fb /src/map/intif.c
parenta1eba2e076401ddbc34e5a65e15bb0f418591b1a (diff)
downloadhercules-94657284973f4037596bae468ebfbee5c217e02b.tar.gz
hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.bz2
hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.xz
hercules-94657284973f4037596bae468ebfbee5c217e02b.zip
Revert "Fixed order of includes in all source files"
This reverts commit b6b3f58795288701d0e162d43fa6f0a47af913b3. Fixes issue 8184 http://hercules.ws/board/tracker/issue-8184-cart-related/
Diffstat (limited to 'src/map/intif.c')
-rw-r--r--src/map/intif.c51
1 files changed, 24 insertions, 27 deletions
diff --git a/src/map/intif.c b/src/map/intif.c
index 383150fbc..6bd24368a 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1,40 +1,37 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#define HERCULES_CORE
-
-#include "../config/core.h" // GP_BOUND_ITEMS
-#include "intif.h"
-
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "atcommand.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/strlib.h"
+#include "map.h"
#include "battle.h"
#include "chrif.h"
#include "clif.h"
-#include "elemental.h"
-#include "guild.h"
-#include "homunculus.h"
+#include "pc.h"
+#include "intif.h"
#include "log.h"
-#include "mail.h"
-#include "map.h"
-#include "mercenary.h"
+#include "storage.h"
#include "party.h"
-#include "pc.h"
+#include "guild.h"
#include "pet.h"
+#include "atcommand.h"
+#include "mercenary.h"
+#include "homunculus.h"
+#include "elemental.h"
+#include "mail.h"
#include "quest.h"
-#include "storage.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <string.h>
+
struct intif_interface intif_s;