diff --git a/zone/aa.cpp b/zone/aa.cpp index faf818a12..8ef113e12 100644 --- a/zone/aa.cpp +++ b/zone/aa.cpp @@ -35,7 +35,6 @@ Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) #include "string_ids.h" #include "titles.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "worldserver.h" #include "bot.h" diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 7f5079552..9c49c22f3 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -23,7 +23,6 @@ #include "../common/spdat.h" #include "client.h" -#include "corpse.h" #include "entity.h" #include "mob.h" diff --git a/zone/api_service.cpp b/zone/api_service.cpp index 8002c302d..68251be0b 100644 --- a/zone/api_service.cpp +++ b/zone/api_service.cpp @@ -22,12 +22,10 @@ #include "../common/net/websocket_server.h" #include "../common/eqemu_logsys.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "client.h" #include "entity.h" #include "corpse.h" #include "api_service.h" -#include "npc.h" #include "object.h" #include "zone.h" #include "doors.h" diff --git a/zone/attack.cpp b/zone/attack.cpp index 52df203fc..46265cba4 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/eq_constants.h" #include "../common/eq_packet_structs.h" #include "../common/rulesys.h" -#include "../common/skills.h" #include "../common/spdat.h" #include "../common/strings.h" #include "../common/data_verification.h" @@ -37,8 +36,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "mob.h" #include "npc.h" -#include - #include "bot.h" extern QueryServ* QServ; diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index bd57481c8..fd4f7c133 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -20,7 +20,6 @@ #include "../common/global_define.h" #include "../common/item_instance.h" #include "../common/rulesys.h" -#include "../common/skills.h" #include "../common/spdat.h" #include "client.h" diff --git a/zone/bot.cpp b/zone/bot.cpp index 568a38e6b..f5d8861bf 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -22,8 +22,6 @@ #include "doors.h" #include "quest_parser_collection.h" #include "lua_parser.h" -#include "../common/strings.h" -#include "../common/say_link.h" #include "../common/repositories/bot_spell_settings_repository.h" #include "../common/data_verification.h" diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp index a77a48562..a891cf852 100644 --- a/zone/bot_command.cpp +++ b/zone/bot_command.cpp @@ -34,10 +34,8 @@ #include #include -#include #include #include -#include #ifdef _WINDOWS #define strcasecmp _stricmp @@ -47,21 +45,14 @@ #include "../common/global_define.h" #include "../common/eq_packet.h" #include "../common/features.h" -#include "../common/guilds.h" -#include "../common/patches/patches.h" #include "../common/ptimer.h" #include "../common/rulesys.h" #include "../common/serverinfo.h" #include "../common/strings.h" #include "../common/say_link.h" -#include "../common/eqemu_logsys.h" -#include "../common/emu_constants.h" - #include "bot_command.h" #include "zonedb.h" -#include "../common/zone_store.h" -#include "guild_mgr.h" #include "map.h" #include "doors.h" #include "qglobals.h" diff --git a/zone/bot_database.cpp b/zone/bot_database.cpp index dddcd293e..a47174665 100644 --- a/zone/bot_database.cpp +++ b/zone/bot_database.cpp @@ -26,7 +26,6 @@ #include "../common/repositories/bot_inventories_repository.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "bot.h" #include "client.h" diff --git a/zone/botspellsai.cpp b/zone/botspellsai.cpp index 085632e1f..b42e4d2cf 100644 --- a/zone/botspellsai.cpp +++ b/zone/botspellsai.cpp @@ -18,7 +18,6 @@ #include "bot.h" #include "../common/data_verification.h" -#include "../common/strings.h" #include "../common/repositories/bot_spells_entries_repository.h" #include "../common/repositories/npc_spells_repository.h" diff --git a/zone/client.cpp b/zone/client.cpp index 006119bc5..3aa05cd05 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -46,7 +46,6 @@ extern volatile bool RunLoops; #include "position.h" #include "worldserver.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "petitions.h" #include "command.h" #include "water_map.h" @@ -57,8 +56,6 @@ extern volatile bool RunLoops; #include "quest_parser_collection.h" #include "queryserv.h" #include "mob_movement_manager.h" -#include "../common/content/world_content_service.h" -#include "../common/expedition_lockout_timer.h" #include "cheat_manager.h" #include "../common/repositories/bug_reports_repository.h" diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp index 4adaee619..934f6c55a 100644 --- a/zone/client_mods.cpp +++ b/zone/client_mods.cpp @@ -22,8 +22,6 @@ #include "../common/rulesys.h" #include "../common/spdat.h" -#include "../common/data_verification.h" - #include "client.h" #include "mob.h" diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index facc39ad7..ccb3a227e 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include #include "bot.h" -#include "bot_command.h" #ifdef _WINDOWS #define snprintf _snprintf @@ -39,23 +38,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #endif -#include "../common/crc32.h" #include "../common/data_verification.h" -#include "../common/faction.h" -#include "../common/guilds.h" #include "../common/rdtsc.h" -#include "../common/rulesys.h" -#include "../common/skills.h" -#include "../common/spdat.h" -#include "../common/strings.h" #include "data_bucket.h" #include "event_codes.h" #include "expedition.h" -#include "expedition_database.h" #include "guild_mgr.h" #include "merc.h" #include "petitions.h" -#include "pets.h" #include "queryserv.h" #include "quest_parser_collection.h" #include "string_ids.h" @@ -71,7 +61,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "client.h" #include "../common/repositories/account_repository.h" -#include "bot.h" #include "../common/events/player_event_logs.h" extern QueryServ* QServ; diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 329be9457..8afd06696 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -22,12 +22,8 @@ #include "../common/eqemu_logsys.h" #include "../common/global_define.h" #include -#include -#include #ifdef _WINDOWS - #include - #include #define snprintf _snprintf #define strncasecmp _strnicmp #define strcasecmp _stricmp @@ -54,7 +50,6 @@ #include "worldserver.h" #include "zone.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "../common/events/player_event_logs.h" extern QueryServ* QServ; diff --git a/zone/command.cpp b/zone/command.cpp index 086558b4b..883fecc5e 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -1,9 +1,6 @@ #include -#include -#include #include -#include #include #include @@ -26,8 +23,6 @@ #include "command.h" #include "dynamic_zone.h" #include "expedition.h" -#include "guild_mgr.h" -#include "qglobals.h" #include "queryserv.h" #include "quest_parser_collection.h" #include "titles.h" @@ -971,7 +966,6 @@ void command_bot(Client *c, const Seperator *sep) #include "gm_commands/doanim.cpp" #include "gm_commands/door.cpp" #include "gm_commands/door_manipulation.cpp" -#include "gm_commands/door_manipulation.h" #include "gm_commands/dye.cpp" #include "gm_commands/dz.cpp" #include "gm_commands/dzkickplayers.cpp" diff --git a/zone/data_bucket.cpp b/zone/data_bucket.cpp index 8a3c5e41a..19011cd80 100644 --- a/zone/data_bucket.cpp +++ b/zone/data_bucket.cpp @@ -1,11 +1,7 @@ #include "data_bucket.h" -#include -#include "../common/strings.h" #include "zonedb.h" -#include "../common/zone_store.h" #include #include -#include /** * Persists data via bucket_name as key diff --git a/zone/dialogue_window.cpp b/zone/dialogue_window.cpp index 765645e6e..3f28d472d 100644 --- a/zone/dialogue_window.cpp +++ b/zone/dialogue_window.cpp @@ -1,7 +1,6 @@ #include #include "dialogue_window.h" -#include "../common/strings.h" void DialogueWindow::Render(Client *c, std::string markdown) { diff --git a/zone/doors.cpp b/zone/doors.cpp index f0df1f88b..e0d0b2a20 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -30,10 +30,8 @@ #include "string_ids.h" #include "worldserver.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "../common/repositories/criteria/content_filter_criteria.h" -#include #include #define OPEN_DOOR 0x02 diff --git a/zone/dynamic_zone.cpp b/zone/dynamic_zone.cpp index 4f01c737e..65087f9ac 100644 --- a/zone/dynamic_zone.cpp +++ b/zone/dynamic_zone.cpp @@ -23,7 +23,6 @@ #include "expedition.h" #include "string_ids.h" #include "worldserver.h" -#include "../common/eqemu_logsys.h" extern WorldServer worldserver; diff --git a/zone/effects.cpp b/zone/effects.cpp index 87374cf3b..f328b8d42 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -28,7 +28,6 @@ #include "string_ids.h" #include "worldserver.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "position.h" float Mob::GetActSpellRange(uint16 spell_id, float range) diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index 1bd461fdf..c37d344d8 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -24,7 +24,6 @@ #include "../common/global_define.h" #include "../common/misc_functions.h" -#include "../common/eqemu_logsys.h" #include "dialogue_window.h" #include "embperl.h" diff --git a/zone/embperl.cpp b/zone/embperl.cpp index bdbe5d70e..25321efe2 100644 --- a/zone/embperl.cpp +++ b/zone/embperl.cpp @@ -12,13 +12,9 @@ Eglin #include "../common/global_define.h" #include "../common/eqemu_logsys.h" -#include -#include #include #include "embperl.h" -#include "embxs.h" #include "../common/features.h" -#include "../common/path_manager.h" #include "../common/process/process.h" #include "../common/file.h" #include "../common/timer.h" diff --git a/zone/embxs.cpp b/zone/embxs.cpp index 2481b330c..71fcd932c 100644 --- a/zone/embxs.cpp +++ b/zone/embxs.cpp @@ -24,7 +24,6 @@ #include "embperl.h" #include "masterentity.h" #include "command.h" -#include "bot_command.h" const char *getItemName(unsigned itemid) { diff --git a/zone/entity.cpp b/zone/entity.cpp index 9ded585bf..ea4e0e4d2 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -17,14 +17,12 @@ */ #include "../common/data_verification.h" #include "../common/global_define.h" -#include #include #include #include #include #ifdef _WINDOWS -#include #else #include #include "../common/unix.h" @@ -43,7 +41,6 @@ #include "worldserver.h" #include "water_map.h" #include "npc_scale_manager.h" -#include "../common/say_link.h" #include "dialogue_window.h" #ifdef _WINDOWS diff --git a/zone/expedition.cpp b/zone/expedition.cpp index f92284d8f..1537b2f06 100644 --- a/zone/expedition.cpp +++ b/zone/expedition.cpp @@ -25,9 +25,6 @@ #include "string_ids.h" #include "worldserver.h" #include "zonedb.h" -#include "../common/eqemu_logsys.h" -#include "../common/expedition_lockout_timer.h" -#include "../common/repositories/dynamic_zone_members_repository.h" #include "../common/repositories/expedition_lockouts_repository.h" extern WorldServer worldserver; diff --git a/zone/expedition_database.cpp b/zone/expedition_database.cpp index 1f49c917e..22d60a19d 100644 --- a/zone/expedition_database.cpp +++ b/zone/expedition_database.cpp @@ -21,9 +21,6 @@ #include "expedition_database.h" #include "expedition.h" #include "zonedb.h" -#include "../common/database.h" -#include "../common/expedition_lockout_timer.h" -#include "../common/strings.h" #include uint32_t ExpeditionDatabase::InsertExpedition(uint32_t dz_id) diff --git a/zone/expedition_request.cpp b/zone/expedition_request.cpp index 85e27e725..e74697144 100644 --- a/zone/expedition_request.cpp +++ b/zone/expedition_request.cpp @@ -24,9 +24,7 @@ #include "groups.h" #include "raids.h" #include "string_ids.h" -#include "../common/expedition_lockout_timer.h" #include "../common/repositories/character_expedition_lockouts_repository.h" -#include "../common/repositories/expeditions_repository.h" constexpr char SystemName[] = "expedition"; diff --git a/zone/forage.cpp b/zone/forage.cpp index eba72977d..71f8f9d53 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -30,15 +30,12 @@ #include "titles.h" #include "water_map.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "../common/repositories/criteria/content_filter_criteria.h" #include "../common/events/player_event_logs.h" #include "worldserver.h" extern WorldServer worldserver; -#include - #ifdef _WINDOWS #define snprintf _snprintf #endif diff --git a/zone/groups.cpp b/zone/groups.cpp index 57311b951..238f8f18e 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -20,9 +20,6 @@ #include "../common/eqemu_logsys.h" #include "expedition.h" #include "masterentity.h" -#include "../common/packet_functions.h" -#include "../common/packet_dump.h" -#include "../common/strings.h" #include "worldserver.h" #include "string_ids.h" #include "../common/events/player_event_logs.h" diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp index 9756d1a0b..6058c873c 100644 --- a/zone/guild_mgr.cpp +++ b/zone/guild_mgr.cpp @@ -20,11 +20,9 @@ #include "../common/strings.h" #include "client.h" -#include "entity.h" #include "guild_mgr.h" #include "worldserver.h" #include "zonedb.h" -#include "../common/zone_store.h" ZoneGuildManager guild_mgr; GuildBankManager *GuildBanks; diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp index 5a67f3a9f..d003d10a1 100644 --- a/zone/hate_list.cpp +++ b/zone/hate_list.cpp @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "mob.h" #include "raids.h" -#include "../common/rulesys.h" #include "../common/data_verification.h" #include "hate_list.h" @@ -30,7 +29,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "zone.h" #include "water_map.h" -#include #include extern Zone *zone; diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 9d966d3d5..5aec134fe 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -23,11 +23,8 @@ #include "quest_parser_collection.h" #include "worldserver.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "../common/events/player_event_logs.h" - #include "bot.h" -#include "../common/events/player_event_logs.h" extern WorldServer worldserver; diff --git a/zone/loottables.cpp b/zone/loottables.cpp index ed9c8e5cc..70c15dc26 100644 --- a/zone/loottables.cpp +++ b/zone/loottables.cpp @@ -18,7 +18,6 @@ #include "../common/global_define.h" #include "../common/loottable.h" -#include "../common/misc_functions.h" #include "../common/data_verification.h" #include "client.h" @@ -26,13 +25,8 @@ #include "mob.h" #include "npc.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "global_loot_manager.h" #include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/say_link.h" - -#include -#include #ifdef _WINDOWS #define snprintf _snprintf diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp index f24c04f12..21c7651cf 100644 --- a/zone/lua_client.cpp +++ b/zone/lua_client.cpp @@ -17,7 +17,6 @@ #include "lua_packet.h" #include "dialogue_window.h" #include "titles.h" -#include "../common/expedition_lockout_timer.h" struct InventoryWhere { }; diff --git a/zone/lua_door.cpp b/zone/lua_door.cpp index a19ab8609..caa2203ab 100644 --- a/zone/lua_door.cpp +++ b/zone/lua_door.cpp @@ -1,6 +1,5 @@ #ifdef LUA_EQEMU -#include "lua.hpp" #include #include diff --git a/zone/lua_encounter.cpp b/zone/lua_encounter.cpp index 08a4f95d3..06e2f1d48 100644 --- a/zone/lua_encounter.cpp +++ b/zone/lua_encounter.cpp @@ -1,6 +1,5 @@ #ifdef LUA_EQEMU -#include "lua.hpp" #include #include "lua_encounter.h" #include "encounter.h" diff --git a/zone/lua_entity.cpp b/zone/lua_entity.cpp index d0ce95c7f..abff39b8f 100644 --- a/zone/lua_entity.cpp +++ b/zone/lua_entity.cpp @@ -1,6 +1,5 @@ #ifdef LUA_EQEMU -#include "lua.hpp" #include #include "entity.h" diff --git a/zone/lua_entity_list.cpp b/zone/lua_entity_list.cpp index a860131c5..fac098d11 100644 --- a/zone/lua_entity_list.cpp +++ b/zone/lua_entity_list.cpp @@ -1,12 +1,10 @@ #ifdef LUA_EQEMU -#include "lua.hpp" #include #include #include "masterentity.h" #include "lua_entity_list.h" -#include "lua_entity.h" #include "lua_mob.h" #include "lua_client.h" #include "lua_npc.h" diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index 703ab9c8c..768f8f19e 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -9,10 +9,8 @@ #include "../common/content/world_content_service.h" #include "../common/timer.h" -#include "../common/eqemu_logsys.h" #include "../common/classes.h" #include "../common/rulesys.h" -#include "lua_parser.h" #include "lua_item.h" #include "lua_iteminst.h" #include "lua_client.h" diff --git a/zone/lua_group.cpp b/zone/lua_group.cpp index 4a3907960..387344571 100644 --- a/zone/lua_group.cpp +++ b/zone/lua_group.cpp @@ -2,14 +2,12 @@ #include "../common/data_verification.h" -#include "lua.hpp" #include #include #include "groups.h" #include "masterentity.h" #include "lua_group.h" -#include "lua_entity.h" #include "lua_mob.h" #include "lua_client.h" #include "lua_npc.h" diff --git a/zone/lua_item.cpp b/zone/lua_item.cpp index 57ae9083b..ac4f8a871 100644 --- a/zone/lua_item.cpp +++ b/zone/lua_item.cpp @@ -1,6 +1,5 @@ #ifdef LUA_EQEMU -#include "lua.hpp" #include #include "masterentity.h" diff --git a/zone/lua_iteminst.cpp b/zone/lua_iteminst.cpp index 180856f66..7a72378b2 100644 --- a/zone/lua_iteminst.cpp +++ b/zone/lua_iteminst.cpp @@ -1,6 +1,5 @@ #ifdef LUA_EQEMU -#include "lua.hpp" #include #include diff --git a/zone/lua_mod.cpp b/zone/lua_mod.cpp index 147a3a046..55d04e4f3 100644 --- a/zone/lua_mod.cpp +++ b/zone/lua_mod.cpp @@ -6,14 +6,10 @@ #include "../common/spdat.h" #include "masterentity.h" -#include "questmgr.h" #include "zone.h" -#include "zone_config.h" #include "lua_parser.h" #include "lua_mod.h" -#include "lua_bit.h" -#include "lua_entity.h" #include "lua_item.h" #include "lua_iteminst.h" #include "lua_mob.h" @@ -21,17 +17,12 @@ #include "lua_client.h" #include "lua_inventory.h" #include "lua_npc.h" -#include "lua_spell.h" -#include "lua_entity_list.h" #include "lua_group.h" #include "lua_raid.h" #include "lua_corpse.h" #include "lua_object.h" #include "lua_door.h" -#include "lua_spawn.h" #include "lua_packet.h" -#include "lua_general.h" -#include "lua_encounter.h" #include "lua_stat_bonuses.h" void LuaMod::Init() diff --git a/zone/lua_packet.cpp b/zone/lua_packet.cpp index 1ebb3489e..46e3d0190 100644 --- a/zone/lua_packet.cpp +++ b/zone/lua_packet.cpp @@ -1,6 +1,5 @@ #ifdef LUA_EQEMU -#include "lua.hpp" #include #include diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp index 97b29b1b0..01ccd1035 100644 --- a/zone/lua_parser.cpp +++ b/zone/lua_parser.cpp @@ -39,7 +39,6 @@ #include "lua_general.h" #include "lua_encounter.h" #include "lua_stat_bonuses.h" -#include "../common/path_manager.h" #include "lua_bot.h" diff --git a/zone/lua_parser_events.cpp b/zone/lua_parser_events.cpp index 88b45ff95..7a81f1f94 100644 --- a/zone/lua_parser_events.cpp +++ b/zone/lua_parser_events.cpp @@ -9,11 +9,8 @@ #include "quest_interface.h" #include "masterentity.h" -#include "../common/seperator.h" -#include "../common/misc_functions.h" #include "lua_item.h" #include "lua_iteminst.h" -#include "lua_entity.h" #include "lua_mob.h" #include "lua_client.h" #include "lua_npc.h" diff --git a/zone/lua_raid.cpp b/zone/lua_raid.cpp index 6cb6cdf7d..fee67c967 100644 --- a/zone/lua_raid.cpp +++ b/zone/lua_raid.cpp @@ -2,13 +2,11 @@ #include "../common/data_verification.h" -#include "lua.hpp" #include #include #include "masterentity.h" #include "lua_raid.h" -#include "lua_entity.h" #include "lua_mob.h" #include "lua_client.h" #include "lua_npc.h" diff --git a/zone/lua_spawn.cpp b/zone/lua_spawn.cpp index 117b4a6b4..d5d712757 100644 --- a/zone/lua_spawn.cpp +++ b/zone/lua_spawn.cpp @@ -1,6 +1,5 @@ #ifdef LUA_EQEMU -#include "lua.hpp" #include #include "spawn2.h" diff --git a/zone/lua_spell.cpp b/zone/lua_spell.cpp index c2a5e622d..6789cfd80 100644 --- a/zone/lua_spell.cpp +++ b/zone/lua_spell.cpp @@ -1,6 +1,5 @@ #ifdef LUA_EQEMU -#include "lua.hpp" #include #include "../common/spdat.h" diff --git a/zone/lua_stat_bonuses.cpp b/zone/lua_stat_bonuses.cpp index 8f50f7992..d5bd43094 100644 --- a/zone/lua_stat_bonuses.cpp +++ b/zone/lua_stat_bonuses.cpp @@ -2,7 +2,6 @@ #include "../common/data_verification.h" -#include "lua.hpp" #include #include "lua_stat_bonuses.h" diff --git a/zone/main.cpp b/zone/main.cpp index e223847ad..cd5dc55e4 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -47,7 +47,6 @@ #include "command.h" #include "bot_command.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "titles.h" #include "guild_mgr.h" #include "task_manager.h" @@ -58,11 +57,8 @@ #include "npc_scale_manager.h" #include "../common/net/eqstream.h" -#include "../common/content/world_content_service.h" -#include #include -#include #include #ifdef _CRTDBG_MAP_ALLOC @@ -71,8 +67,6 @@ #endif #ifdef _WINDOWS -#include -#include #else #include #include "../common/unix.h" @@ -88,7 +82,6 @@ extern volatile bool is_zone_loaded; #include "zone_event_scheduler.h" #include "../common/file.h" -#include "../common/path_manager.h" #include "../common/events/player_event_logs.h" EntityList entity_list; diff --git a/zone/map.cpp b/zone/map.cpp index c92710fa8..cda7d1ca1 100644 --- a/zone/map.cpp +++ b/zone/map.cpp @@ -6,7 +6,6 @@ #include "raycast_mesh.h" #include "zone.h" #include "../common/file.h" -#include "../common/path_manager.h" #include #include diff --git a/zone/merc.cpp b/zone/merc.cpp index f27091f7c..816911945 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -6,18 +6,9 @@ #include "groups.h" #include "mob.h" -#include "../common/eqemu_logsys.h" -#include "../common/eq_packet_structs.h" -#include "../common/eq_constants.h" -#include "../common/skills.h" -#include "../common/spdat.h" - #include "zone.h" #include "string_ids.h" -#include "../common/strings.h" -#include "../common/rulesys.h" - extern volatile bool is_zone_loaded; #if EQDEBUG >= 12 diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp index 325ab909c..5f2ceb568 100644 --- a/zone/mob_ai.cpp +++ b/zone/mob_ai.cpp @@ -38,7 +38,6 @@ #include #include #include -#include extern EntityList entity_list; extern FastMath g_Math; diff --git a/zone/mob_appearance.cpp b/zone/mob_appearance.cpp index 4441d840a..574c4ae0f 100644 --- a/zone/mob_appearance.cpp +++ b/zone/mob_appearance.cpp @@ -21,14 +21,12 @@ #include "../common/data_verification.h" #include "../common/eqemu_logsys.h" #include "../common/item_data.h" -#include "../common/misc_functions.h" #include "../common/spdat.h" #include "../common/strings.h" #include "mob.h" #include "quest_parser_collection.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "bot.h" diff --git a/zone/mob_info.cpp b/zone/mob_info.cpp index 69693a8b0..e8c5bb7d3 100644 --- a/zone/mob_info.cpp +++ b/zone/mob_info.cpp @@ -20,9 +20,6 @@ #include "client.h" #include "mob.h" -#include "../common/races.h" -#include "../common/say_link.h" -#include "../common/strings.h" #include "npc_scale_manager.h" inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribute) diff --git a/zone/npc.cpp b/zone/npc.cpp index 652017690..e461541ab 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -27,7 +27,6 @@ #include "../common/emu_versions.h" #include "../common/features.h" #include "../common/item_instance.h" -#include "../common/item_data.h" #include "../common/linked_list.h" #include "../common/servertalk.h" #include "../common/say_link.h" @@ -45,7 +44,6 @@ #include "bot.h" -#include #include #include #include diff --git a/zone/npc_scale_manager.cpp b/zone/npc_scale_manager.cpp index 191c76694..dca176e47 100644 --- a/zone/npc_scale_manager.cpp +++ b/zone/npc_scale_manager.cpp @@ -19,7 +19,6 @@ */ #include "npc_scale_manager.h" -#include "../common/strings.h" #include "../common/repositories/npc_scale_global_base_repository.h" #include "../common/repositories/npc_types_repository.h" diff --git a/zone/object.cpp b/zone/object.cpp index 4b78eff26..9f5bf7965 100644 --- a/zone/object.cpp +++ b/zone/object.cpp @@ -27,11 +27,9 @@ #include "quest_parser_collection.h" #include "worldserver.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "../common/repositories/criteria/content_filter_criteria.h" #include "../common/events/player_event_logs.h" -#include const char DEFAULT_OBJECT_NAME[] = "IT63_ACTORDEF"; const char DEFAULT_OBJECT_NAME_SUFFIX[] = "_ACTORDEF"; diff --git a/zone/pathfinder_interface.cpp b/zone/pathfinder_interface.cpp index 3a5c07506..74209703c 100644 --- a/zone/pathfinder_interface.cpp +++ b/zone/pathfinder_interface.cpp @@ -2,8 +2,6 @@ #include "client.h" #include "pathfinder_null.h" #include "pathfinder_nav_mesh.h" -#include "pathfinder_waypoint.h" -#include "../common/path_manager.h" #include #include diff --git a/zone/pathfinder_waypoint.cpp b/zone/pathfinder_waypoint.cpp index 19ad3b135..2418b5fad 100644 --- a/zone/pathfinder_waypoint.cpp +++ b/zone/pathfinder_waypoint.cpp @@ -11,9 +11,6 @@ #include "pathfinder_waypoint.h" #include "zone.h" #include "client.h" -#include "../common/eqemu_logsys.h" -#include "../common/strings.h" -#include "../common/rulesys.h" extern Zone *zone; diff --git a/zone/perl_entity.cpp b/zone/perl_entity.cpp index 83f7fb9e7..65bd2a2fa 100644 --- a/zone/perl_entity.cpp +++ b/zone/perl_entity.cpp @@ -7,7 +7,6 @@ #include "../common/global_define.h" #include "../common/rulesys.h" #include "../common/say_link.h" -#include "../common/strings.h" #include Mob* Perl_EntityList_GetMobID(EntityList* self, uint16_t mob_id) // @categories Script Utility diff --git a/zone/perl_hateentry.cpp b/zone/perl_hateentry.cpp index 8b8ec0ff8..0b44143f9 100644 --- a/zone/perl_hateentry.cpp +++ b/zone/perl_hateentry.cpp @@ -4,7 +4,6 @@ #ifdef EMBPERL_XS_CLASSES #include "../common/global_define.h" -#include "../common/linked_list.h" #include "embperl.h" #include "hate_list.h" diff --git a/zone/perl_inventory.cpp b/zone/perl_inventory.cpp index 39fd7665c..ba083e936 100644 --- a/zone/perl_inventory.cpp +++ b/zone/perl_inventory.cpp @@ -4,7 +4,6 @@ #ifdef EMBPERL_XS_CLASSES #include "../common/global_define.h" -#include "../common/inventory_profile.h" #include "embperl.h" bool Perl_Inventory_CanItemFitInContainer(EQ::InventoryProfile* self, EQ::ItemInstance* item_to_check, EQ::ItemInstance* container_to_check) diff --git a/zone/perl_questitem.cpp b/zone/perl_questitem.cpp index 9b102800a..15a9ddc3a 100644 --- a/zone/perl_questitem.cpp +++ b/zone/perl_questitem.cpp @@ -4,7 +4,6 @@ #ifdef EMBPERL_XS_CLASSES #include "../common/global_define.h" -#include "../common/item_instance.h" #include "embperl.h" std::string Perl_QuestItem_GetName(EQ::ItemInstance* self) // @categories Inventory and Items diff --git a/zone/perlpacket.cpp b/zone/perlpacket.cpp index 9f423f089..d0459ee3e 100644 --- a/zone/perlpacket.cpp +++ b/zone/perlpacket.cpp @@ -16,12 +16,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/global_define.h" -#include #include "perlpacket.h" #include "client.h" -#include "entity.h" #include "../common/opcodemgr.h" -#include "../common/packet_dump.h" #include "../common/misc_functions.h" PerlPacket::PerlPacket(const char *opcode, uint32 length) { diff --git a/zone/petitions.cpp b/zone/petitions.cpp index 41c5e3e02..e3c04d637 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -19,7 +19,6 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #include "../common/eqemu_logsys.h" #include #ifdef _WINDOWS -#include #else #include #endif diff --git a/zone/pets.cpp b/zone/pets.cpp index e5575b7a5..2d8dec08d 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -19,7 +19,6 @@ #include "../common/global_define.h" #include "../common/spdat.h" #include "../common/strings.h" -#include "../common/types.h" #include "entity.h" #include "client.h" @@ -27,7 +26,6 @@ #include "pets.h" #include "zonedb.h" -#include "../common/zone_store.h" #include diff --git a/zone/position.cpp b/zone/position.cpp index 18577afd8..fff3aa043 100644 --- a/zone/position.cpp +++ b/zone/position.cpp @@ -1,6 +1,5 @@ #include "position.h" -#include #include #include #include "../common/strings.h" diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 0b57cf3eb..cdf961298 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -36,9 +36,7 @@ #include "worldserver.h" #include "zone.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "dialogue_window.h" -#include "string_ids.h" #include "../common/repositories/tradeskill_recipe_repository.h" diff --git a/zone/raycast_mesh.cpp b/zone/raycast_mesh.cpp index 0fa411836..8873c293e 100644 --- a/zone/raycast_mesh.cpp +++ b/zone/raycast_mesh.cpp @@ -1,7 +1,6 @@ #include "raycast_mesh.h" #include #include -#include #include #include #include diff --git a/zone/shared_task_zone_messaging.cpp b/zone/shared_task_zone_messaging.cpp index 379b5d6f8..8009dc944 100644 --- a/zone/shared_task_zone_messaging.cpp +++ b/zone/shared_task_zone_messaging.cpp @@ -2,13 +2,8 @@ #include "../common/shared_tasks.h" #include "../common/servertalk.h" #include "client.h" -#include "../common/repositories/character_data_repository.h" -#include "../common/repositories/shared_task_members_repository.h" -#include #include -#include -#include #include void SharedTaskZoneMessaging::HandleWorldMessage(ServerPacket *pack) diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index 5a8309a1d..0334f4e1f 100644 --- a/zone/spawn2.cpp +++ b/zone/spawn2.cpp @@ -26,7 +26,6 @@ #include "worldserver.h" #include "zone.h" #include "zonedb.h" -#include "../common/zone_store.h" extern EntityList entity_list; extern Zone* zone; diff --git a/zone/spawngroup.cpp b/zone/spawngroup.cpp index 3763caf89..a25fbedfc 100644 --- a/zone/spawngroup.cpp +++ b/zone/spawngroup.cpp @@ -24,7 +24,6 @@ #include "spawngroup.h" #include "zone.h" #include "zonedb.h" -#include "../common/zone_store.h" #include "../common/repositories/criteria/content_filter_criteria.h" extern EntityList entity_list; diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index ebb0d07ac..68318b641 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -22,7 +22,6 @@ #include "../common/global_define.h" #include "../common/item_instance.h" #include "../common/rulesys.h" -#include "../common/skills.h" #include "../common/spdat.h" #include "../common/data_verification.h" #include "../common/misc_functions.h" diff --git a/zone/spells.cpp b/zone/spells.cpp index f33858996..208bfd3c1 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -72,7 +72,6 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #include "../common/eqemu_logsys.h" #include "../common/item_instance.h" #include "../common/rulesys.h" -#include "../common/skills.h" #include "../common/spdat.h" #include "../common/strings.h" #include "../common/data_verification.h" @@ -86,7 +85,6 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #include "fastmath.h" #include -#include #include #ifndef WIN32 diff --git a/zone/task_manager.cpp b/zone/task_manager.cpp index 0711b0977..993a0b4b2 100644 --- a/zone/task_manager.cpp +++ b/zone/task_manager.cpp @@ -1,7 +1,6 @@ #include "../common/global_define.h" #include "../common/misc_functions.h" #include "../common/repositories/character_activities_repository.h" -#include "../common/repositories/character_data_repository.h" #include "../common/repositories/character_tasks_repository.h" #include "../common/repositories/completed_tasks_repository.h" #include "../common/repositories/task_activities_repository.h" @@ -12,7 +11,6 @@ #include "string_ids.h" #include "task_manager.h" #include "../common/repositories/shared_task_activity_state_repository.h" -#include "../common/repositories/shared_task_dynamic_zones_repository.h" #include "../common/repositories/shared_task_members_repository.h" #include "../common/shared_tasks.h" #include "worldserver.h" diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 2d8e03002..c07e75ede 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -19,7 +19,6 @@ #include "../common/global_define.h" #include "../common/events/player_event_logs.h" -#include #include #ifndef WIN32 @@ -27,7 +26,6 @@ #endif #include "../common/rulesys.h" -#include "../common/strings.h" #include "queryserv.h" #include "quest_parser_collection.h" @@ -36,7 +34,6 @@ #include "zonedb.h" #include "worldserver.h" #include "../common/repositories/char_recipe_list_repository.h" -#include "../common/zone_store.h" #include "../common/repositories/tradeskill_recipe_repository.h" #include "../common/repositories/tradeskill_recipe_entries_repository.h" diff --git a/zone/trap.cpp b/zone/trap.cpp index 56c98fe84..0c447a2d2 100644 --- a/zone/trap.cpp +++ b/zone/trap.cpp @@ -18,7 +18,6 @@ #include "../common/spdat.h" #include "../common/strings.h" -#include "../common/types.h" #include "client.h" #include "entity.h" diff --git a/zone/tribute.cpp b/zone/tribute.cpp index 4f6588e40..18e2bf664 100644 --- a/zone/tribute.cpp +++ b/zone/tribute.cpp @@ -26,8 +26,6 @@ #ifdef _WINDOWS #include - #include - #include #define snprintf _snprintf #define vsnprintf _vsnprintf #define strncasecmp _strnicmp diff --git a/zone/tune.cpp b/zone/tune.cpp index 1880cbc39..dfeece321 100644 --- a/zone/tune.cpp +++ b/zone/tune.cpp @@ -24,13 +24,10 @@ #include "../common/eq_constants.h" #include "../common/eq_packet_structs.h" #include "../common/rulesys.h" -#include "../common/skills.h" #include "../common/spdat.h" #include "../common/strings.h" #include "../common/data_verification.h" -#include "../common/misc_functions.h" #include "queryserv.h" -#include "quest_parser_collection.h" #include "string_ids.h" #include "water_map.h" #include "worldserver.h" @@ -38,12 +35,6 @@ #include "lua_parser.h" #include "fastmath.h" #include "mob.h" -#include "npc.h" - -#include -#include -#include -#include #include "bot.h" diff --git a/zone/water_map.cpp b/zone/water_map.cpp index b7d367c47..27289abd6 100644 --- a/zone/water_map.cpp +++ b/zone/water_map.cpp @@ -4,8 +4,6 @@ #include "water_map_v1.h" #include "water_map_v2.h" #include "../common/eqemu_logsys.h" -#include "../common/file.h" -#include "../common/path_manager.h" #include #include diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index 6ef49d924..56e69d017 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #endif -#include "../common/features.h" #include "../common/rulesys.h" #include "../common/strings.h" #include "../common/misc_functions.h" @@ -34,7 +33,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "mob_movement_manager.h" #include -#include extern FastMath g_Math; diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 699db95fb..09ab02a74 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include #include -#include #include #ifdef _WINDOWS @@ -57,7 +56,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "shared_task_zone_messaging.h" #include "dialogue_window.h" #include "bot_command.h" -#include "queryserv.h" #include "../common/events/player_event_logs.h" extern EntityList entity_list; diff --git a/zone/zone.cpp b/zone/zone.cpp index 23104485b..00915aee1 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -18,7 +18,6 @@ #include #include -#include #include #include @@ -43,8 +42,6 @@ #include "npc.h" #include "object.h" #include "pathfinder_null.h" -#include "pathfinder_nav_mesh.h" -#include "pathfinder_waypoint.h" #include "petitions.h" #include "quest_parser_collection.h" #include "spawn2.h" @@ -58,15 +55,11 @@ #include "../common/data_verification.h" #include "zone_reload.h" #include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/repositories/content_flags_repository.h" #include "../common/repositories/merchantlist_repository.h" #include "../common/repositories/rule_sets_repository.h" -#include "../common/repositories/zone_points_repository.h" #include "../common/serverinfo.h" #include -#include -#include #ifdef _WINDOWS #define snprintf _snprintf diff --git a/zone/zone_event_scheduler.cpp b/zone/zone_event_scheduler.cpp index 3c712b6f5..8d40e6a44 100644 --- a/zone/zone_event_scheduler.cpp +++ b/zone/zone_event_scheduler.cpp @@ -1,5 +1,4 @@ #include "zone_event_scheduler.h" -#include "../common/rulesys.h" #include void ZoneEventScheduler::Process(Zone *zone, WorldContentService *content_service) diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index f57c45daf..d0450674c 100755 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -1,7 +1,6 @@ #include "../common/eqemu_logsys.h" #include "../common/extprofile.h" -#include "../common/item_instance.h" #include "../common/rulesys.h" #include "../common/strings.h" @@ -12,7 +11,6 @@ #include "zone.h" #include "zonedb.h" #include "aura.h" -#include "../common/repositories/criteria/content_filter_criteria.h" #include "../common/repositories/character_disciplines_repository.h" #include "../common/repositories/npc_types_repository.h" diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 3a41ecb1d..ced034878 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -34,10 +34,7 @@ extern QueryServ* QServ; extern WorldServer worldserver; extern Zone* zone; -#include "../common/content/world_content_service.h" - #include "../common/repositories/character_peqzone_flags_repository.h" -#include "../common/repositories/zone_repository.h" #include "../common/events/player_event_logs.h"