diff options
author | Haruna <haru@dotalux.com> | 2015-06-19 12:48:19 +0200 |
---|---|---|
committer | Haruna <haru@dotalux.com> | 2015-06-19 12:48:19 +0200 |
commit | 61f0dcb9a812d057e28c53837327f99bcea4733e (patch) | |
tree | 76c299f94ef60fa6007321b8c403ebc93d8027c1 /src/map/npc.h | |
parent | ec7241c953392938cd3a8740bacb4c869636766f (diff) | |
parent | f2fbdc16a14d07e0895cc09eeba689bc556481d2 (diff) | |
download | hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.gz hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.bz2 hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.xz hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.zip |
Merge pull request #532 from MishimaHaruna/includes
Include paths
Diffstat (limited to 'src/map/npc.h')
-rw-r--r-- | src/map/npc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index e57abc519..bc779b56b 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -5,11 +5,11 @@ #ifndef MAP_NPC_H #define MAP_NPC_H -#include "map.h" // struct block_list -#include "status.h" // struct status_change -#include "unit.h" // struct unit_data -#include "../common/cbasetypes.h" -#include "../common/db.h" +#include "map/map.h" // struct block_list +#include "map/status.h" // struct status_change +#include "map/unit.h" // struct unit_data +#include "common/cbasetypes.h" +#include "common/db.h" struct HPluginData; struct view_data; @@ -288,7 +288,7 @@ void npc_defaults(void); /* comes from npc_chat.c */ #ifdef PCRE_SUPPORT -#include "../../3rdparty/pcre/include/pcre.h" +#include <pcre/include/pcre.h> /* Structure containing all info associated with a single pattern block */ struct pcrematch_entry { struct pcrematch_entry* next; |