diff options
| author | Haru <haru@dotalux.com> | 2014-05-04 06:13:56 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-05-09 08:29:46 +0200 |
| commit | b6b3f58795288701d0e162d43fa6f0a47af913b3 (patch) | |
| tree | a75f686731786ed1746325589d8acb1569409981 /src/map/npc.c | |
| parent | 1c4e3820d5f4ff9870c28104122f6733db4d55a6 (diff) | |
| download | hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.tar.gz hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.tar.bz2 hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.tar.xz hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.zip | |
Fixed order of includes in all source files
- Changed order according to the (upcoming) code style guidelines.
- Fixes several issues caused by missing headers when their include
order is changed or in plugins.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 27759d185..289c42d44 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2,41 +2,44 @@ // See the LICENSE file // Portions Copyright (c) Athena Dev Teams -#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" +#define HERCULES_CORE -#include "map.h" -#include "log.h" +#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 "battle.h" +#include "chat.h" #include "clif.h" +#include "instance.h" #include "intif.h" -#include "pc.h" -#include "status.h" #include "itemdb.h" -#include "script.h" +#include "log.h" +#include "map.h" #include "mob.h" +#include "pc.h" #include "pet.h" -#include "instance.h" -#include "battle.h" +#include "script.h" #include "skill.h" +#include "status.h" #include "unit.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> +#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" struct npc_interface npc_s; |