diff options
| author | Haru <haru@dotalux.com> | 2016-02-16 20:28:18 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-02-17 10:40:45 +0100 |
| commit | 1d2eb6d23519a971db0646a146152fc6f79350f1 (patch) | |
| tree | 47d24a43925e95aea6acb8ff321cb9543600fda4 /src/map | |
| parent | 10908446738f6e425de6e8fa50e8f91eb30c0478 (diff) | |
| download | hercules-1d2eb6d23519a971db0646a146152fc6f79350f1.tar.gz hercules-1d2eb6d23519a971db0646a146152fc6f79350f1.tar.bz2 hercules-1d2eb6d23519a971db0646a146152fc6f79350f1.tar.xz hercules-1d2eb6d23519a971db0646a146152fc6f79350f1.zip | |
Replaced some now unnecessary includes with forward declarations in header files
Added some forgotten <stdio.h> and "common/conf.h" includes to .c files,
that were previously masked by the above.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.h | 2 | ||||
| -rw-r--r-- | src/map/itemdb.h | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 1 | ||||
| -rw-r--r-- | src/map/pc_groups.h | 4 | ||||
| -rw-r--r-- | src/map/quest.h | 3 | ||||
| -rw-r--r-- | src/map/script.c | 1 | ||||
| -rw-r--r-- | src/map/status.h | 2 |
7 files changed, 10 insertions, 5 deletions
diff --git a/src/map/atcommand.h b/src/map/atcommand.h index 384bab20d..a4f9afce7 100644 --- a/src/map/atcommand.h +++ b/src/map/atcommand.h @@ -23,7 +23,6 @@ #include "map/pc_groups.h" #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" #include <stdarg.h> @@ -34,6 +33,7 @@ struct map_session_data; struct AtCommandInfo; struct block_list; +struct config_setting_t; /** * Defines diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 8c2a7ac53..b83c27ed2 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -23,10 +23,10 @@ /* #include "map/map.h" */ #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" #include "common/mmo.h" // ITEM_NAME_LENGTH +struct config_setting_t; struct script_code; struct hplugin_data_store; diff --git a/src/map/mob.c b/src/map/mob.c index 85e1ad5d5..2ae54ba69 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -46,6 +46,7 @@ #include "map/status.h" #include "common/HPM.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/db.h" #include "common/ers.h" #include "common/memmgr.h" diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h index 52ad25191..3f95237b7 100644 --- a/src/map/pc_groups.h +++ b/src/map/pc_groups.h @@ -22,9 +22,11 @@ #define MAP_PC_GROUPS_H #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" +/* Forward Declarations */ +struct config_setting_t; + /// PC permissions enum e_pc_permission { PC_PERM_NONE = 0, // #0 diff --git a/src/map/quest.h b/src/map/quest.h index a4d778219..e0768ef40 100644 --- a/src/map/quest.h +++ b/src/map/quest.h @@ -22,10 +22,11 @@ #define MAP_QUEST_H #include "common/hercules.h" -#include "common/conf.h" #include "common/mmo.h" // enum quest_state +/* Forward Declarations */ struct block_list; +struct config_setting_t; struct map_session_data; #define MAX_QUEST_DB (60355+1) // Highest quest ID + 1 diff --git a/src/map/script.c b/src/map/script.c index e6a9c8ae4..4b3bf960c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -55,6 +55,7 @@ #include "map/storage.h" #include "map/unit.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/memmgr.h" #include "common/md5calc.h" #include "common/mmo.h" // NEW_CARTS diff --git a/src/map/status.h b/src/map/status.h index 1f28826a5..85219b280 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -21,11 +21,11 @@ #ifndef MAP_STATUS_H #define MAP_STATUS_H -#include "common/conf.h" #include "common/hercules.h" #include "common/mmo.h" // NEW_CARTS struct block_list; +struct config_setting_t; struct elemental_data; struct homun_data; struct mercenary_data; |