summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-02 15:35:27 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-02 15:35:27 +0000
commitcba97f4deb4a9bb62da4ab7748926fd5319090d0 (patch)
tree8bf8b528b764622c0a604e6dca7435c0b6ca8acf /src/map/npc.c
parentabb64efe8b339b84991eefd22757b31d8cdc2499 (diff)
downloadhercules-cba97f4deb4a9bb62da4ab7748926fd5319090d0.tar.gz
hercules-cba97f4deb4a9bb62da4ab7748926fd5319090d0.tar.bz2
hercules-cba97f4deb4a9bb62da4ab7748926fd5319090d0.tar.xz
hercules-cba97f4deb4a9bb62da4ab7748926fd5319090d0.zip
- Fixed some includes in skill.c and npc.c, thanks to 252-rer for finding it out.
- Applied the entry reusage system to the battle delay damage structure. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5166 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index bcf66db6c..2cec45a8d 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -8,9 +8,11 @@
#include <math.h>
#include <time.h>
-#include "timer.h"
-#include "nullpo.h"
-#include "malloc.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/grfio.h"
+#include "../common/showmsg.h"
#include "map.h"
#include "log.h"
#include "npc.h"
@@ -24,8 +26,6 @@
#include "pet.h"
#include "battle.h"
#include "skill.h"
-#include "grfio.h"
-#include "showmsg.h"
#ifdef _WIN32
#undef isspace