Merge upstream/master to incorporate EQEmu fixes

Resolve CMake style conflict in common/CMakeLists.txt by adopting
the lowercase CMake command style used consistently throughout
the upstream codebase.

common/patches/patches.cpp

@@ -17,15 +17,14 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "../global_define.h"
 #include "patches.h"
 
-#include "titanium.h"
-#include "uf.h"
-#include "sof.h"
-#include "sod.h"
-#include "rof.h"
-#include "rof2.h"
+#include "common/patches/rof.h"
+#include "common/patches/rof2.h"
+#include "common/patches/sod.h"
+#include "common/patches/sof.h"
+#include "common/patches/titanium.h"
+#include "common/patches/uf.h"
 
 
 void RegisterAllPatches(EQStreamIdentifier &into)

common/patches/patches.h

@@ -17,8 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_PATCHES_H
-#define COMMON_PATCHES_H
+#pragma once
 
 
 /*enum {
@@ -31,5 +30,3 @@ class EQStreamIdentifier;
 
 void RegisterAllPatches(EQStreamIdentifier &into);
 void ReloadAllPatches();
-
-#endif /*COMMON_PATCHES_H*/

common/patches/rof.cpp

@@ -17,24 +17,22 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "../global_define.h"
-#include "../eqemu_config.h"
-#include "../eqemu_logsys.h"
 #include "rof.h"
-#include "../opcodemgr.h"
-
-#include "../eq_stream_ident.h"
-#include "../crc32.h"
-
-#include "../eq_packet_structs.h"
-#include "../misc_functions.h"
-#include "../strings.h"
-#include "../inventory_profile.h"
 #include "rof_structs.h"
-#include "../rulesys.h"
-#include "../path_manager.h"
-#include "../races.h"
-#include "../raid.h"
+
+#include "common/crc32.h"
+#include "common/eq_packet_structs.h"
+#include "common/eq_stream_ident.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/inventory_profile.h"
+#include "common/misc_functions.h"
+#include "common/opcodemgr.h"
+#include "common/path_manager.h"
+#include "common/races.h"
+#include "common/raid.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
 
 #include <iostream>
 #include <sstream>

common/patches/rof.h

@@ -17,10 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_ROF_H
-#define COMMON_ROF_H
+#pragma once
 
-#include "../struct_strategy.h"
+#include "common/struct_strategy.h"
 
 class EQStreamIdentifier;
 
@@ -50,6 +49,4 @@ namespace RoF
 		#include "rof_ops.h"
 	};
 
-}; /*RoF*/
-
-#endif /*COMMON_ROF_H*/
+} /*RoF*/

common/patches/rof2.cpp

@@ -17,31 +17,29 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "../global_define.h"
-#include "../eqemu_config.h"
-#include "../eqemu_logsys.h"
 #include "rof2.h"
-#include "../opcodemgr.h"
-
-#include "../eq_stream_ident.h"
-#include "../crc32.h"
-
-#include "../eq_packet_structs.h"
-#include "../misc_functions.h"
-#include "../strings.h"
-#include "../inventory_profile.h"
 #include "rof2_structs.h"
-#include "../rulesys.h"
-#include "../path_manager.h"
-#include "../classes.h"
-#include "../races.h"
-#include "../raid.h"
 
-#include <iostream>
-#include <sstream>
-#include <numeric>
+#include "common/classes.h"
+#include "common/crc32.h"
+#include "common/eq_packet_structs.h"
+#include "common/eq_stream_ident.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/inventory_profile.h"
+#include "common/misc_functions.h"
+#include "common/opcodemgr.h"
+#include "common/path_manager.h"
+#include "common/races.h"
+#include "common/raid.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
+
 #include <cassert>
 #include <cinttypes>
+#include <iostream>
+#include <numeric>
+#include <sstream>
 
 
 namespace RoF2

common/patches/rof2.h

@@ -17,10 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_ROF2_H
-#define COMMON_ROF2_H
+#pragma once
 
-#include "../struct_strategy.h"
+#include "common/struct_strategy.h"
 
 class EQStreamIdentifier;
 
@@ -51,5 +50,3 @@ namespace RoF2
 	};
 
 }; /*RoF2*/
-
-#endif /*COMMON_ROF2_H*/

common/patches/rof2_limits.cpp

@@ -19,7 +19,7 @@
 
 #include "rof2_limits.h"
 
-#include "../strings.h"
+#include "common/strings.h"
 
 
 int16 RoF2::invtype::GetInvTypeSize(int16 inv_type)

common/patches/rof2_limits.h

@@ -17,12 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_ROF2_LIMITS_H
-#define COMMON_ROF2_LIMITS_H
+#pragma once
 
-#include "../types.h"
-#include "../emu_versions.h"
-#include "../skills.h"
+#include "common/emu_versions.h"
+#include "common/skills.h"
+#include "common/types.h"
 
 
 namespace RoF2
@@ -360,6 +359,4 @@ namespace RoF2
 
 	} /*spells*/
 
-}; /*RoF2*/
-
-#endif /*COMMON_ROF2_LIMITS_H*/
+} /*RoF2*/

common/patches/rof2_structs.h

@@ -17,18 +17,24 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_ROF2_STRUCTS_H
-#define COMMON_ROF2_STRUCTS_H
+#pragma once
+
+#include "common/eq_packet_structs.h"
+#include "common/patches/rof2_limits.h"
+#include "common/strings.h"
+#include "common/textures.h"
+#include "common/types.h"
+
+#include "fmt/format.h"
 
 
-namespace RoF2
-{
-	namespace structs {
+namespace RoF2 { namespace structs {
 
 /*
 ** Compiler override to ensure
 ** byte aligned structures
 */
+#pragma pack(push)
 #pragma pack(1)
 
 struct LoginInfo_Struct {
@@ -5426,7 +5432,8 @@ struct Parcel_Struct
     /*216*/ uint32                       unknown_216;
     /*220*/ uint32                       unknown_220;
 };
-	}; /*structs*/
+
+} /*structs*/
 
 struct EvolveItemToggle_Struct {
 	uint32 action;
@@ -5454,6 +5461,6 @@ struct EvolveXPWindowSendDetails_Struct {
 	/*030*/ char   serialize_data[];
 };
 
-}; /*RoF2*/
+#pragma pack(pop)
 
-#endif /*COMMON_ROF2_STRUCTS_H*/
+} /*RoF2*/

common/patches/rof_limits.cpp

@@ -19,7 +19,7 @@
 
 #include "rof_limits.h"
 
-#include "../strings.h"
+#include "common/strings.h"
 
 
 int16 RoF::invtype::GetInvTypeSize(int16 inv_type)

common/patches/rof_limits.h

@@ -17,12 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_ROF_LIMITS_H
-#define COMMON_ROF_LIMITS_H
+#pragma once
 
-#include "../types.h"
-#include "../emu_versions.h"
-#include "../skills.h"
+#include "common/emu_versions.h"
+#include "common/skills.h"
+#include "common/types.h"
 
 
 namespace RoF
@@ -314,6 +313,4 @@ namespace RoF
 
 	} /*spells*/
 
-}; /*RoF*/
-
-#endif /*COMMON_ROF_LIMITS_H*/
+} /*RoF*/

common/patches/rof_structs.h

@@ -17,18 +17,19 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_ROF_STRUCTS_H
-#define COMMON_ROF_STRUCTS_H
+#pragma once
 
+#include "common/patches/rof_limits.h"
+#include "common/textures.h"
+#include "common/types.h"
 
-namespace RoF
-{
-	namespace structs {
+namespace RoF { namespace structs {
 
 /*
 ** Compiler override to ensure
 ** byte aligned structures
 */
+#pragma pack(push)
 #pragma pack(1)
 
 struct LoginInfo_Struct {
@@ -5139,8 +5140,7 @@ struct SayLinkBodyFrame_Struct {
 /*055*/
 };
 
-	}; /*structs*/
+#pragma pack(pop)
 
-}; /*RoF*/
-
-#endif /*COMMON_ROF_STRUCTS_H*/
+} /*structs*/
+} /*RoF*/

common/patches/sod.cpp

@@ -17,24 +17,22 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "../global_define.h"
-#include "../eqemu_config.h"
-#include "../eqemu_logsys.h"
 #include "sod.h"
-#include "../opcodemgr.h"
-
-#include "../eq_stream_ident.h"
-#include "../crc32.h"
-
-#include "../eq_packet_structs.h"
-#include "../misc_functions.h"
-#include "../strings.h"
-#include "../item_instance.h"
 #include "sod_structs.h"
-#include "../rulesys.h"
-#include "../path_manager.h"
-#include "../races.h"
-#include "../raid.h"
+
+#include "common/crc32.h"
+#include "common/eq_packet_structs.h"
+#include "common/eq_stream_ident.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/item_instance.h"
+#include "common/misc_functions.h"
+#include "common/opcodemgr.h"
+#include "common/path_manager.h"
+#include "common/races.h"
+#include "common/raid.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
 
 #include <iostream>
 #include <sstream>

common/patches/sod.h

@@ -17,10 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_SOD_H
-#define COMMON_SOD_H
+#pragma once
 
-#include "../struct_strategy.h"
+#include "common/struct_strategy.h"
 
 class EQStreamIdentifier;
 
@@ -50,6 +49,4 @@ namespace SoD
 		#include "sod_ops.h"
 	};
 
-}; /*SoD*/
-
-#endif /*COMMON_SOD_H*/
+} /*SoD*/

common/patches/sod_limits.cpp

@@ -19,7 +19,7 @@
 
 #include "sod_limits.h"
 
-#include "../strings.h"
+#include "common/strings.h"
 
 
 int16 SoD::invtype::GetInvTypeSize(int16 inv_type)

common/patches/sod_limits.h

@@ -17,12 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_SOD_LIMITS_H
-#define COMMON_SOD_LIMITS_H
+#pragma once
 
-#include "../types.h"
-#include "../emu_versions.h"
-#include "../skills.h"
+#include "common/emu_versions.h"
+#include "common/skills.h"
+#include "common/types.h"
 
 
 namespace SoD
@@ -339,6 +338,4 @@ namespace SoD
 
 	} /*spells*/
 
-}; /*SoD*/
-
-#endif /*COMMON_SOD_LIMITS_H*/
+} /*SoD*/

common/patches/sod_structs.h

@@ -17,13 +17,14 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_SOD_STRUCTS_H
-#define COMMON_SOD_STRUCTS_H
+#pragma once
 
+#include "common/eq_packet_structs.h"
+#include "common/patches/sod_limits.h"
+#include "common/textures.h"
+#include "common/types.h"
 
-namespace SoD
-{
-	namespace structs {
+namespace SoD { namespace structs {
 
 
 static const uint32 BUFF_COUNT = 25;
@@ -32,6 +33,7 @@ static const uint32 BUFF_COUNT = 25;
 ** Compiler override to ensure
 ** byte aligned structures
 */
+#pragma pack(push)
 #pragma pack(1)
 
 struct LoginInfo_Struct {
@@ -4528,8 +4530,7 @@ struct SayLinkBodyFrame_Struct {
 /*050*/
 };
 
-	}; /*structs*/
+#pragma pack(pop)
 
-}; /*SoD*/
-
-#endif /*COMMON_SOD_STRUCTS_H*/
+} /*structs*/
+} /*SoD*/

common/patches/sof.cpp

@@ -17,23 +17,21 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "../global_define.h"
-#include "../eqemu_config.h"
-#include "../eqemu_logsys.h"
 #include "sof.h"
-#include "../opcodemgr.h"
-
-#include "../eq_stream_ident.h"
-#include "../crc32.h"
-
-#include "../eq_packet_structs.h"
-#include "../misc_functions.h"
-#include "../strings.h"
-#include "../item_instance.h"
 #include "sof_structs.h"
-#include "../rulesys.h"
-#include "../path_manager.h"
-#include "../raid.h"
+
+#include "common/crc32.h"
+#include "common/eq_packet_structs.h"
+#include "common/eq_stream_ident.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/item_instance.h"
+#include "common/misc_functions.h"
+#include "common/opcodemgr.h"
+#include "common/path_manager.h"
+#include "common/raid.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
 
 #include <iostream>
 #include <sstream>

common/patches/sof.h

@@ -17,10 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_SOF_H
-#define COMMON_SOF_H
+#pragma once
 
-#include "../struct_strategy.h"
+#include "common/struct_strategy.h"
 
 class EQStreamIdentifier;
 
@@ -50,6 +49,4 @@ namespace SoF
 		#include "sof_ops.h"
 	};
 
-}; /*SoF*/
-
-#endif /*COMMON_SOF_H*/
+} /*SoF*/

common/patches/sof_limits.cpp

@@ -19,7 +19,7 @@
 
 #include "sof_limits.h"
 
-#include "../strings.h"
+#include "common/strings.h"
 
 
 int16 SoF::invtype::GetInvTypeSize(int16 inv_type)

common/patches/sof_limits.h

@@ -17,12 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_SOF_LIMITS_H
-#define COMMON_SOF_LIMITS_H
+#pragma once
 
-#include "../types.h"
-#include "../emu_versions.h"
-#include "../skills.h"
+#include "common/emu_versions.h"
+#include "common/skills.h"
+#include "common/types.h"
 
 
 namespace SoF
@@ -344,6 +343,4 @@ namespace SoF
 
 	} /*spells*/
 
-}; /*SoF*/
-
-#endif /*COMMON_SOF_LIMITS_H*/
+} /*SoF*/

common/patches/sof_structs.h

@@ -17,13 +17,14 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_SOF_STRUCTS_H
-#define COMMON_SOF_STRUCTS_H
+#pragma once
 
+#include "common/eq_packet_structs.h"
+#include "common/patches/sof_limits.h"
+#include "common/textures.h"
+#include "common/types.h"
 
-namespace SoF
-{
-	namespace structs {
+namespace SoF { namespace structs {
 
 
 static const uint32 BUFF_COUNT = 25;
@@ -32,6 +33,7 @@ static const uint32 BUFF_COUNT = 25;
 ** Compiler override to ensure
 ** byte aligned structures
 */
+#pragma pack(push)
 #pragma pack(1)
 
 struct LoginInfo_Struct {
@@ -4298,8 +4300,7 @@ struct SayLinkBodyFrame_Struct {
 /*050*/
 };
 
-	}; /*structs*/
+#pragma pack(pop)
 
-}; /*SoF*/
-
-#endif /*COMMON_SOF_STRUCTS_H*/
+} /*structs*/
+} /*SoF*/

common/patches/template.cpp

@@ -1,12 +1,12 @@
 
 #include "TEMPLATE.h"
-#include "../opcodemgr.h"
-#include "../logsys.h"
-#include "../eq_stream_ident.h"
-
-#include "../eq_packet_structs.h"
 #include "TEMPLATE_structs.h"
 
+#include "common/eq_packet_structs.h"
+#include "common/eq_stream_ident.h"
+#include "common/logsys.h"
+#include "common/opcodemgr.h"
+
 namespace TEMPLATE {
 
 static const char *name = "CHANGEME";
@@ -146,30 +146,4 @@ DECODE(OP_SetServerFilter) {
 	FINISH_DIRECT_DECODE();
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-} //end namespace TEMPLATE
-
-
-
-
-
-
+} // namespace TEMPLATE

common/patches/template.h

@@ -1,8 +1,6 @@
-#ifndef TEMPLATE_H_
-#define TEMPLATE_H_
+#pragma once
 
-#include "../struct_strategy.h"
-#include "../eqemu_config_extern.h"
+#include "common/struct_strategy.h"
 
 class EQStreamIdentifier;
 
@@ -32,7 +30,3 @@ namespace TEMPLATE {
 	};
 
 };
-
-
-
-#endif /*TEMPLATE_H_*/

common/patches/template_limits.h

@@ -17,8 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_TEMPLATE_LIMITS_H
-#define COMMON_TEMPLATE_LIMITS_H
+#pragma once
 
 
 namespace TEMPLATE
@@ -27,5 +26,3 @@ namespace TEMPLATE
 	// put constants here and #include appropriately
 	
 }; /* TEMPLATE */
-
-#endif /*COMMON_TEMPLATE_LIMITS_H*/

common/patches/template_structs.h

@@ -1,28 +1,11 @@
-#ifndef TEMPLATE_STRUCTS_H_
-#define TEMPLATE_STRUCTS_H_
+#pragma once
 
-namespace TEMPLATE {
-	namespace structs {
+namespace TEMPLATE { namespace structs {
 
 
 //paste contents of eq_packet_structs.h here...
 
 
 
-	};	//end namespace structs
-};	//end namespace TEMPLATE
-
-
-
-
-#endif /*TEMPLATE_STRUCTS_H_*/
-
-
-
-
-
-
-
-
-
-
+} // namespace structs
+} // namespace TEMPLATE

common/patches/titanium.cpp

@@ -17,25 +17,23 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "../global_define.h"
-#include "../eqemu_config.h"
-#include "../eqemu_logsys.h"
 #include "titanium.h"
-#include "../opcodemgr.h"
-
-#include "../eq_stream_ident.h"
-#include "../crc32.h"
-#include "../races.h"
-
-#include "../eq_packet_structs.h"
-#include "../misc_functions.h"
-#include "../strings.h"
-#include "../item_instance.h"
 #include "titanium_structs.h"
-#include "../rulesys.h"
-#include "../path_manager.h"
-#include "../raid.h"
-#include "../guilds.h"
+
+#include "common/crc32.h"
+#include "common/eq_packet_structs.h"
+#include "common/eq_stream_ident.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/guilds.h"
+#include "common/item_instance.h"
+#include "common/misc_functions.h"
+#include "common/opcodemgr.h"
+#include "common/path_manager.h"
+#include "common/races.h"
+#include "common/raid.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
 
 #include <sstream>
 

common/patches/titanium.h

@@ -17,10 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_TITANIUM_H
-#define COMMON_TITANIUM_H
+#pragma once
 
-#include "../struct_strategy.h"
+#include "common/struct_strategy.h"
 
 class EQStreamIdentifier;
 
@@ -50,6 +49,4 @@ namespace Titanium
 		#include "titanium_ops.h"
 	};
 
-}; /*Titanium*/
-
-#endif /*COMMON_TITANIUM_H*/
+} /*Titanium*/

common/patches/titanium_limits.cpp

@@ -19,7 +19,7 @@
 
 #include "titanium_limits.h"
 
-#include "../strings.h"
+#include "common/strings.h"
 
 
 int16 Titanium::invtype::GetInvTypeSize(int16 inv_type)

common/patches/titanium_limits.h

@@ -17,12 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_TITANIUM_LIMITS_H
-#define COMMON_TITANIUM_LIMITS_H
+#pragma once
 
-#include "../types.h"
-#include "../emu_versions.h"
-#include "../skills.h"
+#include "common/emu_versions.h"
+#include "common/skills.h"
+#include "common/types.h"
 
 
 namespace Titanium
@@ -340,6 +339,4 @@ namespace Titanium
 
 	} /*spells*/
 
-}; /*Titanium*/
-
-#endif /*COMMON_TITANIUM_LIMITS_H*/
+} /*Titanium*/

common/patches/titanium_structs.h

@@ -17,13 +17,15 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_TITANIUM_STRUCTS_H
-#define COMMON_TITANIUM_STRUCTS_H
+#pragma once
+
+#include "common/eq_packet_structs.h"
+#include "common/patches/titanium_limits.h"
+#include "common/textures.h"
+#include "common/types.h"
 
 
-namespace Titanium
-{
-	namespace structs {
+namespace Titanium { namespace structs {
 
 
 static const uint32 BUFF_COUNT = 25;
@@ -32,6 +34,7 @@ static const uint32 BUFF_COUNT = 25;
 ** Compiler override to ensure
 ** byte aligned structures
 */
+#pragma pack(push)
 #pragma pack(1)
 
 struct LoginInfo_Struct {
@@ -3774,8 +3777,7 @@ enum TiBazaarTraderBuyerActions {
 	ReconcileItems  = 20
 };
 
-	}; /*structs*/
+#pragma pack(pop)
 
-}; /*Titanium*/
-
-#endif /*COMMON_TITANIUM_STRUCTS_H*/
+} /*structs*/
+} /*Titanium*/

common/patches/uf.cpp

@@ -17,29 +17,26 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "../global_define.h"
-#include "../eqemu_config.h"
-#include "../eqemu_logsys.h"
 #include "uf.h"
-#include "../opcodemgr.h"
-
-#include "../eq_stream_ident.h"
-#include "../crc32.h"
-
-#include "../eq_packet_structs.h"
-#include "../misc_functions.h"
-#include "../strings.h"
-#include "../item_instance.h"
 #include "uf_structs.h"
-#include "../rulesys.h"
-#include "../path_manager.h"
-#include "../classes.h"
-#include "../races.h"
-#include "../raid.h"
-#include "../guilds.h"
-//#include "../repositories/trader_repository.h"
-#include "../cereal/include/cereal/types/vector.hpp"
 
+#include "common/classes.h"
+#include "common/crc32.h"
+#include "common/eq_packet_structs.h"
+#include "common/eq_stream_ident.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/guilds.h"
+#include "common/item_instance.h"
+#include "common/misc_functions.h"
+#include "common/opcodemgr.h"
+#include "common/path_manager.h"
+#include "common/races.h"
+#include "common/raid.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
+
+#include "cereal/types/vector.hpp"
 #include <iostream>
 #include <sstream>
 

common/patches/uf.h

@@ -17,10 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_UF_H
-#define COMMON_UF_H
+#pragma once
 
-#include "../struct_strategy.h"
+#include "common/struct_strategy.h"
 
 class EQStreamIdentifier;
 
@@ -51,5 +50,3 @@ namespace UF
 	};
 
 }; /*UF*/
-
-#endif /*COMMON_UF_H*/

common/patches/uf_limits.cpp

@@ -19,7 +19,7 @@
 
 #include "uf_limits.h"
 
-#include "../strings.h"
+#include "common/strings.h"
 
 
 int16 UF::invtype::GetInvTypeSize(int16 inv_type)

common/patches/uf_limits.h

@@ -17,12 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_UF_LIMITS_H
-#define COMMON_UF_LIMITS_H
+#pragma once
 
-#include "../types.h"
-#include "../emu_versions.h"
-#include "../skills.h"
+#include "common/emu_versions.h"
+#include "common/skills.h"
+#include "common/types.h"
 
 
 namespace UF
@@ -343,6 +342,4 @@ namespace UF
 
 	} /*spells*/
 
-}; /*UF*/
-
-#endif /*COMMON_UF_LIMITS_H*/
+} /*UF*/

common/patches/uf_structs.h

@@ -17,13 +17,14 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef COMMON_UF_STRUCTS_H
-#define COMMON_UF_STRUCTS_H
+#pragma once
 
+#include "common/eq_packet_structs.h"
+#include "common/patches/uf_limits.h"
+#include "common/textures.h"
+#include "common/types.h"
 
-namespace UF
-{
-	namespace structs {
+namespace UF { namespace structs {
 
 
 static const uint32 BUFF_COUNT = 30;
@@ -32,6 +33,7 @@ static const uint32 BUFF_COUNT = 30;
 ** Compiler override to ensure
 ** byte aligned structures
 */
+#pragma pack(push)
 #pragma pack(1)
 
 struct LoginInfo_Struct {
@@ -4710,8 +4712,7 @@ enum UFBazaarTraderBuyerActions {
 	ReconcileItems  = 20
 };
 
-	}; /*structs*/
+#pragma pack(pop)
 
-}; /*UF*/
-
-#endif /*COMMON_UF_STRUCTS_H*/
+} /*structs*/
+} /*UF*/