summaryrefslogtreecommitdiff
path: root/src/map/vending.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/vending.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/vending.c')
-rw-r--r--src/map/vending.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/map/vending.c b/src/map/vending.c
index c8ac814db..9462975b3 100644
--- a/src/map/vending.c
+++ b/src/map/vending.c
@@ -2,27 +2,24 @@
// See the LICENSE file
// Portions Copyright (c) Athena Dev Teams
-#define HERCULES_CORE
-
-#include "vending.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "atcommand.h"
-#include "battle.h"
-#include "chrif.h"
+#include "../common/nullpo.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
#include "clif.h"
#include "itemdb.h"
-#include "log.h"
+#include "atcommand.h"
#include "map.h"
-#include "npc.h"
#include "path.h"
+#include "chrif.h"
+#include "vending.h"
#include "pc.h"
+#include "npc.h"
#include "skill.h"
-#include "../common/nullpo.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#include "battle.h"
+#include "log.h"
+
+#include <stdio.h>
+#include <string.h>
struct vending_interface vending_s;