From f2fbdc16a14d07e0895cc09eeba689bc556481d2 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 5 Jun 2015 01:49:44 +0200 Subject: Cleaned up some #includes Signed-off-by: Haru --- src/map/HPMmap.c | 8 ++-- src/map/atcommand.h | 3 ++ src/map/battleground.c | 1 + src/map/battleground.h | 9 +++- src/map/channel.h | 4 +- src/map/chrif.c | 15 +++---- src/map/chrif.h | 6 +-- src/map/clif.h | 28 ++++++------ src/map/elemental.h | 3 ++ src/map/homunculus.h | 3 +- src/map/instance.c | 1 + src/map/instance.h | 1 + src/map/itemdb.h | 118 ++++++++++++++++++++++++------------------------- src/map/map.h | 1 + src/map/mapreg.h | 2 + src/map/mercenary.h | 2 + src/map/mob.h | 4 +- src/map/npc.c | 1 + 18 files changed, 110 insertions(+), 100 deletions(-) (limited to 'src/map') diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c index 4b8c735fc..8e3048210 100644 --- a/src/map/HPMmap.c +++ b/src/map/HPMmap.c @@ -5,11 +5,6 @@ #include "HPMmap.h" -#include -#include -#include -#include - #include "map/atcommand.h" #include "map/battle.h" #include "map/battleground.h" @@ -63,6 +58,9 @@ #include "common/HPMDataCheck.h" +#include +#include + struct HPM_atcommand_list { //tracking currently not enabled // - requires modifying how plugins calls atcommand creation diff --git a/src/map/atcommand.h b/src/map/atcommand.h index c9c70badb..88ddde8c2 100644 --- a/src/map/atcommand.h +++ b/src/map/atcommand.h @@ -6,9 +6,12 @@ #define MAP_ATCOMMAND_H #include "map/pc_groups.h" +#include "common/cbasetypes.h" #include "common/conf.h" #include "common/db.h" +#include + /** * Declarations **/ diff --git a/src/map/battleground.c b/src/map/battleground.c index 44f3664a4..0fe42110f 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -8,6 +8,7 @@ #include "map/battle.h" #include "map/clif.h" +#include "map/guild.h" #include "map/homunculus.h" #include "map/map.h" #include "map/mapreg.h" diff --git a/src/map/battleground.h b/src/map/battleground.h index aaa76b5d2..a67deb722 100644 --- a/src/map/battleground.h +++ b/src/map/battleground.h @@ -5,10 +5,15 @@ #ifndef MAP_BATTLEGROUND_H #define MAP_BATTLEGROUND_H -#include "map/clif.h" -#include "map/guild.h" +#include "map/map.h" // EVENT_NAME_LENGTH +#include "common/cbasetypes.h" +#include "common/db.h" #include "common/mmo.h" // struct party +struct HPluginData; +struct block_list; +struct map_session_data; + /** * Defines **/ diff --git a/src/map/channel.h b/src/map/channel.h index dbf9ba94f..de1779d96 100644 --- a/src/map/channel.h +++ b/src/map/channel.h @@ -4,11 +4,9 @@ #ifndef MAP_CHANNEL_H #define MAP_CHANNEL_H -#include "map/map.h" #include "common/cbasetypes.h" #include "common/db.h" - -#include +#include "common/mmo.h" /** * Declarations diff --git a/src/map/chrif.c b/src/map/chrif.c index cc1f5db4b..41485d222 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -7,20 +7,21 @@ #include "config/core.h" // AUTOTRADE_PERSISTENCY, STATS_OPT_OUT #include "chrif.h" -#include "map/map.h" #include "map/battle.h" #include "map/clif.h" +#include "map/elemental.h" +#include "map/guild.h" +#include "map/homunculus.h" +#include "map/instance.h" #include "map/intif.h" +#include "map/map.h" +#include "map/mercenary.h" #include "map/npc.h" #include "map/pc.h" #include "map/pet.h" +#include "map/quest.h" #include "map/skill.h" #include "map/status.h" -#include "map/homunculus.h" -#include "map/instance.h" -#include "map/mercenary.h" -#include "map/elemental.h" -#include "map/quest.h" #include "map/storage.h" #include "common/HPM.h" #include "common/cbasetypes.h" @@ -34,9 +35,7 @@ #include #include -#include #include -#include struct chrif_interface chrif_s; diff --git a/src/map/chrif.h b/src/map/chrif.h index 022e4d957..cac965f74 100644 --- a/src/map/chrif.h +++ b/src/map/chrif.h @@ -5,12 +5,12 @@ #ifndef MAP_CHRIF_H #define MAP_CHRIF_H -#include "map/map.h" //TBL_stuff +#include "map/map.h" //TBL_PC #include "common/cbasetypes.h" #include "common/db.h" -#include - +struct eri; +struct map_session_data; struct status_change_entry; /** diff --git a/src/map/clif.h b/src/map/clif.h index 2ba881a31..66dd13304 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -8,7 +8,6 @@ #include "map/map.h" #include "map/packets_struct.h" #include "common/cbasetypes.h" -#include "common/db.h" #include "common/mmo.h" #include @@ -16,29 +15,28 @@ /** * Declarations **/ +struct battleground_data; +struct channel_data; +struct chat_data; +struct eri; +struct flooritem_data; +struct guild; +struct homun_data; struct item; struct item_data; -struct unit_data; struct map_session_data; -struct homun_data; struct mercenary_data; -struct pet_data; struct mob_data; struct npc_data; -struct chat_data; -struct flooritem_data; -struct skill_unit; -struct s_vending; -struct party; +struct party_booking_ad_info; struct party_data; -struct guild; -struct battleground_data; +struct pet_data; struct quest; -struct party_booking_ad_info; -struct view_data; -struct eri; +struct s_vending; struct skill_cd; -struct channel_data; +struct skill_unit; +struct unit_data; +struct view_data; /** * Defines diff --git a/src/map/elemental.h b/src/map/elemental.h index 67b1e3f3a..582e1059c 100644 --- a/src/map/elemental.h +++ b/src/map/elemental.h @@ -7,8 +7,11 @@ #include "map/status.h" // struct status_data, struct status_change #include "map/unit.h" // struct unit_data +#include "common/cbasetypes.h" #include "common/mmo.h" // NAME_LENGTH +#include + /** * Defines **/ diff --git a/src/map/homunculus.h b/src/map/homunculus.h index 387efbf29..32e48b1e9 100644 --- a/src/map/homunculus.h +++ b/src/map/homunculus.h @@ -5,11 +5,12 @@ #ifndef MAP_HOMUNCULUS_H #define MAP_HOMUNCULUS_H -#include "map/pc.h" #include "map/status.h" // struct status_data, struct status_change #include "map/unit.h" // struct unit_data #include "common/mmo.h" +struct map_session_data; + #define MAX_HOM_SKILL_REQUIRE 5 #define homdb_checkid(id) ((id) >= HM_CLASS_BASE && (id) <= HM_CLASS_MAX) #define homun_alive(x) ((x) && (x)->homunculus.vaporize == HOM_ST_ACTIVE && (x)->battle_status.hp > 0) diff --git a/src/map/instance.c b/src/map/instance.c index 255722f58..f5688d02c 100644 --- a/src/map/instance.c +++ b/src/map/instance.c @@ -9,6 +9,7 @@ #include "map/channel.h" #include "map/clif.h" +#include "map/guild.h" #include "map/map.h" #include "map/npc.h" #include "map/party.h" diff --git a/src/map/instance.h b/src/map/instance.h index 88e586ab1..e17d6866f 100644 --- a/src/map/instance.h +++ b/src/map/instance.h @@ -9,6 +9,7 @@ #include "common/cbasetypes.h" #include "common/mmo.h" // struct point +struct HPluginData; struct block_list; struct map_session_data; diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 8d220d58f..624080c3a 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -5,18 +5,14 @@ #ifndef MAP_ITEMDB_H #define MAP_ITEMDB_H -#include "map/map.h" +/* #include "map/map.h" */ #include "common/cbasetypes.h" #include "common/conf.h" #include "common/db.h" #include "common/mmo.h" // ITEM_NAME_LENGTH #include "common/sql.h" -/** - * Declarations - **/ -struct item_group; -struct item_package; +struct script_code; /** * Defines @@ -371,6 +367,61 @@ enum ItemNouseRestrictions { INR_ALL = 0x1 ///< Sum of all the above values }; +struct item_combo { + struct script_code *script; + unsigned short nameid[MAX_ITEMS_PER_COMBO];/* nameid array */ + unsigned char count; + unsigned short id;/* id of this combo */ +}; + +struct item_group { + unsigned short id; + unsigned short *nameid; + unsigned short qty; +}; + +struct item_chain_entry { + unsigned short id; + unsigned short rate; + struct item_chain_entry *next; +}; + +struct item_chain { + struct item_chain_entry *items; + unsigned short qty; +}; + +struct item_package_rand_entry { + unsigned short id; + unsigned short qty; + unsigned short rate; + unsigned short hours; + unsigned int announce : 1; + unsigned int named : 1; + struct item_package_rand_entry *next; +}; + +struct item_package_must_entry { + unsigned short id; + unsigned short qty; + unsigned short hours; + unsigned int announce : 1; + unsigned int named : 1; +}; + +struct item_package_rand_group { + struct item_package_rand_entry *random_list; + unsigned short random_qty; +}; + +struct item_package { + unsigned short id; + struct item_package_rand_group *random_groups; + struct item_package_must_entry *must_items; + unsigned short random_qty; + unsigned short must_qty; +}; + struct item_data { uint16 nameid; char name[ITEM_NAME_LENGTH],jname[ITEM_NAME_LENGTH]; @@ -440,61 +491,6 @@ struct item_data { unsigned int hdatac; }; -struct item_combo { - struct script_code *script; - unsigned short nameid[MAX_ITEMS_PER_COMBO];/* nameid array */ - unsigned char count; - unsigned short id;/* id of this combo */ -}; - -struct item_group { - unsigned short id; - unsigned short *nameid; - unsigned short qty; -}; - -struct item_chain_entry { - unsigned short id; - unsigned short rate; - struct item_chain_entry *next; -}; - -struct item_chain { - struct item_chain_entry *items; - unsigned short qty; -}; - -struct item_package_rand_entry { - unsigned short id; - unsigned short qty; - unsigned short rate; - unsigned short hours; - unsigned int announce : 1; - unsigned int named : 1; - struct item_package_rand_entry *next; -}; - -struct item_package_must_entry { - unsigned short id; - unsigned short qty; - unsigned short hours; - unsigned int announce : 1; - unsigned int named : 1; -}; - -struct item_package_rand_group { - struct item_package_rand_entry *random_list; - unsigned short random_qty; -}; - -struct item_package { - unsigned short id; - struct item_package_rand_group *random_groups; - struct item_package_must_entry *must_items; - unsigned short random_qty; - unsigned short must_qty; -}; - #define itemdb_name(n) (itemdb->search(n)->name) #define itemdb_jname(n) (itemdb->search(n)->jname) #define itemdb_type(n) (itemdb->search(n)->type) diff --git a/src/map/map.h b/src/map/map.h index 81a9a0940..8d879cd56 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -15,6 +15,7 @@ #include "common/mmo.h" #include "common/sql.h" +#include #include struct mob_data; diff --git a/src/map/mapreg.h b/src/map/mapreg.h index d38edaff5..cafd25b64 100644 --- a/src/map/mapreg.h +++ b/src/map/mapreg.h @@ -9,6 +9,8 @@ #include "common/cbasetypes.h" #include "common/db.h" +struct eri; + /** Container for a mapreg value */ struct mapreg_save { int64 uid; ///< Unique ID diff --git a/src/map/mercenary.h b/src/map/mercenary.h index 873d77659..29a2c6ba0 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -8,6 +8,8 @@ #include "map/unit.h" // struct unit_data #include "common/cbasetypes.h" +struct map_session_data; + // number of cells that a mercenary can walk to from it's master before being warped #define MAX_MER_DISTANCE 15 diff --git a/src/map/mob.h b/src/map/mob.h index d3fdb7185..85d2bf9b8 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -5,9 +5,9 @@ #ifndef MAP_MOB_H #define MAP_MOB_H -#include "map/map.h" // struct status_data, struct view_data, struct mob_skill +#include "map/map.h" // struct block_list #include "map/status.h" // struct status_data, struct status_change -#include "map/unit.h" // struct unit_data +#include "map/unit.h" // struct unit_data, view_data #include "common/cbasetypes.h" #include "common/mmo.h" // struct item diff --git a/src/map/npc.c b/src/map/npc.c index 7bc5be383..8114cacaa 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -10,6 +10,7 @@ #include "map/battle.h" #include "map/chat.h" #include "map/clif.h" +#include "map/guild.h" #include "map/instance.h" #include "map/intif.h" #include "map/itemdb.h" -- cgit v1.2.3-60-g2f50