diff options
| author | panikon <panikon@zoho.com> | 2014-05-10 06:08:56 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-05-10 06:08:56 -0300 |
| commit | 94657284973f4037596bae468ebfbee5c217e02b (patch) | |
| tree | c99c1e3a39ad41183f2d70eb093df54ca60ad0fb /src/map/npc.c | |
| parent | a1eba2e076401ddbc34e5a65e15bb0f418591b1a (diff) | |
| download | hercules-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/npc.c')
| -rw-r--r-- | src/map/npc.c | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 8e5854dbf..20b500630 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2,44 +2,41 @@ // See the LICENSE file // Portions Copyright (c) Athena Dev Teams -#define HERCULES_CORE - -#include "../config/core.h" // NPC_SECURE_TIMEOUT_INPUT, NPC_SECURE_TIMEOUT_MENU, NPC_SECURE_TIMEOUT_NEXT, SECURE_NPCTIMEOUT, SECURE_NPCTIMEOUT_INTERVAL -#include "npc.h" - -#include <errno.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> +#include "../common/cbasetypes.h" +#include "../common/timer.h" +#include "../common/nullpo.h" +#include "../common/malloc.h" +#include "../common/showmsg.h" +#include "../common/strlib.h" +#include "../common/utils.h" +#include "../common/ers.h" +#include "../common/db.h" +#include "../common/socket.h" +#include "../common/HPM.h" -#include "battle.h" -#include "chat.h" +#include "map.h" +#include "log.h" #include "clif.h" -#include "instance.h" #include "intif.h" +#include "pc.h" +#include "status.h" #include "itemdb.h" -#include "log.h" -#include "map.h" +#include "script.h" #include "mob.h" -#include "pc.h" #include "pet.h" -#include "script.h" +#include "instance.h" +#include "battle.h" #include "skill.h" -#include "status.h" #include "unit.h" -#include "../common/HPM.h" -#include "../common/cbasetypes.h" -#include "../common/db.h" -#include "../common/ers.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 "../common/utils.h" +#include "npc.h" +#include "chat.h" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <math.h> +#include <time.h> +#include <errno.h> struct npc_interface npc_s; |