From 7fe49b563000f85f33e1419e538c82a551e84010 Mon Sep 17 00:00:00 2001 From: brainiac Date: Thu, 18 Dec 2025 00:59:27 -0800 Subject: [PATCH] normalize includes: zone --- zone/CMakeLists.txt | 9 +- zone/aa.cpp | 50 ++++---- zone/aa.h | 5 +- zone/aa_ability.cpp | 7 +- zone/aa_ability.h | 18 ++- zone/aa_rank.h | 15 +-- zone/aa_rank_effects.h | 13 +- zone/aggro.cpp | 24 ++-- zone/aggromanager.cpp | 2 - zone/aggromanager.h | 11 +- zone/api_service.cpp | 23 ++-- zone/api_service.h | 3 +- zone/attack.cpp | 47 +++----- zone/aura.cpp | 13 +- zone/aura.h | 17 ++- zone/beacon.cpp | 25 +--- zone/beacon.h | 12 +- zone/bonuses.cpp | 30 ++--- zone/bot.cpp | 23 ++-- zone/bot.h | 36 +++--- zone/bot_command.cpp | 46 ++++--- zone/bot_command.h | 11 +- zone/bot_database.cpp | 59 +++++---- zone/bot_database.h | 8 +- zone/bot_raid.cpp | 16 +-- zone/bot_raid.h | 37 +++--- zone/bot_structs.h | 13 +- zone/botspellsai.cpp | 7 +- zone/cheat_manager.cpp | 11 +- zone/cheat_manager.h | 19 ++- zone/cli/cli_benchmark_databuckets.cpp | 21 ++-- zone/cli/cli_sidecar_serve_http.cpp | 14 ++- zone/cli/tests/cli_databuckets.cpp | 18 +-- zone/cli/tests/cli_npc_handins.cpp | 20 ++-- zone/cli/tests/cli_npc_handins_multiquest.cpp | 16 +-- zone/cli/tests/cli_test_util.cpp | 2 +- zone/cli/tests/cli_zone_state.cpp | 16 +-- zone/client.cpp | 110 ++++++++--------- zone/client.h | 89 ++++++-------- zone/client_bot.cpp | 3 +- zone/client_evolving_items.cpp | 12 +- zone/client_mods.cpp | 13 +- zone/client_packet.cpp | 98 +++++++-------- zone/client_process.cpp | 54 ++++----- zone/combat_record.cpp | 5 +- zone/combat_record.h | 8 +- zone/command.cpp | 59 +++++---- zone/command.h | 14 +-- zone/common.h | 15 +-- zone/corpse.cpp | 50 +++----- zone/corpse.h | 14 +-- zone/dialogue_window.h | 11 +- zone/doors.cpp | 31 +++-- zone/doors.h | 8 +- zone/dynamic_zone.cpp | 16 +-- zone/dynamic_zone.h | 8 +- zone/effects.cpp | 20 ++-- zone/embparser.cpp | 22 ++-- zone/embparser.h | 19 ++- zone/embparser_api.cpp | 35 +++--- zone/embperl.cpp | 24 ++-- zone/embperl.h | 14 +-- zone/encounter.cpp | 16 +-- zone/encounter.h | 11 +- zone/entity.cpp | 49 +++----- zone/entity.h | 30 ++--- zone/event_codes.h | 6 +- zone/exp.cpp | 36 +++--- zone/expedition_request.cpp | 11 +- zone/expedition_request.h | 10 +- zone/fastmath.cpp | 9 +- zone/fastmath.h | 5 +- zone/fearpath.cpp | 13 +- zone/forage.cpp | 47 ++++---- zone/forage.h | 8 +- zone/global_loot_manager.cpp | 9 +- zone/global_loot_manager.h | 5 +- zone/groups.cpp | 23 ++-- zone/groups.h | 13 +- zone/guild.cpp | 11 +- zone/guild_mgr.cpp | 19 +-- zone/guild_mgr.h | 16 +-- zone/hate_list.cpp | 21 ++-- zone/hate_list.h | 11 +- zone/heal_rotation.cpp | 4 +- zone/heal_rotation.h | 8 +- zone/horse.cpp | 20 ++-- zone/horse.h | 9 +- zone/inventory.cpp | 22 ++-- zone/loot.cpp | 25 ++-- zone/lua_bit.cpp | 2 +- zone/lua_bit.h | 5 +- zone/lua_bot.cpp | 19 +-- zone/lua_bot.h | 10 +- zone/lua_buff.cpp | 10 +- zone/lua_buff.h | 11 +- zone/lua_client.cpp | 37 +++--- zone/lua_client.h | 9 +- zone/lua_corpse.cpp | 15 +-- zone/lua_corpse.h | 9 +- zone/lua_database.cpp | 8 +- zone/lua_database.h | 7 +- zone/lua_door.cpp | 12 +- zone/lua_door.h | 9 +- zone/lua_encounter.cpp | 7 +- zone/lua_encounter.h | 10 +- zone/lua_entity.cpp | 22 ++-- zone/lua_entity.h | 9 +- zone/lua_entity_list.cpp | 30 ++--- zone/lua_entity_list.h | 9 +- zone/lua_expedition.cpp | 10 +- zone/lua_expedition.h | 10 +- zone/lua_general.cpp | 57 ++++----- zone/lua_general.h | 9 +- zone/lua_group.cpp | 22 ++-- zone/lua_group.h | 9 +- zone/lua_hate_list.cpp | 13 +- zone/lua_hate_list.h | 9 +- zone/lua_inventory.cpp | 16 +-- zone/lua_inventory.h | 9 +- zone/lua_item.cpp | 9 +- zone/lua_item.h | 10 +- zone/lua_iteminst.cpp | 11 +- zone/lua_iteminst.h | 11 +- zone/lua_merc.cpp | 19 +-- zone/lua_merc.h | 7 +- zone/lua_mob.cpp | 31 ++--- zone/lua_mob.h | 10 +- zone/lua_mod.cpp | 50 ++++---- zone/lua_mod.h | 3 +- zone/lua_npc.cpp | 21 ++-- zone/lua_npc.h | 9 +- zone/lua_object.cpp | 11 +- zone/lua_object.h | 9 +- zone/lua_packet.cpp | 10 +- zone/lua_packet.h | 12 +- zone/lua_parser.cpp | 83 +++++++------ zone/lua_parser.h | 24 ++-- zone/lua_parser_events.cpp | 43 ++++--- zone/lua_parser_events.h | 28 ++++- zone/lua_ptr.h | 10 +- zone/lua_raid.cpp | 21 ++-- zone/lua_raid.h | 9 +- zone/lua_spawn.cpp | 11 +- zone/lua_spawn.h | 9 +- zone/lua_spell.cpp | 10 +- zone/lua_spell.h | 9 +- zone/lua_stat_bonuses.cpp | 11 +- zone/lua_stat_bonuses.h | 6 +- zone/lua_zone.cpp | 12 +- zone/lua_zone.h | 10 +- zone/main.cpp | 100 +++++++--------- zone/map.cpp | 18 ++- zone/map.h | 11 +- zone/masterentity.h | 25 ++-- zone/merc.cpp | 19 ++- zone/merc.h | 7 +- zone/mob.cpp | 39 +++--- zone/mob.h | 36 +++--- zone/mob_ai.cpp | 37 +++--- zone/mob_appearance.cpp | 17 ++- zone/mob_info.cpp | 5 +- zone/mob_movement_manager.cpp | 21 ++-- zone/mob_movement_manager.h | 1 + zone/npc.cpp | 73 +++++------- zone/npc.h | 33 ++---- zone/npc_scale_manager.cpp | 5 +- zone/npc_scale_manager.h | 10 +- zone/object.cpp | 26 ++-- zone/object.h | 15 +-- zone/oriented_bounding_box.cpp | 6 +- zone/oriented_bounding_box.h | 9 +- zone/parcels.cpp | 16 +-- zone/pathfinder_interface.cpp | 13 +- zone/pathfinder_interface.h | 3 +- zone/pathfinder_nav_mesh.cpp | 19 +-- zone/pathfinder_nav_mesh.h | 5 +- zone/pathing.cpp | 9 +- zone/pch/pch.h | 18 +-- zone/perl_bot.cpp | 11 +- zone/perl_buff.cpp | 9 +- zone/perl_client.cpp | 13 +- zone/perl_database.cpp | 8 +- zone/perl_database.h | 4 +- zone/perl_doors.cpp | 7 +- zone/perl_entity.cpp | 14 +-- zone/perl_expedition.cpp | 9 +- zone/perl_groups.cpp | 9 +- zone/perl_hateentry.cpp | 9 +- zone/perl_inventory.cpp | 7 +- zone/perl_merc.cpp | 9 +- zone/perl_mob.cpp | 17 ++- zone/perl_npc.cpp | 7 +- zone/perl_object.cpp | 7 +- zone/perl_perlpacket.cpp | 11 +- zone/perl_player_corpse.cpp | 7 +- zone/perl_questitem.cpp | 7 +- zone/perl_questitem_data.cpp | 5 +- zone/perl_raids.cpp | 11 +- zone/perl_spawn.cpp | 8 +- zone/perl_spell.cpp | 7 +- zone/perl_stat_bonuses.cpp | 8 +- zone/perl_zone.cpp | 7 +- zone/perlpacket.cpp | 9 +- zone/perlpacket.h | 12 +- zone/petitions.cpp | 29 ++--- zone/petitions.h | 19 ++- zone/pets.cpp | 32 ++--- zone/pets.h | 15 +-- zone/position.cpp | 11 +- zone/position.h | 17 ++- zone/qglobals.cpp | 8 +- zone/qglobals.h | 5 +- zone/queryserv.cpp | 9 +- zone/queryserv.h | 15 +-- zone/quest_db.cpp | 5 +- zone/quest_interface.h | 11 +- zone/quest_parser_collection.cpp | 22 ++-- zone/quest_parser_collection.h | 35 +++--- zone/questmgr.cpp | 61 +++++----- zone/questmgr.h | 11 +- zone/raids.cpp | 35 +++--- zone/raids.h | 16 +-- zone/raycast_mesh.cpp | 16 +-- zone/raycast_mesh.h | 6 +- zone/shared_task_zone_messaging.cpp | 7 +- zone/shared_task_zone_messaging.h | 6 +- .../sidecar_api/loot_simulator_controller.cpp | 5 +- zone/sidecar_api/sidecar_api.cpp | 21 ++-- zone/sidecar_api/sidecar_api.h | 9 +- zone/spawn2.cpp | 36 +++--- zone/spawn2.h | 10 +- zone/spawngroup.cpp | 16 +-- zone/spawngroup.h | 10 +- zone/special_attacks.cpp | 20 ++-- zone/spell_effects.cpp | 35 +++--- zone/spells.cpp | 66 +++++------ zone/string_ids.h | 6 +- zone/task_client_state.cpp | 32 ++--- zone/task_client_state.h | 16 ++- zone/task_manager.cpp | 30 ++--- zone/task_manager.h | 21 ++-- zone/tasks.cpp | 20 ++-- zone/tasks.h | 16 ++- zone/titles.cpp | 17 ++- zone/titles.h | 9 +- zone/tradeskills.cpp | 33 +++--- zone/trading.cpp | 32 +++-- zone/trap.cpp | 16 +-- zone/trap.h | 9 +- zone/tribute.cpp | 28 ++--- zone/tune.cpp | 40 +++---- zone/water_map.cpp | 13 +- zone/water_map.h | 12 +- zone/water_map_v1.h | 11 +- zone/water_map_v2.h | 12 +- zone/waypoints.cpp | 33 +++--- zone/worldserver.cpp | 112 ++++++++---------- zone/worldserver.h | 14 +-- zone/xtargetautohaters.cpp | 10 +- zone/xtargetautohaters.h | 7 +- zone/zone.cpp | 104 +++++++--------- zone/zone.h | 70 ++++++----- zone/zone_cli.cpp | 6 +- zone/zone_cli.h | 11 +- zone/zone_config.h | 8 +- zone/zone_event_scheduler.cpp | 1 + zone/zone_event_scheduler.h | 11 +- zone/zone_loot.cpp | 12 +- zone/zone_npc_factions.cpp | 8 +- zone/zone_reload.cpp | 3 +- zone/zone_reload.h | 7 +- zone/zone_save_state.cpp | 18 +-- zone/zone_save_state.h | 14 +-- zone/zonedb.cpp | 106 ++++++++--------- zone/zonedb.h | 32 +++-- zone/zonedump.h | 15 ++- zone/zoning.cpp | 31 +++-- 278 files changed, 2431 insertions(+), 2901 deletions(-) diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt index 9d8b90cab..afb2ca531 100644 --- a/zone/CMakeLists.txt +++ b/zone/CMakeLists.txt @@ -269,6 +269,7 @@ add_library(lua_zone STATIC ${lua_sources}) set_property(TARGET lua_zone PROPERTY FOLDER libraries) set_target_properties(lua_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 8) +target_include_directories(lua_zone PRIVATE ..) set(perl_sources perl_bot.cpp @@ -300,6 +301,8 @@ set(perl_sources add_library(perl_zone STATIC ${perl_sources}) set_property(TARGET perl_zone PROPERTY FOLDER libraries) set_target_properties(perl_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 8) +target_link_libraries(perl_zone PUBLIC cereal::cereal fmt::fmt unofficial::libmariadb) +target_include_directories(perl_zone PRIVATE ..) set(gm_command_sources bot_command.cpp @@ -359,7 +362,6 @@ set(gm_command_sources bot_commands/bot_spell_resist_limits.cpp bot_commands/bot_spell_target_count.cpp bot_commands/bot_spelltypes.cpp - bot_commands/bot_summon.cpp bot_commands/bot_suspend.cpp bot_commands/bot_taunt.cpp bot_commands/bot_timer.cpp @@ -664,6 +666,8 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${gm add_library(gm_commands_zone STATIC ${gm_command_sources}) target_link_libraries(gm_commands_zone PRIVATE common) +target_include_directories(gm_commands_zone PRIVATE ..) + set_target_properties(gm_commands_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 32) set_property(TARGET gm_commands_zone PROPERTY FOLDER libraries) @@ -688,7 +692,7 @@ if(EQEMU_BUILD_LUA) endif() if(EQEMU_BUILD_PERL) - target_compile_definitions(perl_zone PUBLIC EMBPERL EMBPERL_PLUGIN PERLBIND_NO_STRICT_SCALAR_TYPES) + target_compile_definitions(perl_zone PUBLIC EMBPERL EMBPERL_PLUGIN PERLBIND_NO_STRICT_SCALAR_TYPES) target_link_libraries(perl_zone PUBLIC perlbind common ${PERL_LIBRARY}) if (EQEMU_BUILD_STATIC AND PERL_LIBRARY) target_link_libraries(zone PRIVATE ${PERL_LIBRARY}) @@ -696,6 +700,7 @@ if(EQEMU_BUILD_PERL) endif() target_link_libraries(zone PRIVATE gm_commands_zone common RecastNavigation::Detour) +target_include_directories(zone PRIVATE ..) if(EQEMU_BUILD_LUA) target_link_libraries(zone PRIVATE lua_zone) diff --git a/zone/aa.cpp b/zone/aa.cpp index edefa361d..8b83054ac 100644 --- a/zone/aa.cpp +++ b/zone/aa.cpp @@ -16,34 +16,32 @@ Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/classes.h" -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/eq_packet_structs.h" -#include "../common/races.h" -#include "../common/spdat.h" -#include "../common/strings.h" -#include "../common/events/player_event_logs.h" #include "aa.h" -#include "client.h" -#include "corpse.h" -#include "groups.h" -#include "mob.h" -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "raids.h" -#include "string_ids.h" -#include "titles.h" -#include "zonedb.h" -#include "worldserver.h" -#include "bot.h" - -#include "../common/repositories/character_alternate_abilities_repository.h" -#include "../common/repositories/aa_ability_repository.h" -#include "../common/repositories/aa_ranks_repository.h" -#include "../common/repositories/aa_rank_effects_repository.h" -#include "../common/repositories/aa_rank_prereqs_repository.h" +#include "common/classes.h" +#include "common/eq_packet_structs.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/races.h" +#include "common/repositories/aa_ability_repository.h" +#include "common/repositories/aa_rank_effects_repository.h" +#include "common/repositories/aa_rank_prereqs_repository.h" +#include "common/repositories/aa_ranks_repository.h" +#include "common/repositories/character_alternate_abilities_repository.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/corpse.h" +#include "zone/groups.h" +#include "zone/mob.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/raids.h" +#include "zone/string_ids.h" +#include "zone/titles.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" extern WorldServer worldserver; extern QueryServ* QServ; diff --git a/zone/aa.h b/zone/aa.h index 720fabfd8..350828b0a 100644 --- a/zone/aa.h +++ b/zone/aa.h @@ -1,5 +1,4 @@ -#ifndef AA_H -#define AA_H +#pragma once #define MAX_SWARM_PETS 12 //this can change as long as you make more coords (swarm_pet_x/swarm_pet_y) #define WAKE_THE_DEAD_NPCTYPEID 500 //We use first pet in pets table as a template @@ -1556,5 +1555,3 @@ enum AATimers aaTimerWarcry, aaTimerMax }; - -#endif diff --git a/zone/aa_ability.cpp b/zone/aa_ability.cpp index 96982b89e..8043f1625 100644 --- a/zone/aa_ability.cpp +++ b/zone/aa_ability.cpp @@ -16,10 +16,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/types.h" -#include "masterentity.h" -#include "aa_ability.h" +#include "common/types.h" +#include "zone/masterentity.h" +#include "zone/aa_ability.h" AA::Rank *AA::Ability::GetRankByPointsSpent(int current_level) { if(current_level == 0) diff --git a/zone/aa_ability.h b/zone/aa_ability.h index eb102ca84..b4902fba9 100644 --- a/zone/aa_ability.h +++ b/zone/aa_ability.h @@ -16,20 +16,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef EQEMU_ZONE_AA_ABILITY_H -#define EQEMU_ZONE_AA_ABILITY_H +#pragma once -#include "../common/global_define.h" +#include "zone/aa_rank_effects.h" +#include "zone/aa_rank.h" + +#include #include #include -#include -#include "aa_rank_effects.h" -#include "aa_rank.h" class Mob; -namespace AA -{ +namespace AA { class Ability { @@ -57,6 +55,4 @@ public: Rank *first; }; -} - -#endif +} // namespace AA diff --git a/zone/aa_rank.h b/zone/aa_rank.h index ba3e4bb99..5a2791447 100644 --- a/zone/aa_rank.h +++ b/zone/aa_rank.h @@ -16,11 +16,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef EQEMU_ZONE_AA_RANK_H -#define EQEMU_ZONE_AA_RANK_H +#pragma once -namespace AA -{ +#include "common/types.h" + +#include +#include + +namespace AA { class Ability; class Rank @@ -51,6 +54,4 @@ public: std::map prereqs; }; -} - -#endif +} // namespace AA diff --git a/zone/aa_rank_effects.h b/zone/aa_rank_effects.h index 83263eb56..98baa9851 100644 --- a/zone/aa_rank_effects.h +++ b/zone/aa_rank_effects.h @@ -16,14 +16,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef EQEMU_ZONE_AA_RANK_EFFECTS_H -#define EQEMU_ZONE_AA_RANK_EFFECTS_H +#pragma once -#include "../common/global_define.h" -#include +#include "common/types.h" -namespace AA -{ +namespace AA { struct RankEffect { @@ -33,6 +30,4 @@ struct RankEffect int limit_value; }; -} - -#endif +} // namespace AA diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 136a09ded..123780dab 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -16,20 +16,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/faction.h" -#include "../common/rulesys.h" -#include "../common/spdat.h" - -#include "client.h" -#include "entity.h" -#include "mob.h" - -#include "bot.h" - -#include "map.h" -#include "water_map.h" +#include "common/eqemu_logsys.h" +#include "common/faction.h" +#include "common/rulesys.h" +#include "common/spdat.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/map.h" +#include "zone/mob.h" +#include "zone/water_map.h" extern Zone* zone; //#define LOSDEBUG 6 diff --git a/zone/aggromanager.cpp b/zone/aggromanager.cpp index 8dd532c74..2398c5a65 100644 --- a/zone/aggromanager.cpp +++ b/zone/aggromanager.cpp @@ -7,5 +7,3 @@ AggroMeter::AggroMeter() : lock_id(0), target_id(0), secondary_id(0), lock_chang data[i].pct = 0; } } - - diff --git a/zone/aggromanager.h b/zone/aggromanager.h index b140b07d7..06a1c8918 100644 --- a/zone/aggromanager.h +++ b/zone/aggromanager.h @@ -1,8 +1,8 @@ -#ifndef AGGROMANAGER_H -#define AGGROMANAGER_H +#pragma once -#include "../common/types.h" -#include +#include "common/types.h" + +#include #include class AggroMeter @@ -75,6 +75,3 @@ public: // fuck it, lets just use a buffer the size of the largest to work with const inline size_t max_packet_size() const { return sizeof(uint8) + sizeof(uint32) + sizeof(uint8) + (sizeof(uint8) + sizeof(uint16)) * AT_Max; } }; - - -#endif /* !AGGROMANAGER_H */ diff --git a/zone/api_service.cpp b/zone/api_service.cpp index 607ab64c6..4e85e9373 100644 --- a/zone/api_service.cpp +++ b/zone/api_service.cpp @@ -18,18 +18,19 @@ * */ -#include -#include "../common/net/websocket_server.h" -#include "../common/eqemu_logsys.h" -#include "zonedb.h" -#include "client.h" -#include "entity.h" -#include "corpse.h" #include "api_service.h" -#include "object.h" -#include "zone.h" -#include "doors.h" -#include + +#include "common/eqemu_logsys.h" +#include "common/net/websocket_server.h" +#include "zone/client.h" +#include "zone/corpse.h" +#include "zone/doors.h" +#include "zone/entity.h" +#include "zone/object.h" +#include "zone/zone.h" +#include "zone/zonedb.h" + +#include extern Zone *zone; diff --git a/zone/api_service.h b/zone/api_service.h index 52018838d..bf991cb08 100644 --- a/zone/api_service.h +++ b/zone/api_service.h @@ -20,7 +20,8 @@ #pragma once +#include "common/net/websocket_server.h" + #include -#include "../common/net/websocket_server.h" void RegisterApiService(std::unique_ptr &server); diff --git a/zone/attack.cpp b/zone/attack.cpp index f5552c47c..e23bb3ffc 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -16,38 +16,29 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eq_constants.h" -#include "../common/eq_packet_structs.h" -#include "../common/rulesys.h" -#include "../common/spdat.h" -#include "../common/strings.h" -#include "../common/data_verification.h" -#include "../common/misc_functions.h" -#include "../common/events/player_event_logs.h" -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "water_map.h" -#include "worldserver.h" -#include "zone.h" -#include "lua_parser.h" -#include "fastmath.h" -#include "mob.h" -#include "npc.h" - -#include "bot.h" +#include "common/data_verification.h" +#include "common/eq_constants.h" +#include "common/eq_packet_structs.h" +#include "common/events/player_event_logs.h" +#include "common/misc_functions.h" +#include "common/rulesys.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/fastmath.h" +#include "zone/lua_parser.h" +#include "zone/mob.h" +#include "zone/npc.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" +#include "zone/zone.h" extern QueryServ* QServ; extern WorldServer worldserver; extern FastMath g_Math; - -#ifdef _WINDOWS -#define snprintf _snprintf -#define strncasecmp _strnicmp -#define strcasecmp _stricmp -#endif - extern EntityList entity_list; extern Zone* zone; diff --git a/zone/aura.cpp b/zone/aura.cpp index a511b6082..77fd687ad 100644 --- a/zone/aura.cpp +++ b/zone/aura.cpp @@ -1,10 +1,9 @@ -#include "../common/strings.h" -#include "../common/repositories/auras_repository.h" - -#include "aura.h" -#include "client.h" -#include "string_ids.h" -#include "raids.h" +#include "common/repositories/auras_repository.h" +#include "common/strings.h" +#include "zone/aura.h" +#include "zone/client.h" +#include "zone/raids.h" +#include "zone/string_ids.h" Aura::Aura(NPCType *type_data, Mob *owner, AuraRecord &record) : NPC(type_data, 0, owner->GetPosition(), GravityBehavior::Flying), spell_id(record.spell_id), diff --git a/zone/aura.h b/zone/aura.h index ae4cd0a4a..c9a92b32b 100644 --- a/zone/aura.h +++ b/zone/aura.h @@ -1,14 +1,14 @@ -#ifndef AURA_H -#define AURA_H + +#pragma once + +#include "common/timer.h" +#include "common/types.h" +#include "zone/mob.h" +#include "zone/npc.h" #include #include -#include "mob.h" -#include "npc.h" -#include "../common/types.h" -#include "../common/timer.h" - class Group; class Raid; class Mob; @@ -86,6 +86,3 @@ private: std::set casted_on; // we keep track of the other entities we've casted on std::set spawned_for; }; - -#endif /* !AURA_H */ - diff --git a/zone/beacon.cpp b/zone/beacon.cpp index eed494486..48106ac77 100644 --- a/zone/beacon.cpp +++ b/zone/beacon.cpp @@ -17,31 +17,20 @@ */ /* - Beacon class, extends Mob. Used for AE rain spells to have a mob target to center around. - */ -class Zone; - -#ifdef _WINDOWS - #if (!defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1900)) - #define snprintf _snprintf - #define vsnprintf _vsnprintf - #endif - #define strncasecmp _strnicmp - #define strcasecmp _stricmp -#endif - -#include "../common/races.h" -#include "beacon.h" -#include "entity.h" -#include "mob.h" +#include "common/races.h" +#include "zone/beacon.h" +#include "zone/entity.h" +#include "zone/mob.h" extern EntityList entity_list; extern Zone* zone; +class Zone; + // if lifetime is 0 this is a permanent beacon.. not sure if that'll be // useful for anything Beacon::Beacon(const glm::vec4 &in_pos, int lifetime) : Mob( @@ -179,5 +168,3 @@ void Beacon::AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 in_resist_ spell_timer.Start(2500); spell_timer.Trigger(); } - - diff --git a/zone/beacon.h b/zone/beacon.h index ac5beb31e..2692a7cb9 100644 --- a/zone/beacon.h +++ b/zone/beacon.h @@ -16,12 +16,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef BEACON_H -#define BEACON_H +#pragma once -#include "mob.h" -#include "../common/types.h" -#include "../common/timer.h" +#include "common/timer.h" +#include "common/types.h" +#include "zone/mob.h" class Group; class Raid; @@ -59,7 +58,4 @@ protected: int max_targets; uint16 caster_id; -private: }; - -#endif diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index c1beab76f..45718570a 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -15,27 +15,19 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/classes.h" -#include "../common/data_verification.h" -#include "../common/global_define.h" -#include "../common/item_instance.h" -#include "../common/rulesys.h" -#include "../common/spdat.h" -#include "client.h" -#include "entity.h" -#include "mob.h" - -#include "bot.h" - -#include "quest_parser_collection.h" - - -#ifndef WIN32 -#include -#include "../common/unix.h" -#endif +#include "common/classes.h" +#include "common/data_verification.h" +#include "common/item_instance.h" +#include "common/rulesys.h" +#include "common/spdat.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/mob.h" +#include "zone/bot.h" +#include "zone/quest_parser_collection.h" +#include void Mob::CalcBonuses() { diff --git a/zone/bot.cpp b/zone/bot.cpp index a702c5e5a..ca7f6134c 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -17,17 +17,18 @@ */ #include "bot.h" -#include "object.h" -#include "raids.h" -#include "doors.h" -#include "quest_parser_collection.h" -#include "lua_parser.h" -#include "../common/repositories/bot_inventories_repository.h" -#include "../common/repositories/bot_spell_settings_repository.h" -#include "../common/repositories/bot_starting_items_repository.h" -#include "../common/data_verification.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/skill_caps.h" + +#include "common/data_verification.h" +#include "common/repositories/bot_inventories_repository.h" +#include "common/repositories/bot_spell_settings_repository.h" +#include "common/repositories/bot_starting_items_repository.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/skill_caps.h" +#include "zone/doors.h" +#include "zone/lua_parser.h" +#include "zone/object.h" +#include "zone/quest_parser_collection.h" +#include "zone/raids.h" /* TODO bot rewrite: diff --git a/zone/bot.h b/zone/bot.h index 434e8f703..6985ba2b8 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -16,26 +16,22 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef BOT_H -#define BOT_H +#pragma once -#include "bot_structs.h" -#include "mob.h" -#include "client.h" -#include "pets.h" -#include "heal_rotation.h" -#include "groups.h" -#include "corpse.h" -#include "zonedb.h" -#include "../common/zone_store.h" -#include "string_ids.h" -#include "../common/misc_functions.h" -#include "../common/global_define.h" -#include "guild_mgr.h" -#include "worldserver.h" -#include "raids.h" - -#include +#include "common/misc_functions.h" +#include "common/zone_store.h" +#include "zone/bot_structs.h" +#include "zone/client.h" +#include "zone/corpse.h" +#include "zone/groups.h" +#include "zone/guild_mgr.h" +#include "zone/heal_rotation.h" +#include "zone/mob.h" +#include "zone/pets.h" +#include "zone/raids.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" constexpr uint32 BOT_KEEP_ALIVE_INTERVAL = 5000; // 5 seconds @@ -1266,5 +1262,3 @@ private: }; bool IsSpellInBotList(DBbotspells_Struct* spell_list, uint16 spell_id); - -#endif // BOT_H diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp index 0e202540c..c8cc1ce32 100644 --- a/zone/bot_command.cpp +++ b/zone/bot_command.cpp @@ -32,34 +32,28 @@ */ -#include - -#ifdef _WINDOWS -#define strcasecmp _stricmp -#endif - -#include "../common/data_verification.h" -#include "../common/global_define.h" -#include "../common/eq_packet.h" -#include "../common/features.h" -#include "../common/ptimer.h" -#include "../common/rulesys.h" -#include "../common/serverinfo.h" -#include "../common/strings.h" -#include "../common/say_link.h" - #include "bot_command.h" -#include "zonedb.h" -#include "qglobals.h" -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "titles.h" -#include "water_map.h" -#include "worldserver.h" -#include "mob.h" -#include "bot_database.h" -#include +#include "common/data_verification.h" +#include "common/eq_packet.h" +#include "common/features.h" +#include "common/ptimer.h" +#include "common/rulesys.h" +#include "common/say_link.h" +#include "common/serverinfo.h" +#include "common/strings.h" +#include "zone/bot_database.h" +#include "zone/mob.h" +#include "zone/qglobals.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/titles.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" + +#include "fmt/format.h" +#include extern QueryServ* QServ; extern WorldServer worldserver; diff --git a/zone/bot_command.h b/zone/bot_command.h index 77d449c44..c8a470bfd 100644 --- a/zone/bot_command.h +++ b/zone/bot_command.h @@ -16,16 +16,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#pragma once -#ifndef BOT_COMMAND_H -#define BOT_COMMAND_H +#include "common/types.h" +#include "bot.h" +#include "dialogue_window.h" class Client; class Seperator; -#include "../common/types.h" -#include "bot.h" -#include "dialogue_window.h" namespace { @@ -1189,5 +1188,3 @@ bool helper_no_available_bots(Client *bot_owner, Bot *my_bot = nullptr); void helper_send_available_subcommands(Client *bot_owner, const char* command_simile, std::vector subcommand_list); void helper_send_usage_required_bots(Client *bot_owner, uint16 spell_type); void SendSpellTypeWindow(Client* c, const Seperator* sep); - -#endif diff --git a/zone/bot_database.cpp b/zone/bot_database.cpp index 10d681913..48ea9bee2 100644 --- a/zone/bot_database.cpp +++ b/zone/bot_database.cpp @@ -16,38 +16,37 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/data_verification.h" -#include "../common/global_define.h" -#include "../common/rulesys.h" -#include "../common/strings.h" -#include "../common/eqemu_logsys.h" +#include "bot_database.h" -#include "../common/repositories/bot_blocked_buffs_repository.h" -#include "../common/repositories/bot_buffs_repository.h" -#include "../common/repositories/bot_create_combinations_repository.h" -#include "../common/repositories/bot_data_repository.h" -#include "../common/repositories/bot_heal_rotations_repository.h" -#include "../common/repositories/bot_heal_rotation_members_repository.h" -#include "../common/repositories/bot_heal_rotation_targets_repository.h" -#include "../common/repositories/bot_inspect_messages_repository.h" -#include "../common/repositories/bot_inventories_repository.h" -#include "../common/repositories/bot_owner_options_repository.h" -#include "../common/repositories/bot_pets_repository.h" -#include "../common/repositories/bot_pet_buffs_repository.h" -#include "../common/repositories/bot_pet_inventories_repository.h" -#include "../common/repositories/bot_spell_casting_chances_repository.h" -#include "../common/repositories/bot_spells_entries_repository.h" -#include "../common/repositories/bot_settings_repository.h" -#include "../common/repositories/bot_stances_repository.h" -#include "../common/repositories/bot_timers_repository.h" -#include "../common/repositories/character_data_repository.h" -#include "../common/repositories/group_id_repository.h" +#include "common/data_verification.h" +#include "common/eqemu_logsys.h" +#include "common/repositories/bot_blocked_buffs_repository.h" +#include "common/repositories/bot_buffs_repository.h" +#include "common/repositories/bot_create_combinations_repository.h" +#include "common/repositories/bot_data_repository.h" +#include "common/repositories/bot_heal_rotation_members_repository.h" +#include "common/repositories/bot_heal_rotation_targets_repository.h" +#include "common/repositories/bot_heal_rotations_repository.h" +#include "common/repositories/bot_inspect_messages_repository.h" +#include "common/repositories/bot_inventories_repository.h" +#include "common/repositories/bot_owner_options_repository.h" +#include "common/repositories/bot_pet_buffs_repository.h" +#include "common/repositories/bot_pet_inventories_repository.h" +#include "common/repositories/bot_pets_repository.h" +#include "common/repositories/bot_settings_repository.h" +#include "common/repositories/bot_spell_casting_chances_repository.h" +#include "common/repositories/bot_spells_entries_repository.h" +#include "common/repositories/bot_stances_repository.h" +#include "common/repositories/bot_timers_repository.h" +#include "common/repositories/character_data_repository.h" +#include "common/repositories/group_id_repository.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/zonedb.h" -#include "zonedb.h" -#include "bot.h" -#include "client.h" - -#include +#include "fmt/format.h" bool BotDatabase::LoadBotCommandSettings(std::map>> &bot_command_settings) diff --git a/zone/bot_database.h b/zone/bot_database.h index 7dcdebc28..279d22669 100644 --- a/zone/bot_database.h +++ b/zone/bot_database.h @@ -16,15 +16,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#pragma once -#ifndef BOT_DATABASE_H -#define BOT_DATABASE_H - +#include "zone/bot_structs.h" #include #include #include -#include "bot_structs.h" class Bot; class Client; @@ -220,5 +218,3 @@ public: std::map> commanded_spell_type_min_levels; }; - -#endif diff --git a/zone/bot_raid.cpp b/zone/bot_raid.cpp index e1eb60748..3a100fe8f 100644 --- a/zone/bot_raid.cpp +++ b/zone/bot_raid.cpp @@ -16,14 +16,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "bot.h" -#include "bot_command.h" -#include "client.h" -#include "object.h" -#include "raids.h" -#include "doors.h" -#include "quest_parser_collection.h" -#include "../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/bot_command.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/doors.h" +#include "zone/object.h" +#include "zone/quest_parser_collection.h" +#include "zone/raids.h" std::vector Raid::GetRaidGroupMembers(uint32 gid) { diff --git a/zone/bot_raid.h b/zone/bot_raid.h index 994b87e1b..be0ff5658 100644 --- a/zone/bot_raid.h +++ b/zone/bot_raid.h @@ -16,26 +16,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef BOT_RAID_H -#define BOT_RAID_H +#pragma once - -#include "bot_structs.h" -#include "mob.h" -#include "client.h" -#include "pets.h" -#include "heal_rotation.h" -#include "groups.h" -#include "corpse.h" -#include "zonedb.h" -#include "../common/zone_store.h" -#include "string_ids.h" -#include "../common/misc_functions.h" -#include "../common/global_define.h" -#include "guild_mgr.h" -#include "worldserver.h" -#include "raids.h" - -#include - -#endif // BOT_RAID_H +#include "common/misc_functions.h" +#include "common/zone_store.h" +#include "zone/bot_structs.h" +#include "zone/client.h" +#include "zone/corpse.h" +#include "zone/groups.h" +#include "zone/guild_mgr.h" +#include "zone/heal_rotation.h" +#include "zone/mob.h" +#include "zone/pets.h" +#include "zone/raids.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" diff --git a/zone/bot_structs.h b/zone/bot_structs.h index 2917cfc0b..291718883 100644 --- a/zone/bot_structs.h +++ b/zone/bot_structs.h @@ -16,14 +16,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef BOT_STRUCTS -#define BOT_STRUCTS +#pragma once -#include "../common/types.h" -#include "../common/timer.h" -#include "mob.h" - -#include +#include "common/types.h" +#include "common/timer.h" +#include "zone/mob.h" struct BotsAvailableList { uint32 bot_id; @@ -186,5 +183,3 @@ struct FindPositionInput { bool front_only; bool bypass_los; }; - -#endif // BOT_STRUCTS diff --git a/zone/botspellsai.cpp b/zone/botspellsai.cpp index b6ad79214..74a2c69e6 100644 --- a/zone/botspellsai.cpp +++ b/zone/botspellsai.cpp @@ -17,9 +17,10 @@ */ #include "bot.h" -#include "../common/data_verification.h" -#include "../common/repositories/bot_spells_entries_repository.h" -#include "../common/repositories/npc_spells_repository.h" + +#include "common/data_verification.h" +#include "common/repositories/bot_spells_entries_repository.h" +#include "common/repositories/npc_spells_repository.h" bool Bot::AICastSpell(Mob* tar, uint8 chance, uint16 spell_type, uint16 sub_target_type, uint16 sub_type) { if (!tar) { diff --git a/zone/cheat_manager.cpp b/zone/cheat_manager.cpp index 2d4696658..4c05bfe16 100644 --- a/zone/cheat_manager.cpp +++ b/zone/cheat_manager.cpp @@ -1,9 +1,10 @@ #include "cheat_manager.h" -#include "client.h" -#include "quest_parser_collection.h" -#include "../common/events/player_event_logs.h" -#include "worldserver.h" -#include "queryserv.h" + +#include "common/events/player_event_logs.h" +#include "zone/client.h" +#include "zone/quest_parser_collection.h" +#include "zone/worldserver.h" +#include "zone/queryserv.h" extern WorldServer worldserver; extern QueryServ *QServ; diff --git a/zone/cheat_manager.h b/zone/cheat_manager.h index 78aa89ba6..fff27e330 100644 --- a/zone/cheat_manager.h +++ b/zone/cheat_manager.h @@ -1,14 +1,15 @@ -#ifndef ANTICHEAT_H -#define ANTICHEAT_H +#pragma once + +#include "common/eq_packet_structs.h" +#include "common/eq_packet.h" +#include "common/rulesys.h" +#include "common/timer.h" + +#include "glm/vec3.hpp" + class CheatManager; class Client; -#include "../common/timer.h" -#include "../common/rulesys.h" -#include -#include "../common/eq_packet_structs.h" -#include "../common/eq_packet.h" - typedef enum { Collision = 1, TeleportB, @@ -85,5 +86,3 @@ private: Timer m_time_since_last_movement_history; uint32 m_warp_counter; }; - -#endif //ANTICHEAT_H diff --git a/zone/cli/cli_benchmark_databuckets.cpp b/zone/cli/cli_benchmark_databuckets.cpp index d2d1dc01c..518ed2767 100644 --- a/zone/cli/cli_benchmark_databuckets.cpp +++ b/zone/cli/cli_benchmark_databuckets.cpp @@ -1,15 +1,18 @@ + +#include "zone/zone_cli.h" +#include "zone/sidecar_api/sidecar_api.h" +#include "zone/zonedb.h" + +#include "common/cli/eqemu_command_handler.h" +#include "common/http/httplib.h" +#include "common/eqemu_logsys.h" +#include "common/platform.h" +#include "common/data_bucket.h" +#include "common/repositories/data_buckets_repository.h" + #include #include #include -#include "../zone_cli.h" -#include "../../common/cli/eqemu_command_handler.h" -#include "../../common/http/httplib.h" -#include "../../common/eqemu_logsys.h" -#include "../sidecar_api/sidecar_api.h" -#include "../../common/platform.h" -#include "../../common/data_bucket.h" -#include "../zonedb.h" -#include "../../common/repositories/data_buckets_repository.h" void RunBenchmarkCycle(uint64_t target_rows) { diff --git a/zone/cli/cli_sidecar_serve_http.cpp b/zone/cli/cli_sidecar_serve_http.cpp index 7e82f8943..3126a42e8 100644 --- a/zone/cli/cli_sidecar_serve_http.cpp +++ b/zone/cli/cli_sidecar_serve_http.cpp @@ -1,9 +1,11 @@ -#include "../zone_cli.h" -#include "../../common/cli/eqemu_command_handler.h" -#include "../../common/http/httplib.h" -#include "../../common/eqemu_logsys.h" -#include "../sidecar_api/sidecar_api.h" -#include "../../common/platform.h" + +#include "zone/zone_cli.h" + +#include "zone/sidecar_api/sidecar_api.h" +#include "common/cli/eqemu_command_handler.h" +#include "common/eqemu_logsys.h" +#include "common/http/httplib.h" +#include "common/platform.h" void ZoneCLI::SidecarServeHttp(int argc, char **argv, argh::parser &cmd, std::string &description) { diff --git a/zone/cli/tests/cli_databuckets.cpp b/zone/cli/tests/cli_databuckets.cpp index 7974c06d2..6e2ed74dd 100644 --- a/zone/cli/tests/cli_databuckets.cpp +++ b/zone/cli/tests/cli_databuckets.cpp @@ -1,11 +1,13 @@ -#include "../../zone_cli.h" -#include "../../common/cli/eqemu_command_handler.h" -#include "../../common/http/httplib.h" -#include "../../common/eqemu_logsys.h" -#include "../../common/platform.h" -#include "../../zone.h" -#include "../../client.h" -#include "../../common/net/eqstream.h" + +#include "zone/zone_cli.h" + +#include "zone/client.h" +#include "zone/zone.h" +#include "common/cli/eqemu_command_handler.h" +#include "common/eqemu_logsys.h" +#include "common/http/httplib.h" +#include "common/net/eqstream.h" +#include "common/platform.h" extern Zone* zone; diff --git a/zone/cli/tests/cli_npc_handins.cpp b/zone/cli/tests/cli_npc_handins.cpp index da606cf23..a51dbd873 100644 --- a/zone/cli/tests/cli_npc_handins.cpp +++ b/zone/cli/tests/cli_npc_handins.cpp @@ -1,12 +1,14 @@ -#include "../../zone_cli.h" -#include "../../common/cli/eqemu_command_handler.h" -#include "../../common/http/httplib.h" -#include "../../common/eqemu_logsys.h" -#include "../../common/platform.h" -#include "../../zone.h" -#include "../../client.h" -#include "../../common/net/eqstream.h" -#include "../../common/json/json.hpp" + +#include "zone/zone_cli.h" + +#include "zone/client.h" +#include "zone/zone.h" +#include "common/cli/eqemu_command_handler.h" +#include "common/eqemu_logsys.h" +#include "common/http/httplib.h" +#include "common/json/json.hpp" +#include "common/net/eqstream.h" +#include "common/platform.h" extern Zone *zone; using json = nlohmann::json; diff --git a/zone/cli/tests/cli_npc_handins_multiquest.cpp b/zone/cli/tests/cli_npc_handins_multiquest.cpp index faaffb765..5a8eca6d1 100644 --- a/zone/cli/tests/cli_npc_handins_multiquest.cpp +++ b/zone/cli/tests/cli_npc_handins_multiquest.cpp @@ -1,10 +1,12 @@ -#include "../../zone_cli.h" -#include "../../common/cli/eqemu_command_handler.h" -#include "../../common/eqemu_logsys.h" -#include "../../common/platform.h" -#include "../../zone.h" -#include "../../client.h" -#include "../../common/net/eqstream.h" + +#include "zone/zone_cli.h" + +#include "zone/client.h" +#include "zone/zone.h" +#include "common/cli/eqemu_command_handler.h" +#include "common/eqemu_logsys.h" +#include "common/net/eqstream.h" +#include "common/platform.h" extern Zone *zone; diff --git a/zone/cli/tests/cli_test_util.cpp b/zone/cli/tests/cli_test_util.cpp index 3f6e7fe2e..a539303a8 100644 --- a/zone/cli/tests/cli_test_util.cpp +++ b/zone/cli/tests/cli_test_util.cpp @@ -1,4 +1,4 @@ -#include "../../zone.h" +#include "zone/zone.h" void RunTest(const std::string &test_name, const std::string &expected, const std::string &actual) { diff --git a/zone/cli/tests/cli_zone_state.cpp b/zone/cli/tests/cli_zone_state.cpp index 235891fa5..881873e61 100644 --- a/zone/cli/tests/cli_zone_state.cpp +++ b/zone/cli/tests/cli_zone_state.cpp @@ -1,10 +1,12 @@ -#include "../../zone_cli.h" -#include "../../common/cli/eqemu_command_handler.h" -#include -#include -#include "../../common/repositories/npc_types_repository.h" -#include "../../corpse.h" -#include "../../../common/repositories/respawn_times_repository.h" +#include "zone/zone_cli.h" +#include "zone/corpse.h" + +#include "common/cli/eqemu_command_handler.h" +#include "common/repositories/npc_types_repository.h" +#include "common/repositories/respawn_times_repository.h" + +#include "cereal/archives/json.hpp" +#include "cereal/types/map.hpp" extern Zone* zone; diff --git a/zone/client.cpp b/zone/client.cpp index 07fa25ba6..05cb01991 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -15,70 +15,57 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include -#include -#include -#include -// for windows compile -#ifndef _WINDOWS - #include - #include - #include - #include "../common/unix.h" -#endif +#include "client.h" -extern volatile bool RunLoops; - -#include "../common/eqemu_logsys.h" -#include "../common/features.h" -#include "../common/spdat.h" -#include "../common/guilds.h" -#include "../common/rulesys.h" -#include "../common/strings.h" -#include "../common/data_verification.h" -#include "../common/profanity_manager.h" -#include "../common/data_bucket.h" -#include "dynamic_zone.h" -#include "expedition_request.h" -#include "position.h" -#include "worldserver.h" -#include "zonedb.h" -#include "petitions.h" -#include "command.h" -#include "water_map.h" -#include "bot_command.h" -#include "string_ids.h" -#include "dialogue_window.h" - -#include "guild_mgr.h" -#include "quest_parser_collection.h" -#include "queryserv.h" -#include "mob_movement_manager.h" -#include "cheat_manager.h" -#include "lua_parser.h" - -#include "../common/repositories/character_alternate_abilities_repository.h" -#include "../common/repositories/character_expedition_lockouts_repository.h" -#include "../common/repositories/account_flags_repository.h" -#include "../common/repositories/bug_reports_repository.h" -#include "../common/repositories/char_recipe_list_repository.h" -#include "../common/repositories/character_spells_repository.h" -#include "../common/repositories/character_disciplines_repository.h" -#include "../common/repositories/character_data_repository.h" -#include "../common/repositories/character_pet_name_repository.h" -#include "../common/repositories/completed_tasks_repository.h" -#include "../common/repositories/discovered_items_repository.h" -#include "../common/repositories/inventory_repository.h" -#include "../common/repositories/keyring_repository.h" -#include "../common/repositories/tradeskill_recipe_repository.h" -#include "../common/events/player_events.h" -#include "../common/events/player_event_logs.h" -#include "dialogue_window.h" -#include "../common/zone_store.h" -#include "../common/skill_caps.h" +#include "common/data_bucket.h" +#include "common/data_verification.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/events/player_events.h" +#include "common/features.h" +#include "common/guilds.h" +#include "common/profanity_manager.h" +#include "common/repositories/account_flags_repository.h" +#include "common/repositories/bug_reports_repository.h" +#include "common/repositories/char_recipe_list_repository.h" +#include "common/repositories/character_alternate_abilities_repository.h" +#include "common/repositories/character_data_repository.h" +#include "common/repositories/character_disciplines_repository.h" +#include "common/repositories/character_expedition_lockouts_repository.h" +#include "common/repositories/character_pet_name_repository.h" +#include "common/repositories/character_spells_repository.h" +#include "common/repositories/completed_tasks_repository.h" +#include "common/repositories/discovered_items_repository.h" +#include "common/repositories/inventory_repository.h" +#include "common/repositories/keyring_repository.h" +#include "common/repositories/tradeskill_recipe_repository.h" +#include "common/rulesys.h" +#include "common/skill_caps.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "common/zone_store.h" +#include "zone/bot_command.h" +#include "zone/cheat_manager.h" +#include "zone/command.h" +#include "zone/dialogue_window.h" +#include "zone/dynamic_zone.h" +#include "zone/expedition_request.h" +#include "zone/guild_mgr.h" +#include "zone/lua_parser.h" +#include "zone/mob_movement_manager.h" +#include "zone/petitions.h" +#include "zone/position.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" +#include +#include +#include extern QueryServ* QServ; extern EntityList entity_list; @@ -86,6 +73,7 @@ extern Zone* zone; extern volatile bool is_zone_loaded; extern WorldServer worldserver; extern uint32 numclients; +extern volatile bool RunLoops; void UpdateWindowTitle(char* iNewTitle); diff --git a/zone/client.h b/zone/client.h index d5e8f3ef4..8f464681b 100644 --- a/zone/client.h +++ b/zone/client.h @@ -15,8 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef CLIENT_H -#define CLIENT_H + +#pragma once class Client; class EQApplicationPacket; @@ -38,59 +38,48 @@ namespace EQ struct ItemData; } -#include "../common/timer.h" -#include "../common/ptimer.h" -#include "../common/emu_opcodes.h" -#include "../common/eq_packet_structs.h" -#include "../common/emu_constants.h" -#include "../common/eq_stream_intf.h" -#include "../common/eq_packet.h" -#include "../common/linked_list.h" -#include "../common/extprofile.h" -#include "../common/races.h" -#include "../common/seperator.h" -#include "../common/inventory_profile.h" -#include "../common/guilds.h" -//#include "../common/item_data.h" -#include "xtargetautohaters.h" -#include "aggromanager.h" +#include "zone/aggromanager.h" +#include "zone/bot_structs.h" +#include "zone/cheat_manager.h" +#include "zone/common.h" +#include "zone/merc.h" +#include "zone/mob.h" +#include "zone/qglobals.h" +#include "zone/questmgr.h" +#include "zone/task_client_state.h" +#include "zone/task_manager.h" +#include "zone/xtargetautohaters.h" +#include "zone/zone.h" +#include "zone/zonedb.h" -#include "common.h" -#include "merc.h" -#include "mob.h" -#include "qglobals.h" -#include "questmgr.h" -#include "zone.h" -#include "zonedb.h" -#include "../common/zone_store.h" -#include "task_manager.h" -#include "task_client_state.h" -#include "cheat_manager.h" -#include "../common/events/player_events.h" -#include "../common/data_verification.h" -#include "../common/repositories/character_parcels_repository.h" -#include "../common/repositories/trader_repository.h" -#include "../common/guild_base.h" -#include "../common/repositories/buyer_buy_lines_repository.h" -#include "../common/repositories/character_evolving_items_repository.h" -#include "../common/repositories/player_titlesets_repository.h" +#include "common/data_verification.h" +#include "common/emu_constants.h" +#include "common/emu_opcodes.h" +#include "common/eq_packet_structs.h" +#include "common/eq_packet.h" +#include "common/eq_stream_intf.h" +#include "common/events/player_events.h" +#include "common/extprofile.h" +#include "common/guild_base.h" +#include "common/guilds.h" +#include "common/inventory_profile.h" +#include "common/linked_list.h" +#include "common/ptimer.h" +#include "common/races.h" +#include "common/repositories/buyer_buy_lines_repository.h" +#include "common/repositories/character_evolving_items_repository.h" +#include "common/repositories/character_parcels_repository.h" +#include "common/repositories/player_titlesets_repository.h" +#include "common/repositories/trader_repository.h" +#include "common/seperator.h" +#include "common/timer.h" +#include "common/zone_store.h" -#include "bot_structs.h" - -#ifdef _WINDOWS - // since windows defines these within windef.h (which windows.h include) - // we are required to undefine these to use min and max from - #undef min - #undef max -#endif - -#include +#include #include #include #include #include -#include - #define CLIENT_LD_TIMEOUT 30000 // length of time client stays in zone after LDing #define TARGETING_RANGE 200 // range for /assist and /target @@ -2434,5 +2423,3 @@ public: void CheckAutoIdleAFK(PlayerPositionUpdateClient_Struct *p); void SyncWorldPositionsToClient(bool ignore_idle = false); }; - -#endif diff --git a/zone/client_bot.cpp b/zone/client_bot.cpp index b5621840f..83e27729d 100644 --- a/zone/client_bot.cpp +++ b/zone/client_bot.cpp @@ -1,6 +1,7 @@ -#include "bot.h" #include "client.h" +#include "zone/bot.h" + #define NO_BOT_LIMIT -1; bool Client::GetBotOption(BotOwnerOption boo) const { diff --git a/zone/client_evolving_items.cpp b/zone/client_evolving_items.cpp index 77c29a45e..8abf4d52b 100644 --- a/zone/client_evolving_items.cpp +++ b/zone/client_evolving_items.cpp @@ -1,11 +1,9 @@ -#include "../common/evolving_items.h" - -#include "../common/events/player_event_logs.h" -#include "../common/global_define.h" - #include "client.h" -#include "string_ids.h" -#include "worldserver.h" + +#include "common/events/player_event_logs.h" +#include "common/evolving_items.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" extern WorldServer worldserver; extern QueryServ* QServ; diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp index 6c7026185..98e85c8b2 100644 --- a/zone/client_mods.cpp +++ b/zone/client_mods.cpp @@ -16,16 +16,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" - -#include "../common/rulesys.h" -#include "../common/spdat.h" - #include "client.h" -#include "mob.h" -#include "bot.h" +#include "common/eqemu_logsys.h" +#include "common/rulesys.h" +#include "common/spdat.h" +#include "zone/bot.h" +#include "zone/mob.h" #include diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index c7bb4a05c..effa1017f 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -15,65 +15,51 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/opcodemgr.h" -#include "../common/raid.h" +#include "client.h" +#include "common/data_bucket.h" +#include "common/data_verification.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/opcodemgr.h" +#include "common/raid.h" +#include "common/rdtsc.h" +#include "common/repositories/account_repository.h" +#include "common/repositories/adventure_members_repository.h" +#include "common/repositories/buyer_buy_lines_repository.h" +#include "common/repositories/character_corpses_repository.h" +#include "common/repositories/character_instance_safereturns_repository.h" +#include "common/repositories/character_pet_name_repository.h" +#include "common/repositories/character_stats_record_repository.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/guild_tributes_repository.h" +#include "common/repositories/tradeskill_recipe_entries_repository.h" +#include "common/rulesys.h" +#include "common/shared_tasks.h" +#include "zone/bot.h" +#include "zone/dialogue_window.h" +#include "zone/dynamic_zone.h" +#include "zone/event_codes.h" +#include "zone/gm_commands/door_manipulation.h" +#include "zone/gm_commands/object_manipulation.h" +#include "zone/guild_mgr.h" +#include "zone/merc.h" +#include "zone/mob_movement_manager.h" +#include "zone/petitions.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/titles.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" +#include "zone/zone.h" + +#include "zlib.h" +#include #include #include -#include +#include #include -#include -#include -#include -#include "bot.h" - -#ifdef _WINDOWS -#define snprintf _snprintf -#define strncasecmp _strnicmp -#define strcasecmp _stricmp -#else -#include -#include -#include -#include -#endif - -#include "../common/data_verification.h" -#include "../common/rdtsc.h" -#include "../common/data_bucket.h" -#include "dynamic_zone.h" -#include "event_codes.h" -#include "guild_mgr.h" -#include "merc.h" -#include "petitions.h" -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "titles.h" -#include "water_map.h" -#include "worldserver.h" -#include "zone.h" -#include "mob_movement_manager.h" -#include "../common/repositories/character_instance_safereturns_repository.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/shared_tasks.h" -#include "gm_commands/door_manipulation.h" -#include "gm_commands/object_manipulation.h" -#include "client.h" -#include "../common/repositories/account_repository.h" -#include "../common/repositories/character_corpses_repository.h" -#include "../common/repositories/guild_tributes_repository.h" -#include "../common/repositories/buyer_buy_lines_repository.h" -#include "../common/repositories/character_pet_name_repository.h" -#include "../common/repositories/tradeskill_recipe_entries_repository.h" - -#include "../common/events/player_event_logs.h" -#include "../common/repositories/character_stats_record_repository.h" -#include "dialogue_window.h" -#include "../common/rulesys.h" -#include "../common/repositories/adventure_members_repository.h" extern QueryServ* QServ; extern Zone* zone; @@ -4925,7 +4911,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) { // Calculate angle from boat heading to EQ heading double theta = std::fmod(((boat->GetHeading() * 360.0) / 512.0),360.0); - double thetar = (theta * M_PI) / 180.0; + double thetar = (theta * std::numbers::pi) / 180.0; // Boat cx is inverted (positive to left) // Boat cy is normal (positive toward heading) diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 19440e3bb..479e49d51 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -19,40 +19,30 @@ Handles client login sequence and packets sent from client to zone */ -#include "../common/eqemu_logsys.h" -#include "../common/global_define.h" +#include "client.h" + +#include "common/data_verification.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/rulesys.h" +#include "common/skills.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/dynamic_zone.h" +#include "zone/event_codes.h" +#include "zone/guild_mgr.h" +#include "zone/map.h" +#include "zone/petitions.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" +#include "zone/zone.h" +#include "zone/zonedb.h" + #include -#ifdef _WINDOWS - #define snprintf _snprintf - #define strncasecmp _strnicmp - #define strcasecmp _stricmp -#else - #include - #include - #include - #include -#endif - -#include "../common/data_verification.h" -#include "../common/rulesys.h" -#include "../common/skills.h" -#include "../common/spdat.h" -#include "../common/strings.h" -#include "dynamic_zone.h" -#include "event_codes.h" -#include "guild_mgr.h" -#include "map.h" -#include "petitions.h" -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "worldserver.h" -#include "zone.h" -#include "zonedb.h" -#include "../common/events/player_event_logs.h" -#include "water_map.h" - extern QueryServ* QServ; extern Zone* zone; extern volatile bool is_zone_loaded; diff --git a/zone/combat_record.cpp b/zone/combat_record.cpp index b05831b9e..a70917ab3 100644 --- a/zone/combat_record.cpp +++ b/zone/combat_record.cpp @@ -1,6 +1,7 @@ #include "combat_record.h" -#include "../common/eqemu_logsys.h" -#include "../common/strings.h" + +#include "common/eqemu_logsys.h" +#include "common/strings.h" void CombatRecord::Start(const std::string& in_mob_name) { diff --git a/zone/combat_record.h b/zone/combat_record.h index 32efb1535..bb3a48a0c 100644 --- a/zone/combat_record.h +++ b/zone/combat_record.h @@ -1,9 +1,9 @@ -#ifndef EQEMU_COMBAT_RECORD_H -#define EQEMU_COMBAT_RECORD_H +#pragma once + +#include "common/types.h" #include #include -#include "../common/types.h" class CombatRecord { public: @@ -25,5 +25,3 @@ private: int64 m_damage_received = 0; int64 m_heal_received = 0; }; - -#endif //EQEMU_COMBAT_RECORD_H diff --git a/zone/command.cpp b/zone/command.cpp index a31760828..2bd292060 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -1,36 +1,31 @@ -#include -#include -#include -#include -#include "../common/repositories/command_subsettings_repository.h" - -#ifdef _WINDOWS -#define strcasecmp _stricmp -#endif - -#include "../common/global_define.h" -#include "../common/eq_packet.h" -#include "../common/features.h" -#include "../common/ptimer.h" -#include "../common/rulesys.h" -#include "../common/strings.h" -#include "../common/say_link.h" -#include "../common/net/eqstream.h" -#include "../common/file.h" -#include "../common/repositories/dynamic_zones_repository.h" - -#include "../common/data_bucket.h" #include "command.h" -#include "dynamic_zone.h" -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "titles.h" -#include "water_map.h" -#include "worldserver.h" -#include "fastmath.h" -#include "mob_movement_manager.h" -#include "npc_scale_manager.h" -#include "../common/events/player_event_logs.h" + +#include "common/data_bucket.h" +#include "common/eq_packet.h" +#include "common/events/player_event_logs.h" +#include "common/features.h" +#include "common/file.h" +#include "common/net/eqstream.h" +#include "common/ptimer.h" +#include "common/repositories/command_subsettings_repository.h" +#include "common/repositories/dynamic_zones_repository.h" +#include "common/rulesys.h" +#include "common/say_link.h" +#include "common/strings.h" +#include "zone/dynamic_zone.h" +#include "zone/fastmath.h" +#include "zone/mob_movement_manager.h" +#include "zone/npc_scale_manager.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/titles.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" + +#include "fmt/format.h" +#include +#include +#include extern QueryServ* QServ; extern WorldServer worldserver; diff --git a/zone/command.h b/zone/command.h index 0159d4d65..752c63bf1 100644 --- a/zone/command.h +++ b/zone/command.h @@ -1,12 +1,12 @@ -#ifndef COMMAND_H -#define COMMAND_H +#pragma once + +#include "common/types.h" + +#include class Client; class Seperator; -#include "../common/types.h" -#include - #define COMMAND_CHAR '#' typedef void (*CmdFuncPtr)(Client *, const Seperator *); @@ -200,8 +200,4 @@ void command_zonebootup(Client *c, const Seperator *sep); void command_zoneshutdown(Client *c, const Seperator *sep); void command_zonevariable(Client *c, const Seperator *sep); void command_zsave(Client *c, const Seperator *sep); - -#include "bot.h" void command_bot(Client*c, const Seperator *sep); - -#endif diff --git a/zone/common.h b/zone/common.h index 6a11f7255..74673ef7e 100644 --- a/zone/common.h +++ b/zone/common.h @@ -1,11 +1,11 @@ -#ifndef __EQEMU_ZONE_COMMON_H -#define __EQEMU_ZONE_COMMON_H -#include "../common/types.h" -#include "../common/spdat.h" -#include "../common/emu_constants.h" +#pragma once -#include +#include "common/types.h" +#include "common/spdat.h" +#include "common/emu_constants.h" + +#include "cereal/cereal.hpp" #define HIGHEST_RESIST 9 //Max resist type value #define MAX_SPELL_PROJECTILE 10 //Max amount of spell projectiles that can be active by a single mob. @@ -914,6 +914,3 @@ typedef enum { petTargetLock, //remain active as long something is on the hatelist. Don't listen to any commands petNone = 0xFF // not a pet } PetTypeOld; - -#endif - diff --git a/zone/corpse.cpp b/zone/corpse.cpp index 9bd13d63b..759ee08a7 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -1,38 +1,26 @@ - -#ifdef _WINDOWS -#if (!defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1900)) -#define snprintf _snprintf -#define vsnprintf _vsnprintf -#endif -#define strncasecmp _strnicmp -#define strcasecmp _stricmp -#endif - -#include "../common/data_verification.h" -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/rulesys.h" -#include "../common/strings.h" -#include "../common/say_link.h" - #include "corpse.h" -#include "dynamic_zone.h" -#include "entity.h" -#include "groups.h" -#include "mob.h" -#include "raids.h" -#include "bot.h" +#include "common/data_verification.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/json/json.hpp" +#include "common/repositories/character_corpse_items_repository.h" +#include "common/repositories/character_corpses_repository.h" +#include "common/rulesys.h" +#include "common/say_link.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/dynamic_zone.h" +#include "zone/entity.h" +#include "zone/groups.h" +#include "zone/mob.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/raids.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "worldserver.h" -#include "../common/events/player_event_logs.h" -#include "../common/repositories/character_corpses_repository.h" -#include "../common/repositories/character_corpse_items_repository.h" #include -#include "queryserv.h" -#include "../common/json/json.hpp" using json = nlohmann::json; diff --git a/zone/corpse.h b/zone/corpse.h index 65c461950..2dbfc3986 100644 --- a/zone/corpse.h +++ b/zone/corpse.h @@ -1,10 +1,10 @@ -#ifndef CORPSE_H -#define CORPSE_H -#include "mob.h" -#include "client.h" -#include "../common/loot.h" -#include "../common/repositories/character_corpses_repository.h" +#pragma once + +#include "common/loot.h" +#include "common/repositories/character_corpses_repository.h" +#include "zone/client.h" +#include "zone/mob.h" class EQApplicationPacket; class Group; @@ -288,5 +288,3 @@ private: LootRequestType m_loot_request_type; uint32 m_account_id; }; - -#endif diff --git a/zone/dialogue_window.h b/zone/dialogue_window.h index 5787b818f..4c233d0f4 100644 --- a/zone/dialogue_window.h +++ b/zone/dialogue_window.h @@ -1,9 +1,9 @@ -#ifndef EQEMU_DIALOGUE_WINDOW_H -#define EQEMU_DIALOGUE_WINDOW_H - +#pragma once +#include #include -#include "client.h" + +class Client; static const std::map html_colors = { {"black", "#000000"}, @@ -462,6 +462,3 @@ public: static std::string TableCell(std::string message = std::string()); static std::string TableRow(std::string message); }; - - -#endif //EQEMU_DIALOGUE_WINDOW_H diff --git a/zone/doors.cpp b/zone/doors.cpp index 858d63a3e..9b6b4a416 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -16,26 +16,23 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/strings.h" - -#include "../common/repositories/doors_repository.h" - -#include "client.h" #include "doors.h" -#include "entity.h" -#include "guild_mgr.h" -#include "mob.h" -#include "string_ids.h" -#include "worldserver.h" -#include "zonedb.h" -#include "../common/evolving_items.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include +#include "common/eqemu_logsys.h" +#include "common/evolving_items.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/doors_repository.h" +#include "common/strings.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/guild_mgr.h" +#include "zone/mob.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" -#include +#include "glm/ext/matrix_transform.hpp" +#include #include #define OPEN_DOOR 0x02 diff --git a/zone/doors.h b/zone/doors.h index f600a280b..807e3d6ba 100644 --- a/zone/doors.h +++ b/zone/doors.h @@ -1,8 +1,7 @@ -#ifndef DOORS_H -#define DOORS_H +#pragma once -#include "mob.h" -#include "../common/repositories/doors_repository.h" +#include "common/repositories/doors_repository.h" +#include "zone/mob.h" class Client; class Mob; @@ -113,4 +112,3 @@ private: uint32 m_client_version_mask; bool m_is_blacklisted_to_open = false; // is door blacklisted to open by npcs }; -#endif diff --git a/zone/dynamic_zone.cpp b/zone/dynamic_zone.cpp index e6e993bc2..05e95c854 100644 --- a/zone/dynamic_zone.cpp +++ b/zone/dynamic_zone.cpp @@ -19,13 +19,15 @@ */ #include "dynamic_zone.h" -#include "client.h" -#include "expedition_request.h" -#include "string_ids.h" -#include "worldserver.h" -#include "../common/repositories/character_expedition_lockouts_repository.h" -#include "../common/repositories/dynamic_zone_lockouts_repository.h" -#include + +#include "common/repositories/character_expedition_lockouts_repository.h" +#include "common/repositories/dynamic_zone_lockouts_repository.h" +#include "zone/client.h" +#include "zone/expedition_request.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" + +#include "cereal/types/utility.hpp" extern WorldServer worldserver; diff --git a/zone/dynamic_zone.h b/zone/dynamic_zone.h index 82d82263f..845668e5a 100644 --- a/zone/dynamic_zone.h +++ b/zone/dynamic_zone.h @@ -18,10 +18,10 @@ * */ -#ifndef DYNAMIC_ZONE_H -#define DYNAMIC_ZONE_H +#pragma once + +#include "common/dynamic_zone_base.h" -#include "../common/dynamic_zone_base.h" #include #include #include @@ -137,5 +137,3 @@ private: std::vector m_loot_events; // only valid inside dz zone }; - -#endif diff --git a/zone/effects.cpp b/zone/effects.cpp index 3efda3d5e..5c81026b4 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -16,19 +16,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/spdat.h" -#include "../common/misc_functions.h" - -#include "client.h" -#include "entity.h" #include "mob.h" -#include "string_ids.h" -#include "worldserver.h" -#include "zonedb.h" -#include "position.h" +#include "common/eqemu_logsys.h" +#include "common/misc_functions.h" +#include "common/spdat.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/position.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" float Mob::GetActSpellRange(uint16 spell_id, float range) { diff --git a/zone/embparser.cpp b/zone/embparser.cpp index ad9708d52..a81bfa9d4 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -18,16 +18,16 @@ #ifdef EMBPERL -#include "../common/global_define.h" -#include "../common/seperator.h" -#include "../common/misc_functions.h" -#include "../common/strings.h" -#include "../common/features.h" -#include "masterentity.h" -#include "embparser.h" -#include "questmgr.h" -#include "qglobals.h" -#include "zone.h" +#include "common/features.h" +#include "common/misc_functions.h" +#include "common/seperator.h" +#include "common/strings.h" +#include "zone/embparser.h" +#include "zone/masterentity.h" +#include "zone/qglobals.h" +#include "zone/questmgr.h" +#include "zone/zone.h" + #include #include @@ -2911,4 +2911,4 @@ int PerlembParser::EventGlobalZone( ); } -#endif +#endif // EMBPERL diff --git a/zone/embparser.h b/zone/embparser.h index 5817ce15b..5aa95dc54 100644 --- a/zone/embparser.h +++ b/zone/embparser.h @@ -16,16 +16,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef EQEMU_EMBPARSER_H -#define EQEMU_EMBPARSER_H +#pragma once + #ifdef EMBPERL -#include "quest_parser_collection.h" -#include "quest_interface.h" -#include -#include +#include "zone/embperl.h" +#include "zone/quest_interface.h" +#include "zone/quest_parser_collection.h" + #include -#include "embperl.h" +#include +#include class Mob; class Client; @@ -309,6 +310,4 @@ private: std::map clear_vars_; }; -#endif -#endif - +#endif // EMBPERL diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index b56cb51d8..debe2c43b 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -16,26 +16,23 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/features.h" -#include "../common/content/world_content_service.h" -#include "../common/zone_store.h" - #ifdef EMBPERL #ifdef EMBPERL_XS -#include "../common/global_define.h" -#include "../common/misc_functions.h" - -#include "dialogue_window.h" -#include "dynamic_zone.h" -#include "embperl.h" -#include "entity.h" -#include "queryserv.h" -#include "questmgr.h" -#include "zone.h" -#include "../common/data_bucket.h" -#include "../common/events/player_event_logs.h" -#include "worldserver.h" +#include "common/content/world_content_service.h" +#include "common/data_bucket.h" +#include "common/events/player_event_logs.h" +#include "common/features.h" +#include "common/misc_functions.h" +#include "common/zone_store.h" +#include "zone/dialogue_window.h" +#include "zone/dynamic_zone.h" +#include "zone/embperl.h" +#include "zone/entity.h" +#include "zone/queryserv.h" +#include "zone/questmgr.h" +#include "zone/worldserver.h" +#include "zone/zone.h" #include @@ -7059,5 +7056,5 @@ void perl_register_quest() } -#endif -#endif +#endif // EMBPERL_XS +#endif // EMBPERL diff --git a/zone/embperl.cpp b/zone/embperl.cpp index 75bc1793c..7b960659a 100644 --- a/zone/embperl.cpp +++ b/zone/embperl.cpp @@ -5,19 +5,16 @@ wraps a perl interpreter for use in eqemu Eglin */ -#ifndef EMBPERL_CPP -#define EMBPERL_CPP - #ifdef EMBPERL -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" +#include "common/eqemu_logsys.h" +#include "common/features.h" +#include "common/file.h" +#include "common/process/process.h" +#include "common/timer.h" +#include "zone/embperl.h" + #include -#include "embperl.h" -#include "../common/features.h" -#include "../common/process/process.h" -#include "../common/file.h" -#include "../common/timer.h" #ifndef GvCV_set #define GvCV_set(gv,cv) (GvCV(gv) = (cv)) @@ -354,8 +351,5 @@ XS(XS_EQEmuIO_PRINT) XSRETURN_EMPTY; } -#endif //EMBPERL_IO_CAPTURE - -#endif //EMBPERL - -#endif //EMBPERL_CPP +#endif // EMBPERL_IO_CAPTURE +#endif // EMBPERL diff --git a/zone/embperl.h b/zone/embperl.h index 022971059..b47367e16 100644 --- a/zone/embperl.h +++ b/zone/embperl.h @@ -5,20 +5,19 @@ eqemu perl wrapper Eglin */ -#ifndef EMBPERL_H -#define EMBPERL_H +#pragma once #ifdef EMBPERL #include "zone_config.h" +#include "perlbind/perlbind.h" +#include +#include +#include #include #include -#include -#include -#include -#include namespace perl = perlbind; #undef connect @@ -149,6 +148,5 @@ public: //check to see if a sub exists in package bool SubExists(const char* package, const char* sub); }; -#endif //EMBPERL -#endif //EMBPERL_H +#endif // EMBPERL diff --git a/zone/encounter.cpp b/zone/encounter.cpp index fc5586a1d..f124d3631 100644 --- a/zone/encounter.cpp +++ b/zone/encounter.cpp @@ -16,19 +16,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef _WINDOWS - #if (!defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1900)) - #define snprintf _snprintf - #define vsnprintf _vsnprintf - #endif - #define strncasecmp _strnicmp - #define strcasecmp _stricmp -#endif - -#include "../common/races.h" #include "encounter.h" -#include "entity.h" -#include "mob.h" + +#include "common/races.h" +#include "zone/entity.h" +#include "zone/mob.h" class Zone; diff --git a/zone/encounter.h b/zone/encounter.h index b0c623562..70f0ea8ca 100644 --- a/zone/encounter.h +++ b/zone/encounter.h @@ -16,12 +16,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef ENCOUNTER_H -#define ENCOUNTER_H +#pragma once -#include "mob.h" -#include "../common/types.h" -#include "../common/timer.h" +#include "common/timer.h" +#include "common/types.h" +#include "zone/mob.h" class Group; class Raid; @@ -58,5 +57,3 @@ protected: private: }; - -#endif diff --git a/zone/entity.cpp b/zone/entity.cpp index 37fa9b4ad..e6586a325 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -15,41 +15,28 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/data_verification.h" -#include "../common/global_define.h" -#include -#include -#include -#include - -#ifdef _WINDOWS -#else -#include -#include "../common/unix.h" -#endif - -#include "../common/features.h" -#include "../common/guilds.h" #include "entity.h" -#include "dynamic_zone.h" -#include "guild_mgr.h" -#include "petitions.h" -#include "quest_parser_collection.h" -#include "raids.h" -#include "string_ids.h" -#include "worldserver.h" -#include "water_map.h" -#include "npc_scale_manager.h" -#include "dialogue_window.h" -#ifdef _WINDOWS - #define snprintf _snprintf - #define strncasecmp _strnicmp - #define strcasecmp _stricmp -#endif +#include "common/data_verification.h" +#include "common/features.h" +#include "common/guilds.h" +#include "zone/bot.h" +#include "zone/dialogue_window.h" +#include "zone/dynamic_zone.h" +#include "zone/guild_mgr.h" +#include "zone/npc_scale_manager.h" +#include "zone/petitions.h" +#include "zone/quest_parser_collection.h" +#include "zone/raids.h" +#include "zone/string_ids.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" -#include "bot.h" +#include +#include +#include +#include extern Zone *zone; extern volatile bool is_zone_loaded; diff --git a/zone/entity.h b/zone/entity.h index 766cd7eda..05fed5a71 100644 --- a/zone/entity.h +++ b/zone/entity.h @@ -15,22 +15,21 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef ENTITY_H -#define ENTITY_H -#include +#pragma once + +#include "common/bodytypes.h" +#include "common/emu_constants.h" +#include "common/eq_constants.h" +#include "common/linked_list.h" +#include "common/servertalk.h" +#include "common/types.h" +#include "zone/common.h" +#include "zone/position.h" +#include "zone/zonedump.h" + #include - -#include "../common/types.h" -#include "../common/linked_list.h" -#include "../common/servertalk.h" -#include "../common/bodytypes.h" -#include "../common/eq_constants.h" -#include "../common/emu_constants.h" - -#include "position.h" -#include "zonedump.h" -#include "common.h" +#include class Encounter; class Beacon; @@ -653,6 +652,3 @@ private: NewSpawn_Struct* data; Client* pSendTo; }; - -#endif - diff --git a/zone/event_codes.h b/zone/event_codes.h index ff345abff..09a437f22 100644 --- a/zone/event_codes.h +++ b/zone/event_codes.h @@ -1,5 +1,4 @@ -#ifndef EVENT_CODES_H -#define EVENT_CODES_H +#pragma once typedef enum { EVENT_SAY = 0, @@ -156,6 +155,3 @@ typedef enum { } QuestEventID; extern const char *QuestEventSubroutines[_LargestEventID]; - -#endif - diff --git a/zone/exp.cpp b/zone/exp.cpp index 1f64d8b71..fe993f542 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -16,26 +16,22 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/features.h" -#include "../common/rulesys.h" -#include "../common/strings.h" - -#include "client.h" -#include "../common/data_bucket.h" -#include "groups.h" -#include "mob.h" -#include "raids.h" - -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "lua_parser.h" -#include "string_ids.h" -#include "../common/data_verification.h" - -#include "bot.h" -#include "../common/events/player_event_logs.h" -#include "worldserver.h" +#include "common/data_bucket.h" +#include "common/data_verification.h" +#include "common/events/player_event_logs.h" +#include "common/features.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/groups.h" +#include "zone/lua_parser.h" +#include "zone/mob.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/raids.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/expedition_request.cpp b/zone/expedition_request.cpp index 7c7763730..6c6425867 100644 --- a/zone/expedition_request.cpp +++ b/zone/expedition_request.cpp @@ -19,11 +19,12 @@ */ #include "expedition_request.h" -#include "client.h" -#include "groups.h" -#include "raids.h" -#include "string_ids.h" -#include "../common/repositories/character_expedition_lockouts_repository.h" + +#include "common/repositories/character_expedition_lockouts_repository.h" +#include "zone/client.h" +#include "zone/groups.h" +#include "zone/raids.h" +#include "zone/string_ids.h" ExpeditionRequest::ExpeditionRequest(const DynamicZone& dz, Client& client, bool silent) : m_dz(&dz), m_requester(&client), m_silent(silent) diff --git a/zone/expedition_request.h b/zone/expedition_request.h index 037c43ae3..8f1493c44 100644 --- a/zone/expedition_request.h +++ b/zone/expedition_request.h @@ -18,11 +18,11 @@ * */ -#ifndef EXPEDITION_REQUEST_H -#define EXPEDITION_REQUEST_H +#pragma once + +#include "common/dynamic_zone_lockout.h" +#include "zone/dynamic_zone.h" -#include "dynamic_zone.h" -#include "../common/dynamic_zone_lockout.h" #include #include #include @@ -67,5 +67,3 @@ private: std::vector m_members; std::vector m_lockouts; }; - -#endif diff --git a/zone/fastmath.cpp b/zone/fastmath.cpp index 0da87dc87..f4140c316 100644 --- a/zone/fastmath.cpp +++ b/zone/fastmath.cpp @@ -1,9 +1,8 @@ -#if defined(_MSC_VER) -#define _USE_MATH_DEFINES -#endif -#include + #include "fastmath.h" +#include + FastMath g_Math; // This should match EQ's sin/cos LUTs @@ -14,7 +13,7 @@ FastMath::FastMath() int si = 128; float res; do { - res = std::cos(static_cast(ci) * M_PI * 2 / 512); + res = std::cos(static_cast(ci) * std::numbers::pi * 2 / 512); lut_cos[ci] = res; if (si == 512) si = 0; diff --git a/zone/fastmath.h b/zone/fastmath.h index 083198e48..a7ab75682 100644 --- a/zone/fastmath.h +++ b/zone/fastmath.h @@ -1,5 +1,4 @@ -#ifndef FASTMATH_H -#define FASTMATH_H +#pragma once class FastMath { @@ -14,5 +13,3 @@ public: inline float FastCos(float a) { return lut_cos[static_cast(a) & 0x1ff]; } }; - -#endif /* !FASTMATH_H */ diff --git a/zone/fearpath.cpp b/zone/fearpath.cpp index e944b057d..7bd9c6319 100644 --- a/zone/fearpath.cpp +++ b/zone/fearpath.cpp @@ -16,15 +16,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/rulesys.h" - -#include "map.h" -#include "water_map.h" -#include "zone.h" - -#ifdef _WINDOWS -#define snprintf _snprintf -#endif +#include "common/rulesys.h" +#include "zone/map.h" +#include "zone/water_map.h" +#include "zone/zone.h" extern Zone* zone; diff --git a/zone/forage.cpp b/zone/forage.cpp index 2b5933053..3bf668997 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -16,34 +16,31 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/misc_functions.h" -#include "../common/rulesys.h" -#include "../common/strings.h" - -#include "entity.h" #include "forage.h" -#include "npc.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "titles.h" -#include "water_map.h" -#include "zonedb.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/repositories/forage_repository.h" -#include "../common/repositories/fishing_repository.h" -#include "../common/events/player_event_logs.h" -#include "worldserver.h" -#include "queryserv.h" + +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/misc_functions.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/fishing_repository.h" +#include "common/repositories/forage_repository.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/entity.h" +#include "zone/npc.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/titles.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" + +#include extern WorldServer worldserver; extern QueryServ *QServ; -#ifdef _WINDOWS -#define snprintf _snprintf -#endif - struct NPCType; //max number of items which can be in the foraging @@ -218,8 +215,8 @@ bool Client::CanFish() { HeadingDegrees = (int) ((GetHeading()*360)/512); HeadingDegrees = HeadingDegrees % 360; - rodPosition.x = m_Position.x + RodLength * sin(HeadingDegrees * M_PI/180.0f); - rodPosition.y = m_Position.y + RodLength * cos(HeadingDegrees * M_PI/180.0f); + rodPosition.x = m_Position.x + RodLength * sin(HeadingDegrees * std::numbers::pi / 180.0f); + rodPosition.y = m_Position.y + RodLength * cos(HeadingDegrees * std::numbers::pi / 180.0f); rodPosition.z = m_Position.z; float bestz = zone->zonemap->FindBestZ(rodPosition, nullptr); diff --git a/zone/forage.h b/zone/forage.h index c2f852fd8..4140c0281 100644 --- a/zone/forage.h +++ b/zone/forage.h @@ -16,11 +16,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef FORAGE_H -#define FORAGE_H -#include "../common/types.h" +#pragma once + +#include "common/types.h" #define MAX_COMMON_FOOD_IDS 8 #define MAX_COMMON_FISH_IDS 9 - -#endif diff --git a/zone/global_loot_manager.cpp b/zone/global_loot_manager.cpp index e9c63598f..74e8c1549 100644 --- a/zone/global_loot_manager.cpp +++ b/zone/global_loot_manager.cpp @@ -1,8 +1,9 @@ #include "global_loot_manager.h" -#include "npc.h" -#include "client.h" -#include "zone.h" -#include "dialogue_window.h" + +#include "zone/client.h" +#include "zone/dialogue_window.h" +#include "zone/npc.h" +#include "zone/zone.h" extern Zone *zone; diff --git a/zone/global_loot_manager.h b/zone/global_loot_manager.h index 1de6e7831..8ee5dd382 100644 --- a/zone/global_loot_manager.h +++ b/zone/global_loot_manager.h @@ -1,5 +1,4 @@ -#ifndef GLOBAL_LOOT_MANAGER_H -#define GLOBAL_LOOT_MANAGER_H +#pragma once #include #include @@ -58,5 +57,3 @@ public: void ShowZoneGlobalLoot(Client *to) const; void ShowNPCGlobalLoot(Client *to, NPC *who) const; }; - -#endif /* !GLOBAL_LOOT_MANAGER_H */ diff --git a/zone/groups.cpp b/zone/groups.cpp index b70f44f18..b0a297a55 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -16,17 +16,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "dynamic_zone.h" -#include "masterentity.h" -#include "worldserver.h" -#include "string_ids.h" -#include "../common/events/player_event_logs.h" -#include "../common/repositories/character_expedition_lockouts_repository.h" -#include "../common/repositories/group_id_repository.h" -#include "../common/repositories/group_leaders_repository.h" -#include "queryserv.h" +#include "groups.h" + +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/repositories/character_expedition_lockouts_repository.h" +#include "common/repositories/group_id_repository.h" +#include "common/repositories/group_leaders_repository.h" +#include "zone/dynamic_zone.h" +#include "zone/masterentity.h" +#include "zone/queryserv.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" extern EntityList entity_list; diff --git a/zone/groups.h b/zone/groups.h index 8c312f6ef..b51223f25 100644 --- a/zone/groups.h +++ b/zone/groups.h @@ -15,14 +15,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef GROUPS_H -#define GROUPS_H -#include "../common/eq_packet_structs.h" -#include "../common/types.h" +#pragma once -#include "mob.h" -#include "xtargetautohaters.h" +#include "common/eq_packet_structs.h" +#include "common/types.h" +#include "zone/mob.h" +#include "zone/xtargetautohaters.h" class Client; class EQApplicationPacket; @@ -195,5 +194,3 @@ private: XTargetAutoHaters m_autohatermgr; }; - -#endif diff --git a/zone/guild.cpp b/zone/guild.cpp index 9c48b5e3e..8b1e1bbe5 100644 --- a/zone/guild.cpp +++ b/zone/guild.cpp @@ -16,12 +16,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/database.h" -#include "../common/guilds.h" -#include "../common/strings.h" +#include "client.h" -#include "guild_mgr.h" -#include "worldserver.h" +#include "common/database.h" +#include "common/guilds.h" +#include "common/strings.h" +#include "zone/guild_mgr.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp index aa2d9fd70..d13d04c1a 100644 --- a/zone/guild_mgr.cpp +++ b/zone/guild_mgr.cpp @@ -17,15 +17,16 @@ */ #include "guild_mgr.h" -#include "../common/emu_versions.h" -#include "../common/repositories/guild_bank_repository.h" -#include "../common/repositories/guild_ranks_repository.h" -#include "../common/servertalk.h" -#include "../common/strings.h" -#include "client.h" -#include "string_ids.h" -#include "worldserver.h" -#include "zonedb.h" + +#include "common/emu_versions.h" +#include "common/repositories/guild_bank_repository.h" +#include "common/repositories/guild_ranks_repository.h" +#include "common/servertalk.h" +#include "common/strings.h" +#include "zone/client.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" ZoneGuildManager guild_mgr; diff --git a/zone/guild_mgr.h b/zone/guild_mgr.h index 0b59bd1f6..c552ce194 100644 --- a/zone/guild_mgr.h +++ b/zone/guild_mgr.h @@ -1,13 +1,12 @@ -#ifndef GUILD_MGR_H_ -#define GUILD_MGR_H_ +#pragma once + +#include "common/guild_base.h" +#include "common/repositories/guild_bank_repository.h" +#include "common/types.h" +#include "zone/petitions.h" #include #include -#include "../common/guild_base.h" -#include "../common/types.h" - -#include "../common/repositories/guild_bank_repository.h" -#include "../zone/petitions.h" //extern GuildRanks_Struct guilds[512]; //extern ZoneDatabase database; @@ -141,6 +140,3 @@ private: extern ZoneGuildManager guild_mgr; extern GuildBankManager *GuildBanks; - -#endif /*GUILD_MGR_H_*/ - diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp index 59f0aeb8d..d152d838e 100644 --- a/zone/hate_list.cpp +++ b/zone/hate_list.cpp @@ -16,18 +16,17 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "client.h" -#include "entity.h" -#include "groups.h" -#include "mob.h" -#include "raids.h" - -#include "../common/data_verification.h" - #include "hate_list.h" -#include "quest_parser_collection.h" -#include "zone.h" -#include "water_map.h" + +#include "common/data_verification.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/groups.h" +#include "zone/mob.h" +#include "zone/quest_parser_collection.h" +#include "zone/raids.h" +#include "zone/water_map.h" +#include "zone/zone.h" #include diff --git a/zone/hate_list.h b/zone/hate_list.h index ef3dcfbbf..32eea7cb5 100644 --- a/zone/hate_list.h +++ b/zone/hate_list.h @@ -16,10 +16,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef HATELIST_H -#define HATELIST_H +#pragma once -#include "../common/emu_constants.h" +#include "common/emu_constants.h" +#include "common/types.h" + +#include class Client; class Group; @@ -102,6 +104,3 @@ private: std::list list; Mob *hate_owner; }; - -#endif - diff --git a/zone/heal_rotation.cpp b/zone/heal_rotation.cpp index 66793c580..fdb5bd7a8 100644 --- a/zone/heal_rotation.cpp +++ b/zone/heal_rotation.cpp @@ -16,7 +16,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "bot.h" +#include "heal_rotation.h" + +#include "zone/bot.h" #define SAFE_HP_RATIO_CLOTH 95.0f #define SAFE_HP_RATIO_LEATHER 90.0f diff --git a/zone/heal_rotation.h b/zone/heal_rotation.h index 888e45edb..1773a042b 100644 --- a/zone/heal_rotation.h +++ b/zone/heal_rotation.h @@ -16,11 +16,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#pragma once -#ifndef HEAL_ROTATION_H -#define HEAL_ROTATION_H - -#include "mob.h" +#include "zone/mob.h" #define CASTING_CYCLE_MINIMUM_INTERVAL 1000 #define CASTING_CYCLE_MINIMUM_INTERVAL_S 1 @@ -157,5 +155,3 @@ private: bool IsHealRotationMemberClass(uint8 class_id); bool IsHealRotationTargetMobType(Mob* target_mob); - -#endif diff --git a/zone/horse.cpp b/zone/horse.cpp index c705a7c04..a59d7c83b 100644 --- a/zone/horse.cpp +++ b/zone/horse.cpp @@ -16,18 +16,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/linked_list.h" -#include "../common/strings.h" - -#include "../common/repositories/horses_repository.h" - -#include "client.h" -#include "entity.h" #include "horse.h" -#include "mob.h" -#include "string_ids.h" + +#include "common/eqemu_logsys.h" +#include "common/linked_list.h" +#include "common/repositories/horses_repository.h" +#include "common/strings.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/mob.h" +#include "zone/string_ids.h" std::map Horse::horse_types; diff --git a/zone/horse.h b/zone/horse.h index 8c8a37df5..b458b261e 100644 --- a/zone/horse.h +++ b/zone/horse.h @@ -15,11 +15,12 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef HORSES_H -#define HORSES_H -#include "npc.h" +#pragma once +#include "zone/npc.h" + +#include "glm/vec4.hpp" #include class Client; @@ -41,5 +42,3 @@ protected: static const NPCType* GetHorseType(uint16 spell_id); static const NPCType* BuildHorseType(uint16 spell_id); }; - -#endif diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 847368d1b..812d09aba 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -16,18 +16,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" +#include "client.h" -#include "../common/strings.h" -#include "quest_parser_collection.h" -#include "worldserver.h" -#include "zonedb.h" -#include "../common/events/player_event_logs.h" -#include "bot.h" -#include "../common/evolving_items.h" -#include "../common/repositories/character_corpse_items_repository.h" -#include "queryserv.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/evolving_items.h" +#include "common/repositories/character_corpse_items_repository.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" extern WorldServer worldserver; extern QueryServ *QServ; diff --git a/zone/loot.cpp b/zone/loot.cpp index c93151bff..519bf97c7 100644 --- a/zone/loot.cpp +++ b/zone/loot.cpp @@ -1,20 +1,15 @@ -#include "../common/global_define.h" -#include "../common/data_verification.h" - -#include "../common/loot.h" -#include "client.h" -#include "entity.h" -#include "mob.h" #include "npc.h" -#include "zonedb.h" -#include "global_loot_manager.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/repositories/global_loot_repository.h" -#include "quest_parser_collection.h" -#ifdef _WINDOWS -#define snprintf _snprintf -#endif +#include "common/data_verification.h" +#include "common/loot.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/global_loot_repository.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/global_loot_manager.h" +#include "zone/mob.h" +#include "zone/quest_parser_collection.h" +#include "zone/zonedb.h" void NPC::AddLootTable(uint32 loottable_id, bool is_global) { diff --git a/zone/lua_bit.cpp b/zone/lua_bit.cpp index b923d534d..5c8af6fcc 100644 --- a/zone/lua_bit.cpp +++ b/zone/lua_bit.cpp @@ -30,7 +30,7 @@ #define LUA_BITOP_VERSION "1.0.2" #include "lua.hpp" -#include +#include typedef int32_t SBits; typedef uint32_t UBits; diff --git a/zone/lua_bit.h b/zone/lua_bit.h index 67cd659ba..50023e6ef 100644 --- a/zone/lua_bit.h +++ b/zone/lua_bit.h @@ -1,6 +1,3 @@ -#ifndef _LUABIT_H -#define _LUABIT_H +#pragma once int luaopen_bit(lua_State *L); - -#endif diff --git a/zone/lua_bot.cpp b/zone/lua_bot.cpp index 1e537d76a..221beb33b 100644 --- a/zone/lua_bot.cpp +++ b/zone/lua_bot.cpp @@ -1,14 +1,15 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include - -#include "bot.h" #include "lua_bot.h" -#include "lua_iteminst.h" -#include "lua_mob.h" -#include "lua_group.h" -#include "lua_item.h" + +#include "zone/bot.h" +#include "zone/lua_iteminst.h" +#include "zone/lua_mob.h" +#include "zone/lua_group.h" +#include "zone/lua_item.h" + +#include "lua.hpp" +#include "luabind/luabind.hpp" void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id) { Lua_Safe_Call_Void(); @@ -790,4 +791,4 @@ luabind::scope lua_register_bot() { .def("Stand", (void(Lua_Bot::*)(void))&Lua_Bot::Stand); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_bot.h b/zone/lua_bot.h index 86e3ca28b..fb678533b 100644 --- a/zone/lua_bot.h +++ b/zone/lua_bot.h @@ -1,9 +1,8 @@ -\ -#ifndef EQEMU_LUA_BOT_H -#define EQEMU_LUA_BOT_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_mob.h" +#include "zone/lua_mob.h" class Bot; class Lua_Bot; @@ -162,5 +161,4 @@ public: void Fling(float value, float target_x, float target_y, float target_z, bool ignore_los, bool clip_through_walls); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_buff.cpp b/zone/lua_buff.cpp index 5873b9493..7dba2550c 100644 --- a/zone/lua_buff.cpp +++ b/zone/lua_buff.cpp @@ -1,11 +1,11 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include -#include - #include "lua_buff.h" +#include "lua.hpp" +#include "luabind/iterator_policy.hpp" +#include "luabind/luabind.hpp" + uint16 Lua_Buff::GetCasterID() { Lua_Safe_Call_Int(); @@ -151,4 +151,4 @@ luabind::scope lua_register_buff() { .def("SendsClientUpdate", &Lua_Buff::SendsClientUpdate); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_buff.h b/zone/lua_buff.h index f94d09b7e..03c9744d6 100644 --- a/zone/lua_buff.h +++ b/zone/lua_buff.h @@ -1,9 +1,9 @@ -#ifndef EQEMU_LUA_BUFF_H -#define EQEMU_LUA_BUFF_H +#pragma once + #ifdef LUA_EQEMU -#include "common.h" -#include "lua_ptr.h" +#include "zone/common.h" +#include "zone/lua_ptr.h" struct Buffs_Struct; @@ -47,5 +47,4 @@ public: bool SendsClientUpdate(); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp index 15ec526b6..0d917f382 100644 --- a/zone/lua_client.cpp +++ b/zone/lua_client.cpp @@ -1,22 +1,23 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include - -#include "client.h" -#include "dynamic_zone.h" -#include "expedition_request.h" #include "lua_client.h" -#include "lua_expedition.h" -#include "lua_npc.h" -#include "lua_item.h" -#include "lua_iteminst.h" -#include "lua_inventory.h" -#include "lua_group.h" -#include "lua_raid.h" -#include "lua_packet.h" -#include "dialogue_window.h" -#include "titles.h" + +#include "zone/client.h" +#include "zone/dialogue_window.h" +#include "zone/dynamic_zone.h" +#include "zone/expedition_request.h" +#include "zone/lua_expedition.h" +#include "zone/lua_group.h" +#include "zone/lua_inventory.h" +#include "zone/lua_item.h" +#include "zone/lua_iteminst.h" +#include "zone/lua_npc.h" +#include "zone/lua_packet.h" +#include "zone/lua_raid.h" +#include "zone/titles.h" + +#include "lua.hpp" +#include "luabind/luabind.hpp" struct InventoryWhere { }; @@ -4241,6 +4242,4 @@ luabind::scope lua_register_inventory_where() { )]; } - - -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_client.h b/zone/lua_client.h index c85c061b6..0fcb6dde6 100644 --- a/zone/lua_client.h +++ b/zone/lua_client.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_CLIENT_H -#define EQEMU_LUA_CLIENT_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_mob.h" +#include "zone/lua_mob.h" class Client; class Lua_Expedition; @@ -649,5 +649,4 @@ public: void Fling(float value, float target_x, float target_y, float target_z, bool ignore_los, bool clip_through_walls); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_corpse.cpp b/zone/lua_corpse.cpp index 2db6bad07..4997dd731 100644 --- a/zone/lua_corpse.cpp +++ b/zone/lua_corpse.cpp @@ -1,12 +1,13 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include -#include - -#include "corpse.h" #include "lua_corpse.h" -#include "lua_client.h" + +#include "zone/corpse.h" +#include "zone/lua_client.h" + +#include "lua.hpp" +#include "luabind/iterator_policy.hpp" +#include "luabind/luabind.hpp" struct Lua_Corpse_Loot_List { std::vector entries; @@ -266,4 +267,4 @@ luabind::scope lua_register_corpse_loot_list() { .def_readwrite("entries", &Lua_Corpse_Loot_List::entries, luabind::return_stl_iterator); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_corpse.h b/zone/lua_corpse.h index 58bfb7d05..66fee476a 100644 --- a/zone/lua_corpse.h +++ b/zone/lua_corpse.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_CORPSE_H -#define EQEMU_LUA_CORPSE_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_mob.h" +#include "zone/lua_mob.h" class Corpse; class Lua_Client; @@ -68,5 +68,4 @@ public: Lua_Corpse_Loot_List GetLootList(lua_State* L); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_database.cpp b/zone/lua_database.cpp index aa2a5bea4..796e36a7f 100644 --- a/zone/lua_database.cpp +++ b/zone/lua_database.cpp @@ -1,9 +1,11 @@ #ifdef LUA_EQEMU #include "lua_database.h" -#include "zonedb.h" -#include -#include + +#include "zone/zonedb.h" + +#include "luabind/adopt_policy.hpp" +#include "luabind/luabind.hpp" // Luabind adopts the PreparedStmt wrapper object allocated with new and deletes it via GC // Lua GC is non-deterministic so handles should be closed explicitly to free db resources diff --git a/zone/lua_database.h b/zone/lua_database.h index ca81f67cd..ccfa28b6c 100644 --- a/zone/lua_database.h +++ b/zone/lua_database.h @@ -2,9 +2,10 @@ #ifdef LUA_EQEMU -#include "quest_db.h" -#include "../common/mysql_stmt.h" -#include +#include "common/mysql_stmt.h" +#include "zone/quest_db.h" + +#include "luabind/object.hpp" namespace luabind { struct scope; } luabind::scope lua_register_database(); diff --git a/zone/lua_door.cpp b/zone/lua_door.cpp index 91fd55316..71d4df2f0 100644 --- a/zone/lua_door.cpp +++ b/zone/lua_door.cpp @@ -1,12 +1,14 @@ #ifdef LUA_EQEMU -#include -#include - -#include "doors.h" -#include "lua_mob.h" #include "lua_door.h" +#include "zone/doors.h" +#include "zone/lua_mob.h" + +#include "luabind/luabind.hpp" +#include "luabind/object.hpp" + + void Lua_Door::SetDoorName(const char *name) { Lua_Safe_Call_Void(); self->SetDoorName(name); diff --git a/zone/lua_door.h b/zone/lua_door.h index a1a80eec6..51b7900f5 100644 --- a/zone/lua_door.h +++ b/zone/lua_door.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_DOOR_H -#define EQEMU_LUA_DOOR_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_entity.h" +#include "zone/lua_entity.h" class Doors; class Lua_Mob; @@ -83,5 +83,4 @@ public: uint32 GetGuildID(); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_encounter.cpp b/zone/lua_encounter.cpp index 06e2f1d48..fb0678436 100644 --- a/zone/lua_encounter.cpp +++ b/zone/lua_encounter.cpp @@ -1,12 +1,13 @@ #ifdef LUA_EQEMU -#include #include "lua_encounter.h" -#include "encounter.h" +#include "zone/encounter.h" + +#include "luabind/luabind.hpp" luabind::scope lua_register_encounter() { return luabind::class_("Encounter"); } -#endif \ No newline at end of file +#endif // LUA_EQEMU \ No newline at end of file diff --git a/zone/lua_encounter.h b/zone/lua_encounter.h index f3d4598f7..07a8f65cb 100644 --- a/zone/lua_encounter.h +++ b/zone/lua_encounter.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_ENCOUNTER_H -#define EQEMU_LUA_ENCOUNTER_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "zone/lua_ptr.h" class Encounter; @@ -28,5 +28,5 @@ public: } }; -#endif -#endif + +#endif // LUA_EQEMU diff --git a/zone/lua_entity.cpp b/zone/lua_entity.cpp index 18ffdee2a..660a04a1a 100644 --- a/zone/lua_entity.cpp +++ b/zone/lua_entity.cpp @@ -1,18 +1,18 @@ #ifdef LUA_EQEMU -#include - -#include "entity.h" #include "lua_entity.h" -#include "lua_mob.h" -#include "lua_client.h" -#include "lua_npc.h" -#include "lua_corpse.h" -#include "lua_object.h" -#include "lua_door.h" -#include "lua_bot.h" -#include "lua_merc.h" +#include "zone/entity.h" +#include "zone/lua_bot.h" +#include "zone/lua_client.h" +#include "zone/lua_corpse.h" +#include "zone/lua_door.h" +#include "zone/lua_merc.h" +#include "zone/lua_mob.h" +#include "zone/lua_npc.h" +#include "zone/lua_object.h" + +#include "luabind/luabind.hpp" bool Lua_Entity::IsClient() { Lua_Safe_Call_Bool(); diff --git a/zone/lua_entity.h b/zone/lua_entity.h index 3ac07a2e3..dbf60a178 100644 --- a/zone/lua_entity.h +++ b/zone/lua_entity.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_ENTITY_H -#define EQEMU_LUA_ENTITY_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "zone/lua_ptr.h" class Entity; class Lua_Client; @@ -63,5 +63,4 @@ public: Lua_Merc CastToMerc(); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_entity_list.cpp b/zone/lua_entity_list.cpp index 4b99c869e..ff6d8ca73 100644 --- a/zone/lua_entity_list.cpp +++ b/zone/lua_entity_list.cpp @@ -1,22 +1,22 @@ #ifdef LUA_EQEMU -#include -#include - -#include "masterentity.h" #include "lua_entity_list.h" -#include "lua_mob.h" -#include "lua_client.h" -#include "lua_npc.h" -#include "lua_object.h" -#include "lua_door.h" -#include "lua_corpse.h" -#include "lua_group.h" -#include "lua_raid.h" -#include "lua_spawn.h" -#include "lua_bot.h" -#include "lua_merc.h" +#include "zone/lua_bot.h" +#include "zone/lua_client.h" +#include "zone/lua_corpse.h" +#include "zone/lua_door.h" +#include "zone/lua_group.h" +#include "zone/lua_merc.h" +#include "zone/lua_mob.h" +#include "zone/lua_npc.h" +#include "zone/lua_object.h" +#include "zone/lua_raid.h" +#include "zone/lua_spawn.h" +#include "zone/masterentity.h" + +#include "luabind/luabind.hpp" +#include "luabind/iterator_policy.hpp" struct Lua_Mob_List { std::vector entries; diff --git a/zone/lua_entity_list.h b/zone/lua_entity_list.h index ad4f0fbd5..f1d9c596e 100644 --- a/zone/lua_entity_list.h +++ b/zone/lua_entity_list.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_ENTITY_LIST_H -#define EQEMU_LUA_ENTITY_LIST_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "zone/lua_ptr.h" class EntityList; class Lua_Mob; @@ -161,5 +161,4 @@ public: Lua_NPC_List GetNPCsByExcludedIDs(luabind::adl::object npc_ids); }; -#endif -#endif +#endif // LUA_EQEMU \ No newline at end of file diff --git a/zone/lua_expedition.cpp b/zone/lua_expedition.cpp index 41554b41e..bdb17e3bc 100644 --- a/zone/lua_expedition.cpp +++ b/zone/lua_expedition.cpp @@ -1,11 +1,13 @@ #ifdef LUA_EQEMU #include "lua_expedition.h" -#include "dynamic_zone.h" -#include "../common/zone_store.h" + +#include "common/zone_store.h" +#include "zone/dynamic_zone.h" + #include "lua.hpp" -#include -#include +#include "luabind/luabind.hpp" +#include "luabind/object.hpp" void Lua_Expedition::AddLockout(std::string event_name, uint32_t seconds) { Lua_Safe_Call_Void(); diff --git a/zone/lua_expedition.h b/zone/lua_expedition.h index f11e3d6d6..943144f4b 100644 --- a/zone/lua_expedition.h +++ b/zone/lua_expedition.h @@ -18,12 +18,13 @@ * */ -#ifndef EQEMU_LUA_EXPEDITION_H -#define EQEMU_LUA_EXPEDITION_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" -#include "../common/types.h" +#include "common/types.h" +#include "zone/lua_ptr.h" + #include class DynamicZone; @@ -96,4 +97,3 @@ public: }; #endif // LUA_EQEMU -#endif // EQEMU_LUA_EXPEDITION_H diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index 73a1e29ba..ff6b02123 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -1,35 +1,36 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include +#include "lua_general.h" -#include +#include "common/classes.h" +#include "common/content/world_content_service.h" +#include "common/data_bucket.h" +#include "common/events/player_event_logs.h" +#include "common/rulesys.h" +#include "common/timer.h" +#include "zone/dialogue_window.h" +#include "zone/dynamic_zone.h" +#include "zone/encounter.h" +#include "zone/lua_client.h" +#include "zone/lua_encounter.h" +#include "zone/lua_entity_list.h" +#include "zone/lua_expedition.h" +#include "zone/lua_item.h" +#include "zone/lua_iteminst.h" +#include "zone/lua_npc.h" +#include "zone/lua_spell.h" +#include "zone/lua_zone.h" +#include "zone/qglobals.h" +#include "zone/quest_parser_collection.h" +#include "zone/questmgr.h" +#include "zone/worldserver.h" +#include "zone/zone.h" + +#include "lua.hpp" +#include "luabind/luabind.hpp" #include #include - -#include "../common/content/world_content_service.h" -#include "../common/timer.h" -#include "../common/classes.h" -#include "../common/rulesys.h" -#include "lua_item.h" -#include "lua_iteminst.h" -#include "lua_client.h" -#include "lua_npc.h" -#include "lua_entity_list.h" -#include "lua_expedition.h" -#include "lua_spell.h" -#include "lua_zone.h" -#include "quest_parser_collection.h" -#include "questmgr.h" -#include "qglobals.h" -#include "encounter.h" -#include "lua_encounter.h" -#include "../common/data_bucket.h" -#include "dialogue_window.h" -#include "dynamic_zone.h" -#include "../common/events/player_event_logs.h" -#include "worldserver.h" -#include "zone.h" +#include struct Events { }; struct Factions { }; @@ -8082,4 +8083,4 @@ luabind::scope lua_register_exp_source() { )]; } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_general.h b/zone/lua_general.h index 6c195d817..db9b0f91a 100644 --- a/zone/lua_general.h +++ b/zone/lua_general.h @@ -1,7 +1,9 @@ -#ifndef EQEMU_LUA_GENERAL_H -#define EQEMU_LUA_GENERAL_H +#pragma once + #ifdef LUA_EQEMU +#include "luabind/luabind.hpp" + luabind::scope lua_register_general(); luabind::scope lua_register_random(); luabind::scope lua_register_events(); @@ -26,5 +28,4 @@ luabind::scope lua_register_journal_speakmode(); luabind::scope lua_register_journal_mode(); luabind::scope lua_register_exp_source(); -#endif -#endif +#endif // LUA_EQEMU \ No newline at end of file diff --git a/zone/lua_group.cpp b/zone/lua_group.cpp index 4bb1f4c4f..b380c2b76 100644 --- a/zone/lua_group.cpp +++ b/zone/lua_group.cpp @@ -1,16 +1,16 @@ #ifdef LUA_EQEMU -#include "../common/data_verification.h" - -#include -#include - -#include "groups.h" -#include "masterentity.h" #include "lua_group.h" -#include "lua_mob.h" -#include "lua_client.h" -#include "lua_npc.h" + +#include "common/data_verification.h" +#include "zone/groups.h" +#include "zone/lua_client.h" +#include "zone/lua_mob.h" +#include "zone/lua_npc.h" +#include "zone/masterentity.h" + +#include "luabind/luabind.hpp" +#include "luabind/object.hpp" void Lua_Group::DisbandGroup() { Lua_Safe_Call_Void(); @@ -182,4 +182,4 @@ luabind::scope lua_register_group() { .def("TeleportGroup", (void(Lua_Group::*)(Lua_Mob,uint32,uint32,float,float,float,float))&Lua_Group::TeleportGroup); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_group.h b/zone/lua_group.h index ee4e353bc..45d4db982 100644 --- a/zone/lua_group.h +++ b/zone/lua_group.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_GROUP_H -#define EQEMU_LUA_GROUP_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "zone/lua_ptr.h" class Group; class Lua_Mob; @@ -55,5 +55,4 @@ public: bool DoesAnyMemberHaveExpeditionLockout(std::string expedition_name, std::string event_name, int max_check_count); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_hate_list.cpp b/zone/lua_hate_list.cpp index 4ca52a5b1..b7e4745fb 100644 --- a/zone/lua_hate_list.cpp +++ b/zone/lua_hate_list.cpp @@ -1,12 +1,13 @@ #ifdef LUA_EQEMU -#include -#include - -#include "masterentity.h" -#include "lua_mob.h" #include "lua_hate_list.h" +#include "zone/lua_mob.h" +#include "zone/masterentity.h" + +#include "luabind/iterator_policy.hpp" +#include "luabind/luabind.hpp" + Lua_Mob Lua_HateEntry::GetEnt() { Lua_Safe_Call_Class(Lua_Mob); return Lua_Mob(self->entity_on_hatelist); @@ -62,4 +63,4 @@ luabind::scope lua_register_hate_list() { .def_readwrite("entries", &Lua_HateList::entries, luabind::return_stl_iterator); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_hate_list.h b/zone/lua_hate_list.h index 036bd775a..590ab016f 100644 --- a/zone/lua_hate_list.h +++ b/zone/lua_hate_list.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_HATE_LIST_H -#define EQEMU_LUA_HATE_LIST_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "zone/lua_ptr.h" class Lua_Mob; struct struct_HateList; @@ -33,5 +33,4 @@ struct Lua_HateList std::vector entries; }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_inventory.cpp b/zone/lua_inventory.cpp index 3d464a915..99b1051f5 100644 --- a/zone/lua_inventory.cpp +++ b/zone/lua_inventory.cpp @@ -1,12 +1,14 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include - -#include "masterentity.h" #include "lua_inventory.h" -#include "lua_iteminst.h" -#include "lua_item.h" + +#include "zone/lua_item.h" +#include "zone/lua_iteminst.h" +#include "zone/masterentity.h" + +#include "lua.hpp" +#include "luabind/luabind.hpp" + Lua_ItemInst Lua_Inventory::GetItem(int slot_id) { Lua_Safe_Call_Class(Lua_ItemInst); @@ -237,4 +239,4 @@ luabind::scope lua_register_inventory() { .def("SwapItem", (bool(Lua_Inventory::*)(int,int))&Lua_Inventory::SwapItem); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_inventory.h b/zone/lua_inventory.h index a9c5c8d5e..2bee12f9d 100644 --- a/zone/lua_inventory.h +++ b/zone/lua_inventory.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_INVENTORY_H -#define EQEMU_LUA_INVENTORY_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "zone/lua_ptr.h" class Lua_ItemInst; class Lua_Item; @@ -71,5 +71,4 @@ public: luabind::object GetAugmentIDsBySlotID(lua_State* L, int16 slot_id); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_item.cpp b/zone/lua_item.cpp index a27eea220..776b075b8 100644 --- a/zone/lua_item.cpp +++ b/zone/lua_item.cpp @@ -1,10 +1,11 @@ #ifdef LUA_EQEMU -#include - -#include "masterentity.h" #include "lua_item.h" +#include "zone/masterentity.h" + +#include "luabind/luabind.hpp" + Lua_Item::Lua_Item(uint32 item_id) { const EQ::ItemData *t = database.GetItem(item_id); SetLuaPtrData(t); @@ -1089,4 +1090,4 @@ luabind::scope lua_register_item() { .def("Worn_Type", &Lua_Item::GetWorn_Type); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_item.h b/zone/lua_item.h index 5e62d8c80..a7390b09f 100644 --- a/zone/lua_item.h +++ b/zone/lua_item.h @@ -1,8 +1,9 @@ -#ifndef EQEMU_LUA_ITEM_H -#define EQEMU_LUA_ITEM_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "common/types.h" +#include "zone/lua_ptr.h" namespace EQ { @@ -206,5 +207,4 @@ public: const char *GetScrollName(); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_iteminst.cpp b/zone/lua_iteminst.cpp index a911fcee0..4047db7f4 100644 --- a/zone/lua_iteminst.cpp +++ b/zone/lua_iteminst.cpp @@ -1,11 +1,12 @@ #ifdef LUA_EQEMU -#include -#include - -#include "masterentity.h" #include "lua_iteminst.h" -#include "lua_item.h" + +#include "zone/lua_item.h" +#include "zone/masterentity.h" + +#include "luabind/luabind.hpp" +#include "luabind/object.hpp" Lua_ItemInst::Lua_ItemInst(int item_id) { SetLuaPtrData(database.CreateItem(item_id)); diff --git a/zone/lua_iteminst.h b/zone/lua_iteminst.h index 486378058..a75c657b1 100644 --- a/zone/lua_iteminst.h +++ b/zone/lua_iteminst.h @@ -1,10 +1,10 @@ -#ifndef EQEMU_LUA_ITEMINST_H -#define EQEMU_LUA_ITEMINST_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "common/types.h" +#include "zone/lua_ptr.h" -// Forward declaration class Lua_Item; namespace EQ @@ -111,5 +111,4 @@ private: bool cloned_; }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_merc.cpp b/zone/lua_merc.cpp index 8e153c19f..c8437b9c8 100644 --- a/zone/lua_merc.cpp +++ b/zone/lua_merc.cpp @@ -1,15 +1,16 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include - -#include "merc.h" -#include "lua_client.h" #include "lua_merc.h" -#include "lua_group.h" -#include "lua_item.h" -#include "lua_iteminst.h" -#include "lua_mob.h" + +#include "zone/lua_client.h" +#include "zone/lua_group.h" +#include "zone/lua_item.h" +#include "zone/lua_iteminst.h" +#include "zone/lua_mob.h" +#include "zone/merc.h" + +#include "lua.hpp" +#include "luabind/luabind.hpp" uint32 Lua_Merc::GetCostFormula() { diff --git a/zone/lua_merc.h b/zone/lua_merc.h index 90a7b3ab8..9dbee8d99 100644 --- a/zone/lua_merc.h +++ b/zone/lua_merc.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_MERC_H -#define EQEMU_LUA_MERC_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_mob.h" +#include "zone/lua_mob.h" class Merc; class Lua_Group; @@ -60,4 +60,3 @@ public: }; #endif // LUA_EQEMU -#endif // EQEMU_LUA_MERC_H diff --git a/zone/lua_mob.cpp b/zone/lua_mob.cpp index e23eb2d03..8e8108e7e 100644 --- a/zone/lua_mob.cpp +++ b/zone/lua_mob.cpp @@ -1,21 +1,22 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include - -#include "bot.h" -#include "client.h" -#include "dialogue_window.h" -#include "lua_bot.h" -#include "lua_buff.h" -#include "lua_client.h" -#include "lua_hate_list.h" -#include "lua_item.h" -#include "lua_iteminst.h" #include "lua_mob.h" -#include "lua_npc.h" -#include "lua_stat_bonuses.h" -#include "npc.h" + +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" +#include "zone/lua_bot.h" +#include "zone/lua_buff.h" +#include "zone/lua_client.h" +#include "zone/lua_hate_list.h" +#include "zone/lua_item.h" +#include "zone/lua_iteminst.h" +#include "zone/lua_npc.h" +#include "zone/lua_stat_bonuses.h" +#include "zone/npc.h" + +#include "lua.hpp" +#include "luabind/luabind.hpp" struct SpecialAbilities { }; diff --git a/zone/lua_mob.h b/zone/lua_mob.h index b5019aa5f..46b28cf8c 100644 --- a/zone/lua_mob.h +++ b/zone/lua_mob.h @@ -1,8 +1,9 @@ -#ifndef EQEMU_LUA_MOB_H -#define EQEMU_LUA_MOB_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_entity.h" +#include "common/types.h" +#include "zone/lua_entity.h" class Mob; struct Lua_HateList; @@ -619,5 +620,4 @@ public: void SetPetType(uint8 pet_type); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_mod.cpp b/zone/lua_mod.cpp index f6ee1a770..3ed6a278e 100644 --- a/zone/lua_mod.cpp +++ b/zone/lua_mod.cpp @@ -1,29 +1,30 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include -#include - -#include "../common/spdat.h" -#include "masterentity.h" -#include "zone.h" - -#include "lua_parser.h" #include "lua_mod.h" -#include "lua_item.h" -#include "lua_iteminst.h" -#include "lua_mob.h" -#include "lua_hate_list.h" -#include "lua_client.h" -#include "lua_inventory.h" -#include "lua_npc.h" -#include "lua_group.h" -#include "lua_raid.h" -#include "lua_corpse.h" -#include "lua_object.h" -#include "lua_door.h" -#include "lua_packet.h" -#include "lua_stat_bonuses.h" + +#include "common/spdat.h" +#include "zone/masterentity.h" +#include "zone/zone.h" +#include "zone/lua_parser.h" +#include "zone/lua_item.h" +#include "zone/lua_iteminst.h" +#include "zone/lua_mob.h" +#include "zone/lua_hate_list.h" +#include "zone/lua_client.h" +#include "zone/lua_inventory.h" +#include "zone/lua_npc.h" +#include "zone/lua_group.h" +#include "zone/lua_raid.h" +#include "zone/lua_corpse.h" +#include "zone/lua_object.h" +#include "zone/lua_door.h" +#include "zone/lua_packet.h" +#include "zone/lua_stat_bonuses.h" + +#include "lua.hpp" +#include "luabind/luabind.hpp" +#include "luabind/object.hpp" + void LuaMod::Init() { @@ -1082,4 +1083,5 @@ void LuaMod::HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, u lua_pop(L, n); } } -#endif + +#endif // LUA_EQEMU diff --git a/zone/lua_mod.h b/zone/lua_mod.h index 9c8dcd9ea..b19543c6f 100644 --- a/zone/lua_mod.h +++ b/zone/lua_mod.h @@ -1,7 +1,8 @@ #pragma once +#include "common/repositories/bug_reports_repository.h" + #include -#include "../common/repositories/bug_reports_repository.h" struct lua_State; diff --git a/zone/lua_npc.cpp b/zone/lua_npc.cpp index b0cd59c49..d6432af28 100644 --- a/zone/lua_npc.cpp +++ b/zone/lua_npc.cpp @@ -1,15 +1,16 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include -#include - -#include "npc.h" #include "lua_npc.h" -#include "lua_client.h" -#include "lua_item.h" -#include "lua_iteminst.h" -#include "lua_spawn.h" + +#include "zone/lua_client.h" +#include "zone/lua_item.h" +#include "zone/lua_iteminst.h" +#include "zone/lua_spawn.h" +#include "zone/npc.h" + +#include "lua.hpp" +#include "luabind/iterator_policy.hpp" +#include "luabind/luabind.hpp" struct Lua_NPC_Loot_List { std::vector entries; @@ -1131,4 +1132,4 @@ luabind::scope lua_register_npc_loot_list() { .def_readwrite("entries", &Lua_NPC_Loot_List::entries, luabind::return_stl_iterator); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_npc.h b/zone/lua_npc.h index d166ccdff..7ac11cc36 100644 --- a/zone/lua_npc.h +++ b/zone/lua_npc.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_NPC_H -#define EQEMU_LUA_NPC_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_mob.h" +#include "zone/lua_mob.h" class NPC; class Lua_Mob; @@ -204,5 +204,4 @@ public: }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_object.cpp b/zone/lua_object.cpp index bed74f4eb..e56551f52 100644 --- a/zone/lua_object.cpp +++ b/zone/lua_object.cpp @@ -1,11 +1,12 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include - -#include "object.h" #include "lua_object.h" +#include "zone/object.h" + +#include "lua.hpp" +#include "luabind/luabind.hpp" + void Lua_Object::Depop() { Lua_Safe_Call_Void(); self->Depop(); @@ -247,4 +248,4 @@ luabind::scope lua_register_object() { .def("VarSave", (uint32(Lua_Object::*)(void))&Lua_Object::VarSave); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_object.h b/zone/lua_object.h index 65f5fbe80..633a3026a 100644 --- a/zone/lua_object.h +++ b/zone/lua_object.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_OBJECT_H -#define EQEMU_LUA_OBJECT_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_entity.h" +#include "zone/lua_entity.h" class Object; @@ -68,5 +68,4 @@ public: bool EntityVariableExists(std::string variable_name); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_packet.cpp b/zone/lua_packet.cpp index c9a20aab2..9ea64d36c 100644 --- a/zone/lua_packet.cpp +++ b/zone/lua_packet.cpp @@ -1,11 +1,13 @@ #ifdef LUA_EQEMU -#include -#include - -#include "masterentity.h" #include "lua_packet.h" +#include "zone/masterentity.h" + +#include "luabind/luabind.hpp" +#include "luabind/object.hpp" + + struct Opcodes { }; Lua_Packet::Lua_Packet(int opcode, int size) { diff --git a/zone/lua_packet.h b/zone/lua_packet.h index ede02c81f..2754652e5 100644 --- a/zone/lua_packet.h +++ b/zone/lua_packet.h @@ -1,9 +1,9 @@ -#ifndef EQEMU_LUA_PACKET_H -#define EQEMU_LUA_PACKET_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" -#include "../common/types.h" +#include "common/types.h" +#include "zone/lua_ptr.h" class EQApplicationPacket; @@ -67,5 +67,5 @@ private: bool owned_; }; -#endif -#endif +#endif // LUA_EQEMU + diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp index 00f89e6d6..9a445f536 100644 --- a/zone/lua_parser.cpp +++ b/zone/lua_parser.cpp @@ -1,49 +1,48 @@ #ifdef LUA_EQEMU -#include "lua.hpp" -#include -#include +#include "lua_parser.h" -#include -#include +#include "common/spdat.h" +#include "zone/lua_bit.h" +#include "zone/lua_bot.h" +#include "zone/lua_buff.h" +#include "zone/lua_client.h" +#include "zone/lua_corpse.h" +#include "zone/lua_database.h" +#include "zone/lua_door.h" +#include "zone/lua_encounter.h" +#include "zone/lua_entity_list.h" +#include "zone/lua_entity.h" +#include "zone/lua_expedition.h" +#include "zone/lua_general.h" +#include "zone/lua_group.h" +#include "zone/lua_hate_list.h" +#include "zone/lua_inventory.h" +#include "zone/lua_item.h" +#include "zone/lua_iteminst.h" +#include "zone/lua_merc.h" +#include "zone/lua_mob.h" +#include "zone/lua_npc.h" +#include "zone/lua_object.h" +#include "zone/lua_packet.h" +#include "zone/lua_raid.h" +#include "zone/lua_spawn.h" +#include "zone/lua_spell.h" +#include "zone/lua_stat_bonuses.h" +#include "zone/lua_zone.h" +#include "zone/masterentity.h" +#include "zone/questmgr.h" +#include "zone/zone_config.h" +#include "zone/zone.h" + +#include "lua.hpp" +#include "luabind/luabind.hpp" +#include "luabind/object.hpp" +#include +#include +#include #include #include -#include - -#include "../common/spdat.h" -#include "masterentity.h" -#include "questmgr.h" -#include "zone.h" -#include "zone_config.h" - -#include "lua_bit.h" -#include "lua_bot.h" -#include "lua_buff.h" -#include "lua_client.h" -#include "lua_corpse.h" -#include "lua_door.h" -#include "lua_encounter.h" -#include "lua_entity.h" -#include "lua_entity_list.h" -#include "lua_expedition.h" -#include "lua_general.h" -#include "lua_group.h" -#include "lua_hate_list.h" -#include "lua_inventory.h" -#include "lua_item.h" -#include "lua_iteminst.h" -#include "lua_merc.h" -#include "lua_mob.h" -#include "lua_npc.h" -#include "lua_object.h" -#include "lua_packet.h" -#include "lua_parser.h" -#include "lua_raid.h" -#include "lua_spawn.h" -#include "lua_spell.h" -#include "lua_stat_bonuses.h" -#include "lua_database.h" -#include "lua_zone.h" const char *LuaEvents[_LargestEventID] = { "event_say", @@ -2295,4 +2294,4 @@ void LuaParser::LoadGlobalZoneScript(std::string filename) { LoadScript(filename, "global_zone"); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_parser.h b/zone/lua_parser.h index c1bad7088..bda8161d3 100644 --- a/zone/lua_parser.h +++ b/zone/lua_parser.h @@ -1,18 +1,17 @@ -#ifndef _EQE_LUA_PARSER_H -#define _EQE_LUA_PARSER_H +#pragma once + #ifdef LUA_EQEMU -#include "quest_parser_collection.h" -#include "quest_interface.h" -#include +#include "common/repositories/bug_reports_repository.h" +#include "zone/lua_mod.h" +#include "zone/quest_interface.h" +#include "zone/quest_parser_collection.h" +#include "zone/zone_config.h" + +#include #include #include -#include - -#include "zone_config.h" -#include "lua_mod.h" - -#include "../common/repositories/bug_reports_repository.h" +#include extern const ZoneConfig *Config; @@ -360,5 +359,4 @@ private: ZoneArgumentHandler ZoneArgumentDispatch[_LargestEventID]; }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_parser_events.cpp b/zone/lua_parser_events.cpp index 68dd7ca2a..42d8de0c0 100644 --- a/zone/lua_parser_events.cpp +++ b/zone/lua_parser_events.cpp @@ -1,27 +1,26 @@ #ifdef LUA_EQEMU -#include + +#include "lua_parser_events.h" + +#include "zone/lua_client.h" +#include "zone/lua_corpse.h" +#include "zone/lua_door.h" +#include "zone/lua_encounter.h" +#include "zone/lua_item.h" +#include "zone/lua_iteminst.h" +#include "zone/lua_mob.h" +#include "zone/lua_npc.h" +#include "zone/lua_object.h" +#include "zone/lua_packet.h" +#include "zone/lua_spell.h" +#include "zone/masterentity.h" +#include "zone/quest_interface.h" +#include "zone/quest_parser_collection.h" +#include "zone/zone.h" #include "lua.hpp" -#include -#include - -#include "quest_parser_collection.h" -#include "quest_interface.h" - -#include "masterentity.h" -#include "lua_item.h" -#include "lua_iteminst.h" -#include "lua_mob.h" -#include "lua_client.h" -#include "lua_npc.h" -#include "lua_spell.h" -#include "lua_corpse.h" -#include "lua_door.h" -#include "lua_object.h" -#include "lua_packet.h" -#include "lua_encounter.h" -#include "zone.h" -#include "lua_parser_events.h" +#include "luabind/luabind.hpp" +#include "luabind/object.hpp" //NPC void handle_npc_event_say( @@ -3195,4 +3194,4 @@ void handle_zone_timer_stop( lua_setfield(L, -2, "timer"); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_parser_events.h b/zone/lua_parser_events.h index 79135bd6e..5c718eb1c 100644 --- a/zone/lua_parser_events.h +++ b/zone/lua_parser_events.h @@ -1,7 +1,28 @@ -#ifndef _EQE_LUA_PARSER_EVENTS_H -#define _EQE_LUA_PARSER_EVENTS_H +#pragma once + #ifdef LUA_EQEMU +#include "common/types.h" + +#include +#include +#include + +class Bot; +class Client; +class Encounter; +class Merc; +class Mob; +class NPC; +class QuestInterface; +class Zone; +struct lua_State; + +namespace EQ +{ + class ItemInstance; +} + typedef void(*NPCArgumentHandler)(QuestInterface*, lua_State*, NPC*, Mob*, std::string, uint32, std::vector*); typedef void(*PlayerArgumentHandler)(QuestInterface*, lua_State*, Client*, std::string, uint32, std::vector*); typedef void(*ItemArgumentHandler)(QuestInterface*, lua_State*, Client*, EQ::ItemInstance*, Mob*, std::string, uint32, std::vector*); @@ -1434,5 +1455,4 @@ void handle_zone_timer_stop( std::vector *extra_pointers ); -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_ptr.h b/zone/lua_ptr.h index d337059ae..52ca4c3ca 100644 --- a/zone/lua_ptr.h +++ b/zone/lua_ptr.h @@ -1,7 +1,10 @@ -#ifndef EQEMU_LUA_PTR_H -#define EQEMU_LUA_PTR_H +#pragma once + #ifdef LUA_EQEMU +#include "lua.hpp" +#include "luabind/luabind.hpp" + #ifndef EQEMU_UNSAFE_LUA #define Lua_Safe_Call_Void() if(!d_) { return; } NativeType *self = reinterpret_cast(d_) #define Lua_Safe_Call_Bool() if(!d_) { return false; } NativeType *self = reinterpret_cast(d_) @@ -51,5 +54,4 @@ protected: T *d_; }; -#endif -#endif \ No newline at end of file +#endif // LUA_EQEMU diff --git a/zone/lua_raid.cpp b/zone/lua_raid.cpp index 46290a861..4c45d46db 100644 --- a/zone/lua_raid.cpp +++ b/zone/lua_raid.cpp @@ -1,15 +1,16 @@ #ifdef LUA_EQEMU -#include "../common/data_verification.h" - -#include -#include - -#include "masterentity.h" #include "lua_raid.h" -#include "lua_mob.h" -#include "lua_client.h" -#include "lua_npc.h" + +#include "common/data_verification.h" +#include "zone/lua_client.h" +#include "zone/lua_mob.h" +#include "zone/lua_npc.h" +#include "zone/masterentity.h" + +#include "luabind/luabind.hpp" +#include "luabind/object.hpp" + bool Lua_Raid::IsRaidMember(const char *name) { Lua_Safe_Call_Bool(); @@ -201,4 +202,4 @@ luabind::scope lua_register_raid() { .def("TeleportRaid", (int(Lua_Raid::*)(Lua_Mob,uint32,uint32,float,float,float,float))&Lua_Raid::TeleportRaid); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_raid.h b/zone/lua_raid.h index ca9718a59..7d32d7389 100644 --- a/zone/lua_raid.h +++ b/zone/lua_raid.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_RAID_H -#define EQEMU_LUA_RAID_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "zone/lua_ptr.h" class Raid; class Lua_Client; @@ -56,5 +56,4 @@ public: bool DoesAnyMemberHaveExpeditionLockout(std::string expedition_name, std::string event_name, int max_check_count); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_spawn.cpp b/zone/lua_spawn.cpp index d5d712757..a0a805e97 100644 --- a/zone/lua_spawn.cpp +++ b/zone/lua_spawn.cpp @@ -1,11 +1,12 @@ #ifdef LUA_EQEMU -#include - -#include "spawn2.h" -#include "lua_npc.h" #include "lua_spawn.h" +#include "zone/spawn2.h" +#include "zone/lua_npc.h" + +#include "luabind/luabind.hpp" + void Lua_Spawn::LoadGrid() { Lua_Safe_Call_Void(); self->LoadGrid(); @@ -170,4 +171,4 @@ luabind::scope lua_register_spawn() { .def("SpawnGroupID", (uint32(Lua_Spawn::*)(void))&Lua_Spawn::SpawnGroupID); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_spawn.h b/zone/lua_spawn.h index c25bf34f5..bd470ca78 100644 --- a/zone/lua_spawn.h +++ b/zone/lua_spawn.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_SPAWN_H -#define EQEMU_LUA_SPAWN_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "zone/lua_ptr.h" class Spawn2; class Lua_NPC; @@ -53,5 +53,4 @@ public: uint32 GetKillCount(); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_spell.cpp b/zone/lua_spell.cpp index 6789cfd80..35cbb35f4 100644 --- a/zone/lua_spell.cpp +++ b/zone/lua_spell.cpp @@ -1,10 +1,12 @@ #ifdef LUA_EQEMU -#include - -#include "../common/spdat.h" #include "lua_spell.h" +#include "common/spdat.h" + +#include "luabind/luabind.hpp" + + Lua_Spell::Lua_Spell(int id) { if(IsValidSpell(id)) { SetLuaPtrData(&spells[id]); @@ -581,4 +583,4 @@ luabind::scope lua_register_spell() { .def("ZoneType", &Lua_Spell::GetZoneType); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_spell.h b/zone/lua_spell.h index b9af8a564..9a91fc420 100644 --- a/zone/lua_spell.h +++ b/zone/lua_spell.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_LUA_SPELL_H -#define EQEMU_LUA_SPELL_H +#pragma once + #ifdef LUA_EQEMU -#include "lua_ptr.h" +#include "zone/lua_ptr.h" struct SPDat_Spell_Struct; @@ -112,5 +112,4 @@ public: int GetRank(); }; -#endif -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_stat_bonuses.cpp b/zone/lua_stat_bonuses.cpp index 78374fdef..db7e844fa 100644 --- a/zone/lua_stat_bonuses.cpp +++ b/zone/lua_stat_bonuses.cpp @@ -1,11 +1,12 @@ #ifdef LUA_EQEMU -#include "../common/data_verification.h" - -#include - #include "lua_stat_bonuses.h" +#include "common/data_verification.h" + +#include "luabind/luabind.hpp" + + int32 Lua_StatBonuses::GetAC() const { Lua_Safe_Call_Int(); return self->AC; @@ -1557,4 +1558,4 @@ luabind::scope lua_register_stat_bonuses() { .def("XPRateMod", &Lua_StatBonuses::GetXPRateMod); } -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_stat_bonuses.h b/zone/lua_stat_bonuses.h index ff4e9f932..577c260ca 100644 --- a/zone/lua_stat_bonuses.h +++ b/zone/lua_stat_bonuses.h @@ -2,8 +2,8 @@ #ifdef LUA_EQEMU -#include "lua_ptr.h" -#include "common.h" +#include "zone/common.h" +#include "zone/lua_ptr.h" struct StatBonuses; @@ -284,4 +284,4 @@ public: int32 GetReduceTradeskillFail(int idx) const; }; -#endif +#endif // LUA_EQEMU diff --git a/zone/lua_zone.cpp b/zone/lua_zone.cpp index 037571620..58f2e59fa 100644 --- a/zone/lua_zone.cpp +++ b/zone/lua_zone.cpp @@ -1,11 +1,12 @@ -#include "../common/features.h" -#include "zone.h" +#ifdef LUA_EQEMU - -#include -#include "../common/global_define.h" #include "lua_zone.h" +#include "common/features.h" +#include "zone/zone.h" + +#include "luabind/luabind.hpp" + bool Lua_Zone::BuffTimersSuspended() { Lua_Safe_Call_Bool(); @@ -1012,3 +1013,4 @@ luabind::scope lua_register_zone() { .def("VariableExists", &Lua_Zone::VariableExists); } +#endif // LUA_EQEMU diff --git a/zone/lua_zone.h b/zone/lua_zone.h index 42a1d8841..e6aeb2ba9 100644 --- a/zone/lua_zone.h +++ b/zone/lua_zone.h @@ -2,10 +2,10 @@ #ifdef LUA_EQEMU -#include "lua_client.h" -#include "lua_ptr.h" -#include "common.h" -#include "zone.h" +#include "zone/common.h" +#include "zone/lua_client.h" +#include "zone/lua_ptr.h" +#include "zone/zone.h" class Lua_Zone; @@ -171,4 +171,4 @@ public: }; -#endif +#endif // LUA_EQEMU diff --git a/zone/main.cpp b/zone/main.cpp index 4f5916078..e6be02f90 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -18,63 +18,57 @@ * */ -#define DONT_SHARED_OPCODES -#define PLATFORM_ZONE 1 +#include "common/crash.h" +#include "common/database/database_update.h" +#include "common/eq_packet_structs.h" +#include "common/eq_stream_ident.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/evolving_items.h" +#include "common/file.h" +#include "common/guilds.h" +#include "common/memory_mapped_file.h" +#include "common/misc.h" +#include "common/mutex.h" +#include "common/net/eqstream.h" +#include "common/opcodemgr.h" +#include "common/patches/patches.h" +#include "common/path_manager.h" +#include "common/platform/posix/include_pthreads.h" +#include "common/profanity_manager.h" +#include "common/rulesys.h" +#include "common/skill_caps.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "common/timer.h" +#include "zone/api_service.h" +#include "zone/bot_command.h" +#include "zone/command.h" +#include "zone/embparser.h" +#include "zone/guild_mgr.h" +#include "zone/lua_parser.h" +#include "zone/masterentity.h" +#include "zone/npc_scale_manager.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/questmgr.h" +#include "zone/task_manager.h" +#include "zone/titles.h" +#include "zone/worldserver.h" +#include "zone/zone_cli.h" +#include "zone/zone_config.h" +#include "zone/zone_event_scheduler.h" +#include "zone/zone.h" +#include "zone/zonedb.h" -#include "../common/global_define.h" -#include "../common/timer.h" -#include "../common/eq_packet_structs.h" -#include "../common/mutex.h" -#include "../common/opcodemgr.h" -#include "../common/guilds.h" -#include "../common/eq_stream_ident.h" -#include "../common/patches/patches.h" -#include "../common/rulesys.h" -#include "../common/profanity_manager.h" -#include "../common/strings.h" -#include "../common/crash.h" -#include "../common/memory_mapped_file.h" -#include "../common/spdat.h" -#include "../common/eqemu_logsys.h" -#include "../common/misc.h" - -#include "api_service.h" -#include "zone_config.h" -#include "masterentity.h" -#include "worldserver.h" -#include "zone.h" -#include "queryserv.h" -#include "command.h" -#include "bot_command.h" -#include "zonedb.h" -#include "titles.h" -#include "guild_mgr.h" -#include "task_manager.h" -#include "quest_parser_collection.h" -#include "embparser.h" -#include "../common/evolving_items.h" -#include "lua_parser.h" -#include "questmgr.h" -#include "npc_scale_manager.h" - -#include "../common/net/eqstream.h" - -#include #include +#include #ifdef _CRTDBG_MAP_ALLOC #undef new #define new new(_NORMAL_BLOCK, __FILE__, __LINE__) #endif -#ifdef _WINDOWS -#else - -#include -#include "../common/unix.h" - -#endif - volatile bool RunLoops = true; #ifdef __FreeBSD__ #include @@ -82,14 +76,6 @@ volatile bool RunLoops = true; extern volatile bool is_zone_loaded; -#include "zone_event_scheduler.h" -#include "../common/file.h" -#include "../common/events/player_event_logs.h" -#include "../common/path_manager.h" -#include "../common/database/database_update.h" -#include "../common/skill_caps.h" -#include "zone_cli.h" - EntityList entity_list; WorldServer worldserver; uint32 numclients = 0; diff --git a/zone/map.cpp b/zone/map.cpp index bf6ff68ec..b91475fa4 100644 --- a/zone/map.cpp +++ b/zone/map.cpp @@ -1,13 +1,11 @@ -#include "../common/global_define.h" -#include "../common/misc_functions.h" -#include "../common/compression.h" - -#include "client.h" -#include "map.h" -#include "raycast_mesh.h" -#include "zone.h" -#include "../common/file.h" -#include "../common/memory/ksm.hpp" +#include "common/compression.h" +#include "common/file.h" +#include "common/memory/ksm.hpp" +#include "common/misc_functions.h" +#include "zone/client.h" +#include "zone/map.h" +#include "zone/raycast_mesh.h" +#include "zone/zone.h" #include #include diff --git a/zone/map.h b/zone/map.h index 20fad6e95..d19b4ec7c 100644 --- a/zone/map.h +++ b/zone/map.h @@ -19,13 +19,12 @@ */ -#ifndef ZONE_MAP_H -#define ZONE_MAP_H +#pragma once -#include "position.h" -#include +#include "zone/position.h" +#include "zone/zone_config.h" -#include "zone_config.h" +#include #define BEST_Z_INVALID -99999 @@ -68,5 +67,3 @@ private: struct impl; impl *imp; }; - -#endif diff --git a/zone/masterentity.h b/zone/masterentity.h index bdfa23b10..1e1981423 100644 --- a/zone/masterentity.h +++ b/zone/masterentity.h @@ -1,16 +1,15 @@ //Trumpcard: EntityLists are composed of multiple list types. This is the //master that includes all types. When entity.h is required, many of these are as well. -#include "entity.h" -#include "groups.h" -#include "raids.h" -#include "client.h" -#include "object.h" -#include "corpse.h" -#include "doors.h" -#include "mob.h" -#include "trap.h" -#include "beacon.h" -#include "horse.h" - -#include "bot.h" +#include "zone/beacon.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/corpse.h" +#include "zone/doors.h" +#include "zone/entity.h" +#include "zone/groups.h" +#include "zone/horse.h" +#include "zone/mob.h" +#include "zone/object.h" +#include "zone/raids.h" +#include "zone/trap.h" diff --git a/zone/merc.cpp b/zone/merc.cpp index c29faff18..587f09fcf 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -1,15 +1,14 @@ - #include "merc.h" -#include "client.h" -#include "corpse.h" -#include "entity.h" -#include "groups.h" -#include "mob.h" -#include "quest_parser_collection.h" -#include "zone.h" -#include "string_ids.h" -#include "../common/skill_caps.h" +#include "common/skill_caps.h" +#include "zone/client.h" +#include "zone/corpse.h" +#include "zone/entity.h" +#include "zone/groups.h" +#include "zone/mob.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/zone.h" extern volatile bool is_zone_loaded; diff --git a/zone/merc.h b/zone/merc.h index 028b08299..ed5f98fed 100644 --- a/zone/merc.h +++ b/zone/merc.h @@ -1,7 +1,6 @@ -#ifndef MERC_H -#define MERC_H +#pragma once -#include "npc.h" +#include "zone/npc.h" class Client; class Corpse; @@ -384,5 +383,3 @@ private: Timer confidence_timer; Timer check_target_timer; }; - -#endif // MERC_H diff --git a/zone/mob.cpp b/zone/mob.cpp index 69d1ce826..9c60ff30e 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -16,28 +16,27 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/data_verification.h" -#include "../common/spdat.h" -#include "../common/strings.h" -#include "../common/misc_functions.h" +#include "mob.h" -#include "../common/repositories/bot_data_repository.h" -#include "../common/repositories/character_data_repository.h" +#include "common/data_bucket.h" +#include "common/data_verification.h" +#include "common/misc_functions.h" +#include "common/repositories/bot_data_repository.h" +#include "common/repositories/character_data_repository.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/dialogue_window.h" +#include "zone/mob_movement_manager.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" -#include "../common/data_bucket.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "worldserver.h" -#include "mob_movement_manager.h" -#include "water_map.h" -#include "dialogue_window.h" - -#include -#include -#include #include - -#include "bot.h" +#include +#include +#include extern EntityList entity_list; @@ -641,7 +640,7 @@ void Mob::BreakCharmPetIfConditionsMet() { void Mob::CalcInvisibleLevel() { - bool was_invisible = invisible; + uint8 was_invisible = invisible; invisible = std::max({spellbonuses.invisibility, nobuff_invisible}); invisible_undead = spellbonuses.invisibility_verse_undead; diff --git a/zone/mob.h b/zone/mob.h index ca0abe268..be9663f3e 100644 --- a/zone/mob.h +++ b/zone/mob.h @@ -16,28 +16,27 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MOB_H -#define MOB_H -#include "common.h" -#include "../common/data_bucket.h" -#include "entity.h" -#include "hate_list.h" -#include "pathfinder_interface.h" -#include "position.h" -#include "aa_ability.h" -#include "aa.h" -#include "../common/light_source.h" -#include "../common/emu_constants.h" -#include "combat_record.h" -#include "event_codes.h" +#pragma once + +#include "common/data_bucket.h" +#include "common/emu_constants.h" +#include "common/light_source.h" +#include "zone/aa_ability.h" +#include "zone/aa.h" +#include "zone/combat_record.h" +#include "zone/common.h" +#include "zone/entity.h" +#include "zone/event_codes.h" +#include "zone/hate_list.h" +#include "zone/heal_rotation.h" +#include "zone/pathfinder_interface.h" +#include "zone/position.h" #include +#include #include #include -#include - -#include "heal_rotation.h" char* strn0cpy(char* dest, const char* source, uint32 size); @@ -1953,6 +1952,3 @@ private: void DoSpellInterrupt(uint16 spell_id, int32 mana_cost, int my_curmana); void HandleDoorOpen(); }; - -#endif - diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp index 516df6384..285db4b63 100644 --- a/zone/mob_ai.cpp +++ b/zone/mob_ai.cpp @@ -16,28 +16,26 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/features.h" -#include "../common/rulesys.h" -#include "../common/strings.h" - -#include "client.h" -#include "entity.h" -#include "map.h" #include "mob.h" -#include "npc.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "water_map.h" -#include "fastmath.h" -#include "../common/data_verification.h" -#include "bot.h" -#include "../common/repositories/npc_spells_repository.h" -#include "../common/repositories/npc_spells_entries_repository.h" -#include "../common/repositories/criteria/content_filter_criteria.h" +#include "common/data_verification.h" +#include "common/features.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/npc_spells_entries_repository.h" +#include "common/repositories/npc_spells_repository.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/fastmath.h" +#include "zone/map.h" +#include "zone/npc.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/water_map.h" -#include +#include "glm/gtx/projection.hpp" #include #include #include @@ -2992,4 +2990,3 @@ uint32 ZoneDatabase::GetMaxNPCSpellsEffectsID() { return Strings::ToInt(row[0]); } - diff --git a/zone/mob_appearance.cpp b/zone/mob_appearance.cpp index 2556a41b1..6e6feaa48 100644 --- a/zone/mob_appearance.cpp +++ b/zone/mob_appearance.cpp @@ -18,17 +18,16 @@ * */ -#include "../common/data_verification.h" -#include "../common/eqemu_logsys.h" -#include "../common/item_data.h" -#include "../common/spdat.h" -#include "../common/strings.h" - #include "mob.h" -#include "quest_parser_collection.h" -#include "zonedb.h" -#include "bot.h" +#include "common/data_verification.h" +#include "common/eqemu_logsys.h" +#include "common/item_data.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/quest_parser_collection.h" +#include "zone/zonedb.h" void Mob::SetMobTextureProfile( uint8 material_slot, diff --git a/zone/mob_info.cpp b/zone/mob_info.cpp index a896f8f01..812f9ab8f 100644 --- a/zone/mob_info.cpp +++ b/zone/mob_info.cpp @@ -18,9 +18,10 @@ * */ -#include "client.h" #include "mob.h" -#include "npc_scale_manager.h" + +#include "zone/client.h" +#include "zone/npc_scale_manager.h" inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribute) { diff --git a/zone/mob_movement_manager.cpp b/zone/mob_movement_manager.cpp index e82202df6..214e68a56 100644 --- a/zone/mob_movement_manager.cpp +++ b/zone/mob_movement_manager.cpp @@ -1,17 +1,18 @@ #include "mob_movement_manager.h" -#include "client.h" -#include "mob.h" -#include "zone.h" -#include "position.h" -#include "water_map.h" -#include "../common/eq_packet_structs.h" -#include "../common/misc_functions.h" -#include "../common/data_verification.h" -#include +#include "common/data_verification.h" +#include "common/eq_packet_structs.h" +#include "common/misc_functions.h" +#include "zone/client.h" +#include "zone/mob.h" +#include "zone/position.h" +#include "zone/water_map.h" +#include "zone/zone.h" + +#include #include #include -#include +#include extern double frame_time; extern Zone *zone; diff --git a/zone/mob_movement_manager.h b/zone/mob_movement_manager.h index 85d062804..4e4110758 100644 --- a/zone/mob_movement_manager.h +++ b/zone/mob_movement_manager.h @@ -1,4 +1,5 @@ #pragma once + #include class Mob; diff --git a/zone/npc.cpp b/zone/npc.cpp index 0a91d8e52..64b61d33b 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -16,55 +16,42 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/bodytypes.h" -#include "../common/classes.h" -#include "../common/global_define.h" -#include "../common/misc_functions.h" -#include "../common/rulesys.h" -#include "../common/seperator.h" -#include "../common/spdat.h" -#include "../common/strings.h" -#include "../common/emu_versions.h" -#include "../common/features.h" -#include "../common/item_instance.h" -#include "../common/linked_list.h" -#include "../common/servertalk.h" -#include "../common/say_link.h" -#include "../common/data_verification.h" - -#include "../common/repositories/npc_types_repository.h" -#include "../common/repositories/spawngroup_repository.h" -#include "../common/repositories/spawn2_repository.h" -#include "../common/repositories/spawnentry_repository.h" - -#include "client.h" -#include "entity.h" #include "npc.h" -#include "string_ids.h" -#include "spawn2.h" -#include "zone.h" -#include "quest_parser_collection.h" -#include "water_map.h" -#include "npc_scale_manager.h" -#include "bot.h" -#include "../common/skill_caps.h" -#include "../common/events/player_event_logs.h" +#include "common/bodytypes.h" +#include "common/classes.h" +#include "common/data_verification.h" +#include "common/emu_versions.h" +#include "common/events/player_event_logs.h" +#include "common/features.h" +#include "common/item_instance.h" +#include "common/linked_list.h" +#include "common/misc_functions.h" +#include "common/repositories/npc_types_repository.h" +#include "common/repositories/spawn2_repository.h" +#include "common/repositories/spawnentry_repository.h" +#include "common/repositories/spawngroup_repository.h" +#include "common/rulesys.h" +#include "common/say_link.h" +#include "common/seperator.h" +#include "common/servertalk.h" +#include "common/skill_caps.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/npc_scale_manager.h" +#include "zone/quest_parser_collection.h" +#include "zone/spawn2.h" +#include "zone/string_ids.h" +#include "zone/water_map.h" +#include "zone/zone.h" -#include +#include #include #include -#ifdef _WINDOWS -#define snprintf _snprintf -#define strncasecmp _strnicmp -#define strcasecmp _stricmp -#else -#include -#include - -#endif - extern Zone* zone; extern QueryServ* QServ; extern volatile bool is_zone_loaded; diff --git a/zone/npc.h b/zone/npc.h index 90569d12b..c4b37d90f 100644 --- a/zone/npc.h +++ b/zone/npc.h @@ -15,30 +15,24 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef NPC_H -#define NPC_H -#include "../common/rulesys.h" +#pragma once -#include "mob.h" -#include "qglobals.h" -#include "zonedb.h" -#include "../common/zone_store.h" -#include "zonedump.h" -#include "../common/repositories/npc_faction_entries_repository.h" -#include "../common/repositories/loottable_repository.h" -#include "../common/repositories/loottable_entries_repository.h" -#include "../common/repositories/lootdrop_repository.h" -#include "../common/repositories/lootdrop_entries_repository.h" +#include "common/repositories/lootdrop_entries_repository.h" +#include "common/repositories/lootdrop_repository.h" +#include "common/repositories/loottable_entries_repository.h" +#include "common/repositories/loottable_repository.h" +#include "common/repositories/npc_faction_entries_repository.h" +#include "common/rulesys.h" +#include "common/zone_store.h" +#include "zone/mob.h" +#include "zone/qglobals.h" +#include "zone/zonedb.h" +#include "zone/zonedump.h" #include #include - -#ifdef _WINDOWS - #define M_PI 3.141592 -#endif - typedef struct { float min_x; float max_x; @@ -808,6 +802,3 @@ private: bool m_record_loot_stats; std::vector m_rolled_items = {}; }; - -#endif - diff --git a/zone/npc_scale_manager.cpp b/zone/npc_scale_manager.cpp index 2a66b613a..b2c7d879c 100644 --- a/zone/npc_scale_manager.cpp +++ b/zone/npc_scale_manager.cpp @@ -19,8 +19,9 @@ */ #include "npc_scale_manager.h" -#include "../common/repositories/npc_scale_global_base_repository.h" -#include "../common/repositories/npc_types_repository.h" + +#include "common/repositories/npc_scale_global_base_repository.h" +#include "common/repositories/npc_types_repository.h" /** * @param npc diff --git a/zone/npc_scale_manager.h b/zone/npc_scale_manager.h index 2c37b3d7b..0c2472bf7 100644 --- a/zone/npc_scale_manager.h +++ b/zone/npc_scale_manager.h @@ -18,11 +18,11 @@ * */ -#ifndef EQEMU_NPC_SCALE_MANAGER_H -#define EQEMU_NPC_SCALE_MANAGER_H +#pragma once + +#include "zone/npc.h" +#include "zone/zone.h" -#include "npc.h" -#include "zone.h" extern Zone* zone; class NpcScaleManager { @@ -119,5 +119,3 @@ public: }; extern NpcScaleManager *npc_scale_manager; - -#endif //EQEMU_NPC_SCALE_MANAGER_H diff --git a/zone/object.cpp b/zone/object.cpp index 6da171b23..8eca194dd 100644 --- a/zone/object.cpp +++ b/zone/object.cpp @@ -16,22 +16,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/strings.h" - -#include "client.h" -#include "entity.h" -#include "mob.h" #include "object.h" -#include "quest_parser_collection.h" -#include "worldserver.h" -#include "zonedb.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/events/player_event_logs.h" -#include "../common/repositories/ground_spawns_repository.h" -#include "../common/repositories/object_repository.h" -#include "queryserv.h" +#include "common/events/player_event_logs.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/ground_spawns_repository.h" +#include "common/repositories/object_repository.h" +#include "common/strings.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/mob.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" const char DEFAULT_OBJECT_NAME[] = "IT63_ACTORDEF"; diff --git a/zone/object.h b/zone/object.h index 5e66c3d19..2c6801554 100644 --- a/zone/object.h +++ b/zone/object.h @@ -15,17 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef OBJECT_H -#define OBJECT_H + +#pragma once // Object Class: // Represents Zone Objects (forges, ovens, brew barrels, items dropped to ground, etc) -#include "../common/eq_packet_structs.h" -#include "../common/timer.h" -#include "../common/types.h" - -#include "entity.h" +#include "common/eq_packet_structs.h" +#include "common/timer.h" +#include "common/types.h" +#include "zone/entity.h" class Client; class EQApplicationPacket; @@ -380,5 +379,3 @@ static std::map object_types = { { ObjectType::CollectibleBag, "Collectible Bag" }, { ObjectType::NoDeposit, "No Deposit" } }; - -#endif diff --git a/zone/oriented_bounding_box.cpp b/zone/oriented_bounding_box.cpp index ca248ba1d..2efab1c44 100644 --- a/zone/oriented_bounding_box.cpp +++ b/zone/oriented_bounding_box.cpp @@ -1,6 +1,8 @@ + #include "oriented_bounding_box.h" -#include -#include + +#include "glm/gtc/matrix_transform.hpp" +#include "glm/gtx/transform.hpp" glm::mat4 CreateRotateMatrix(float rx, float ry, float rz) { glm::mat4 rot_x(1.0f); diff --git a/zone/oriented_bounding_box.h b/zone/oriented_bounding_box.h index bbc3cc6c3..d6936ff62 100644 --- a/zone/oriented_bounding_box.h +++ b/zone/oriented_bounding_box.h @@ -1,8 +1,7 @@ -#ifndef EQEMU_ORIENTED_BOUNDNG_BOX_H -#define EQEMU_ORIENTED_BOUNDNG_BOX_H +#pragma once -#include -#include +#include "glm/vec3.hpp" +#include "glm/mat4x4.hpp" class OrientedBoundingBox { @@ -19,5 +18,3 @@ private: glm::mat4 transformation; glm::mat4 inverted_transformation; }; - -#endif diff --git a/zone/parcels.cpp b/zone/parcels.cpp index f1dc874c1..28e9b114a 100644 --- a/zone/parcels.cpp +++ b/zone/parcels.cpp @@ -16,15 +16,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/events/player_event_logs.h" -#include "../common/repositories/trader_repository.h" -#include "../common/repositories/character_parcels_repository.h" -#include "../common/repositories/character_parcels_containers_repository.h" -#include "worldserver.h" -#include "string_ids.h" #include "client.h" -#include "../common/ruletypes.h" + +#include "common/events/player_event_logs.h" +#include "common/repositories/character_parcels_containers_repository.h" +#include "common/repositories/character_parcels_repository.h" +#include "common/repositories/trader_repository.h" +#include "common/ruletypes.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" extern WorldServer worldserver; extern QueryServ *QServ; diff --git a/zone/pathfinder_interface.cpp b/zone/pathfinder_interface.cpp index e6aef0cd9..9ffb8f07c 100644 --- a/zone/pathfinder_interface.cpp +++ b/zone/pathfinder_interface.cpp @@ -1,8 +1,11 @@ -#include "../common/seperator.h" -#include "client.h" -#include "pathfinder_null.h" -#include "pathfinder_nav_mesh.h" -#include +#include "pathfinder_interface.h" + +#include "common/seperator.h" +#include "zone/client.h" +#include "zone/pathfinder_nav_mesh.h" +#include "zone/pathfinder_null.h" + +#include "fmt/format.h" #include IPathfinder *IPathfinder::Load(const std::string &zone) { diff --git a/zone/pathfinder_interface.h b/zone/pathfinder_interface.h index d69dbac74..79b334f2e 100644 --- a/zone/pathfinder_interface.h +++ b/zone/pathfinder_interface.h @@ -1,6 +1,7 @@ #pragma once -#include "map.h" +#include "zone/map.h" + #include class Client; diff --git a/zone/pathfinder_nav_mesh.cpp b/zone/pathfinder_nav_mesh.cpp index 5cf89f091..71523021f 100644 --- a/zone/pathfinder_nav_mesh.cpp +++ b/zone/pathfinder_nav_mesh.cpp @@ -1,14 +1,15 @@ -#include -#include -#include #include "pathfinder_nav_mesh.h" -#include -#include -#include "zone.h" -#include "water_map.h" -#include "client.h" -#include "../common/compression.h" +#include "common/compression.h" +#include "zone/client.h" +#include "zone/water_map.h" +#include "zone/zone.h" + +#include "recastnavigation/DetourCommon.h" +#include "recastnavigation/DetourNavMeshQuery.h" +#include +#include +#include extern Zone *zone; diff --git a/zone/pathfinder_nav_mesh.h b/zone/pathfinder_nav_mesh.h index 3b10cc23c..2f8687dc4 100644 --- a/zone/pathfinder_nav_mesh.h +++ b/zone/pathfinder_nav_mesh.h @@ -1,8 +1,11 @@ #pragma once #include "pathfinder_interface.h" + +#include "glm/vec3.hpp" +#include "recastnavigation/DetourNavMesh.h" +#include #include -#include class PathfinderNavmesh : public IPathfinder { diff --git a/zone/pathing.cpp b/zone/pathing.cpp index 5a44b2832..5d3fde1ac 100644 --- a/zone/pathing.cpp +++ b/zone/pathing.cpp @@ -1,9 +1,8 @@ -#include "../common/global_define.h" -#include "../common/event/task.h" - #include "client.h" -#include "zone.h" -#include "water_map.h" + +#include "common/event/task.h" +#include "zone/water_map.h" +#include "zone/zone.h" extern Zone *zone; diff --git a/zone/pch/pch.h b/zone/pch/pch.h index a34b69021..c8c509b31 100644 --- a/zone/pch/pch.h +++ b/zone/pch/pch.h @@ -1,11 +1,11 @@ #pragma once -#include "../merc.h" -#include "../mob.h" -#include "../npc.h" -#include "../corpse.h" -#include "../doors.h" -#include "../bot.h" -#include "../entity.h" -#include "../client.h" -#include "../zone.h" \ No newline at end of file +#include "zone/merc.h" +#include "zone/mob.h" +#include "zone/npc.h" +#include "zone/corpse.h" +#include "zone/doors.h" +#include "zone/bot.h" +#include "zone/entity.h" +#include "zone/client.h" +#include "zone/zone.h" diff --git a/zone/perl_bot.cpp b/zone/perl_bot.cpp index f667eaa44..8c90aa604 100644 --- a/zone/perl_bot.cpp +++ b/zone/perl_bot.cpp @@ -1,8 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" + #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "bot.h" + +#include "zone/bot.h" +#include "zone/embperl.h" Mob* Perl_Bot_GetOwner(Bot* self) // @categories Script Utility, Bot { @@ -741,4 +742,4 @@ void perl_register_bot() package.add("Stand", &Perl_Bot_Stand); } -#endif //EMBPERL_XS_CLASSES +#endif // EMBPERL_XS_CLASSES diff --git a/zone/perl_buff.cpp b/zone/perl_buff.cpp index 71c92cc4e..62cb7ef71 100644 --- a/zone/perl_buff.cpp +++ b/zone/perl_buff.cpp @@ -1,8 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" + #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "common.h" + +#include "zone/common.h" +#include "zone/embperl.h" uint16 Perl_Buff_GetCasterID(Buffs_Struct* self) { diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index 49a2d9d02..c41003e11 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -1,13 +1,12 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "client.h" -#include "dynamic_zone.h" -#include "titles.h" -#include "dialogue_window.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" +#include "zone/dynamic_zone.h" +#include "zone/embperl.h" +#include "zone/titles.h" void Perl_Client_SendSound(Client* self) // @categories Script Utility { diff --git a/zone/perl_database.cpp b/zone/perl_database.cpp index d0e7c1609..6b475a37c 100644 --- a/zone/perl_database.cpp +++ b/zone/perl_database.cpp @@ -1,10 +1,10 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "embperl.h" -#include "perl_database.h" -#include "zonedb.h" +#include "zone/embperl.h" +#include "zone/perl_database.h" +#include "zone/zonedb.h" // Perl takes ownership of returned objects allocated with new and deletes // them via the DESTROY method when the last perl reference goes out of scope diff --git a/zone/perl_database.h b/zone/perl_database.h index 2c1922bb5..11a52c83b 100644 --- a/zone/perl_database.h +++ b/zone/perl_database.h @@ -1,7 +1,7 @@ #pragma once -#include "quest_db.h" -#include "../common/mysql_stmt.h" +#include "common/mysql_stmt.h" +#include "zone/quest_db.h" class Perl_MySQLPreparedStmt; diff --git a/zone/perl_doors.cpp b/zone/perl_doors.cpp index 8fb986899..64b692aa1 100644 --- a/zone/perl_doors.cpp +++ b/zone/perl_doors.cpp @@ -1,10 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "doors.h" +#include "zone/doors.h" +#include "zone/embperl.h" uint32_t Perl_Doors_GetDoorDBID(Doors* self) // @categories Doors { diff --git a/zone/perl_entity.cpp b/zone/perl_entity.cpp index eaad24db5..767af3623 100644 --- a/zone/perl_entity.cpp +++ b/zone/perl_entity.cpp @@ -1,13 +1,13 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "embperl.h" -#include "entity.h" -#include "mob.h" -#include "../common/global_define.h" -#include "../common/rulesys.h" -#include "../common/say_link.h" +#include "common/rulesys.h" +#include "common/say_link.h" +#include "zone/embperl.h" +#include "zone/entity.h" +#include "zone/mob.h" + #include Mob* Perl_EntityList_GetMobID(EntityList* self, uint16_t mob_id) // @categories Script Utility diff --git a/zone/perl_expedition.cpp b/zone/perl_expedition.cpp index a9b485f9a..a1a4081bc 100644 --- a/zone/perl_expedition.cpp +++ b/zone/perl_expedition.cpp @@ -1,11 +1,10 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "embperl.h" -#include "dynamic_zone.h" -#include "../common/zone_store.h" -#include "../common/global_define.h" +#include "common/zone_store.h" +#include "zone/dynamic_zone.h" +#include "zone/embperl.h" void Perl_Expedition_AddLockout(DynamicZone* self, std::string event_name, uint32_t seconds) { diff --git a/zone/perl_groups.cpp b/zone/perl_groups.cpp index a97716a28..23247307d 100644 --- a/zone/perl_groups.cpp +++ b/zone/perl_groups.cpp @@ -1,11 +1,10 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/data_verification.h" -#include "../common/global_define.h" -#include "embperl.h" -#include "groups.h" +#include "common/data_verification.h" +#include "zone/embperl.h" +#include "zone/groups.h" void Perl_Group_DisbandGroup(Group* self) // @categories Script Utility, Group { diff --git a/zone/perl_hateentry.cpp b/zone/perl_hateentry.cpp index 4e813b7b2..0fbd2ef2b 100644 --- a/zone/perl_hateentry.cpp +++ b/zone/perl_hateentry.cpp @@ -1,11 +1,10 @@ -#include "../common/features.h" -#include "client.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "hate_list.h" +#include "zone/client.h" +#include "zone/embperl.h" +#include "zone/hate_list.h" int64_t Perl_HateEntry_GetDamage(struct_HateList* self) // @categories Script Utility, Hate and Aggro { diff --git a/zone/perl_inventory.cpp b/zone/perl_inventory.cpp index a002a24a7..f943ba6e9 100644 --- a/zone/perl_inventory.cpp +++ b/zone/perl_inventory.cpp @@ -1,10 +1,9 @@ -#include "../common/features.h" -#include "client.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" +#include "zone/client.h" +#include "zone/embperl.h" bool Perl_Inventory_CanItemFitInContainer(EQ::InventoryProfile* self, EQ::ItemInstance* item_to_check, EQ::ItemInstance* container_to_check) { diff --git a/zone/perl_merc.cpp b/zone/perl_merc.cpp index 00f7e4625..2e2ec358b 100644 --- a/zone/perl_merc.cpp +++ b/zone/perl_merc.cpp @@ -1,8 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" + #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "merc.h" + +#include "zone/embperl.h" +#include "zone/merc.h" uint32 Perl_Merc_GetCostFormula(Merc* self) { diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp index dd06db33b..5a207e1ad 100644 --- a/zone/perl_mob.cpp +++ b/zone/perl_mob.cpp @@ -1,15 +1,14 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "../common/spdat.h" -#include "embperl.h" -#include "mob.h" -#include "client.h" -#include "dialogue_window.h" -#include "bot.h" -#include "questmgr.h" +#include "common/spdat.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/dialogue_window.h" +#include "zone/embperl.h" +#include "zone/mob.h" +#include "zone/questmgr.h" bool Perl_Mob_IsClient(Mob* self) // @categories Script Utility { diff --git a/zone/perl_npc.cpp b/zone/perl_npc.cpp index 6eaf0ac47..018d9be8f 100644 --- a/zone/perl_npc.cpp +++ b/zone/perl_npc.cpp @@ -1,10 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "npc.h" +#include "zone/embperl.h" +#include "zone/npc.h" void Perl_NPC_SignalNPC(NPC* self, int signal_id) // @categories Script Utility { diff --git a/zone/perl_object.cpp b/zone/perl_object.cpp index 0b744f93e..7ecdbeffd 100644 --- a/zone/perl_object.cpp +++ b/zone/perl_object.cpp @@ -1,10 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "object.h" +#include "zone/embperl.h" +#include "zone/object.h" bool Perl_Object_IsGroundSpawn(Object* self) // @categories Objects { diff --git a/zone/perl_perlpacket.cpp b/zone/perl_perlpacket.cpp index 1f0a6411d..4666fd5f9 100644 --- a/zone/perl_perlpacket.cpp +++ b/zone/perl_perlpacket.cpp @@ -1,9 +1,10 @@ -#include "../common/features.h" +#include "common/features.h" + #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "../common/types.h" -#include "embperl.h" -#include "perlpacket.h" + +#include "common/types.h" +#include "zone/embperl.h" +#include "zone/perlpacket.h" PerlPacket* Perl_PerlPacket_new(const char* class_name) { diff --git a/zone/perl_player_corpse.cpp b/zone/perl_player_corpse.cpp index c034e0312..8ff9e97f1 100644 --- a/zone/perl_player_corpse.cpp +++ b/zone/perl_player_corpse.cpp @@ -1,10 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "corpse.h" +#include "zone/corpse.h" +#include "zone/embperl.h" uint32_t Perl_Corpse_GetCharID(Corpse* self) // @categories Account and Character, Corpse { diff --git a/zone/perl_questitem.cpp b/zone/perl_questitem.cpp index 53e906de7..d3cb071b0 100644 --- a/zone/perl_questitem.cpp +++ b/zone/perl_questitem.cpp @@ -1,10 +1,9 @@ -#include "../common/features.h" -#include "client.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" +#include "zone/client.h" +#include "zone/embperl.h" std::string Perl_QuestItem_GetName(EQ::ItemInstance* self) // @categories Inventory and Items { diff --git a/zone/perl_questitem_data.cpp b/zone/perl_questitem_data.cpp index 18261b3da..81d710a01 100644 --- a/zone/perl_questitem_data.cpp +++ b/zone/perl_questitem_data.cpp @@ -1,10 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" #include "client.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" +#include "zone/embperl.h" int Perl_QuestItemData_GetMinimumStatus(EQ::ItemData* self) { diff --git a/zone/perl_raids.cpp b/zone/perl_raids.cpp index c01785121..2cfa0802d 100644 --- a/zone/perl_raids.cpp +++ b/zone/perl_raids.cpp @@ -1,12 +1,11 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/data_verification.h" -#include "../common/global_define.h" -#include "embperl.h" -#include "raids.h" -#include "client.h" +#include "common/data_verification.h" +#include "zone/client.h" +#include "zone/embperl.h" +#include "zone/raids.h" bool Perl_Raid_IsRaidMember(Raid* self, const char* name) // @categories Raid { diff --git a/zone/perl_spawn.cpp b/zone/perl_spawn.cpp index 95c38aed1..d0b5120e2 100644 --- a/zone/perl_spawn.cpp +++ b/zone/perl_spawn.cpp @@ -1,9 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" -#include "spawn2.h" + +#include "zone/embperl.h" +#include "zone/spawn2.h" void Perl_Spawn_Depop(Spawn2* self) { diff --git a/zone/perl_spell.cpp b/zone/perl_spell.cpp index d8fd34509..6d82b5a64 100644 --- a/zone/perl_spell.cpp +++ b/zone/perl_spell.cpp @@ -1,10 +1,9 @@ -#include "../common/features.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "../common/spdat.h" -#include "embperl.h" +#include "common/spdat.h" +#include "zone/embperl.h" int Perl_Spell_GetActivated(SPDat_Spell_Struct* self) { diff --git a/zone/perl_stat_bonuses.cpp b/zone/perl_stat_bonuses.cpp index 2d232b898..27e61fd93 100644 --- a/zone/perl_stat_bonuses.cpp +++ b/zone/perl_stat_bonuses.cpp @@ -1,10 +1,10 @@ -#include "../common/features.h" -#include "common.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "embperl.h" -#include "../common/data_verification.h" +#include "common/data_verification.h" +#include "zone/common.h" +#include "zone/embperl.h" int32 Perl_StatBonuses_GetAC(StatBonuses* self) { diff --git a/zone/perl_zone.cpp b/zone/perl_zone.cpp index b81bfe344..d570ee87b 100644 --- a/zone/perl_zone.cpp +++ b/zone/perl_zone.cpp @@ -1,10 +1,9 @@ -#include "../common/features.h" -#include "zone.h" +#include "common/features.h" #ifdef EMBPERL_XS_CLASSES -#include "../common/global_define.h" -#include "embperl.h" +#include "zone/embperl.h" +#include "zone/zone.h" bool Perl_Zone_BuffTimersSuspended(Zone* self) { diff --git a/zone/perlpacket.cpp b/zone/perlpacket.cpp index d0459ee3e..48298e7c2 100644 --- a/zone/perlpacket.cpp +++ b/zone/perlpacket.cpp @@ -15,11 +15,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" + #include "perlpacket.h" -#include "client.h" -#include "../common/opcodemgr.h" -#include "../common/misc_functions.h" + +#include "common/misc_functions.h" +#include "common/opcodemgr.h" +#include "zone/client.h" PerlPacket::PerlPacket(const char *opcode, uint32 length) { SetOpcode(opcode); diff --git a/zone/perlpacket.h b/zone/perlpacket.h index 4f8e39f0e..d42b802df 100644 --- a/zone/perlpacket.h +++ b/zone/perlpacket.h @@ -15,15 +15,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef PERLPACKET_H -#define PERLPACKET_H + +#pragma once + +#include "common/emu_opcodes.h" +#include "common/types.h" #include #include -#include "../common/types.h" -#include "../common/emu_opcodes.h" - class Client; class PerlPacket { @@ -61,5 +61,3 @@ protected: uint32 len; unsigned char *packet; }; - -#endif diff --git a/zone/petitions.cpp b/zone/petitions.cpp index 2790a0df8..781c50e45 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -15,28 +15,17 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include -#ifdef _WINDOWS -#else -#include -#endif -#ifdef _WINDOWS - #define snprintf _snprintf - #define strncasecmp _strnicmp - #define strcasecmp _stricmp -#endif - - -#include "../common/eq_packet_structs.h" -#include "../common/servertalk.h" -#include "../common/strings.h" - -#include "entity.h" #include "petitions.h" -#include "worldserver.h" + +#include "common/eq_packet_structs.h" +#include "common/eqemu_logsys.h" +#include "common/servertalk.h" +#include "common/strings.h" +#include "zone/entity.h" +#include "zone/worldserver.h" + +#include extern WorldServer worldserver; diff --git a/zone/petitions.h b/zone/petitions.h index 20ddf8137..2ecee85fd 100644 --- a/zone/petitions.h +++ b/zone/petitions.h @@ -15,17 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef PETITIONS_H -#define PETITIONS_H -#include "../common/linked_list.h" -#include "../common/misc_functions.h" -#include "../common/mutex.h" -#include "../common/types.h" +#pragma once -#include "client.h" -#include "zonedb.h" -#include "../common/zone_store.h" +#include "common/linked_list.h" +#include "common/misc_functions.h" +#include "common/mutex.h" +#include "common/types.h" +#include "common/zone_store.h" +#include "zone/client.h" +#include "zone/zonedb.h" class Client; @@ -122,5 +121,3 @@ private: LinkedList list; Mutex PList_Mutex; }; - -#endif diff --git a/zone/pets.cpp b/zone/pets.cpp index fea4c7f7b..d4eec4dbe 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -16,31 +16,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/spdat.h" -#include "../common/strings.h" - -#include "../common/repositories/pets_repository.h" -#include "../common/repositories/pets_beastlord_data_repository.h" -#include "../common/repositories/character_pet_name_repository.h" - -#include "entity.h" -#include "client.h" -#include "mob.h" - #include "pets.h" -#include "zonedb.h" + +#include "common/repositories/character_pet_name_repository.h" +#include "common/repositories/pets_beastlord_data_repository.h" +#include "common/repositories/pets_repository.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/mob.h" +#include "zone/zonedb.h" #include -#include "bot.h" - -#ifndef WIN32 -#include -#include "../common/unix.h" -#endif - - // need to pass in a char array of 64 chars void GetRandPetName(char *name) { diff --git a/zone/pets.h b/zone/pets.h index dc656fb08..caa5023cd 100644 --- a/zone/pets.h +++ b/zone/pets.h @@ -1,15 +1,10 @@ -#ifndef PETS_H -#define PETS_H +#pragma once class Mob; struct NPCType; class Pet : public NPC { - public: - Pet(NPCType *type_data, Mob *owner, uint8 pet_type, uint16 spell_id, int16 power); - virtual bool CheckSpellLevelRestriction(Mob *caster, uint16 spell_id); - - }; - -#endif - +public: + Pet(NPCType *type_data, Mob *owner, uint8 pet_type, uint16 spell_id, int16 power); + virtual bool CheckSpellLevelRestriction(Mob *caster, uint16 spell_id); +}; diff --git a/zone/position.cpp b/zone/position.cpp index 39cb5b6d4..e60e9f96f 100644 --- a/zone/position.cpp +++ b/zone/position.cpp @@ -1,12 +1,13 @@ #include "position.h" -#include +#include "common/data_verification.h" +#include "common/strings.h" +#include "common/types.h" + +#include "fmt/format.h" #include -#include "../common/strings.h" -#include "../common/data_verification.h" #include -#include "../common/types.h" -#include +#include constexpr float position_eps = 0.0001f; diff --git a/zone/position.h b/zone/position.h index ae43aca4f..b548bab89 100644 --- a/zone/position.h +++ b/zone/position.h @@ -15,15 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef POSITION_H -#define POSITION_H +#pragma once + +#include "common/types.h" + +#include "glm/geometric.hpp" +#include "glm/vec2.hpp" +#include "glm/vec3.hpp" +#include "glm/vec4.hpp" #include -#include -#include -#include -#include -#include "../common/types.h" std::string to_string(const glm::vec4 &position); std::string to_string(const glm::vec3 &position); @@ -65,5 +66,3 @@ float CalculateHeadingAngleBetweenPositions(float x1, float y1, float x2, float bool IsWithinCircularArc(glm::vec4 arc_center, glm::vec4 point, uint32 arc_offset, uint32 arc_radius, uint32 arc_radius_limit); bool IsWithinSquare(glm::vec4 center, uint32 area, glm::vec4 position); - -#endif diff --git a/zone/qglobals.cpp b/zone/qglobals.cpp index 64a9cf65c..4456a08bb 100644 --- a/zone/qglobals.cpp +++ b/zone/qglobals.cpp @@ -1,8 +1,8 @@ -#include "../common/strings.h" - #include "qglobals.h" -#include "client.h" -#include "zone.h" + +#include "common/strings.h" +#include "zone/client.h" +#include "zone/zone.h" void QGlobalCache::AddGlobal(uint32 id, QGlobal global) { diff --git a/zone/qglobals.h b/zone/qglobals.h index 619f825de..95c98da18 100644 --- a/zone/qglobals.h +++ b/zone/qglobals.h @@ -1,5 +1,4 @@ -#ifndef __QGLOBALS__H -#define __QGLOBALS__H +#pragma once #include @@ -41,5 +40,3 @@ protected: void LoadBy(const std::string &query); std::list qGlobalBucket; }; - -#endif diff --git a/zone/queryserv.cpp b/zone/queryserv.cpp index 5a5200d5f..3f0cd8686 100644 --- a/zone/queryserv.cpp +++ b/zone/queryserv.cpp @@ -1,10 +1,9 @@ -#include "../common/global_define.h" -#include "../common/servertalk.h" -#include "../common/strings.h" -#include "../common/events/player_event_logs.h" #include "queryserv.h" -#include "worldserver.h" +#include "common/events/player_event_logs.h" +#include "common/servertalk.h" +#include "common/strings.h" +#include "zone/worldserver.h" extern WorldServer worldserver; extern QueryServ* QServ; diff --git a/zone/queryserv.h b/zone/queryserv.h index f1a100c31..834365f32 100644 --- a/zone/queryserv.h +++ b/zone/queryserv.h @@ -1,11 +1,10 @@ -#ifndef QUERYSERV_ZONE_H -#define QUERYSERV_ZONE_H +#pragma once -#include "../common/net/servertalk_server.h" -#include "../common/net/servertalk_client_connection.h" -#include "../common/event/timer.h" -#include "../common/rulesys.h" -#include "../common/eqemu_logsys.h" +#include "common/eqemu_logsys.h" +#include "common/event/timer.h" +#include "common/net/servertalk_client_connection.h" +#include "common/net/servertalk_server.h" +#include "common/rulesys.h" class QueryServ { public: @@ -58,5 +57,3 @@ private: std::map> m_streams; std::unique_ptr m_keepalive; }; - -#endif /* QUERYSERV_ZONE_H */ diff --git a/zone/quest_db.cpp b/zone/quest_db.cpp index 5eda523d4..0efb9092a 100644 --- a/zone/quest_db.cpp +++ b/zone/quest_db.cpp @@ -1,6 +1,7 @@ #include "quest_db.h" -#include "zonedb.h" -#include "zone_config.h" + +#include "zone/zone_config.h" +#include "zone/zonedb.h" // New connections avoid concurrency issues and allow use of unbuffered results // with prepared statements. Using zone connections w/o buffering would cause diff --git a/zone/quest_interface.h b/zone/quest_interface.h index f18e1dbec..1e668b9a7 100644 --- a/zone/quest_interface.h +++ b/zone/quest_interface.h @@ -16,11 +16,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _EQE_QUESTINTERFACE_H -#define _EQE_QUESTINTERFACE_H +#pragma once + +#include "common/types.h" +#include "zone/event_codes.h" -#include "../common/types.h" -#include "event_codes.h" #include class Client; @@ -383,6 +383,3 @@ public: protected: std::list errors_; }; - -#endif - diff --git a/zone/quest_parser_collection.cpp b/zone/quest_parser_collection.cpp index 9535cb89a..f2b6a7fd5 100644 --- a/zone/quest_parser_collection.cpp +++ b/zone/quest_parser_collection.cpp @@ -16,20 +16,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#include "../common/global_define.h" -#include "../common/misc_functions.h" -#include "../common/features.h" - #include "quest_parser_collection.h" -#include "quest_interface.h" -#include "zone.h" -#include "questmgr.h" -#include "../common/path_manager.h" -#include "../common/repositories/perl_event_export_settings_repository.h" -#include "../common/file.h" -#include +#include "common/features.h" +#include "common/file.h" +#include "common/misc_functions.h" +#include "common/path_manager.h" +#include "common/repositories/perl_event_export_settings_repository.h" +#include "zone/quest_interface.h" +#include "zone/questmgr.h" +#include "zone/zone.h" + +#include // an encounter can register events before the object is loaded // examples diff --git a/zone/quest_parser_collection.h b/zone/quest_parser_collection.h index 5d7d1d3c0..f93854ddd 100644 --- a/zone/quest_parser_collection.h +++ b/zone/quest_parser_collection.h @@ -16,25 +16,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _EQE_QUESTPARSERCOLLECTION_H -#define _EQE_QUESTPARSERCOLLECTION_H +#pragma once -#include "../common/types.h" - -#include "encounter.h" -#include "beacon.h" -#include "client.h" -#include "corpse.h" -#include "doors.h" -#include "groups.h" -#include "mob.h" -#include "object.h" -#include "raids.h" -#include "trap.h" - -#include "quest_interface.h" - -#include "zone_config.h" +#include "common/types.h" +#include "zone/beacon.h" +#include "zone/client.h" +#include "zone/corpse.h" +#include "zone/doors.h" +#include "zone/encounter.h" +#include "zone/groups.h" +#include "zone/mob.h" +#include "zone/object.h" +#include "zone/quest_interface.h" +#include "zone/raids.h" +#include "zone/trap.h" +#include "zone/zone_config.h" #include #include @@ -404,6 +400,3 @@ private: }; extern QuestParserCollection *parse; - -#endif - diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 342955fff..4135b1e91 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -16,40 +16,37 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/classes.h" -#include "../common/data_verification.h" -#include "../common/global_define.h" -#include "../common/rulesys.h" -#include "../common/skills.h" -#include "../common/spdat.h" -#include "../common/strings.h" -#include "../common/say_link.h" -#include "../common/events/player_event_logs.h" - -#include "entity.h" -#include "event_codes.h" -#include "guild_mgr.h" -#include "qglobals.h" -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "questmgr.h" -#include "spawn2.h" -#include "worldserver.h" -#include "zone.h" -#include "zonedb.h" -#include "dialogue_window.h" - -#include "../common/repositories/account_repository.h" -#include "../common/repositories/completed_tasks_repository.h" -#include "../common/repositories/tradeskill_recipe_repository.h" -#include "../common/repositories/instance_list_repository.h" -#include "../common/repositories/grid_entries_repository.h" +#include "common/classes.h" +#include "common/data_verification.h" +#include "common/events/player_event_logs.h" +#include "common/repositories/account_repository.h" +#include "common/repositories/completed_tasks_repository.h" +#include "common/repositories/grid_entries_repository.h" +#include "common/repositories/instance_list_repository.h" +#include "common/repositories/tradeskill_recipe_repository.h" +#include "common/rulesys.h" +#include "common/say_link.h" +#include "common/skills.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/dialogue_window.h" +#include "zone/entity.h" +#include "zone/event_codes.h" +#include "zone/guild_mgr.h" +#include "zone/qglobals.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/questmgr.h" +#include "zone/spawn2.h" +#include "zone/worldserver.h" +#include "zone/zone.h" +#include "zone/zonedb.h" +#include #include -#include #include - -#include "bot.h" +#include extern QueryServ* QServ; extern Zone* zone; @@ -4588,7 +4585,7 @@ void QuestManager::SpawnCircle(uint32 npc_id, glm::vec4 position, float radius, glm::vec4 npc_position = position; for (uint32 i = 0; i < points; i++) { - float angle = 2 * M_PI * i / points; + float angle = 2 * std::numbers::pi * i / points; npc_position.x = position.x + radius * std::cos(angle); npc_position.y = position.y + radius * std::sin(angle); diff --git a/zone/questmgr.h b/zone/questmgr.h index f58bb283a..f7e3d4a85 100644 --- a/zone/questmgr.h +++ b/zone/questmgr.h @@ -15,11 +15,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __QUEST_MANAGER_H__ -#define __QUEST_MANAGER_H__ -#include "../common/timer.h" -#include "tasks.h" +#pragma once + +#include "common/timer.h" +#include "zone/tasks.h" #include #include @@ -414,6 +414,3 @@ private: }; extern QuestManager quest_manager; - -#endif - diff --git a/zone/raids.cpp b/zone/raids.cpp index ee7c69f0f..9fd5cd5d3 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -16,25 +16,22 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/strings.h" -#include "../common/events/player_event_logs.h" -#include "../common/repositories/character_expedition_lockouts_repository.h" -#include "../common/repositories/raid_details_repository.h" -#include "../common/repositories/raid_members_repository.h" -#include "../common/raid.h" - - -#include "client.h" -#include "dynamic_zone.h" -#include "entity.h" -#include "groups.h" -#include "mob.h" -#include "raids.h" -#include "string_ids.h" -#include "bot.h" - -#include "worldserver.h" -#include "queryserv.h" +#include "common/events/player_event_logs.h" +#include "common/raid.h" +#include "common/repositories/character_expedition_lockouts_repository.h" +#include "common/repositories/raid_details_repository.h" +#include "common/repositories/raid_members_repository.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/dynamic_zone.h" +#include "zone/entity.h" +#include "zone/groups.h" +#include "zone/mob.h" +#include "zone/queryserv.h" +#include "zone/raids.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" extern EntityList entity_list; extern WorldServer worldserver; diff --git a/zone/raids.h b/zone/raids.h index 05e232984..46a5c6bc3 100644 --- a/zone/raids.h +++ b/zone/raids.h @@ -15,13 +15,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef RAIDS_H -#define RAIDS_H -#include "../common/types.h" -#include "groups.h" -#include "xtargetautohaters.h" -#include "client.h" +#pragma once + +#include "common/types.h" +#include "zone/groups.h" +#include "zone/xtargetautohaters.h" +#include "zone/client.h" class Client; class EQApplicationPacket; @@ -299,7 +299,3 @@ protected: XTargetAutoHaters m_autohatermgr; }; - - -#endif - diff --git a/zone/raycast_mesh.cpp b/zone/raycast_mesh.cpp index 20c3f6b71..405285cbf 100644 --- a/zone/raycast_mesh.cpp +++ b/zone/raycast_mesh.cpp @@ -1,11 +1,13 @@ #include "raycast_mesh.h" -#include "../common/memory/ksm.hpp" -#include "../common/eqemu_logsys.h" -#include -#include -#include -#include -#include + +#include "common/eqemu_logsys.h" +#include "common/memory/ksm.hpp" + +#include +#include +#include +#include +#include #include // This code snippet allows you to create an axis aligned bounding volume tree for a triangle mesh so that you can do diff --git a/zone/raycast_mesh.h b/zone/raycast_mesh.h index 1aaa100cb..14306df22 100644 --- a/zone/raycast_mesh.h +++ b/zone/raycast_mesh.h @@ -1,6 +1,4 @@ -#ifndef RAYCAST_MESH_H - -#define RAYCAST_MESH_H +#pragma once // This code snippet allows you to create an axis aligned bounding volume tree for a triangle mesh so that you can do // high-speed raycasting. @@ -62,5 +60,3 @@ RaycastMesh * createRaycastMesh(RmUint32 vcount, // The number of vertices in t RaycastMesh* loadRaycastMesh(std::vector& rm_buffer, bool& load_success); void serializeRaycastMesh(RaycastMesh* rm, std::vector& rm_buffer); #endif /*USE_MAP_MMFS*/ - -#endif \ No newline at end of file diff --git a/zone/shared_task_zone_messaging.cpp b/zone/shared_task_zone_messaging.cpp index f3cbe0983..6d4b772cb 100644 --- a/zone/shared_task_zone_messaging.cpp +++ b/zone/shared_task_zone_messaging.cpp @@ -1,7 +1,8 @@ #include "shared_task_zone_messaging.h" -#include "../common/shared_tasks.h" -#include "../common/servertalk.h" -#include "client.h" + +#include "common/servertalk.h" +#include "common/shared_tasks.h" +#include "zone/client.h" #include #include diff --git a/zone/shared_task_zone_messaging.h b/zone/shared_task_zone_messaging.h index 492e3ac92..86393bc01 100644 --- a/zone/shared_task_zone_messaging.h +++ b/zone/shared_task_zone_messaging.h @@ -1,5 +1,4 @@ -#ifndef EQEMU_SHARED_TASK_ZONE_MESSAGING_H -#define EQEMU_SHARED_TASK_ZONE_MESSAGING_H +#pragma once class ServerPacket; @@ -7,6 +6,3 @@ class SharedTaskZoneMessaging { public: static void HandleWorldMessage(ServerPacket *pack); }; - - -#endif //EQEMU_SHARED_TASK_ZONE_MESSAGING_H diff --git a/zone/sidecar_api/loot_simulator_controller.cpp b/zone/sidecar_api/loot_simulator_controller.cpp index ad61157ef..4975a97de 100644 --- a/zone/sidecar_api/loot_simulator_controller.cpp +++ b/zone/sidecar_api/loot_simulator_controller.cpp @@ -1,6 +1,7 @@ #include "sidecar_api.h" -#include "../../common/json/json.hpp" -#include "../zone.h" + +#include "common/json/json.hpp" +#include "zone/zone.h" extern Zone *zone; diff --git a/zone/sidecar_api/sidecar_api.cpp b/zone/sidecar_api/sidecar_api.cpp index 583506798..f8a9f74e3 100644 --- a/zone/sidecar_api/sidecar_api.cpp +++ b/zone/sidecar_api/sidecar_api.cpp @@ -1,12 +1,15 @@ #include "sidecar_api.h" -#include "../../common/http/httplib.h" -#include "../../common/eqemu_logsys.h" -#include "../zonedb.h" -#include "../../common/process.h" -#include "../common.h" -#include "../zone.h" -#include "../client.h" -#include "../../common/json/json.hpp" + +#include "common/eqemu_logsys.h" +#include "common/file.h" +#include "common/http/httplib.h" +#include "common/json/json.hpp" +#include "common/process.h" +#include "zone/client.h" +#include "zone/common.h" +#include "zone/zone.h" +#include "zone/zonedb.h" + #include void CatchSidecarSignal(int sig_num) @@ -49,8 +52,6 @@ void SidecarApi::MapBestZController(const httplib::Request& req, httplib::Respon } -#include "../../common/file.h" - constexpr static int HTTP_RESPONSE_OK = 200; constexpr static int HTTP_RESPONSE_BAD_REQUEST = 400; constexpr static int HTTP_RESPONSE_UNAUTHORIZED = 401; diff --git a/zone/sidecar_api/sidecar_api.h b/zone/sidecar_api/sidecar_api.h index 0bf62223b..fbc6fd8b4 100644 --- a/zone/sidecar_api/sidecar_api.h +++ b/zone/sidecar_api/sidecar_api.h @@ -1,7 +1,7 @@ -#ifndef EQEMU_SIDECAR_API_H -#define EQEMU_SIDECAR_API_H -#include "../../common/http/httplib.h" +#pragma once + +#include "common/http/httplib.h" class SidecarApi { public: @@ -12,6 +12,3 @@ public: static void LootSimulatorController(const httplib::Request &req, httplib::Response &res); static void MapBestZController(const httplib::Request &req, httplib::Response &res); }; - - -#endif //EQEMU_SIDECAR_API_H diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index 9127ab3e6..f10a41e84 100644 --- a/zone/spawn2.cpp +++ b/zone/spawn2.cpp @@ -16,25 +16,25 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include "../common/global_define.h" -#include "../common/strings.h" - -#include "client.h" -#include "entity.h" #include "spawn2.h" -#include "spawngroup.h" -#include "worldserver.h" -#include "zone.h" -#include "zonedb.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/repositories/spawn_conditions_repository.h" -#include "../common/repositories/spawn_condition_values_repository.h" -#include "../common/repositories/spawn_events_repository.h" -#include "../common/repositories/spawn2_repository.h" -#include "../common/repositories/spawn2_disabled_repository.h" -#include "../common/repositories/respawn_times_repository.h" -#include "../common/repositories/zone_state_spawns_repository.h" + +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/respawn_times_repository.h" +#include "common/repositories/spawn_condition_values_repository.h" +#include "common/repositories/spawn_conditions_repository.h" +#include "common/repositories/spawn_events_repository.h" +#include "common/repositories/spawn2_disabled_repository.h" +#include "common/repositories/spawn2_repository.h" +#include "common/repositories/zone_state_spawns_repository.h" +#include "common/strings.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/spawngroup.h" +#include "zone/worldserver.h" +#include "zone/zone.h" +#include "zone/zonedb.h" + +#include "cereal/archives/json.hpp" extern EntityList entity_list; extern Zone* zone; diff --git a/zone/spawn2.h b/zone/spawn2.h index f5b31022a..f77565b5d 100644 --- a/zone/spawn2.h +++ b/zone/spawn2.h @@ -15,11 +15,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef SPAWN2_H -#define SPAWN2_H -#include "../common/timer.h" -#include "npc.h" +#pragma once + +#include "common/timer.h" +#include "zone/npc.h" #define SC_AlwaysEnabled 0 @@ -186,5 +186,3 @@ protected: constexpr int format_as(SpawnCondition::OnChange val) { return static_cast(val); } constexpr int format_as(SpawnEvent::Action val) { return static_cast(val); } - -#endif diff --git a/zone/spawngroup.cpp b/zone/spawngroup.cpp index acf03f071..bdce23a72 100644 --- a/zone/spawngroup.cpp +++ b/zone/spawngroup.cpp @@ -16,15 +16,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include "../common/global_define.h" -#include "../common/types.h" - -#include "entity.h" #include "spawngroup.h" -#include "zone.h" -#include "zonedb.h" -#include "../common/repositories/criteria/content_filter_criteria.h" + +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/types.h" +#include "zone/entity.h" +#include "zone/zone.h" +#include "zone/zonedb.h" + +#include "fmt/format.h" extern EntityList entity_list; extern Zone *zone; diff --git a/zone/spawngroup.h b/zone/spawngroup.h index 9fee72996..832c58138 100644 --- a/zone/spawngroup.h +++ b/zone/spawngroup.h @@ -15,13 +15,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef SPAWNGROUP_H -#define SPAWNGROUP_H -#include "../common/types.h" +#pragma once + +#include "common/types.h" -#include #include +#include #include class SpawnEntry { @@ -85,5 +85,3 @@ public: private: std::map> m_spawn_groups; }; - -#endif diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 57feb3f2e..5f2de8c03 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -16,18 +16,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/rulesys.h" -#include "../common/strings.h" - -#include "client.h" -#include "entity.h" #include "mob.h" -#include "string_ids.h" -#include "lua_parser.h" -#include "npc.h" -#include "bot.h" -#include +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/lua_parser.h" +#include "zone/npc.h" +#include "zone/string_ids.h" + +#include extern double frame_time; diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 42078e322..74e824691 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -16,28 +16,23 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/eqemu_logsys.h" -#include "../common/bodytypes.h" -#include "../common/classes.h" -#include "../common/global_define.h" -#include "../common/item_instance.h" -#include "../common/rulesys.h" -#include "../common/spdat.h" -#include "../common/data_verification.h" -#include "../common/misc_functions.h" +#include "mob.h" -#include "bot.h" -#include "quest_parser_collection.h" -#include "lua_parser.h" -#include "string_ids.h" -#include "worldserver.h" +#include "common/bodytypes.h" +#include "common/classes.h" +#include "common/data_verification.h" +#include "common/eqemu_logsys.h" +#include "common/item_instance.h" +#include "common/misc_functions.h" +#include "common/rulesys.h" +#include "common/spdat.h" +#include "zone/bot.h" +#include "zone/lua_parser.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" -#include - -#ifndef WIN32 -#include -#include "../common/unix.h" -#endif +#include extern Zone* zone; diff --git a/zone/spells.cpp b/zone/spells.cpp index 6636a092c..4e89bbba9 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -66,46 +66,34 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) and not SpellFinished(). */ -#include "../common/bodytypes.h" -#include "../common/classes.h" -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/item_instance.h" -#include "../common/rulesys.h" -#include "../common/spdat.h" -#include "../common/strings.h" -#include "../common/data_verification.h" -#include "../common/misc_functions.h" -#include "../common/events/player_event_logs.h" -#include "../common/repositories/character_corpses_repository.h" -#include "../common/repositories/spell_buckets_repository.h" - -#include "../common/data_bucket.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "worldserver.h" -#include "fastmath.h" -#include "lua_parser.h" - -#include -#include -#include "queryserv.h" - -#ifndef WIN32 - #include - #include "../common/unix.h" -#endif - -#ifdef _GOTFRAGS - #include "../common/packet_dump_file.h" -#endif - -#include "bot.h" - -#include "mob_movement_manager.h" -#include "client.h" #include "mob.h" -#include "water_map.h" + +#include "common/bodytypes.h" +#include "common/classes.h" +#include "common/data_bucket.h" +#include "common/data_verification.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/item_instance.h" +#include "common/misc_functions.h" +#include "common/repositories/character_corpses_repository.h" +#include "common/repositories/spell_buckets_repository.h" +#include "common/rulesys.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/client.h" +#include "zone/fastmath.h" +#include "zone/lua_parser.h" +#include "zone/mob_movement_manager.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" + +#include +#include extern Zone *zone; extern volatile bool is_zone_loaded; diff --git a/zone/string_ids.h b/zone/string_ids.h index 5e929db02..50fe61bfb 100644 --- a/zone/string_ids.h +++ b/zone/string_ids.h @@ -1,5 +1,4 @@ -#ifndef STRING_IDS -#define STRING_IDS +#pragma once //These strings are loaded from eqstr_us.txt, but may vary between client versions. Maybe we could make this an enum that's dependent on the client version? #define GENERIC_9_STRINGS 1 //%1 %2 %3 %4 %5 %6 %7 %8 %9 @@ -600,6 +599,3 @@ #define GAIN_XP_BONUS 14541 //You gain experience (with a bonus)! #define GAIN_XP_PENALTY 14542 //You gain experience (with a penalty)! #define GENERIC_MISS 15041 //%1 missed %2 - -#endif - diff --git a/zone/task_client_state.cpp b/zone/task_client_state.cpp index af9525a60..b2bd100be 100644 --- a/zone/task_client_state.cpp +++ b/zone/task_client_state.cpp @@ -1,20 +1,20 @@ -#include "../common/global_define.h" -#include "../common/misc_functions.h" -#include "../common/repositories/character_activities_repository.h" -#include "../common/repositories/character_task_timers_repository.h" -#include "../common/repositories/character_tasks_repository.h" -#include "../common/repositories/completed_tasks_repository.h" -#include "../common/rulesys.h" -#include "client.h" -#include "queryserv.h" -#include "quest_parser_collection.h" #include "task_client_state.h" -#include "zonedb.h" -#include "../common/shared_tasks.h" -#include "worldserver.h" -#include "dynamic_zone.h" -#include "string_ids.h" -#include "../common/events/player_event_logs.h" + +#include "common/events/player_event_logs.h" +#include "common/misc_functions.h" +#include "common/repositories/character_activities_repository.h" +#include "common/repositories/character_task_timers_repository.h" +#include "common/repositories/character_tasks_repository.h" +#include "common/repositories/completed_tasks_repository.h" +#include "common/rulesys.h" +#include "common/shared_tasks.h" +#include "zone/client.h" +#include "zone/dynamic_zone.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" #define EBON_CRYSTAL 40902 #define RADIANT_CRYSTAL 40903 diff --git a/zone/task_client_state.h b/zone/task_client_state.h index 30c5dd69c..e444619eb 100644 --- a/zone/task_client_state.h +++ b/zone/task_client_state.h @@ -1,12 +1,12 @@ -#ifndef EQEMU_TASK_CLIENT_STATE_H -#define EQEMU_TASK_CLIENT_STATE_H +#pragma once + +#include "common/types.h" +#include "zone/tasks.h" -#include "tasks.h" -#include "../common/types.h" -#include -#include -#include #include +#include +#include +#include constexpr float MAX_TASK_SELECT_DISTANCE = 60.0f; // client closes window at this distance @@ -183,5 +183,3 @@ private: ); bool HasActiveTasks(); }; - -#endif //EQEMU_TASK_CLIENT_STATE_H diff --git a/zone/task_manager.cpp b/zone/task_manager.cpp index d6df2ebb9..8a7badbd4 100644 --- a/zone/task_manager.cpp +++ b/zone/task_manager.cpp @@ -1,19 +1,19 @@ -#include "../common/global_define.h" -#include "../common/misc_functions.h" -#include "../common/repositories/character_activities_repository.h" -#include "../common/repositories/character_tasks_repository.h" -#include "../common/repositories/completed_tasks_repository.h" -#include "../common/repositories/task_activities_repository.h" -#include "../common/repositories/tasks_repository.h" -#include "../common/repositories/tasksets_repository.h" -#include "client.h" -#include "dynamic_zone.h" -#include "string_ids.h" #include "task_manager.h" -#include "../common/repositories/shared_task_activity_state_repository.h" -#include "../common/repositories/shared_task_members_repository.h" -#include "../common/shared_tasks.h" -#include "worldserver.h" + +#include "common/misc_functions.h" +#include "common/repositories/character_activities_repository.h" +#include "common/repositories/character_tasks_repository.h" +#include "common/repositories/completed_tasks_repository.h" +#include "common/repositories/shared_task_activity_state_repository.h" +#include "common/repositories/shared_task_members_repository.h" +#include "common/repositories/task_activities_repository.h" +#include "common/repositories/tasks_repository.h" +#include "common/repositories/tasksets_repository.h" +#include "common/shared_tasks.h" +#include "zone/client.h" +#include "zone/dynamic_zone.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/task_manager.h b/zone/task_manager.h index abd1255a4..83a4f9571 100644 --- a/zone/task_manager.h +++ b/zone/task_manager.h @@ -1,14 +1,14 @@ -#ifndef EQEMU_TASK_MANAGER_H -#define EQEMU_TASK_MANAGER_H +#pragma once + +#include "common/repositories/character_tasks_repository.h" +#include "common/types.h" +#include "zone/task_client_state.h" +#include "zone/tasks.h" -#include "tasks.h" -#include "task_client_state.h" -#include "../common/types.h" -#include "../common/repositories/character_tasks_repository.h" -#include -#include -#include #include +#include +#include +#include class Client; class Mob; @@ -97,6 +97,3 @@ private: void SendSharedTaskSelector(Client* client, Mob* mob, const std::vector& tasks); void SyncClientSharedTaskStateToLocal(Client *c); }; - - -#endif //EQEMU_TASK_MANAGER_H diff --git a/zone/tasks.cpp b/zone/tasks.cpp index 708a43e84..145c5d430 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -1,14 +1,14 @@ -#include "../common/global_define.h" -#include "../common/misc_functions.h" -#include "../common/rulesys.h" -#include "../common/strings.h" -#include "client.h" -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "string_ids.h" #include "tasks.h" -#include "zonedb.h" -#include "../common/repositories/character_task_timers_repository.h" + +#include "common/misc_functions.h" +#include "common/repositories/character_task_timers_repository.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/client.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/zonedb.h" extern QueryServ *QServ; diff --git a/zone/tasks.h b/zone/tasks.h index 56be4fa8d..5d6e764da 100644 --- a/zone/tasks.h +++ b/zone/tasks.h @@ -1,12 +1,12 @@ -#ifndef TASKS_H -#define TASKS_H +#pragma once + +#include "common/tasks.h" +#include "common/types.h" -#include "../common/types.h" -#include "../common/tasks.h" -#include -#include -#include #include +#include +#include +#include class Client; class Mob; @@ -14,5 +14,3 @@ class Mob; namespace EQ { class ItemInstance; } - -#endif diff --git a/zone/titles.cpp b/zone/titles.cpp index 84ee2dd50..ef1d771c8 100644 --- a/zone/titles.cpp +++ b/zone/titles.cpp @@ -1,13 +1,12 @@ -#include "../common/eq_packet_structs.h" -#include "../common/strings.h" -#include "../common/misc_functions.h" -#include "../common/repositories/player_titlesets_repository.h" - -#include "client.h" -#include "mob.h" - #include "titles.h" -#include "worldserver.h" + +#include "common/eq_packet_structs.h" +#include "common/misc_functions.h" +#include "common/repositories/player_titlesets_repository.h" +#include "common/strings.h" +#include "zone/client.h" +#include "zone/mob.h" +#include "zone/worldserver.h" extern WorldServer worldserver; diff --git a/zone/titles.h b/zone/titles.h index 5486e49c5..4541810c0 100644 --- a/zone/titles.h +++ b/zone/titles.h @@ -1,8 +1,8 @@ -#ifndef TITLES_H -#define TITLES_H +#pragma once + +#include "common/repositories/titles_repository.h" #include -#include "../common/repositories/titles_repository.h" class Client; class EQApplicationPacket; @@ -30,6 +30,3 @@ protected: }; extern TitleManager title_manager; - -#endif - diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index d307ca418..756c5fcc8 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -16,29 +16,24 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/events/player_event_logs.h" +#include "client.h" + +#include "common/events/player_event_logs.h" +#include "common/repositories/char_recipe_list_repository.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/tradeskill_recipe_entries_repository.h" +#include "common/repositories/tradeskill_recipe_repository.h" +#include "common/rulesys.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/titles.h" +#include "zone/worldserver.h" +#include "zone/zonedb.h" #include #include -#ifndef WIN32 -#include //for htonl -#endif - -#include "../common/rulesys.h" - -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "titles.h" -#include "zonedb.h" -#include "worldserver.h" -#include "../common/repositories/char_recipe_list_repository.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/repositories/tradeskill_recipe_repository.h" -#include "../common/repositories/tradeskill_recipe_entries_repository.h" - extern QueryServ* QServ; extern WorldServer worldserver; diff --git a/zone/trading.cpp b/zone/trading.cpp index 9415c9e01..b5f26eb4d 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -16,25 +16,23 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/rulesys.h" -#include "../common/strings.h" -#include "../common/eq_packet_structs.h" -#include "../common/misc_functions.h" -#include "../common/events/player_event_logs.h" -#include "../common/repositories/trader_repository.h" -#include "../common/repositories/buyer_repository.h" -#include "../common/repositories/buyer_buy_lines_repository.h" - #include "client.h" -#include "entity.h" -#include "mob.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "worldserver.h" -#include "../common/bazaar.h" +#include "common/bazaar.h" +#include "common/eq_packet_structs.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/misc_functions.h" +#include "common/repositories/buyer_buy_lines_repository.h" +#include "common/repositories/buyer_repository.h" +#include "common/repositories/trader_repository.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/entity.h" +#include "zone/mob.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" #include class QueryServ; diff --git a/zone/trap.cpp b/zone/trap.cpp index 7377d5897..fbab07540 100644 --- a/zone/trap.cpp +++ b/zone/trap.cpp @@ -16,15 +16,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/spdat.h" -#include "../common/strings.h" - -#include "client.h" -#include "entity.h" -#include "mob.h" #include "trap.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/repositories/traps_repository.h" + +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/traps_repository.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/client.h" +#include "zone/entity.h" +#include "zone/mob.h" /* diff --git a/zone/trap.h b/zone/trap.h index 4c7e7daa1..23f8fedd1 100644 --- a/zone/trap.h +++ b/zone/trap.h @@ -15,10 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TRAP_H -#define _TRAP_H -#include "entity.h" +#pragma once + +#include "zone/entity.h" class Mob; class NPC; @@ -81,6 +81,3 @@ public: protected: NPC *hiddenTrigger; }; - -#endif - diff --git a/zone/tribute.cpp b/zone/tribute.cpp index f9a9e7357..e783465ec 100644 --- a/zone/tribute.cpp +++ b/zone/tribute.cpp @@ -16,30 +16,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eq_packet_structs.h" -#include "../common/features.h" -#include "../common/repositories/guild_tributes_repository.h" -#include "../common/guild_base.h" -#include "guild_mgr.h" -#include "worldserver.h" - #include "client.h" -#include +#include "common/eq_packet_structs.h" +#include "common/features.h" +#include "common/guild_base.h" +#include "common/repositories/guild_tributes_repository.h" +#include "zone/guild_mgr.h" +#include "zone/worldserver.h" -#ifdef _WINDOWS - #include - #define snprintf _snprintf - #define vsnprintf _vsnprintf - #define strncasecmp _strnicmp - #define strcasecmp _stricmp -#else - #include - #include - #include - #include "../common/unix.h" -#endif +#include /* diff --git a/zone/tune.cpp b/zone/tune.cpp index 6f94d7bbd..0471d74df 100644 --- a/zone/tune.cpp +++ b/zone/tune.cpp @@ -16,38 +16,26 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if EQDEBUG >= 5 -//#define TUNE_DEBUG 20 -#endif - -#include "../common/global_define.h" -#include "../common/eq_constants.h" -#include "../common/eq_packet_structs.h" -#include "../common/rulesys.h" -#include "../common/spdat.h" -#include "../common/strings.h" -#include "../common/data_verification.h" -#include "queryserv.h" -#include "string_ids.h" -#include "water_map.h" -#include "worldserver.h" -#include "zone.h" -#include "lua_parser.h" -#include "fastmath.h" #include "mob.h" -#include "bot.h" +#include "common/data_verification.h" +#include "common/eq_constants.h" +#include "common/eq_packet_structs.h" +#include "common/rulesys.h" +#include "common/spdat.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/fastmath.h" +#include "zone/lua_parser.h" +#include "zone/queryserv.h" +#include "zone/string_ids.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" +#include "zone/zone.h" extern QueryServ* QServ; extern WorldServer worldserver; extern FastMath g_Math; - -#ifdef _WINDOWS -#define snprintf _snprintf -#define strncasecmp _strnicmp -#define strcasecmp _stricmp -#endif - extern EntityList entity_list; extern Zone* zone; diff --git a/zone/water_map.cpp b/zone/water_map.cpp index e31bb0c75..80fc2d58e 100644 --- a/zone/water_map.cpp +++ b/zone/water_map.cpp @@ -1,14 +1,13 @@ - - #include "water_map.h" -#include "water_map_v1.h" -#include "water_map_v2.h" -#include "../common/eqemu_logsys.h" + +#include "common/eqemu_logsys.h" +#include "zone/water_map_v1.h" +#include "zone/water_map_v2.h" #include #include -#include -#include +#include +#include /** * @param zone_name diff --git a/zone/water_map.h b/zone/water_map.h index 975703b40..1eec456a9 100644 --- a/zone/water_map.h +++ b/zone/water_map.h @@ -1,9 +1,9 @@ -#ifndef EQEMU_WATER_MAP_H -#define EQEMU_WATER_MAP_H +#pragma once + +#include "common/types.h" +#include "zone/position.h" +#include "zone/zone_config.h" -#include "../common/types.h" -#include "position.h" -#include "zone_config.h" #include extern const ZoneConfig *Config; @@ -39,5 +39,3 @@ public: protected: virtual bool Load(FILE *fp) { return false; } }; - -#endif diff --git a/zone/water_map_v1.h b/zone/water_map_v1.h index af4d4966f..cdce61ccf 100644 --- a/zone/water_map_v1.h +++ b/zone/water_map_v1.h @@ -1,8 +1,8 @@ -#ifndef EQEMU_WATER_MAP_V1_H -#define EQEMU_WATER_MAP_V1_H +#pragma once -#include "water_map.h" +#include "zone/water_map.h" +#pragma pack(push) #pragma pack(1) typedef struct ZBSP_Node { int32 node_number; @@ -11,7 +11,8 @@ typedef struct ZBSP_Node { int32 special; int32 left, right; } ZBSP_Node; -#pragma pack() + +#pragma pack(pop) class WaterMapV1 : public WaterMap { @@ -36,5 +37,3 @@ private: friend class WaterMap; }; - -#endif diff --git a/zone/water_map_v2.h b/zone/water_map_v2.h index 704d1a119..5da8acdb8 100644 --- a/zone/water_map_v2.h +++ b/zone/water_map_v2.h @@ -1,10 +1,10 @@ -#ifndef EQEMU_WATER_MAP_V2_H -#define EQEMU_WATER_MAP_V2_H +#pragma once + +#include "zone/oriented_bounding_box.h" +#include "zone/water_map.h" -#include "water_map.h" -#include "oriented_bounding_box.h" -#include #include +#include class WaterMapV2 : public WaterMap { @@ -26,5 +26,3 @@ protected: std::vector> regions; friend class WaterMap; }; - -#endif diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index 5904c83ad..4745b6c8c 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -15,28 +15,24 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#ifdef _EQDEBUG -#include -#endif -#include "../common/rulesys.h" -#include "../common/strings.h" -#include "../common/misc_functions.h" -#include "../common/eqemu_logsys.h" - -#include "map.h" #include "npc.h" -#include "quest_parser_collection.h" -#include "water_map.h" -#include "fastmath.h" -#include "mob_movement_manager.h" -#include "../common/repositories/grid_repository.h" -#include "../common/repositories/grid_entries_repository.h" -#include "../common/repositories/spawn2_repository.h" +#include "common/eqemu_logsys.h" +#include "common/misc_functions.h" +#include "common/repositories/grid_entries_repository.h" +#include "common/repositories/grid_repository.h" +#include "common/repositories/spawn2_repository.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/fastmath.h" +#include "zone/map.h" +#include "zone/mob_movement_manager.h" +#include "zone/quest_parser_collection.h" +#include "zone/water_map.h" -#include +#include extern FastMath g_Math; @@ -1266,7 +1262,6 @@ void NPC::RestoreGuardSpotCharm() /****************** * Bot-specific overloads to make them play nice with the new movement system */ -#include "bot.h" void Bot::WalkTo(float x, float y, float z) { diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 747302e24..b73a55b6b 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -16,63 +16,55 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include -#include -#include -#include - -#ifdef _WINDOWS -#include - -#define snprintf _snprintf -#define strncasecmp _strnicmp -#define strcasecmp _stricmp -#endif - -#include "../common/eq_packet_structs.h" -#include "../common/misc_functions.h" -#include "../common/rulesys.h" -#include "../common/say_link.h" -#include "../common/servertalk.h" -#include "../common/profanity_manager.h" - -#include "client.h" -#include "command.h" -#include "corpse.h" -#include "dynamic_zone.h" -#include "entity.h" -#include "quest_parser_collection.h" -#include "guild_mgr.h" -#include "mob.h" -#include "petitions.h" -#include "raids.h" -#include "string_ids.h" -#include "titles.h" #include "worldserver.h" -#include "zone.h" -#include "zone_config.h" -#include "../common/shared_tasks.h" -#include "shared_task_zone_messaging.h" -#include "dialogue_window.h" -#include "bot_command.h" -#include "../common/events/player_event_logs.h" -#include "../common/repositories/guild_tributes_repository.h" -#include "../common/patches/patches.h" -#include "../common/skill_caps.h" -#include "../common/server_reload_types.h" -#include "queryserv.h" + +#include "common/eq_packet_structs.h" +#include "common/events/player_event_logs.h" +#include "common/misc_functions.h" +#include "common/patches/patches.h" +#include "common/profanity_manager.h" +#include "common/repositories/guild_tributes_repository.h" +#include "common/rulesys.h" +#include "common/say_link.h" +#include "common/server_reload_types.h" +#include "common/servertalk.h" +#include "common/shared_tasks.h" +#include "common/skill_caps.h" +#include "zone/bot_command.h" +#include "zone/client.h" +#include "zone/command.h" +#include "zone/corpse.h" +#include "zone/dialogue_window.h" +#include "zone/dynamic_zone.h" +#include "zone/entity.h" +#include "zone/guild_mgr.h" +#include "zone/mob.h" +#include "zone/petitions.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/raids.h" +#include "zone/shared_task_zone_messaging.h" +#include "zone/string_ids.h" +#include "zone/titles.h" +#include "zone/zone_config.h" +#include "zone/zone.h" + +#include +#include +#include +#include extern EntityList entity_list; extern Zone *zone; extern volatile bool is_zone_loaded; -extern void Shutdown(); extern WorldServer worldserver; extern uint32 numclients; extern volatile bool RunLoops; extern QuestParserCollection *parse; extern QueryServ *QServ; +void Shutdown(); + // QuestParserCollection *parse = 0; WorldServer::WorldServer() @@ -2927,10 +2919,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) c->AssignTask(u->task_identifier, u->task_subidentifier, u->enforce_level_requirement); break; case CZTaskUpdateSubtype_DisableTask: - c->DisableTask(1, reinterpret_cast(u->task_identifier)); + c->DisableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_EnableTask: - c->EnableTask(1, reinterpret_cast(u->task_identifier)); + c->EnableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_FailTask: c->FailTask(u->task_identifier); @@ -2957,10 +2949,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) group_member->AssignTask(u->task_identifier, u->task_subidentifier, u->enforce_level_requirement); break; case CZTaskUpdateSubtype_DisableTask: - group_member->DisableTask(1, reinterpret_cast(u->task_identifier)); + group_member->DisableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_EnableTask: - group_member->EnableTask(1, reinterpret_cast(u->task_identifier)); + group_member->EnableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_FailTask: group_member->FailTask(u->task_identifier); @@ -2988,10 +2980,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) m.member->CastToClient()->AssignTask(u->task_identifier, u->task_subidentifier, u->enforce_level_requirement); break; case CZTaskUpdateSubtype_DisableTask: - m.member->CastToClient()->DisableTask(1, reinterpret_cast(u->task_identifier)); + m.member->CastToClient()->DisableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_EnableTask: - m.member->CastToClient()->EnableTask(1, reinterpret_cast(u->task_identifier)); + m.member->CastToClient()->EnableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_FailTask: m.member->CastToClient()->FailTask(u->task_identifier); @@ -3017,10 +3009,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) c.second->AssignTask(u->task_identifier, u->task_subidentifier, u->enforce_level_requirement); break; case CZTaskUpdateSubtype_DisableTask: - c.second->DisableTask(1, reinterpret_cast(u->task_identifier)); + c.second->DisableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_EnableTask: - c.second->EnableTask(1, reinterpret_cast(u->task_identifier)); + c.second->EnableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_FailTask: c.second->FailTask(u->task_identifier); @@ -3045,10 +3037,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) c.second->AssignTask(u->task_identifier, u->task_subidentifier, u->enforce_level_requirement); break; case CZTaskUpdateSubtype_DisableTask: - c.second->DisableTask(1, reinterpret_cast(u->task_identifier)); + c.second->DisableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_EnableTask: - c.second->EnableTask(1, reinterpret_cast(u->task_identifier)); + c.second->EnableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_FailTask: c.second->FailTask(u->task_identifier); @@ -3073,10 +3065,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) c->AssignTask(u->task_identifier, u->task_subidentifier, u->enforce_level_requirement); break; case CZTaskUpdateSubtype_DisableTask: - c->DisableTask(1, reinterpret_cast(u->task_identifier)); + c->DisableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_EnableTask: - c->EnableTask(1, reinterpret_cast(u->task_identifier)); + c->EnableTask(1, reinterpret_cast(&u->task_identifier)); break; case CZTaskUpdateSubtype_FailTask: c->FailTask(u->task_identifier); @@ -3313,10 +3305,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) c.second->AssignTask(u->task_identifier, u->task_subidentifier, u->enforce_level_requirement); break; case WWTaskUpdateType_DisableTask: - c.second->DisableTask(1, reinterpret_cast(u->task_identifier)); + c.second->DisableTask(1, reinterpret_cast(&u->task_identifier)); break; case WWTaskUpdateType_EnableTask: - c.second->EnableTask(1, reinterpret_cast(u->task_identifier)); + c.second->EnableTask(1, reinterpret_cast(&u->task_identifier)); break; case WWTaskUpdateType_FailTask: c.second->FailTask(u->task_identifier); diff --git a/zone/worldserver.h b/zone/worldserver.h index 2e92169a5..7d59e6d85 100644 --- a/zone/worldserver.h +++ b/zone/worldserver.h @@ -15,13 +15,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef WORLDSERVER_H -#define WORLDSERVER_H -#include "../common/eq_packet_structs.h" -#include "../common/net/servertalk_client_connection.h" -#include "zone_event_scheduler.h" -#include "../common/server_reload_types.h" +#pragma once + +#include "common/eq_packet_structs.h" +#include "common/net/servertalk_client_connection.h" +#include "common/server_reload_types.h" +#include "zone/zone_event_scheduler.h" class ServerPacket; class EQApplicationPacket; @@ -88,5 +88,3 @@ public: void SetScheduler(ZoneEventScheduler *scheduler); void SendReload(ServerReload::Type type, bool is_global = true); }; -#endif - diff --git a/zone/xtargetautohaters.cpp b/zone/xtargetautohaters.cpp index ab010d9db..5c49b08a3 100644 --- a/zone/xtargetautohaters.cpp +++ b/zone/xtargetautohaters.cpp @@ -1,8 +1,9 @@ #include "xtargetautohaters.h" -#include "mob.h" -#include "client.h" -#include "raids.h" -#include "groups.h" + +#include "zone/client.h" +#include "zone/groups.h" +#include "zone/mob.h" +#include "zone/raids.h" #include @@ -109,4 +110,3 @@ bool XTargetAutoHaters::contains_mob(int spawn_id) [spawn_id](const HatersCount &c) { return c.spawn_id == spawn_id; }); return it != m_haters.end(); } - diff --git a/zone/xtargetautohaters.h b/zone/xtargetautohaters.h index 73c0fa8d2..761331fa9 100644 --- a/zone/xtargetautohaters.h +++ b/zone/xtargetautohaters.h @@ -1,5 +1,4 @@ -#ifndef XTARGETAUTOHATERS_H -#define XTARGETAUTOHATERS_H +#pragma once #include @@ -41,7 +40,3 @@ private: Group *m_group; Raid *m_raid; }; - - -#endif /* !XTARGETAUTOHATERS_H */ - diff --git a/zone/zone.cpp b/zone/zone.cpp index 771ac9538..34a635b3b 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -16,69 +16,53 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include -#include - -#ifdef _WINDOWS -#define snprintf _snprintf -#define vsnprintf _vsnprintf -#else -#include -#include "../common/unix.h" -#endif - -#include "../common/global_define.h" -#include "../common/features.h" -#include "../common/rulesys.h" -#include "../common/seperator.h" -#include "../common/strings.h" -#include "../common/eqemu_logsys.h" - -#include "dynamic_zone.h" -#include "guild_mgr.h" -#include "map.h" -#include "npc.h" -#include "object.h" -#include "pathfinder_null.h" -#include "petitions.h" -#include "quest_parser_collection.h" -#include "spawn2.h" -#include "spawngroup.h" -#include "water_map.h" -#include "worldserver.h" #include "zone.h" -#include "zone_config.h" -#include "mob_movement_manager.h" -#include "npc_scale_manager.h" -#include "../common/data_verification.h" -#include "zone_reload.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/repositories/character_exp_modifiers_repository.h" -#include "../common/repositories/merchantlist_repository.h" -#include "../common/repositories/object_repository.h" -#include "../common/repositories/rule_sets_repository.h" -#include "../common/repositories/level_exp_mods_repository.h" -#include "../common/repositories/ldon_trap_entries_repository.h" -#include "../common/repositories/ldon_trap_templates_repository.h" -#include "../common/repositories/respawn_times_repository.h" -#include "../common/repositories/npc_emotes_repository.h" -#include "../common/repositories/zone_state_spawns_repository.h" -#include "../common/serverinfo.h" -#include "../common/repositories/merc_stance_entries_repository.h" -#include "../common/repositories/alternate_currency_repository.h" -#include "../common/repositories/graveyard_repository.h" -#include "../common/repositories/trader_repository.h" -#include "../common/repositories/buyer_repository.h" -#include +#include "common/data_verification.h" +#include "common/eqemu_logsys.h" +#include "common/features.h" +#include "common/repositories/alternate_currency_repository.h" +#include "common/repositories/buyer_repository.h" +#include "common/repositories/character_exp_modifiers_repository.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/graveyard_repository.h" +#include "common/repositories/ldon_trap_entries_repository.h" +#include "common/repositories/ldon_trap_templates_repository.h" +#include "common/repositories/level_exp_mods_repository.h" +#include "common/repositories/merc_stance_entries_repository.h" +#include "common/repositories/merchantlist_repository.h" +#include "common/repositories/npc_emotes_repository.h" +#include "common/repositories/object_repository.h" +#include "common/repositories/respawn_times_repository.h" +#include "common/repositories/rule_sets_repository.h" +#include "common/repositories/trader_repository.h" +#include "common/repositories/zone_state_spawns_repository.h" +#include "common/rulesys.h" +#include "common/seperator.h" +#include "common/serverinfo.h" +#include "common/strings.h" +#include "zone/dynamic_zone.h" +#include "zone/guild_mgr.h" +#include "zone/map.h" +#include "zone/mob_movement_manager.h" +#include "zone/npc_scale_manager.h" +#include "zone/npc.h" +#include "zone/object.h" +#include "zone/pathfinder_null.h" +#include "zone/petitions.h" +#include "zone/quest_parser_collection.h" +#include "zone/spawn2.h" +#include "zone/spawngroup.h" +#include "zone/water_map.h" +#include "zone/worldserver.h" +#include "zone/zone_config.h" +#include "zone/zone_reload.h" -#ifdef _WINDOWS -#define snprintf _snprintf -#define strncasecmp _strnicmp -#define strcasecmp _stricmp -#endif +#include +#include +#include +#include +#include extern bool staticzone; extern QuestParserCollection* parse; diff --git a/zone/zone.h b/zone/zone.h index fe9d39650..ce6a731fd 100755 --- a/zone/zone.h +++ b/zone/zone.h @@ -15,41 +15,41 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef ZONE_H -#define ZONE_H -#include "../common/eqtime.h" -#include "../common/linked_list.h" -#include "../common/rulesys.h" -#include "../common/types.h" -#include "../common/random.h" -#include "../common/strings.h" -#include "zonedb.h" -#include "../common/zone_store.h" -#include "../common/repositories/grid_repository.h" -#include "../common/repositories/grid_entries_repository.h" -#include "../common/repositories/zone_points_repository.h" -#include "qglobals.h" -#include "spawn2.h" -#include "spawngroup.h" -#include "aa_ability.h" -#include "pathfinder_interface.h" -#include "global_loot_manager.h" -#include "queryserv.h" -#include "../common/discord/discord.h" -#include "../common/repositories/dynamic_zone_templates_repository.h" -#include "../common/repositories/npc_faction_repository.h" -#include "../common/repositories/npc_faction_entries_repository.h" -#include "../common/repositories/faction_association_repository.h" -#include "../common/repositories/loottable_repository.h" -#include "../common/repositories/loottable_entries_repository.h" -#include "../common/repositories/lootdrop_repository.h" -#include "../common/repositories/lootdrop_entries_repository.h" -#include "../common/repositories/base_data_repository.h" -#include "../common/repositories/skill_caps_repository.h" -#include "../common/repositories/zone_state_spawns_repository.h" -#include "../common/repositories/spawn2_disabled_repository.h" -#include "../common/repositories/player_titlesets_repository.h" +#pragma once + +#include "common/discord/discord.h" +#include "common/eqtime.h" +#include "common/linked_list.h" +#include "common/random.h" +#include "common/repositories/base_data_repository.h" +#include "common/repositories/dynamic_zone_templates_repository.h" +#include "common/repositories/faction_association_repository.h" +#include "common/repositories/grid_entries_repository.h" +#include "common/repositories/grid_repository.h" +#include "common/repositories/lootdrop_entries_repository.h" +#include "common/repositories/lootdrop_repository.h" +#include "common/repositories/loottable_entries_repository.h" +#include "common/repositories/loottable_repository.h" +#include "common/repositories/npc_faction_entries_repository.h" +#include "common/repositories/npc_faction_repository.h" +#include "common/repositories/player_titlesets_repository.h" +#include "common/repositories/skill_caps_repository.h" +#include "common/repositories/spawn2_disabled_repository.h" +#include "common/repositories/zone_points_repository.h" +#include "common/repositories/zone_state_spawns_repository.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "common/types.h" +#include "common/zone_store.h" +#include "zone/aa_ability.h" +#include "zone/global_loot_manager.h" +#include "zone/pathfinder_interface.h" +#include "zone/qglobals.h" +#include "zone/queryserv.h" +#include "zone/spawn2.h" +#include "zone/spawngroup.h" +#include "zone/zonedb.h" struct EXPModifier { @@ -585,5 +585,3 @@ private: std::vector paused_zone_timers; std::deque m_zone_signals; }; - -#endif diff --git a/zone/zone_cli.cpp b/zone/zone_cli.cpp index 59ddee18d..88c310b28 100644 --- a/zone/zone_cli.cpp +++ b/zone/zone_cli.cpp @@ -1,6 +1,8 @@ #include "zone_cli.h" -#include "../common/cli/eqemu_command_handler.h" -#include + +#include "common/cli/eqemu_command_handler.h" + +#include bool ZoneCLI::RanConsoleCommand(int argc, char **argv) { diff --git a/zone/zone_cli.h b/zone/zone_cli.h index 7e5e6e81c..d9dcfdfe2 100644 --- a/zone/zone_cli.h +++ b/zone/zone_cli.h @@ -1,8 +1,9 @@ -#ifndef EQEMU_ZONE_CLI_H -#define EQEMU_ZONE_CLI_H -#include -#include "../common/cli/argh.h" +#pragma once + +#include "common/cli/argh.h" + +#include class ZoneCLI { public: @@ -17,5 +18,3 @@ public: static void TestNpcHandinsMultiQuest(int argc, char **argv, argh::parser &cmd, std::string &description); static void TestZoneState(int argc, char **argv, argh::parser &cmd, std::string &description); }; - -#endif //EQEMU_ZONE_CLI_H diff --git a/zone/zone_config.h b/zone/zone_config.h index e527e0601..b556c7b32 100644 --- a/zone/zone_config.h +++ b/zone/zone_config.h @@ -15,10 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __ZoneConfig_H -#define __ZoneConfig_H -#include "../common/eqemu_config.h" +#pragma once + +#include "common/eqemu_config.h" class ZoneConfig : public EQEmuConfig { public: @@ -59,5 +59,3 @@ class ZoneConfig : public EQEmuConfig { void Dump() const; }; - -#endif diff --git a/zone/zone_event_scheduler.cpp b/zone/zone_event_scheduler.cpp index 8d40e6a44..d6f78f6d5 100644 --- a/zone/zone_event_scheduler.cpp +++ b/zone/zone_event_scheduler.cpp @@ -1,4 +1,5 @@ #include "zone_event_scheduler.h" + #include void ZoneEventScheduler::Process(Zone *zone, WorldContentService *content_service) diff --git a/zone/zone_event_scheduler.h b/zone/zone_event_scheduler.h index f92442402..bd996a8ec 100644 --- a/zone/zone_event_scheduler.h +++ b/zone/zone_event_scheduler.h @@ -1,9 +1,8 @@ -#ifndef EQEMU_ZONE_EVENT_SCHEDULER_H -#define EQEMU_ZONE_EVENT_SCHEDULER_H +#pragma once -#include "../common/server_event_scheduler.h" -#include "zone.h" -#include "../common/content/world_content_service.h" +#include "common/content/world_content_service.h" +#include "common/server_event_scheduler.h" +#include "zone/zone.h" class ZoneEventScheduler : public ServerEventScheduler { public: @@ -16,5 +15,3 @@ public: return &instance; } }; - -#endif //EQEMU_ZONE_EVENT_SCHEDULER_H diff --git a/zone/zone_loot.cpp b/zone/zone_loot.cpp index 9a09bfcad..076aeb291 100644 --- a/zone/zone_loot.cpp +++ b/zone/zone_loot.cpp @@ -1,9 +1,11 @@ -#include #include "zone.h" -#include "../common/repositories/loottable_repository.h" -#include "../common/repositories/loottable_entries_repository.h" -#include "../common/repositories/lootdrop_repository.h" -#include "../common/repositories/lootdrop_entries_repository.h" + +#include "common/repositories/lootdrop_entries_repository.h" +#include "common/repositories/lootdrop_repository.h" +#include "common/repositories/loottable_entries_repository.h" +#include "common/repositories/loottable_repository.h" + +#include void Zone::LoadLootTables(const std::vector in_loottable_ids) { diff --git a/zone/zone_npc_factions.cpp b/zone/zone_npc_factions.cpp index 0a37ffb80..b9b07562a 100644 --- a/zone/zone_npc_factions.cpp +++ b/zone/zone_npc_factions.cpp @@ -1,7 +1,9 @@ -#include #include "zone.h" -#include "../common/repositories/npc_faction_repository.h" -#include "../common/repositories/npc_faction_entries_repository.h" + +#include "common/repositories/npc_faction_entries_repository.h" +#include "common/repositories/npc_faction_repository.h" + +#include void Zone::LoadNPCFactions(const std::vector &npc_faction_ids) { diff --git a/zone/zone_reload.cpp b/zone/zone_reload.cpp index fbe9e55f7..11adf7eaf 100644 --- a/zone/zone_reload.cpp +++ b/zone/zone_reload.cpp @@ -19,7 +19,8 @@ */ #include "zone_reload.h" -#include "quest_parser_collection.h" + +#include "zone/quest_parser_collection.h" void ZoneReload::HotReloadQuests() { diff --git a/zone/zone_reload.h b/zone/zone_reload.h index 1e4f95826..0e721f16f 100644 --- a/zone/zone_reload.h +++ b/zone/zone_reload.h @@ -18,14 +18,9 @@ * */ -#ifndef EQEMU_ZONE_RELOAD_H -#define EQEMU_ZONE_RELOAD_H - +#pragma once class ZoneReload { public: static void HotReloadQuests(); }; - - -#endif //EQEMU_ZONE_RELOAD_H diff --git a/zone/zone_save_state.cpp b/zone/zone_save_state.cpp index f36f3ee1c..4b1c4c4f2 100644 --- a/zone/zone_save_state.cpp +++ b/zone/zone_save_state.cpp @@ -1,12 +1,14 @@ -#include -#include -#include -#include "npc.h" -#include "corpse.h" -#include "zone.h" #include "zone_save_state.h" -#include "../common/repositories/spawn2_repository.h" -#include "../common/repositories/criteria/content_filter_criteria.h" + +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/spawn2_repository.h" +#include "zone/corpse.h" +#include "zone/npc.h" +#include "zone/zone.h" + +#include "cereal/archives/json.hpp" +#include "cereal/types/map.hpp" +#include // IsZoneStateValid checks if the zone state is valid // if these fields are all empty or zero value for an entire zone state, it's considered invalid diff --git a/zone/zone_save_state.h b/zone/zone_save_state.h index 8d124240b..cec63750c 100644 --- a/zone/zone_save_state.h +++ b/zone/zone_save_state.h @@ -1,13 +1,13 @@ #pragma once +#include "common/repositories/spawn2_disabled_repository.h" +#include "common/repositories/zone_state_spawns_repository.h" +#include "zone/corpse.h" +#include "zone/npc.h" +#include "zone/zone.h" +#include "cereal/archives/json.hpp" +#include "cereal/types/map.hpp" #include -#include -#include -#include "npc.h" -#include "corpse.h" -#include "zone.h" -#include "../common/repositories/zone_state_spawns_repository.h" -#include "../common/repositories/spawn2_disabled_repository.h" struct LootEntryStateData { uint32 item_id = 0; diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 0dc143675..a0d6f24bf 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -1,62 +1,60 @@ - -#include "../common/eqemu_logsys.h" -#include "../common/extprofile.h" -#include "../common/rulesys.h" -#include "../common/strings.h" - -#include "client.h" -#include "corpse.h" -#include "groups.h" -#include "merc.h" -#include "zone.h" #include "zonedb.h" -#include "aura.h" -#include "../common/repositories/blocked_spells_repository.h" -#include "../common/repositories/character_tribute_repository.h" -#include "../common/repositories/character_data_repository.h" -#include "../common/repositories/character_disciplines_repository.h" -#include "../common/repositories/npc_types_repository.h" -#include "../common/repositories/character_bind_repository.h" -#include "../common/repositories/character_pet_buffs_repository.h" -#include "../common/repositories/character_pet_inventory_repository.h" -#include "../common/repositories/character_pet_info_repository.h" -#include "../common/repositories/character_buffs_repository.h" -#include "../common/repositories/character_languages_repository.h" -#include "../common/repositories/criteria/content_filter_criteria.h" -#include "../common/repositories/spawn2_disabled_repository.h" -#include "../common/repositories/character_leadership_abilities_repository.h" -#include "../common/repositories/character_material_repository.h" -#include "../common/repositories/character_memmed_spells_repository.h" -#include "../common/repositories/character_spells_repository.h" -#include "../common/repositories/character_skills_repository.h" -#include "../common/repositories/character_potionbelt_repository.h" -#include "../common/repositories/character_bandolier_repository.h" -#include "../common/repositories/character_currency_repository.h" -#include "../common/repositories/character_alternate_abilities_repository.h" -#include "../common/repositories/character_auras_repository.h" -#include "../common/repositories/character_alt_currency_repository.h" -#include "../common/repositories/character_item_recast_repository.h" -#include "../common/repositories/account_repository.h" -#include "../common/repositories/respawn_times_repository.h" -#include "../common/repositories/object_contents_repository.h" -#include "../common/repositories/mercs_repository.h" -#include "../common/repositories/merc_buffs_repository.h" -#include "../common/repositories/merc_inventory_repository.h" -#include "../common/repositories/merc_subtypes_repository.h" -#include "../common/repositories/npc_types_tint_repository.h" -#include "../common/repositories/merchantlist_temp_repository.h" -#include "../common/repositories/character_exp_modifiers_repository.h" -#include "../common/repositories/character_data_repository.h" -#include "../common/repositories/character_corpses_repository.h" -#include "../common/repositories/character_corpse_items_repository.h" -#include "../common/repositories/zone_repository.h" -#include "../common/repositories/trader_repository.h" -#include "../common/repositories/character_evolving_items_repository.h" +#include "common/eqemu_logsys.h" +#include "common/extprofile.h" +#include "common/repositories/account_repository.h" +#include "common/repositories/blocked_spells_repository.h" +#include "common/repositories/character_alt_currency_repository.h" +#include "common/repositories/character_alternate_abilities_repository.h" +#include "common/repositories/character_auras_repository.h" +#include "common/repositories/character_bandolier_repository.h" +#include "common/repositories/character_bind_repository.h" +#include "common/repositories/character_buffs_repository.h" +#include "common/repositories/character_corpse_items_repository.h" +#include "common/repositories/character_corpses_repository.h" +#include "common/repositories/character_currency_repository.h" +#include "common/repositories/character_data_repository.h" +#include "common/repositories/character_data_repository.h" +#include "common/repositories/character_disciplines_repository.h" +#include "common/repositories/character_evolving_items_repository.h" +#include "common/repositories/character_exp_modifiers_repository.h" +#include "common/repositories/character_item_recast_repository.h" +#include "common/repositories/character_languages_repository.h" +#include "common/repositories/character_leadership_abilities_repository.h" +#include "common/repositories/character_material_repository.h" +#include "common/repositories/character_memmed_spells_repository.h" +#include "common/repositories/character_pet_buffs_repository.h" +#include "common/repositories/character_pet_info_repository.h" +#include "common/repositories/character_pet_inventory_repository.h" +#include "common/repositories/character_potionbelt_repository.h" +#include "common/repositories/character_skills_repository.h" +#include "common/repositories/character_spells_repository.h" +#include "common/repositories/character_tribute_repository.h" +#include "common/repositories/criteria/content_filter_criteria.h" +#include "common/repositories/merc_buffs_repository.h" +#include "common/repositories/merc_inventory_repository.h" +#include "common/repositories/merc_subtypes_repository.h" +#include "common/repositories/merchantlist_temp_repository.h" +#include "common/repositories/mercs_repository.h" +#include "common/repositories/npc_types_repository.h" +#include "common/repositories/npc_types_tint_repository.h" +#include "common/repositories/object_contents_repository.h" +#include "common/repositories/respawn_times_repository.h" +#include "common/repositories/spawn2_disabled_repository.h" +#include "common/repositories/trader_repository.h" +#include "common/repositories/zone_repository.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/aura.h" +#include "zone/client.h" +#include "zone/corpse.h" +#include "zone/groups.h" +#include "zone/merc.h" +#include "zone/zone.h" +#include "fmt/format.h" #include #include -#include extern Zone* zone; diff --git a/zone/zonedb.h b/zone/zonedb.h index cda0a5ab2..5dee242fb 100644 --- a/zone/zonedb.h +++ b/zone/zonedb.h @@ -1,21 +1,20 @@ -#ifndef ZONEDB_H_ -#define ZONEDB_H_ + +#pragma once + +#include "common/eq_packet_structs.h" +#include "common/eqemu_logsys.h" +#include "common/faction.h" +#include "common/races.h" +#include "common/repositories/doors_repository.h" +#include "common/repositories/npc_faction_entries_repository.h" +#include "common/shareddb.h" +#include "zone/aa_ability.h" +#include "zone/bot_database.h" +#include "zone/event_codes.h" +#include "zone/position.h" #include -#include "../common/shareddb.h" -#include "../common/eq_packet_structs.h" -#include "position.h" -#include "../common/faction.h" -#include "../common/eqemu_logsys.h" -#include "aa_ability.h" -#include "event_codes.h" -#include "../common/repositories/doors_repository.h" -#include "../common/races.h" -#include "../common/repositories/npc_faction_entries_repository.h" - -#include "bot_database.h" - class Client; class Corpse; class Merc; @@ -674,6 +673,3 @@ protected: extern ZoneDatabase database; extern ZoneDatabase content_db; - -#endif /*ZONEDB_H_*/ - diff --git a/zone/zonedump.h b/zone/zonedump.h index 5d29a252b..e811a61fa 100644 --- a/zone/zonedump.h +++ b/zone/zonedump.h @@ -24,12 +24,13 @@ npc_count int unsigned not null default 0, npcloot_count int unsigned not null d spawn2 mediumblob, npcs mediumblob, npc_loot mediumblob, gmspawntype mediumblob, time timestamp(14)); */ -#ifndef ZONEDUMP_H -#define ZONEDUMP_H -#include "../common/faction.h" -#include "../common/eq_packet_structs.h" -#include "../common/inventory_profile.h" +#pragma once +#include "common/faction.h" +#include "common/eq_packet_structs.h" +#include "common/inventory_profile.h" + +#pragma pack(push) #pragma pack(1) struct NPCType @@ -160,6 +161,4 @@ struct NPCType uint32 m_npc_tint_id; }; -#pragma pack() - -#endif +#pragma pack(pop) diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 96ad15dbc..46bd4849c 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -16,29 +16,26 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/global_define.h" -#include "../common/eqemu_logsys.h" -#include "../common/rulesys.h" -#include "../common/strings.h" +#include "client.h" -#include "dynamic_zone.h" -#include "queryserv.h" -#include "quest_parser_collection.h" -#include "string_ids.h" -#include "worldserver.h" -#include "zone.h" - -#include "bot.h" +#include "common/eqemu_logsys.h" +#include "common/events/player_event_logs.h" +#include "common/repositories/character_peqzone_flags_repository.h" +#include "common/repositories/zone_flags_repository.h" +#include "common/rulesys.h" +#include "common/strings.h" +#include "zone/bot.h" +#include "zone/dynamic_zone.h" +#include "zone/queryserv.h" +#include "zone/quest_parser_collection.h" +#include "zone/string_ids.h" +#include "zone/worldserver.h" +#include "zone/zone.h" extern QueryServ* QServ; extern WorldServer worldserver; extern Zone* zone; -#include "../common/repositories/character_peqzone_flags_repository.h" -#include "../common/repositories/zone_flags_repository.h" -#include "../common/events/player_event_logs.h" - - void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { if (RuleB(Bots, Enabled)) { Bot::ProcessClientZoneChange(this);