normalize includes: zone

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)

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/classes.h"
-
+#include "common/eq_packet_structs.h"
-#include "../common/repositories/character_alternate_abilities_repository.h"
+#include "common/eqemu_logsys.h"
-#include "../common/repositories/aa_ability_repository.h"
+#include "common/events/player_event_logs.h"
-#include "../common/repositories/aa_ranks_repository.h"
+#include "common/races.h"
-#include "../common/repositories/aa_rank_effects_repository.h"
+#include "common/repositories/aa_ability_repository.h"
-#include "../common/repositories/aa_rank_prereqs_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;

zone/aa.h

@@ -1,5 +1,4 @@
-#ifndef AA_H
+#pragma once
-#define AA_H
 
 #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

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 "../common/types.h"
+#include "zone/masterentity.h"
-#include "masterentity.h"
+#include "zone/aa_ability.h"
-#include "aa_ability.h"
 
 AA::Rank *AA::Ability::GetRankByPointsSpent(int current_level) {
 	if(current_level == 0)

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
+#pragma once
-#define EQEMU_ZONE_AA_ABILITY_H
 
-#include "../common/global_define.h"
+#include "zone/aa_rank_effects.h"
+#include "zone/aa_rank.h"
+
+#include <memory>
 #include <unordered_map>
 #include <vector>
-#include <memory>
-#include "aa_rank_effects.h"
-#include "aa_rank.h"
 
 class Mob;
 
-namespace AA
+namespace AA {
-{
 
 class Ability
 {
@@ -57,6 +55,4 @@ public:
 	Rank *first;
 };
 
-}
+} // namespace AA
-
-#endif

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
+#pragma once
-#define EQEMU_ZONE_AA_RANK_H
 
-namespace AA
+#include "common/types.h"
-{
+
+#include <map>
+#include <vector>
+
+namespace AA {
 
 class Ability;
 class Rank
@@ -51,6 +54,4 @@ public:
 	std::map<int, int> prereqs;
 };
 
-}
+} // namespace AA
-
-#endif

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
+#pragma once
-#define EQEMU_ZONE_AA_RANK_EFFECTS_H
 
-#include "../common/global_define.h"
+#include "common/types.h"
-#include <string>
 
-namespace AA
+namespace AA {
-{
 
 struct RankEffect
 {
@@ -33,6 +30,4 @@ struct RankEffect
 	int limit_value;
 };
 
-}
+} // namespace AA
-
-#endif

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/eqemu_logsys.h"
+#include "common/faction.h"
-#include "../common/faction.h"
+#include "common/rulesys.h"
-#include "../common/rulesys.h"
+#include "common/spdat.h"
-#include "../common/spdat.h"
+#include "zone/bot.h"
-
+#include "zone/client.h"
-#include "client.h"
+#include "zone/entity.h"
-#include "entity.h"
+#include "zone/map.h"
-#include "mob.h"
+#include "zone/mob.h"
-
+#include "zone/water_map.h"
-#include "bot.h"
-
-#include "map.h"
-#include "water_map.h"
 
 extern Zone* zone;
 //#define LOSDEBUG 6

zone/aggromanager.cpp

@@ -7,5 +7,3 @@ AggroMeter::AggroMeter() : lock_id(0), target_id(0), secondary_id(0), lock_chang
 		data[i].pct = 0;
 	}
 }
-
-

zone/aggromanager.h

@@ -1,8 +1,8 @@
-#ifndef AGGROMANAGER_H
+#pragma once
-#define AGGROMANAGER_H
 
-#include "../common/types.h"
+#include "common/types.h"
-#include <assert.h>
+
+#include <cassert>
 #include <cstddef>
 
 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 */

zone/api_service.cpp

@@ -18,18 +18,19 @@
  *
  */
 
-#include <memory>
-#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 "common/eqemu_logsys.h"
-#include "doors.h"
+#include "common/net/websocket_server.h"
-#include <iostream>
+#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 <memory>
 
 extern Zone *zone;
 

zone/api_service.h

@@ -20,7 +20,8 @@
 
 #pragma once
 
+#include "common/net/websocket_server.h"
+
 #include <memory>
-#include "../common/net/websocket_server.h"
 
 void RegisterApiService(std::unique_ptr<EQ::Net::WebsocketServer> &server);

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/data_verification.h"
-#include "../common/eq_constants.h"
+#include "common/eq_constants.h"
-#include "../common/eq_packet_structs.h"
+#include "common/eq_packet_structs.h"
-#include "../common/rulesys.h"
+#include "common/events/player_event_logs.h"
-#include "../common/spdat.h"
+#include "common/misc_functions.h"
-#include "../common/strings.h"
+#include "common/rulesys.h"
-#include "../common/data_verification.h"
+#include "common/spdat.h"
-#include "../common/misc_functions.h"
+#include "common/strings.h"
-#include "../common/events/player_event_logs.h"
+#include "zone/bot.h"
-#include "queryserv.h"
+#include "zone/fastmath.h"
-#include "quest_parser_collection.h"
+#include "zone/lua_parser.h"
-#include "string_ids.h"
+#include "zone/mob.h"
-#include "water_map.h"
+#include "zone/npc.h"
-#include "worldserver.h"
+#include "zone/queryserv.h"
-#include "zone.h"
+#include "zone/quest_parser_collection.h"
-#include "lua_parser.h"
+#include "zone/string_ids.h"
-#include "fastmath.h"
+#include "zone/water_map.h"
-#include "mob.h"
+#include "zone/worldserver.h"
-#include "npc.h"
+#include "zone/zone.h"
-
-#include "bot.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;
 

zone/aura.cpp

@@ -1,10 +1,9 @@
-#include "../common/strings.h"
+#include "common/repositories/auras_repository.h"
-#include "../common/repositories/auras_repository.h"
+#include "common/strings.h"
-
+#include "zone/aura.h"
-#include "aura.h"
+#include "zone/client.h"
-#include "client.h"
+#include "zone/raids.h"
-#include "string_ids.h"
+#include "zone/string_ids.h"
-#include "raids.h"
 
 Aura::Aura(NPCType *type_data, Mob *owner, AuraRecord &record)
 	: NPC(type_data, 0, owner->GetPosition(), GravityBehavior::Flying), spell_id(record.spell_id),

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 <functional>
 #include <set>
 
-#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<int> casted_on; // we keep track of the other entities we've casted on
 	std::set<int> spawned_for;
 };
-
-#endif /* !AURA_H */
-

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;
+#include "common/races.h"
-
+#include "zone/beacon.h"
-#ifdef _WINDOWS
+#include "zone/entity.h"
-	#if (!defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1900))
+#include "zone/mob.h"
-		#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"
 
 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();
 }
-
-

zone/beacon.h

@@ -16,12 +16,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef BEACON_H
+#pragma once
-#define BEACON_H
 
-#include "mob.h"
+#include "common/timer.h"
-#include "../common/types.h"
+#include "common/types.h"
-#include "../common/timer.h"
+#include "zone/mob.h"
 
 class Group;
 class Raid;
@@ -59,7 +58,4 @@ protected:
 	int max_targets;
 
 	uint16 caster_id;
-private:
 };
-
-#endif

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 "common/classes.h"
-#include "entity.h"
+#include "common/data_verification.h"
-#include "mob.h"
+#include "common/item_instance.h"
-
+#include "common/rulesys.h"
-#include "bot.h"
+#include "common/spdat.h"
-
+#include "zone/client.h"
-#include "quest_parser_collection.h"
+#include "zone/entity.h"
-
+#include "zone/mob.h"
-
+#include "zone/bot.h"
-#ifndef WIN32
+#include "zone/quest_parser_collection.h"
-#include <stdlib.h>
-#include "../common/unix.h"
-#endif
 
+#include <cstdlib>
 
 void Mob::CalcBonuses()
 {

zone/bot.cpp

@@ -17,17 +17,18 @@
 */
 
 #include "bot.h"
-#include "object.h"
+
-#include "raids.h"
+#include "common/data_verification.h"
-#include "doors.h"
+#include "common/repositories/bot_inventories_repository.h"
-#include "quest_parser_collection.h"
+#include "common/repositories/bot_spell_settings_repository.h"
-#include "lua_parser.h"
+#include "common/repositories/bot_starting_items_repository.h"
-#include "../common/repositories/bot_inventories_repository.h"
+#include "common/repositories/criteria/content_filter_criteria.h"
-#include "../common/repositories/bot_spell_settings_repository.h"
+#include "common/skill_caps.h"
-#include "../common/repositories/bot_starting_items_repository.h"
+#include "zone/doors.h"
-#include "../common/data_verification.h"
+#include "zone/lua_parser.h"
-#include "../common/repositories/criteria/content_filter_criteria.h"
+#include "zone/object.h"
-#include "../common/skill_caps.h"
+#include "zone/quest_parser_collection.h"
+#include "zone/raids.h"
 
 /*
 TODO bot rewrite:

zone/bot.h

@@ -16,26 +16,22 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef BOT_H
+#pragma once
-#define BOT_H
 
-#include "bot_structs.h"
+#include "common/misc_functions.h"
-#include "mob.h"
+#include "common/zone_store.h"
-#include "client.h"
+#include "zone/bot_structs.h"
-#include "pets.h"
+#include "zone/client.h"
-#include "heal_rotation.h"
+#include "zone/corpse.h"
-#include "groups.h"
+#include "zone/groups.h"
-#include "corpse.h"
+#include "zone/guild_mgr.h"
-#include "zonedb.h"
+#include "zone/heal_rotation.h"
-#include "../common/zone_store.h"
+#include "zone/mob.h"
-#include "string_ids.h"
+#include "zone/pets.h"
-#include "../common/misc_functions.h"
+#include "zone/raids.h"
-#include "../common/global_define.h"
+#include "zone/string_ids.h"
-#include "guild_mgr.h"
+#include "zone/worldserver.h"
-#include "worldserver.h"
+#include "zone/zonedb.h"
-#include "raids.h"
-
-#include <sstream>
 
 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

zone/bot_command.cpp

@@ -32,34 +32,28 @@
 
 */
 
-#include <string.h>
-
-#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 <fmt/format.h>
+#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 <cstring>
 
 extern QueryServ* QServ;
 extern WorldServer worldserver;

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
+#include "common/types.h"
-#define BOT_COMMAND_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<const char*> subcommand_list);
 void helper_send_usage_required_bots(Client *bot_owner, uint16 spell_type);
 void SendSpellTypeWindow(Client* c, const Seperator* sep);
-
-#endif

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 "bot_database.h"
-#include "../common/global_define.h"
-#include "../common/rulesys.h"
-#include "../common/strings.h"
-#include "../common/eqemu_logsys.h"
 
-#include "../common/repositories/bot_blocked_buffs_repository.h"
+#include "common/data_verification.h"
-#include "../common/repositories/bot_buffs_repository.h"
+#include "common/eqemu_logsys.h"
-#include "../common/repositories/bot_create_combinations_repository.h"
+#include "common/repositories/bot_blocked_buffs_repository.h"
-#include "../common/repositories/bot_data_repository.h"
+#include "common/repositories/bot_buffs_repository.h"
-#include "../common/repositories/bot_heal_rotations_repository.h"
+#include "common/repositories/bot_create_combinations_repository.h"
-#include "../common/repositories/bot_heal_rotation_members_repository.h"
+#include "common/repositories/bot_data_repository.h"
-#include "../common/repositories/bot_heal_rotation_targets_repository.h"
+#include "common/repositories/bot_heal_rotation_members_repository.h"
-#include "../common/repositories/bot_inspect_messages_repository.h"
+#include "common/repositories/bot_heal_rotation_targets_repository.h"
-#include "../common/repositories/bot_inventories_repository.h"
+#include "common/repositories/bot_heal_rotations_repository.h"
-#include "../common/repositories/bot_owner_options_repository.h"
+#include "common/repositories/bot_inspect_messages_repository.h"
-#include "../common/repositories/bot_pets_repository.h"
+#include "common/repositories/bot_inventories_repository.h"
-#include "../common/repositories/bot_pet_buffs_repository.h"
+#include "common/repositories/bot_owner_options_repository.h"
-#include "../common/repositories/bot_pet_inventories_repository.h"
+#include "common/repositories/bot_pet_buffs_repository.h"
-#include "../common/repositories/bot_spell_casting_chances_repository.h"
+#include "common/repositories/bot_pet_inventories_repository.h"
-#include "../common/repositories/bot_spells_entries_repository.h"
+#include "common/repositories/bot_pets_repository.h"
-#include "../common/repositories/bot_settings_repository.h"
+#include "common/repositories/bot_settings_repository.h"
-#include "../common/repositories/bot_stances_repository.h"
+#include "common/repositories/bot_spell_casting_chances_repository.h"
-#include "../common/repositories/bot_timers_repository.h"
+#include "common/repositories/bot_spells_entries_repository.h"
-#include "../common/repositories/character_data_repository.h"
+#include "common/repositories/bot_stances_repository.h"
-#include "../common/repositories/group_id_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 "fmt/format.h"
-#include "bot.h"
-#include "client.h"
-
-#include <fmt/format.h>
 
 
 bool BotDatabase::LoadBotCommandSettings(std::map<std::string, std::pair<uint8, std::vector<std::string>>> &bot_command_settings)

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
+#include "zone/bot_structs.h"
-#define BOT_DATABASE_H
-
 
 #include <list>
 #include <map>
 #include <vector>
-#include "bot_structs.h"
 
 class Bot;
 class Client;
@@ -220,5 +218,3 @@ public:
 		std::map<int32_t, std::map<int32_t, BotSpellTypesByClass>> commanded_spell_type_min_levels;
 
 };
-
-#endif

zone/bot_raid.cpp

@@ -16,14 +16,14 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "bot.h"
+#include "common/data_verification.h"
-#include "bot_command.h"
+#include "zone/bot_command.h"
-#include "client.h"
+#include "zone/bot.h"
-#include "object.h"
+#include "zone/client.h"
-#include "raids.h"
+#include "zone/doors.h"
-#include "doors.h"
+#include "zone/object.h"
-#include "quest_parser_collection.h"
+#include "zone/quest_parser_collection.h"
-#include "../common/data_verification.h"
+#include "zone/raids.h"
 
 std::vector<RaidMember> Raid::GetRaidGroupMembers(uint32 gid)
 {

zone/bot_raid.h

@@ -16,26 +16,19 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef BOT_RAID_H
+#pragma once
-#define BOT_RAID_H
 
-
+#include "common/misc_functions.h"
-#include "bot_structs.h"
+#include "common/zone_store.h"
-#include "mob.h"
+#include "zone/bot_structs.h"
-#include "client.h"
+#include "zone/client.h"
-#include "pets.h"
+#include "zone/corpse.h"
-#include "heal_rotation.h"
+#include "zone/groups.h"
-#include "groups.h"
+#include "zone/guild_mgr.h"
-#include "corpse.h"
+#include "zone/heal_rotation.h"
-#include "zonedb.h"
+#include "zone/mob.h"
-#include "../common/zone_store.h"
+#include "zone/pets.h"
-#include "string_ids.h"
+#include "zone/raids.h"
-#include "../common/misc_functions.h"
+#include "zone/string_ids.h"
-#include "../common/global_define.h"
+#include "zone/worldserver.h"
-#include "guild_mgr.h"
+#include "zone/zonedb.h"
-#include "worldserver.h"
-#include "raids.h"
-
-#include <sstream>
-
-#endif // BOT_RAID_H

zone/bot_structs.h

@@ -16,14 +16,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef BOT_STRUCTS
+#pragma once
-#define BOT_STRUCTS
 
-#include "../common/types.h"
+#include "common/types.h"
-#include "../common/timer.h"
+#include "common/timer.h"
-#include "mob.h"
+#include "zone/mob.h"
-
-#include <sstream>
 
 struct BotsAvailableList {
 	uint32 bot_id;
@@ -186,5 +183,3 @@ struct FindPositionInput {
 	bool	front_only;
 	bool	bypass_los;
 };
-
-#endif // BOT_STRUCTS

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/data_verification.h"
-#include "../common/repositories/npc_spells_repository.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) {

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 "../common/events/player_event_logs.h"
+#include "zone/client.h"
-#include "worldserver.h"
+#include "zone/quest_parser_collection.h"
-#include "queryserv.h"
+#include "zone/worldserver.h"
+#include "zone/queryserv.h"
 
 extern WorldServer worldserver;
 extern QueryServ *QServ;

zone/cheat_manager.h

@@ -1,14 +1,15 @@
-#ifndef ANTICHEAT_H
+#pragma once
-#define ANTICHEAT_H
+
+#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 <glm/ext/vector_float3.hpp>
-#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

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 <chrono>
 #include <iostream>
 #include <random>
-#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)
 {

zone/cli/cli_sidecar_serve_http.cpp

@@ -1,9 +1,11 @@
-#include "../zone_cli.h"
+
-#include "../../common/cli/eqemu_command_handler.h"
+#include "zone/zone_cli.h"
-#include "../../common/http/httplib.h"
+
-#include "../../common/eqemu_logsys.h"
+#include "zone/sidecar_api/sidecar_api.h"
-#include "../sidecar_api/sidecar_api.h"
+#include "common/cli/eqemu_command_handler.h"
-#include "../../common/platform.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)
 {

zone/cli/tests/cli_databuckets.cpp

@@ -1,11 +1,13 @@
-#include "../../zone_cli.h"
+
-#include "../../common/cli/eqemu_command_handler.h"
+#include "zone/zone_cli.h"
-#include "../../common/http/httplib.h"
+
-#include "../../common/eqemu_logsys.h"
+#include "zone/client.h"
-#include "../../common/platform.h"
+#include "zone/zone.h"
-#include "../../zone.h"
+#include "common/cli/eqemu_command_handler.h"
-#include "../../client.h"
+#include "common/eqemu_logsys.h"
-#include "../../common/net/eqstream.h"
+#include "common/http/httplib.h"
+#include "common/net/eqstream.h"
+#include "common/platform.h"
 
 extern Zone* zone;
 

zone/cli/tests/cli_npc_handins.cpp

@@ -1,12 +1,14 @@
-#include "../../zone_cli.h"
+
-#include "../../common/cli/eqemu_command_handler.h"
+#include "zone/zone_cli.h"
-#include "../../common/http/httplib.h"
+
-#include "../../common/eqemu_logsys.h"
+#include "zone/client.h"
-#include "../../common/platform.h"
+#include "zone/zone.h"
-#include "../../zone.h"
+#include "common/cli/eqemu_command_handler.h"
-#include "../../client.h"
+#include "common/eqemu_logsys.h"
-#include "../../common/net/eqstream.h"
+#include "common/http/httplib.h"
-#include "../../common/json/json.hpp"
+#include "common/json/json.hpp"
+#include "common/net/eqstream.h"
+#include "common/platform.h"
 
 extern Zone *zone;
 using json = nlohmann::json;

zone/cli/tests/cli_npc_handins_multiquest.cpp

@@ -1,10 +1,12 @@
-#include "../../zone_cli.h"
+
-#include "../../common/cli/eqemu_command_handler.h"
+#include "zone/zone_cli.h"
-#include "../../common/eqemu_logsys.h"
+
-#include "../../common/platform.h"
+#include "zone/client.h"
-#include "../../zone.h"
+#include "zone/zone.h"
-#include "../../client.h"
+#include "common/cli/eqemu_command_handler.h"
-#include "../../common/net/eqstream.h"
+#include "common/eqemu_logsys.h"
+#include "common/net/eqstream.h"
+#include "common/platform.h"
 
 extern Zone *zone;
 

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)
 {

zone/cli/tests/cli_zone_state.cpp

@@ -1,10 +1,12 @@
-#include "../../zone_cli.h"
+#include "zone/zone_cli.h"
-#include "../../common/cli/eqemu_command_handler.h"
+#include "zone/corpse.h"
-#include <cereal/archives/json.hpp>
+
-#include <cereal/types/map.hpp>
+#include "common/cli/eqemu_command_handler.h"
-#include "../../common/repositories/npc_types_repository.h"
+#include "common/repositories/npc_types_repository.h"
-#include "../../corpse.h"
+#include "common/repositories/respawn_times_repository.h"
-#include "../../../common/repositories/respawn_times_repository.h"
+
+#include "cereal/archives/json.hpp"
+#include "cereal/types/map.hpp"
 
 extern Zone* zone;
 

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 <iostream>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 
-// for windows compile
+#include "client.h"
-#ifndef _WINDOWS
-	#include <stdarg.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include "../common/unix.h"
-#endif
 
-extern volatile bool RunLoops;
+#include "common/data_bucket.h"
-
+#include "common/data_verification.h"
-#include "../common/eqemu_logsys.h"
+#include "common/eqemu_logsys.h"
-#include "../common/features.h"
+#include "common/events/player_event_logs.h"
-#include "../common/spdat.h"
+#include "common/events/player_events.h"
-#include "../common/guilds.h"
+#include "common/features.h"
-#include "../common/rulesys.h"
+#include "common/guilds.h"
-#include "../common/strings.h"
+#include "common/profanity_manager.h"
-#include "../common/data_verification.h"
+#include "common/repositories/account_flags_repository.h"
-#include "../common/profanity_manager.h"
+#include "common/repositories/bug_reports_repository.h"
-#include "../common/data_bucket.h"
+#include "common/repositories/char_recipe_list_repository.h"
-#include "dynamic_zone.h"
+#include "common/repositories/character_alternate_abilities_repository.h"
-#include "expedition_request.h"
+#include "common/repositories/character_data_repository.h"
-#include "position.h"
+#include "common/repositories/character_disciplines_repository.h"
-#include "worldserver.h"
+#include "common/repositories/character_expedition_lockouts_repository.h"
-#include "zonedb.h"
+#include "common/repositories/character_pet_name_repository.h"
-#include "petitions.h"
+#include "common/repositories/character_spells_repository.h"
-#include "command.h"
+#include "common/repositories/completed_tasks_repository.h"
-#include "water_map.h"
+#include "common/repositories/discovered_items_repository.h"
-#include "bot_command.h"
+#include "common/repositories/inventory_repository.h"
-#include "string_ids.h"
+#include "common/repositories/keyring_repository.h"
-#include "dialogue_window.h"
+#include "common/repositories/tradeskill_recipe_repository.h"
-
+#include "common/rulesys.h"
-#include "guild_mgr.h"
+#include "common/skill_caps.h"
-#include "quest_parser_collection.h"
+#include "common/spdat.h"
-#include "queryserv.h"
+#include "common/strings.h"
-#include "mob_movement_manager.h"
+#include "common/zone_store.h"
-#include "cheat_manager.h"
+#include "zone/bot_command.h"
-#include "lua_parser.h"
+#include "zone/cheat_manager.h"
-
+#include "zone/command.h"
-#include "../common/repositories/character_alternate_abilities_repository.h"
+#include "zone/dialogue_window.h"
-#include "../common/repositories/character_expedition_lockouts_repository.h"
+#include "zone/dynamic_zone.h"
-#include "../common/repositories/account_flags_repository.h"
+#include "zone/expedition_request.h"
-#include "../common/repositories/bug_reports_repository.h"
+#include "zone/guild_mgr.h"
-#include "../common/repositories/char_recipe_list_repository.h"
+#include "zone/lua_parser.h"
-#include "../common/repositories/character_spells_repository.h"
+#include "zone/mob_movement_manager.h"
-#include "../common/repositories/character_disciplines_repository.h"
+#include "zone/petitions.h"
-#include "../common/repositories/character_data_repository.h"
+#include "zone/position.h"
-#include "../common/repositories/character_pet_name_repository.h"
+#include "zone/queryserv.h"
-#include "../common/repositories/completed_tasks_repository.h"
+#include "zone/quest_parser_collection.h"
-#include "../common/repositories/discovered_items_repository.h"
+#include "zone/string_ids.h"
-#include "../common/repositories/inventory_repository.h"
+#include "zone/water_map.h"
-#include "../common/repositories/keyring_repository.h"
+#include "zone/worldserver.h"
-#include "../common/repositories/tradeskill_recipe_repository.h"
+#include "zone/zonedb.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 <cstdlib>
+#include <cstdio>
+#include <cstdarg>
 
 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);
 

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 "zone/aggromanager.h"
-#include "../common/ptimer.h"
+#include "zone/bot_structs.h"
-#include "../common/emu_opcodes.h"
+#include "zone/cheat_manager.h"
-#include "../common/eq_packet_structs.h"
+#include "zone/common.h"
-#include "../common/emu_constants.h"
+#include "zone/merc.h"
-#include "../common/eq_stream_intf.h"
+#include "zone/mob.h"
-#include "../common/eq_packet.h"
+#include "zone/qglobals.h"
-#include "../common/linked_list.h"
+#include "zone/questmgr.h"
-#include "../common/extprofile.h"
+#include "zone/task_client_state.h"
-#include "../common/races.h"
+#include "zone/task_manager.h"
-#include "../common/seperator.h"
+#include "zone/xtargetautohaters.h"
-#include "../common/inventory_profile.h"
+#include "zone/zone.h"
-#include "../common/guilds.h"
+#include "zone/zonedb.h"
-//#include "../common/item_data.h"
-#include "xtargetautohaters.h"
-#include "aggromanager.h"
 
-#include "common.h"
+#include "common/data_verification.h"
-#include "merc.h"
+#include "common/emu_constants.h"
-#include "mob.h"
+#include "common/emu_opcodes.h"
-#include "qglobals.h"
+#include "common/eq_packet_structs.h"
-#include "questmgr.h"
+#include "common/eq_packet.h"
-#include "zone.h"
+#include "common/eq_stream_intf.h"
-#include "zonedb.h"
+#include "common/events/player_events.h"
-#include "../common/zone_store.h"
+#include "common/extprofile.h"
-#include "task_manager.h"
+#include "common/guild_base.h"
-#include "task_client_state.h"
+#include "common/guilds.h"
-#include "cheat_manager.h"
+#include "common/inventory_profile.h"
-#include "../common/events/player_events.h"
+#include "common/linked_list.h"
-#include "../common/data_verification.h"
+#include "common/ptimer.h"
-#include "../common/repositories/character_parcels_repository.h"
+#include "common/races.h"
-#include "../common/repositories/trader_repository.h"
+#include "common/repositories/buyer_buy_lines_repository.h"
-#include "../common/guild_base.h"
+#include "common/repositories/character_evolving_items_repository.h"
-#include "../common/repositories/buyer_buy_lines_repository.h"
+#include "common/repositories/character_parcels_repository.h"
-#include "../common/repositories/character_evolving_items_repository.h"
+#include "common/repositories/player_titlesets_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"
+#include <cfloat>
-
-#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 <algorithm>
-	#undef min
-	#undef max
-#endif
-
-#include <float.h>
 #include <set>
 #include <algorithm>
 #include <memory>
 #include <deque>
-#include <ctime>
-
 
 #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

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 {

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;

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 <algorithm>
 

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 "client.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/opcodemgr.h"
-#include "../common/raid.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 <cstdio>
 #include <iomanip>
 #include <iostream>
-#include <math.h>
+#include <numbers>
 #include <set>
-#include <stdio.h>
-#include <string.h>
-#include <zlib.h>
-#include "bot.h"
-
-#ifdef _WINDOWS
-#define snprintf	_snprintf
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
-#else
-#include <pthread.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#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)

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 "client.h"
-#include "../common/global_define.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 <iostream>
 
-#ifdef _WINDOWS
-	#define snprintf	_snprintf
-	#define strncasecmp	_strnicmp
-	#define strcasecmp	_stricmp
-#else
-	#include <pthread.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <unistd.h>
-#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;

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)
 {

zone/combat_record.h

@@ -1,9 +1,9 @@
-#ifndef EQEMU_COMBAT_RECORD_H
+#pragma once
-#define EQEMU_COMBAT_RECORD_H
+
+#include "common/types.h"
 
 #include <ctime>
 #include <string>
-#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

zone/command.cpp

@@ -1,36 +1,31 @@
-#include <string.h>
-#include <algorithm>
-#include <thread>
-#include <fmt/format.h>
-#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 "common/data_bucket.h"
-#include "quest_parser_collection.h"
+#include "common/eq_packet.h"
-#include "titles.h"
+#include "common/events/player_event_logs.h"
-#include "water_map.h"
+#include "common/features.h"
-#include "worldserver.h"
+#include "common/file.h"
-#include "fastmath.h"
+#include "common/net/eqstream.h"
-#include "mob_movement_manager.h"
+#include "common/ptimer.h"
-#include "npc_scale_manager.h"
+#include "common/repositories/command_subsettings_repository.h"
-#include "../common/events/player_event_logs.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 <algorithm>
+#include <cstring>
+#include <thread>
 
 extern QueryServ* QServ;
 extern WorldServer worldserver;

zone/command.h

@@ -1,12 +1,12 @@
-#ifndef COMMAND_H
+#pragma once
-#define COMMAND_H
+
+#include "common/types.h"
+
+#include <string>
 
 class Client;
 class Seperator;
 
-#include "../common/types.h"
-#include <string>
-
 #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

zone/common.h

@@ -1,11 +1,11 @@
-#ifndef __EQEMU_ZONE_COMMON_H
-#define __EQEMU_ZONE_COMMON_H
 
-#include "../common/types.h"
+#pragma once
-#include "../common/spdat.h"
-#include "../common/emu_constants.h"
 
-#include <cereal/cereal.hpp>
+#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
-

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 <iostream>
-#include "queryserv.h"
-#include "../common/json/json.hpp"
 
 using json = nlohmann::json;
 

zone/corpse.h

@@ -1,10 +1,10 @@
-#ifndef CORPSE_H
-#define CORPSE_H
 
-#include "mob.h"
+#pragma once
-#include "client.h"
+
-#include "../common/loot.h"
+#include "common/loot.h"
-#include "../common/repositories/character_corpses_repository.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

zone/dialogue_window.h

@@ -1,9 +1,9 @@
-#ifndef EQEMU_DIALOGUE_WINDOW_H
+#pragma once
-#define EQEMU_DIALOGUE_WINDOW_H
-
 
+#include <map>
 #include <string>
-#include "client.h"
+
+class Client;
 
 static const std::map<std::string, std::string> 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

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 <string.h>
+#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 <glm/ext/matrix_transform.hpp>
+#include "glm/ext/matrix_transform.hpp"
+#include <cstring>
 #include <numbers>
 
 #define OPEN_DOOR 0x02

zone/doors.h

@@ -1,8 +1,7 @@
-#ifndef DOORS_H
+#pragma once
-#define DOORS_H
 
-#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

zone/dynamic_zone.cpp

@@ -19,13 +19,15 @@
  */
 
 #include "dynamic_zone.h"
-#include "client.h"
+
-#include "expedition_request.h"
+#include "common/repositories/character_expedition_lockouts_repository.h"
-#include "string_ids.h"
+#include "common/repositories/dynamic_zone_lockouts_repository.h"
-#include "worldserver.h"
+#include "zone/client.h"
-#include "../common/repositories/character_expedition_lockouts_repository.h"
+#include "zone/expedition_request.h"
-#include "../common/repositories/dynamic_zone_lockouts_repository.h"
+#include "zone/string_ids.h"
-#include <cereal/types/utility.hpp>
+#include "zone/worldserver.h"
+
+#include "cereal/types/utility.hpp"
 
 extern WorldServer worldserver;
 

zone/dynamic_zone.h

@@ -18,10 +18,10 @@
  *
  */
 
-#ifndef DYNAMIC_ZONE_H
+#pragma once
-#define DYNAMIC_ZONE_H
+
+#include "common/dynamic_zone_base.h"
 
-#include "../common/dynamic_zone_base.h"
 #include <cstdint>
 #include <string>
 #include <unordered_map>
@@ -137,5 +137,3 @@ private:
 
 	std::vector<DzLootEvent> m_loot_events; // only valid inside dz zone
 };
-
-#endif

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 "common/eqemu_logsys.h"
-#include "worldserver.h"
+#include "common/misc_functions.h"
-#include "zonedb.h"
+#include "common/spdat.h"
-#include "position.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)
 {

zone/embparser.cpp

@@ -18,16 +18,16 @@
 
 #ifdef EMBPERL
 
-#include "../common/global_define.h"
+#include "common/features.h"
-#include "../common/seperator.h"
+#include "common/misc_functions.h"
-#include "../common/misc_functions.h"
+#include "common/seperator.h"
-#include "../common/strings.h"
+#include "common/strings.h"
-#include "../common/features.h"
+#include "zone/embparser.h"
-#include "masterentity.h"
+#include "zone/masterentity.h"
-#include "embparser.h"
+#include "zone/qglobals.h"
-#include "questmgr.h"
+#include "zone/questmgr.h"
-#include "qglobals.h"
+#include "zone/zone.h"
-#include "zone.h"
+
 #include <algorithm>
 #include <sstream>
 
@@ -2911,4 +2911,4 @@ int PerlembParser::EventGlobalZone(
 	);
 }
 
-#endif
+#endif // EMBPERL

zone/embparser.h

@@ -16,16 +16,17 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef EQEMU_EMBPARSER_H
+#pragma once
-#define EQEMU_EMBPARSER_H
+
 #ifdef EMBPERL
 
-#include "quest_parser_collection.h"
+#include "zone/embperl.h"
-#include "quest_interface.h"
+#include "zone/quest_interface.h"
-#include <string>
+#include "zone/quest_parser_collection.h"
-#include <queue>
+
 #include <map>
-#include "embperl.h"
+#include <queue>
+#include <string>
 
 class Mob;
 class Client;
@@ -309,6 +310,4 @@ private:
 	std::map<std::string, int>         clear_vars_;
 };
 
-#endif
+#endif // EMBPERL
-#endif
-

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/content/world_content_service.h"
-#include "../common/misc_functions.h"
+#include "common/data_bucket.h"
-
+#include "common/events/player_event_logs.h"
-#include "dialogue_window.h"
+#include "common/features.h"
-#include "dynamic_zone.h"
+#include "common/misc_functions.h"
-#include "embperl.h"
+#include "common/zone_store.h"
-#include "entity.h"
+#include "zone/dialogue_window.h"
-#include "queryserv.h"
+#include "zone/dynamic_zone.h"
-#include "questmgr.h"
+#include "zone/embperl.h"
-#include "zone.h"
+#include "zone/entity.h"
-#include "../common/data_bucket.h"
+#include "zone/queryserv.h"
-#include "../common/events/player_event_logs.h"
+#include "zone/questmgr.h"
-#include "worldserver.h"
+#include "zone/worldserver.h"
+#include "zone/zone.h"
 
 #include <cctype>
 
@@ -7059,5 +7056,5 @@ void perl_register_quest()
 
 }
 
-#endif
+#endif // EMBPERL_XS
-#endif
+#endif // EMBPERL

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 <vector>
-#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_IO_CAPTURE
-
+#endif // EMBPERL
-#endif //EMBPERL
-
-#endif //EMBPERL_CPP

zone/embperl.h

@@ -5,20 +5,19 @@ eqemu perl wrapper
 Eglin
 */
 
-#ifndef EMBPERL_H
+#pragma once
-#define EMBPERL_H
 
 #ifdef EMBPERL
 
 #include "zone_config.h"
 
+#include "perlbind/perlbind.h"
+#include <cstdio>
+#include <cstring>
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
-#include <stdio.h>
-#include <string.h>
 
-#include <perlbind/perlbind.h>
 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

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;
 

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
+#pragma once
-#define ENCOUNTER_H
 
-#include "mob.h"
+#include "common/timer.h"
-#include "../common/types.h"
+#include "common/types.h"
-#include "../common/timer.h"
+#include "zone/mob.h"
 
 class Group;
 class Raid;
@@ -58,5 +57,3 @@ protected:
 
 private:
 };
-
-#endif

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 <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <iostream>
-
-#ifdef _WINDOWS
-#else
-#include <pthread.h>
-#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
+#include "common/data_verification.h"
-	#define snprintf	_snprintf
+#include "common/features.h"
-	#define strncasecmp	_strnicmp
+#include "common/guilds.h"
-	#define strcasecmp	_stricmp
+#include "zone/bot.h"
-#endif
+#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 <cstdarg>
+#include <cstdio>
+#include <cstring>
+#include <iostream>
 
 extern Zone *zone;
 extern volatile bool is_zone_loaded;

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 <unordered_map>
+#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 <queue>
-
+#include <unordered_map>
-#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"
 
 class Encounter;
 class Beacon;
@@ -653,6 +652,3 @@ private:
 	NewSpawn_Struct* data;
 	Client* pSendTo;
 };
-
-#endif
-

zone/event_codes.h

@@ -1,5 +1,4 @@
-#ifndef EVENT_CODES_H
+#pragma once
-#define EVENT_CODES_H
 
 typedef enum {
 	EVENT_SAY = 0,
@@ -156,6 +155,3 @@ typedef enum {
 } QuestEventID;
 
 extern const char *QuestEventSubroutines[_LargestEventID];
-
-#endif
-

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/data_bucket.h"
-#include "../common/features.h"
+#include "common/data_verification.h"
-#include "../common/rulesys.h"
+#include "common/events/player_event_logs.h"
-#include "../common/strings.h"
+#include "common/features.h"
-
+#include "common/rulesys.h"
-#include "client.h"
+#include "common/strings.h"
-#include "../common/data_bucket.h"
+#include "zone/bot.h"
-#include "groups.h"
+#include "zone/client.h"
-#include "mob.h"
+#include "zone/groups.h"
-#include "raids.h"
+#include "zone/lua_parser.h"
-
+#include "zone/mob.h"
-#include "queryserv.h"
+#include "zone/queryserv.h"
-#include "quest_parser_collection.h"
+#include "zone/quest_parser_collection.h"
-#include "lua_parser.h"
+#include "zone/raids.h"
-#include "string_ids.h"
+#include "zone/string_ids.h"
-#include "../common/data_verification.h"
+#include "zone/worldserver.h"
-
-#include "bot.h"
-#include "../common/events/player_event_logs.h"
-#include "worldserver.h"
 
 extern WorldServer worldserver;
 

zone/expedition_request.cpp

@@ -19,11 +19,12 @@
  */
 
 #include "expedition_request.h"
-#include "client.h"
+
-#include "groups.h"
+#include "common/repositories/character_expedition_lockouts_repository.h"
-#include "raids.h"
+#include "zone/client.h"
-#include "string_ids.h"
+#include "zone/groups.h"
-#include "../common/repositories/character_expedition_lockouts_repository.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)

zone/expedition_request.h

@@ -18,11 +18,11 @@
  *
  */
 
-#ifndef EXPEDITION_REQUEST_H
+#pragma once
-#define EXPEDITION_REQUEST_H
+
+#include "common/dynamic_zone_lockout.h"
+#include "zone/dynamic_zone.h"
 
-#include "dynamic_zone.h"
-#include "../common/dynamic_zone_lockout.h"
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -67,5 +67,3 @@ private:
 	std::vector<DynamicZoneMember> m_members;
 	std::vector<DzLockout> m_lockouts;
 };
-
-#endif

zone/fastmath.cpp

@@ -1,9 +1,8 @@
-#if defined(_MSC_VER)
+
-#define _USE_MATH_DEFINES
-#endif
-#include <cmath>
 #include "fastmath.h"
 
+#include <numbers>
+
 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<float>(ci) * M_PI * 2 / 512);
+		res = std::cos(static_cast<float>(ci) * std::numbers::pi * 2 / 512);
 		lut_cos[ci] = res;
 		if (si == 512)
 			si = 0;

zone/fastmath.h

@@ -1,5 +1,4 @@
-#ifndef FASTMATH_H
+#pragma once
-#define FASTMATH_H
 
 class FastMath
 {
@@ -14,5 +13,3 @@ public:
 	inline float FastCos(float a) { return lut_cos[static_cast<int>(a) & 0x1ff]; }
 
 };
-
-#endif /* !FASTMATH_H */

zone/fearpath.cpp

@@ -16,15 +16,10 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/rulesys.h"
+#include "common/rulesys.h"
-
+#include "zone/map.h"
-#include "map.h"
+#include "zone/water_map.h"
-#include "water_map.h"
+#include "zone/zone.h"
-#include "zone.h"
-
-#ifdef _WINDOWS
-#define snprintf	_snprintf
-#endif
 
 extern Zone* zone;
 

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 "common/eqemu_logsys.h"
-#include "string_ids.h"
+#include "common/events/player_event_logs.h"
-#include "titles.h"
+#include "common/misc_functions.h"
-#include "water_map.h"
+#include "common/repositories/criteria/content_filter_criteria.h"
-#include "zonedb.h"
+#include "common/repositories/fishing_repository.h"
-#include "../common/repositories/criteria/content_filter_criteria.h"
+#include "common/repositories/forage_repository.h"
-#include "../common/repositories/forage_repository.h"
+#include "common/rulesys.h"
-#include "../common/repositories/fishing_repository.h"
+#include "common/strings.h"
-#include "../common/events/player_event_logs.h"
+#include "zone/entity.h"
-#include "worldserver.h"
+#include "zone/npc.h"
-#include "queryserv.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 <numbers>
 
 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.x = m_Position.x + RodLength * sin(HeadingDegrees * std::numbers::pi / 180.0f);
-		rodPosition.y = m_Position.y + RodLength * cos(HeadingDegrees * M_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);

zone/forage.h

@@ -16,11 +16,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef FORAGE_H
+#pragma once
-#define FORAGE_H
+
-#include "../common/types.h"
+#include "common/types.h"
 
 #define MAX_COMMON_FOOD_IDS 8
 #define MAX_COMMON_FISH_IDS 9
-
-#endif

zone/global_loot_manager.cpp

@@ -1,8 +1,9 @@
 #include "global_loot_manager.h"
-#include "npc.h"
+
-#include "client.h"
+#include "zone/client.h"
-#include "zone.h"
+#include "zone/dialogue_window.h"
-#include "dialogue_window.h"
+#include "zone/npc.h"
+#include "zone/zone.h"
 
 extern Zone *zone;
 

zone/global_loot_manager.h

@@ -1,5 +1,4 @@
-#ifndef GLOBAL_LOOT_MANAGER_H
+#pragma once
-#define GLOBAL_LOOT_MANAGER_H
 
 #include <vector>
 #include <string>
@@ -58,5 +57,3 @@ public:
 	void ShowZoneGlobalLoot(Client *to) const;
 	void ShowNPCGlobalLoot(Client *to, NPC *who) const;
 };
-
-#endif /* !GLOBAL_LOOT_MANAGER_H */

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 "groups.h"
-#include "../common/eqemu_logsys.h"
+
-#include "dynamic_zone.h"
+#include "common/eqemu_logsys.h"
-#include "masterentity.h"
+#include "common/events/player_event_logs.h"
-#include "worldserver.h"
+#include "common/repositories/character_expedition_lockouts_repository.h"
-#include "string_ids.h"
+#include "common/repositories/group_id_repository.h"
-#include "../common/events/player_event_logs.h"
+#include "common/repositories/group_leaders_repository.h"
-#include "../common/repositories/character_expedition_lockouts_repository.h"
+#include "zone/dynamic_zone.h"
-#include "../common/repositories/group_id_repository.h"
+#include "zone/masterentity.h"
-#include "../common/repositories/group_leaders_repository.h"
+#include "zone/queryserv.h"
-#include "queryserv.h"
+#include "zone/string_ids.h"
+#include "zone/worldserver.h"
 
 
 extern EntityList  entity_list;

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"
+#pragma once
-#include "../common/types.h"
 
-#include "mob.h"
+#include "common/eq_packet_structs.h"
-#include "xtargetautohaters.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

zone/guild.cpp

@@ -16,12 +16,13 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/database.h"
+#include "client.h"
-#include "../common/guilds.h"
-#include "../common/strings.h"
 
-#include "guild_mgr.h"
+#include "common/database.h"
-#include "worldserver.h"
+#include "common/guilds.h"
+#include "common/strings.h"
+#include "zone/guild_mgr.h"
+#include "zone/worldserver.h"
 
 extern WorldServer worldserver;
 

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/emu_versions.h"
-#include "../common/repositories/guild_ranks_repository.h"
+#include "common/repositories/guild_bank_repository.h"
-#include "../common/servertalk.h"
+#include "common/repositories/guild_ranks_repository.h"
-#include "../common/strings.h"
+#include "common/servertalk.h"
-#include "client.h"
+#include "common/strings.h"
-#include "string_ids.h"
+#include "zone/client.h"
-#include "worldserver.h"
+#include "zone/string_ids.h"
-#include "zonedb.h"
+#include "zone/worldserver.h"
+#include "zone/zonedb.h"
 
 
 ZoneGuildManager guild_mgr;

zone/guild_mgr.h

@@ -1,13 +1,12 @@
-#ifndef GUILD_MGR_H_
+#pragma once
-#define GUILD_MGR_H_
+
+#include "common/guild_base.h"
+#include "common/repositories/guild_bank_repository.h"
+#include "common/types.h"
+#include "zone/petitions.h"
 
 #include <list>
 #include <map>
-#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_*/
-

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 "common/data_verification.h"
-#include "water_map.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 <list>
 

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
+#pragma once
-#define HATELIST_H
 
-#include "../common/emu_constants.h"
+#include "common/emu_constants.h"
+#include "common/types.h"
+
+#include <list>
 
 class Client;
 class Group;
@@ -102,6 +104,3 @@ private:
 	std::list<struct_HateList *> list;
 	Mob                          *hate_owner;
 };
-
-#endif
-

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

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
+#include "zone/mob.h"
-#define HEAL_ROTATION_H
-
-#include "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

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<uint16, const NPCType *> Horse::horse_types;
 

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 <map>
 
 class Client;
@@ -41,5 +42,3 @@ protected:
 	static const NPCType* GetHorseType(uint16 spell_id);
 	static const NPCType* BuildHorseType(uint16 spell_id);
 };
-
-#endif

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 "client.h"
-#include "../common/eqemu_logsys.h"
 
-#include "../common/strings.h"
+#include "common/eqemu_logsys.h"
-#include "quest_parser_collection.h"
+#include "common/events/player_event_logs.h"
-#include "worldserver.h"
+#include "common/evolving_items.h"
-#include "zonedb.h"
+#include "common/repositories/character_corpse_items_repository.h"
-#include "../common/events/player_event_logs.h"
+#include "common/strings.h"
-#include "bot.h"
+#include "zone/bot.h"
-#include "../common/evolving_items.h"
+#include "zone/queryserv.h"
-#include "../common/repositories/character_corpse_items_repository.h"
+#include "zone/quest_parser_collection.h"
-#include "queryserv.h"
+#include "zone/worldserver.h"
+#include "zone/zonedb.h"
 
 extern WorldServer worldserver;
 extern QueryServ  *QServ;

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
+#include "common/data_verification.h"
-#define snprintf	_snprintf
+#include "common/loot.h"
-#endif
+#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)
 {

zone/lua_bit.cpp

@@ -30,7 +30,7 @@
 #define LUA_BITOP_VERSION	"1.0.2"
 
 #include "lua.hpp"
-#include <stdint.h>
+#include <cstdint>
 
 typedef int32_t SBits;
 typedef uint32_t UBits;

zone/lua_bit.h

@@ -1,6 +1,3 @@
-#ifndef _LUABIT_H
+#pragma once
-#define _LUABIT_H
 
 int luaopen_bit(lua_State *L);
-
-#endif

zone/lua_bot.cpp

@@ -1,14 +1,15 @@
 #ifdef LUA_EQEMU
 
-#include "lua.hpp"
-#include <luabind/luabind.hpp>
-
-#include "bot.h"
 #include "lua_bot.h"
-#include "lua_iteminst.h"
+
-#include "lua_mob.h"
+#include "zone/bot.h"
-#include "lua_group.h"
+#include "zone/lua_iteminst.h"
-#include "lua_item.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

zone/lua_bot.h

@@ -1,9 +1,8 @@
-\
+#pragma once
-#ifndef EQEMU_LUA_BOT_H
+
-#define EQEMU_LUA_BOT_H
 #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 // LUA_EQEMU
-#endif

zone/lua_buff.cpp

@@ -1,11 +1,11 @@
 #ifdef LUA_EQEMU
 
-#include "lua.hpp"
-#include <luabind/luabind.hpp>
-#include <luabind/iterator_policy.hpp>
-
 #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

zone/lua_buff.h

@@ -1,9 +1,9 @@
-#ifndef EQEMU_LUA_BUFF_H
+#pragma once
-#define EQEMU_LUA_BUFF_H
+
 #ifdef LUA_EQEMU
 
-#include "common.h"
+#include "zone/common.h"
-#include "lua_ptr.h"
+#include "zone/lua_ptr.h"
 
 struct Buffs_Struct;
 
@@ -47,5 +47,4 @@ public:
 	bool SendsClientUpdate();
 };
 
-#endif
+#endif // LUA_EQEMU
-#endif

zone/lua_client.cpp

@@ -1,22 +1,23 @@
 #ifdef LUA_EQEMU
 
-#include "lua.hpp"
-#include <luabind/luabind.hpp>
-
-#include "client.h"
-#include "dynamic_zone.h"
-#include "expedition_request.h"
 #include "lua_client.h"
-#include "lua_expedition.h"
+
-#include "lua_npc.h"
+#include "zone/client.h"
-#include "lua_item.h"
+#include "zone/dialogue_window.h"
-#include "lua_iteminst.h"
+#include "zone/dynamic_zone.h"
-#include "lua_inventory.h"
+#include "zone/expedition_request.h"
-#include "lua_group.h"
+#include "zone/lua_expedition.h"
-#include "lua_raid.h"
+#include "zone/lua_group.h"
-#include "lua_packet.h"
+#include "zone/lua_inventory.h"
-#include "dialogue_window.h"
+#include "zone/lua_item.h"
-#include "titles.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 // LUA_EQEMU
-
-#endif

zone/lua_client.h

@@ -1,8 +1,8 @@
-#ifndef EQEMU_LUA_CLIENT_H
+#pragma once
-#define EQEMU_LUA_CLIENT_H
+
 #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 // LUA_EQEMU
-#endif

zone/lua_corpse.cpp

@@ -1,12 +1,13 @@
 #ifdef LUA_EQEMU
 
-#include "lua.hpp"
-#include <luabind/luabind.hpp>
-#include <luabind/iterator_policy.hpp>
-
-#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<uint32> 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

zone/lua_corpse.h

@@ -1,8 +1,8 @@
-#ifndef EQEMU_LUA_CORPSE_H
+#pragma once
-#define EQEMU_LUA_CORPSE_H
+
 #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 // LUA_EQEMU
-#endif