make include guards standards conforming

fix compile issues

CMakeLists.txt

@@ -1,5 +1,11 @@
 cmake_minimum_required(VERSION 3.25)
 project(Darkflame)
+
+# check if the path to the source directory contains a space
+if("${CMAKE_SOURCE_DIR}" MATCHES " ")
+	message(FATAL_ERROR "The server cannot build in the path (" ${CMAKE_SOURCE_DIR} ") because it contains a space. Please move the server to a path without spaces.")
+endif()
+
 include(CTest)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -229,7 +235,6 @@ include_directories(
 	"tests/dCommonTests"
 	"tests/dGameTests"
 	"tests/dGameTests/dComponentsTests"
-	"tests/dGameTests/dScriptsTests"
 
 	SYSTEM "thirdparty/magic_enum/include/magic_enum"
 	SYSTEM "thirdparty/raknet/Source"

Dockerfile

@@ -31,7 +31,7 @@ COPY --from=build /app/build/*Server /app/
 
 # Necessary suplimentary files
 COPY --from=build /app/build/*.ini /app/configs/
-COPY --from=build /app/build/vanity/*.* /app/vanity/*
+COPY --from=build /app/build/vanity/*.* /app/vanity/
 COPY --from=build /app/build/navmeshes /app/navmeshes
 COPY --from=build /app/build/migrations /app/migrations
 COPY --from=build /app/build/*.dcf /app/
@@ -39,7 +39,7 @@ COPY --from=build /app/build/*.dcf /app/
 # backup of config and vanity files to copy to the host incase 
 # of a mount clobbering the copy from above
 COPY --from=build /app/build/*.ini /app/default-configs/ 
-COPY --from=build /app/build/vanity/*.* /app/default-vanity/*
+COPY --from=build /app/build/vanity/*.* /app/default-vanity/
 
 # needed as the container runs with the root user
 # and therefore sudo doesn't exist

dChatServer/ChatIgnoreList.h

@@ -1,5 +1,5 @@
-#ifndef __CHATIGNORELIST__H__
-#define __CHATIGNORELIST__H__
+#ifndef CHATIGNORELIST_H
+#define CHATIGNORELIST_H
 
 struct Packet;
 
@@ -24,4 +24,4 @@ namespace ChatIgnoreList {
 	};
 };
 
-#endif  //!__CHATIGNORELIST__H__
+#endif  //!CHATIGNORELIST_H

dChatServer/ChatServer.cpp

@@ -179,6 +179,7 @@ int main(int argc, char** argv) {
 }
 
 void HandlePacket(Packet* packet) {
+	if (packet->length < 1) return;
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) {
 		LOG("A server has disconnected, erasing their connected players from the list.");
 	} else if (packet->data[0] == ID_NEW_INCOMING_CONNECTION) {

dChatServer/PlayerContainer.cpp

@@ -36,16 +36,19 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 	data.playerID = playerId;
 
 	uint32_t len;
-	inStream.Read<uint32_t>(len);
+	if (!inStream.Read<uint32_t>(len)) return;
 
-	for (int i = 0; i < len; i++) {
-		char character; inStream.Read<char>(character);
-		data.playerName += character;
+	if (len > 33) {
+		LOG("Received a really long player name, probably a fake packet %i.", len);
+		return;
 	}
 
-	inStream.Read(data.zoneID);
-	inStream.Read(data.muteExpire);
-	inStream.Read(data.gmLevel);
+	data.playerName.resize(len);
+	inStream.ReadAlignedBytes(reinterpret_cast<unsigned char*>(data.playerName.data()), len);
+
+	if (!inStream.Read(data.zoneID)) return;
+	if (!inStream.Read(data.muteExpire)) return;
+	if (!inStream.Read(data.gmLevel)) return;
 	data.sysAddr = packet->systemAddress;
 
 	m_Names[data.playerID] = GeneralUtils::UTF8ToUTF16(data.playerName);
@@ -122,6 +125,11 @@ void PlayerContainer::CreateTeamServer(Packet* packet) {
 	size_t membersSize = 0;
 	inStream.Read(membersSize);
 
+	if (membersSize >= 4) {
+		LOG("Tried to create a team with more than 4 players");
+		return;
+	}
+
 	std::vector<LWOOBJID> members;
 
 	members.reserve(membersSize);

dCommon/Amf3.h

@@ -1,5 +1,5 @@
-#ifndef __AMF3__H__
-#define __AMF3__H__
+#ifndef AMF3_H
+#define AMF3_H
 
 #include "dCommonVars.h"
 #include "Logger.h"
@@ -377,4 +377,4 @@ private:
 	AMFDense m_Dense;
 };
 
-#endif  //!__AMF3__H__
+#endif  //!AMF3_H

dCommon/BinaryIO.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __BINARYIO__H__
-#define __BINARYIO__H__
+#ifndef BINARYIO_H
+#define BINARYIO_H
 
 #include <iostream>
 #include <fstream>
@@ -71,4 +71,4 @@ namespace BinaryIO {
 	}
 }
 
-#endif  //!__BINARYIO__H__
+#endif  //!BINARYIO_H

dCommon/BinaryPathFinder.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __BINARYPATHFINDER__H__
-#define __BINARYPATHFINDER__H__
+#ifndef BINARYPATHFINDER_H
+#define BINARYPATHFINDER_H
 
 #include <filesystem>
 
@@ -12,4 +12,4 @@ public:
 	static std::filesystem::path GetBinaryDir();
 };
 
-#endif  //!__BINARYPATHFINDER__H__
+#endif  //!BINARYPATHFINDER_H

dCommon/Brick.h

@@ -1,5 +1,5 @@
-#ifndef __BRICK__H__
-#define __BRICK__H__
+#ifndef BRICK_H
+#define BRICK_H
 
 #include <cstdint>
 
@@ -8,4 +8,4 @@ struct Brick {
 	uint32_t materialID;
 };
 
-#endif  //!__BRICK__H__
+#endif  //!BRICK_H

dCommon/Diagnostics.cpp

@@ -201,7 +201,7 @@ void OnTerminate() {
 }
 
 void MakeBacktrace() {
-	struct sigaction sigact;
+	struct sigaction sigact{};
 
 	sigact.sa_sigaction = CritErrHdlr;
 	sigact.sa_flags = SA_RESTART | SA_SIGINFO;

dCommon/DluAssert.h

@@ -1,5 +1,5 @@
-#ifndef __DLUASSERT__H__
-#define __DLUASSERT__H__
+#ifndef DLUASSERT_H
+#define DLUASSERT_H
 
 #include <assert.h>
 
@@ -9,4 +9,4 @@
 #	define DluAssert(expression)
 #endif
 
-#endif  //!__DLUASSERT__H__
+#endif  //!DLUASSERT_H

dCommon/FdbToSqlite.h

@@ -1,5 +1,5 @@
-#ifndef __FDBTOSQLITE__H__
-#define __FDBTOSQLITE__H__
+#ifndef FDBTOSQLITE_H
+#define FDBTOSQLITE_H
 
 #pragma once
 
@@ -142,4 +142,4 @@ namespace FdbToSqlite {
 	}; //! class FdbToSqlite
 }; //! namespace FdbToSqlite
 
-#endif  //!__FDBTOSQLITE__H__
+#endif  //!FDBTOSQLITE_H

dCommon/LDFFormat.h

@@ -1,5 +1,5 @@
-#ifndef __LDFFORMAT__H__
-#define __LDFFORMAT__H__
+#ifndef LDFFORMAT_H
+#define LDFFORMAT_H
 
 // Custom Classes
 #include "dCommonVars.h"
@@ -31,22 +31,22 @@ public:
 
 	virtual ~LDFBaseData() {}
 
-	virtual void WriteToPacket(RakNet::BitStream& packet) = 0;
+	virtual void WriteToPacket(RakNet::BitStream& packet) const = 0;
 
-	virtual const std::u16string& GetKey() = 0;
+	virtual const std::u16string& GetKey() const = 0;
 
-	virtual eLDFType GetValueType() = 0;
+	virtual eLDFType GetValueType() const = 0;
 
 	/** Gets a string from the key/value pair
 	 * @param includeKey Whether or not to include the key in the data
 	 * @param includeTypeId Whether or not to include the type id in the data
 	 * @return The string representation of the data
 	 */
-	virtual std::string GetString(bool includeKey = true, bool includeTypeId = true) = 0;
+	virtual std::string GetString(bool includeKey = true, bool includeTypeId = true) const = 0;
 
-	virtual std::string GetValueAsString() = 0;
+	virtual std::string GetValueAsString() const = 0;
 
-	virtual LDFBaseData* Copy() = 0;
+	virtual LDFBaseData* Copy() const = 0;
 
 	/**
 	 * Given an input string, return the data as a LDF key.
@@ -62,7 +62,7 @@ private:
 	T value;
 
 	//! Writes the key to the packet
-	void WriteKey(RakNet::BitStream& packet) {
+	void WriteKey(RakNet::BitStream& packet) const {
 		packet.Write<uint8_t>(this->key.length() * sizeof(uint16_t));
 		for (uint32_t i = 0; i < this->key.length(); ++i) {
 			packet.Write<uint16_t>(this->key[i]);
@@ -70,7 +70,7 @@ private:
 	}
 
 	//! Writes the value to the packet
-	void WriteValue(RakNet::BitStream& packet) {
+	void WriteValue(RakNet::BitStream& packet) const {
 		packet.Write<uint8_t>(this->GetValueType());
 		packet.Write(this->value);
 	}
@@ -90,7 +90,7 @@ public:
 	/*!
 	  \return The value
 	 */
-	const T& GetValue(void) { return this->value; }
+	const T& GetValue(void) const { return this->value; }
 
 	//! Sets the value
 	/*!
@@ -102,13 +102,13 @@ public:
 	/*!
 	  \return The value string
 	 */
-	std::string GetValueString(void) { return ""; }
+	std::string GetValueString(void) const { return ""; }
 
 	//! Writes the data to a packet
 	/*!
 	  \param packet The packet
 	 */
-	void WriteToPacket(RakNet::BitStream& packet) override {
+	void WriteToPacket(RakNet::BitStream& packet) const override {
 		this->WriteKey(packet);
 		this->WriteValue(packet);
 	}
@@ -117,13 +117,13 @@ public:
 	/*!
 	 \return The key
 	 */
-	const std::u16string& GetKey(void) override { return this->key; }
+	const std::u16string& GetKey(void) const override { return this->key; }
 
 	//! Gets the LDF Type
 	/*!
 	 \return The LDF value type
 	 */
-	eLDFType GetValueType(void) override { return LDF_TYPE_UNKNOWN; }
+	eLDFType GetValueType(void) const override { return LDF_TYPE_UNKNOWN; }
 
 	//! Gets the string data
 	/*!
@@ -131,7 +131,7 @@ public:
 	  \param includeTypeId Whether or not to include the type id in the data
 	  \return The string representation of the data
 	 */
-	std::string GetString(const bool includeKey = true, const bool includeTypeId = true) override {
+	std::string GetString(const bool includeKey = true, const bool includeTypeId = true) const override {
 		if (GetValueType() == -1) {
 			return GeneralUtils::UTF16ToWTF8(this->key) + "=-1:<server variable>";
 		}
@@ -154,11 +154,11 @@ public:
 		return stream.str();
 	}
 
-	std::string GetValueAsString() override {
+	std::string GetValueAsString() const override {
 		return this->GetValueString();
 	}
 
-	LDFBaseData* Copy() override {
+	LDFBaseData* Copy() const override {
 		return new LDFData<T>(key, value);
 	}
 
@@ -166,19 +166,19 @@ public:
 };
 
 // LDF Types
-template<> inline eLDFType LDFData<std::u16string>::GetValueType(void) { return LDF_TYPE_UTF_16; };
-template<> inline eLDFType LDFData<int32_t>::GetValueType(void) { return LDF_TYPE_S32; };
-template<> inline eLDFType LDFData<float>::GetValueType(void) { return LDF_TYPE_FLOAT; };
-template<> inline eLDFType LDFData<double>::GetValueType(void) { return LDF_TYPE_DOUBLE; };
-template<> inline eLDFType LDFData<uint32_t>::GetValueType(void) { return LDF_TYPE_U32; };
-template<> inline eLDFType LDFData<bool>::GetValueType(void) { return LDF_TYPE_BOOLEAN; };
-template<> inline eLDFType LDFData<uint64_t>::GetValueType(void) { return LDF_TYPE_U64; };
-template<> inline eLDFType LDFData<LWOOBJID>::GetValueType(void) { return LDF_TYPE_OBJID; };
-template<> inline eLDFType LDFData<std::string>::GetValueType(void) { return LDF_TYPE_UTF_8; };
+template<> inline eLDFType LDFData<std::u16string>::GetValueType(void) const { return LDF_TYPE_UTF_16; };
+template<> inline eLDFType LDFData<int32_t>::GetValueType(void) const { return LDF_TYPE_S32; };
+template<> inline eLDFType LDFData<float>::GetValueType(void) const { return LDF_TYPE_FLOAT; };
+template<> inline eLDFType LDFData<double>::GetValueType(void) const { return LDF_TYPE_DOUBLE; };
+template<> inline eLDFType LDFData<uint32_t>::GetValueType(void) const { return LDF_TYPE_U32; };
+template<> inline eLDFType LDFData<bool>::GetValueType(void) const { return LDF_TYPE_BOOLEAN; };
+template<> inline eLDFType LDFData<uint64_t>::GetValueType(void) const { return LDF_TYPE_U64; };
+template<> inline eLDFType LDFData<LWOOBJID>::GetValueType(void) const { return LDF_TYPE_OBJID; };
+template<> inline eLDFType LDFData<std::string>::GetValueType(void) const { return LDF_TYPE_UTF_8; };
 
 // The specialized version for std::u16string (UTF-16)
 template<>
-inline void LDFData<std::u16string>::WriteValue(RakNet::BitStream& packet) {
+inline void LDFData<std::u16string>::WriteValue(RakNet::BitStream& packet) const {
 	packet.Write<uint8_t>(this->GetValueType());
 
 	packet.Write<uint32_t>(this->value.length());
@@ -189,7 +189,7 @@ inline void LDFData<std::u16string>::WriteValue(RakNet::BitStream& packet) {
 
 // The specialized version for bool
 template<>
-inline void LDFData<bool>::WriteValue(RakNet::BitStream& packet) {
+inline void LDFData<bool>::WriteValue(RakNet::BitStream& packet) const {
 	packet.Write<uint8_t>(this->GetValueType());
 
 	packet.Write<uint8_t>(this->value);
@@ -197,7 +197,7 @@ inline void LDFData<bool>::WriteValue(RakNet::BitStream& packet) {
 
 // The specialized version for std::string (UTF-8)
 template<>
-inline void LDFData<std::string>::WriteValue(RakNet::BitStream& packet) {
+inline void LDFData<std::string>::WriteValue(RakNet::BitStream& packet) const {
 	packet.Write<uint8_t>(this->GetValueType());
 
 	packet.Write<uint32_t>(this->value.length());
@@ -206,18 +206,18 @@ inline void LDFData<std::string>::WriteValue(RakNet::BitStream& packet) {
 	}
 }
 
-template<> inline std::string LDFData<std::u16string>::GetValueString() {
+template<> inline std::string LDFData<std::u16string>::GetValueString() const {
 	return GeneralUtils::UTF16ToWTF8(this->value, this->value.size());
 }
 
-template<> inline std::string LDFData<int32_t>::GetValueString() { return std::to_string(this->value); }
-template<> inline std::string LDFData<float>::GetValueString() { return std::to_string(this->value); }
-template<> inline std::string LDFData<double>::GetValueString() { return std::to_string(this->value); }
-template<> inline std::string LDFData<uint32_t>::GetValueString() { return std::to_string(this->value); }
-template<> inline std::string LDFData<bool>::GetValueString() { return std::to_string(this->value); }
-template<> inline std::string LDFData<uint64_t>::GetValueString() { return std::to_string(this->value); }
-template<> inline std::string LDFData<LWOOBJID>::GetValueString() { return std::to_string(this->value); }
+template<> inline std::string LDFData<int32_t>::GetValueString() const { return std::to_string(this->value); }
+template<> inline std::string LDFData<float>::GetValueString() const { return std::to_string(this->value); }
+template<> inline std::string LDFData<double>::GetValueString() const { return std::to_string(this->value); }
+template<> inline std::string LDFData<uint32_t>::GetValueString() const { return std::to_string(this->value); }
+template<> inline std::string LDFData<bool>::GetValueString() const { return std::to_string(this->value); }
+template<> inline std::string LDFData<uint64_t>::GetValueString() const { return std::to_string(this->value); }
+template<> inline std::string LDFData<LWOOBJID>::GetValueString() const { return std::to_string(this->value); }
 
-template<> inline std::string LDFData<std::string>::GetValueString() { return this->value; }
+template<> inline std::string LDFData<std::string>::GetValueString() const { return this->value; }
 
-#endif  //!__LDFFORMAT__H__
+#endif  //!LDFFORMAT_H

dCommon/NiPoint3.h

@@ -1,5 +1,5 @@
-#ifndef __NIPOINT3_H__
-#define __NIPOINT3_H__
+#ifndef NIPOINT3_H
+#define NIPOINT3_H
 
 /*!
   \file NiPoint3.hpp
@@ -201,4 +201,4 @@ namespace NiPoint3Constant {
 // .inl file needed for code organization and to circumvent circular dependency issues
 #include "NiPoint3.inl"
 
-#endif // !__NIPOINT3_H__
+#endif // !NIPOINT3_H

dCommon/NiPoint3.inl

@@ -1,5 +1,5 @@
 #pragma once
-#ifndef __NIPOINT3_H__
+#ifndef NIPOINT3_H
 #error "This should only be included inline in NiPoint3.h: Do not include directly!"
 #endif
 

dCommon/NiQuaternion.h

@@ -1,5 +1,5 @@
-#ifndef __NIQUATERNION_H__
-#define __NIQUATERNION_H__
+#ifndef NIQUATERNION_H
+#define NIQUATERNION_H
 
 // Custom Classes
 #include "NiPoint3.h"
@@ -155,4 +155,4 @@ namespace NiQuaternionConstant {
 // Include constexpr and inline function definitions in a seperate file for readability
 #include "NiQuaternion.inl"
 
-#endif // !__NIQUATERNION_H__
+#endif // !NIQUATERNION_H

dCommon/NiQuaternion.inl

@@ -1,5 +1,5 @@
 #pragma once
-#ifndef __NIQUATERNION_H__
+#ifndef NIQUATERNION_H
 #error "This should only be included inline in NiQuaternion.h: Do not include directly!"
 #endif
 

dCommon/PositionUpdate.h

@@ -1,5 +1,5 @@
-#ifndef __POSITIONUPDATE__H__
-#define __POSITIONUPDATE__H__
+#ifndef POSITIONUPDATE_H
+#define POSITIONUPDATE_H
 
 #include "NiPoint3.h"
 #include "NiQuaternion.h"
@@ -33,4 +33,4 @@ struct PositionUpdate {
 	RemoteInputInfo remoteInputInfo;
 };
 
-#endif  //!__POSITIONUPDATE__H__
+#endif  //!POSITIONUPDATE_H

dCommon/dClient/ClientVersion.h

@@ -1,5 +1,5 @@
-#ifndef __CLIENTVERSION_H__
-#define __CLIENTVERSION_H__
+#ifndef CLIENTVERSION_H
+#define CLIENTVERSION_H
 
 #include <cstdint>
 
@@ -9,4 +9,4 @@ namespace ClientVersion {
 	constexpr uint16_t minor = 64;
 }
 
-#endif // !__CLIENTVERSION_H__
+#endif // !CLIENTVERSION_H

dCommon/dConfig.cpp

@@ -1,6 +1,7 @@
 #include "dConfig.h"
 
 #include <sstream>
+#include <algorithm>
 
 #include "BinaryPathFinder.h"
 #include "GeneralUtils.h"

dCommon/dEnums/StringifiedEnum.h

@@ -1,5 +1,5 @@
-#ifndef __STRINGIFIEDENUM_H__
-#define __STRINGIFIEDENUM_H__
+#ifndef STRINGIFIEDENUM_H
+#define STRINGIFIEDENUM_H
 
 #include <string>
 #include "magic_enum.hpp"
@@ -26,4 +26,4 @@ namespace StringifiedEnum {
 	}
 }
 
-#endif // !__STRINGIFIEDENUM_H__
+#endif // !STRINGIFIEDENUM_H

dCommon/dEnums/dCommonVars.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __DCOMMONVARS__H__
-#define __DCOMMONVARS__H__
+#ifndef DCOMMONVARS_H
+#define DCOMMONVARS_H
 
 #include <cstdint>
 #include <string>
@@ -158,4 +158,4 @@ public:
 	}
 };
 
-#endif  //!__DCOMMONVARS__H__
+#endif  //!DCOMMONVARS_H

dCommon/dEnums/eAddFriendResponseCode.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EADDFRIENDRESPONSECODE__H__
-#define __EADDFRIENDRESPONSECODE__H__
+#ifndef EADDFRIENDRESPONSECODE_H
+#define EADDFRIENDRESPONSECODE_H
 
 #include <cstdint>
 
@@ -12,4 +12,4 @@ enum class eAddFriendResponseCode : uint8_t {
 	CANCELLED
 };
 
-#endif  //!__ADDFRIENDRESPONSECODE__H__
+#endif  //!ADDFRIENDRESPONSECODE_H

dCommon/dEnums/eAddFriendResponseType.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EADDFRIENDRESPONSETYPE__H__
-#define __EADDFRIENDRESPONSETYPE__H__
+#ifndef EADDFRIENDRESPONSETYPE_H
+#define EADDFRIENDRESPONSETYPE_H
 
 #include <cstdint>
 
@@ -21,4 +21,4 @@ enum class eAddFriendResponseType : uint8_t {
 	FRIENDISFREETRIAL
 };
 
-#endif  //!__EADDFRIENDRESPONSETYPE__H__
+#endif  //!EADDFRIENDRESPONSETYPE_H

dCommon/dEnums/eAninmationFlags.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EANINMATIONFLAGS__H__
-#define __EANINMATIONFLAGS__H__
+#ifndef EANINMATIONFLAGS_H
+#define EANINMATIONFLAGS_H
 
 #include <cstdint>
 
@@ -41,4 +41,4 @@ enum class eAnimationFlags : uint32_t {
 	IDLE_MISC12
 };
 
-#endif  //!__EANINMATIONFLAGS__H__
+#endif  //!EANINMATIONFLAGS_H

dCommon/dEnums/eAuthMessageType.h

@@ -1,5 +1,5 @@
-#ifndef __EAUTHMESSAGETYPE__H__
-#define __EAUTHMESSAGETYPE__H__
+#ifndef EAUTHMESSAGETYPE_H
+#define EAUTHMESSAGETYPE_H
 
 #include <cstdint>
 
@@ -12,4 +12,4 @@ enum class eAuthMessageType : uint32_t {
 	RUNTIME_CONFIG
 };
 
-#endif  //!__EAUTHMESSAGETYPE__H__
+#endif  //!EAUTHMESSAGETYPE_H

dCommon/dEnums/eBasicAttackSuccessTypes.h

@@ -1,5 +1,5 @@
-#ifndef __EBASICATTACKSUCCESSTYPES__H__
-#define __EBASICATTACKSUCCESSTYPES__H__
+#ifndef EBASICATTACKSUCCESSTYPES_H
+#define EBASICATTACKSUCCESSTYPES_H
 
 #include <cstdint>
 
@@ -9,4 +9,4 @@ enum class eBasicAttackSuccessTypes : uint8_t {
 	FAILIMMUNE
 };
 
-#endif  //!__EBASICATTACKSUCCESSTYPES__H__
+#endif  //!EBASICATTACKSUCCESSTYPES_H

dCommon/dEnums/eBlueprintSaveResponseType.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EBLUEPRINTSAVERESPONSETYPE__H__
-#define __EBLUEPRINTSAVERESPONSETYPE__H__
+#ifndef EBLUEPRINTSAVERESPONSETYPE_H
+#define EBLUEPRINTSAVERESPONSETYPE_H
 
 #include <cstdint>
 
@@ -23,4 +23,4 @@ enum class eBlueprintSaveResponseType : uint32_t {
     FindMatchesFailed
 };
 
-#endif  //!__EBLUEPRINTSAVERESPONSETYPE__H__
+#endif  //!EBLUEPRINTSAVERESPONSETYPE_H

dCommon/dEnums/eBubbleType.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EBUBBLETYPE__H__
-#define __EBUBBLETYPE__H__
+#ifndef EBUBBLETYPE_H
+#define EBUBBLETYPE_H
 
 #include <cstdint>
 
@@ -11,4 +11,4 @@ enum class eBubbleType : uint32_t {
 	SKUNK
 };
 
-#endif  //!__EBUBBLETYPE__H__
+#endif  //!EBUBBLETYPE_H

dCommon/dEnums/eBuildType.h

@@ -1,5 +1,5 @@
-#ifndef __EBUILDTYPE__H__
-#define __EBUILDTYPE__H__
+#ifndef EBUILDTYPE_H
+#define EBUILDTYPE_H
 
 #include <cstdint>
 
@@ -9,4 +9,4 @@ enum class eBuildType :uint32_t {
 	ON_PROPERTY
 };
 
-#endif  //!__EBUILDTYPE__H__
+#endif  //!EBUILDTYPE_H

dCommon/dEnums/eCharacterCreationResponse.h

@@ -1,5 +1,5 @@
-#ifndef __ECHARACTERCREATIONRESPONSE__H__
-#define __ECHARACTERCREATIONRESPONSE__H__
+#ifndef ECHARACTERCREATIONRESPONSE_H
+#define ECHARACTERCREATIONRESPONSE_H
 
 #include <cstdint>
 
@@ -11,4 +11,4 @@ enum class eCharacterCreationResponse : uint8_t {
 	CUSTOM_NAME_IN_USE
 };
 
-#endif  //!__ECHARACTERCREATIONRESPONSE__H__
+#endif  //!ECHARACTERCREATIONRESPONSE_H

dCommon/dEnums/eCharacterVersion.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __ECHARACTERVERSION__H__
-#define __ECHARACTERVERSION__H__
+#ifndef ECHARACTERVERSION_H
+#define ECHARACTERVERSION_H
 
 #include <cstdint>
 
@@ -18,4 +18,4 @@ enum class eCharacterVersion : uint32_t {
 	UP_TO_DATE, // will become SPEED_BASE
 };
 
-#endif  //!__ECHARACTERVERSION__H__
+#endif  //!ECHARACTERVERSION_H

dCommon/dEnums/eChatMessageType.h

@@ -1,5 +1,5 @@
-#ifndef __ECHATMESSAGETYPE__H__
-#define __ECHATMESSAGETYPE__H__
+#ifndef ECHATMESSAGETYPE_H
+#define ECHATMESSAGETYPE_H
 
 #include <cstdint>
 
@@ -77,4 +77,4 @@ enum class eChatMessageType :uint32_t {
 	CREATE_TEAM,
 };
 
-#endif  //!__ECHATMESSAGETYPE__H__
+#endif  //!ECHATMESSAGETYPE_H

dCommon/dEnums/eCinematicEvent.h

@@ -1,5 +1,5 @@
-#ifndef __ECINEMATICEVENT__H__
-#define __ECINEMATICEVENT__H__
+#ifndef ECINEMATICEVENT_H
+#define ECINEMATICEVENT_H
 
 #include <cstdint>
 
@@ -9,4 +9,4 @@ enum class eCinematicEvent : uint32_t {
 	ENDED,
 };
 
-#endif  //!__ECINEMATICEVENT__H__
+#endif  //!ECINEMATICEVENT_H

dCommon/dEnums/eClientMessageType.h

@@ -1,5 +1,5 @@
-#ifndef __ECLIENTMESSAGETYPE__H__
-#define __ECLIENTMESSAGETYPE__H__
+#ifndef ECLIENTMESSAGETYPE_H
+#define ECLIENTMESSAGETYPE_H
 
 #include <cstdint>
 
@@ -73,4 +73,4 @@ enum class eClientMessageType : uint32_t {
 	UGC_DOWNLOAD_FAILED = 120
 };
 
-#endif  //!__ECLIENTMESSAGETYPE__H__
+#endif  //!ECLIENTMESSAGETYPE_H

dCommon/dEnums/eConnectionType.h

@@ -1,5 +1,5 @@
-#ifndef __ECONNECTIONTYPE__H__
-#define __ECONNECTIONTYPE__H__
+#ifndef ECONNECTIONTYPE_H
+#define ECONNECTIONTYPE_H
 
 enum class eConnectionType : uint16_t {
 	SERVER = 0,
@@ -10,4 +10,4 @@ enum class eConnectionType : uint16_t {
 	MASTER
 };
 
-#endif  //!__ECONNECTIONTYPE__H__
+#endif  //!ECONNECTIONTYPE_H

dCommon/dEnums/eControlScheme.h

@@ -1,5 +1,5 @@
-#ifndef __ECONTROLSCHEME__H__
-#define __ECONTROLSCHEME__H__
+#ifndef ECONTROLSCHEME_H
+#define ECONTROLSCHEME_H
 
 #include <cstdint>
 
@@ -15,4 +15,4 @@ enum class eControlScheme : uint32_t {
 	SCHEME_WEAR_A_ROBOT //== freecam?
 };
 
-#endif  //!__ECONTROLSCHEME__H__
+#endif  //!ECONTROLSCHEME_H

dCommon/dEnums/eCyclingMode.h

@@ -1,5 +1,5 @@
-#ifndef __ECYCLINGMODE__H__
-#define __ECYCLINGMODE__H__
+#ifndef ECYCLINGMODE_H
+#define ECYCLINGMODE_H
 
 #include <cstdint>
 
@@ -8,4 +8,4 @@ enum class eCyclingMode : uint32_t {
 	DISALLOW_CYCLING
 };
 
-#endif  //!__ECYCLINGMODE__H__
+#endif  //!ECYCLINGMODE_H

dCommon/dEnums/eEndBehavior.h

@@ -1,5 +1,5 @@
-#ifndef __EENDBEHAVIOR__H__
-#define __EENDBEHAVIOR__H__
+#ifndef EENDBEHAVIOR_H
+#define EENDBEHAVIOR_H
 
 #include <cstdint>
 
@@ -8,4 +8,4 @@ enum class eEndBehavior : uint32_t {
 	WAIT
 };
 
-#endif  //!__EENDBEHAVIOR__H__
+#endif  //!EENDBEHAVIOR_H

dCommon/dEnums/eGameActivity.h

@@ -1,5 +1,5 @@
-#ifndef __EGAMEACTIVITY__H__
-#define __EGAMEACTIVITY__H__
+#ifndef EGAMEACTIVITY_H
+#define EGAMEACTIVITY_H
 
 #include <cstdint>
 
@@ -12,4 +12,4 @@ enum class eGameActivity : uint32_t {
 	PET_TAMING
 };
 
-#endif  //!__EGAMEACTIVITY__H__
+#endif  //!EGAMEACTIVITY_H

dCommon/dEnums/eGameMasterLevel.h

@@ -1,5 +1,5 @@
-#ifndef __EGAMEMASTERLEVEL__H__
-#define __EGAMEMASTERLEVEL__H__
+#ifndef EGAMEMASTERLEVEL_H
+#define EGAMEMASTERLEVEL_H
 
 #include <cstdint>
 
@@ -17,4 +17,4 @@ enum class eGameMasterLevel : uint8_t {
 };
 
 
-#endif  //!__EGAMEMASTERLEVEL__H__
+#endif  //!EGAMEMASTERLEVEL_H

dCommon/dEnums/eGameMessageType.h

@@ -1,5 +1,5 @@
-#ifndef __EGAMEMESSAGETYPE__H__
-#define __EGAMEMESSAGETYPE__H__
+#ifndef EGAMEMESSAGETYPE_H
+#define EGAMEMESSAGETYPE_H
 
 #include <cstdint>
 
@@ -1611,4 +1611,4 @@ struct magic_enum::customize::enum_range<eGameMessageType> {
 	static constexpr int max = 1772;
 };
 
-#endif  //!__EGAMEMESSAGETYPE__H__
+#endif  //!EGAMEMESSAGETYPE_H

dCommon/dEnums/eHelpType.h

@@ -1,6 +1,6 @@
 
-#ifndef __EHELPTYPE__H__
-#define __EHELPTYPE__H__
+#ifndef EHELPTYPE_H
+#define EHELPTYPE_H
 
 #include <cstdint>
 
@@ -38,4 +38,4 @@ enum class eHelpType : int32_t {
 	UI_INVENTORY_FULL_CANNOT_PICKUP_ITEM = 86
 };
 
-#endif  //!__EHELPTYPE__H__
+#endif  //!EHELPTYPE_H

dCommon/dEnums/eInventoryType.h

@@ -1,9 +1,12 @@
 #pragma once
 
-#ifndef __EINVENTORYTYPE__H__
-#define __EINVENTORYTYPE__H__
+#ifndef EINVENTORYTYPE_H
+#define EINVENTORYTYPE_H
 
 #include <cstdint>
+
+#include "magic_enum.hpp"
+
 static const uint8_t NUMBER_OF_INVENTORIES = 17;
 /**
  * Represents the different types of inventories an entity may have
@@ -56,4 +59,10 @@ public:
 	};
 };
 
-#endif  //!__EINVENTORYTYPE__H__
+template <>
+struct magic_enum::customize::enum_range<eInventoryType> {
+	static constexpr int min = 0;
+	static constexpr int max = 16;
+};
+
+#endif  //!EINVENTORYTYPE_H

dCommon/dEnums/eItemSetPassiveAbilityID.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EITEMSETPASSIVEABILITYID__H__
-#define __EITEMSETPASSIVEABILITYID__H__
+#ifndef EITEMSETPASSIVEABILITYID_H
+#define EITEMSETPASSIVEABILITYID_H
 
 enum class eItemSetPassiveAbilityID {
 	EngineerRank1 = 2,
@@ -55,4 +55,4 @@ enum class eItemSetPassiveAbilityID {
 	LightningSpinjitzu = 52
 };
 
-#endif  //!__EITEMSETPASSIVEABILITYID__H__
+#endif  //!EITEMSETPASSIVEABILITYID_H

dCommon/dEnums/eItemType.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EITEMTYPE__H__
-#define __EITEMTYPE__H__
+#ifndef EITEMTYPE_H
+#define EITEMTYPE_H
 
 #include <cstdint>
 
@@ -33,4 +33,4 @@ enum class eItemType : int32_t {
 	MOUNT
 };
 
-#endif  //!__EITEMTYPE__H__
+#endif  //!EITEMTYPE_H

dCommon/dEnums/eKillType.h

@@ -1,5 +1,5 @@
-#ifndef __EKILLTYPE__H__
-#define __EKILLTYPE__H__
+#ifndef EKILLTYPE_H
+#define EKILLTYPE_H
 
 #include <cstdint>
 
@@ -8,4 +8,4 @@ enum class eKillType : uint32_t {
 	SILENT
 };
 
-#endif  //!__EKILLTYPE__H__
+#endif  //!EKILLTYPE_H

dCommon/dEnums/eLoginResponse.h

@@ -1,5 +1,5 @@
-#ifndef __ELOGINRESPONSE__H__
-#define __ELOGINRESPONSE__H__
+#ifndef ELOGINRESPONSE_H
+#define ELOGINRESPONSE_H
 
 #include <cstdint>
 
@@ -21,4 +21,4 @@ enum class eLoginResponse : uint8_t {
 	ACCOUNT_NOT_ACTIVATED
 };
 
-#endif  //!__ELOGINRESPONSE__H__
+#endif  //!ELOGINRESPONSE_H

dCommon/dEnums/eLootSourceType.h

@@ -1,5 +1,5 @@
-#ifndef __ELOOTSOURCETYPE__H__
-#define __ELOOTSOURCETYPE__H__
+#ifndef ELOOTSOURCETYPE_H
+#define ELOOTSOURCETYPE_H
 
 #include <cstdint>
 
@@ -28,4 +28,4 @@ enum class eLootSourceType : uint32_t {
 	RELOCATE
 };
 
-#endif  //!__ELOOTSOURCETYPE__H__
+#endif  //!ELOOTSOURCETYPE_H

dCommon/dEnums/eMasterMessageType.h

@@ -1,5 +1,5 @@
-#ifndef __EMASTERMESSAGETYPE__H__
-#define __EMASTERMESSAGETYPE__H__
+#ifndef EMASTERMESSAGETYPE_H
+#define EMASTERMESSAGETYPE_H
 
 #include <cstdint>
 
@@ -33,4 +33,4 @@ enum class eMasterMessageType : uint32_t {
 	NEW_SESSION_ALERT
 };
 
-#endif  //!__EMASTERMESSAGETYPE__H__
+#endif  //!EMASTERMESSAGETYPE_H

dCommon/dEnums/eMatchUpdate.h

@@ -1,5 +1,5 @@
-#ifndef __EMATCHUPDATE__H__
-#define __EMATCHUPDATE__H__
+#ifndef EMATCHUPDATE_H
+#define EMATCHUPDATE_H
 
 #include <cstdint>
 
@@ -14,4 +14,4 @@ enum class eMatchUpdate : int32_t {
 	PLAYER_UPDATE
 };
 
-#endif  //!__EMATCHUPDATE__H__
+#endif  //!EMATCHUPDATE_H

dCommon/dEnums/eMissionLockState.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EMISSIONLOCKSTATE__H__
-#define __EMISSIONLOCKSTATE__H__
+#ifndef EMISSIONLOCKSTATE_H
+#define EMISSIONLOCKSTATE_H
 
 enum class eMissionLockState : int {
 	LOCKED,
@@ -9,4 +9,4 @@ enum class eMissionLockState : int {
 	UNLOCKED,
 };
 
-#endif  //!__EMISSIONLOCKSTATE__H__
+#endif  //!EMISSIONLOCKSTATE_H

dCommon/dEnums/eMissionState.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __MISSIONSTATE__H__
-#define __MISSIONSTATE__H__
+#ifndef MISSIONSTATE_H
+#define MISSIONSTATE_H
 
 /**
  * Represents the possible states a mission can be in
@@ -53,4 +53,4 @@ enum class eMissionState : int {
 	COMPLETE_READY_TO_COMPLETE = 12
 };
 
-#endif  //!__MISSIONSTATE__H__
+#endif  //!MISSIONSTATE_H

dCommon/dEnums/eMissionTaskType.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EMISSIONTASKTYPE__H__
-#define __EMISSIONTASKTYPE__H__
+#ifndef EMISSIONTASKTYPE_H
+#define EMISSIONTASKTYPE_H
 
 enum class eMissionTaskType : int {
 	UNKNOWN = -1,
@@ -40,4 +40,4 @@ enum class eMissionTaskType : int {
 	DONATION
 };
 
-#endif  //!__EMISSIONTASKTYPE__H__
+#endif  //!EMISSIONTASKTYPE_H

dCommon/dEnums/eMovementPlatformState.h

@@ -1,5 +1,5 @@
-#ifndef __EMOVEMENTPLATFORMSTATE__H__
-#define __EMOVEMENTPLATFORMSTATE__H__
+#ifndef EMOVEMENTPLATFORMSTATE_H
+#define EMOVEMENTPLATFORMSTATE_H
 
 #include <cstdint>
 
@@ -13,4 +13,4 @@ enum class eMovementPlatformState : uint32_t
 	Stopped = 0b01100
 };
 
-#endif  //!__EMOVEMENTPLATFORMSTATE__H__
+#endif  //!EMOVEMENTPLATFORMSTATE_H

dCommon/dEnums/eObjectBits.h

@@ -1,5 +1,5 @@
-#ifndef __EOBJECTBITS__H__
-#define __EOBJECTBITS__H__
+#ifndef EOBJECTBITS_H
+#define EOBJECTBITS_H
 
 #include <cstdint>
 
@@ -10,4 +10,4 @@ enum class eObjectBits : size_t {
 	CHARACTER = 60
 };
 
-#endif  //!__EOBJECTBITS__H__
+#endif  //!EOBJECTBITS_H

dCommon/dEnums/eObjectWorldState.h

@@ -1,5 +1,5 @@
-#ifndef __EOBJECTWORLDSTATE__H__
-#define __EOBJECTWORLDSTATE__H__
+#ifndef EOBJECTWORLDSTATE_H
+#define EOBJECTWORLDSTATE_H
 
 #include <cstdint>
 
@@ -9,4 +9,4 @@ enum class eObjectWorldState : uint32_t {
 	INVENTORY
 };
 
-#endif  //!__EOBJECTWORLDSTATE__H__
+#endif  //!EOBJECTWORLDSTATE_H

dCommon/dEnums/ePackageType.h

@@ -1,5 +1,5 @@
-#ifndef __EPACKAGETYPE__H__
-#define __EPACKAGETYPE__H__
+#ifndef EPACKAGETYPE_H
+#define EPACKAGETYPE_H
 
 enum class ePackageType {
 	INVALID = -1,
@@ -10,4 +10,4 @@ enum class ePackageType {
 };
 
 
-#endif  //!__EPACKAGETYPE__H__
+#endif  //!EPACKAGETYPE_H

dCommon/dEnums/ePermissionMap.h

@@ -2,8 +2,8 @@
 
 #include <cstdint>
 
-#ifndef __EPERMISSIONMAP__H__
-#define __EPERMISSIONMAP__H__
+#ifndef EPERMISSIONMAP_H
+#define EPERMISSIONMAP_H
 
 /**
  * Bitmap of permissions and restrictions for characters.
@@ -29,4 +29,4 @@ enum class ePermissionMap : uint64_t {
 	RestrictedChatAccess = 0x1 << 6,
 };
 
-#endif  //!__EPERMISSIONMAP__H__
+#endif  //!EPERMISSIONMAP_H

dCommon/dEnums/ePetAbilityType.h

@@ -1,5 +1,5 @@
-#ifndef __EPETABILITYTYPE__H__
-#define __EPETABILITYTYPE__H__
+#ifndef EPETABILITYTYPE_H
+#define EPETABILITYTYPE_H
 
 #include <cstdint>
 
@@ -10,4 +10,4 @@ enum class ePetAbilityType : uint32_t {
 	DigAtPosition
 };
 
-#endif  //!__EPETABILITYTYPE__H__
+#endif  //!EPETABILITYTYPE_H

dCommon/dEnums/ePetTamingNotifyType.h

@@ -1,5 +1,5 @@
-#ifndef __EPETTAMINGNOTIFYTYPE__H__
-#define __EPETTAMINGNOTIFYTYPE__H__
+#ifndef EPETTAMINGNOTIFYTYPE_H
+#define EPETTAMINGNOTIFYTYPE_H
 
 #include <cstdint>
 
@@ -12,4 +12,4 @@ enum class ePetTamingNotifyType : uint32_t {
 	NAMINGPET
 };
 
-#endif  //!__EPETTAMINGNOTIFYTYPE__H__
+#endif  //!EPETTAMINGNOTIFYTYPE_H

dCommon/dEnums/ePhysicsEffectType.h

@@ -1,5 +1,5 @@
-#ifndef __EPHYSICSEFFECTTYPE__H__
-#define __EPHYSICSEFFECTTYPE__H__
+#ifndef EPHYSICSEFFECTTYPE_H
+#define EPHYSICSEFFECTTYPE_H
 
 
 #include <cstdint>
@@ -12,4 +12,4 @@ enum class ePhysicsEffectType : uint32_t {
 	FRICTION
 };
 
-#endif  //!__EPHYSICSEFFECTTYPE__H__
+#endif  //!EPHYSICSEFFECTTYPE_H

dCommon/dEnums/ePlayerFlag.h

@@ -1,5 +1,5 @@
-#ifndef __EPLAYERFLAG__H__
-#define __EPLAYERFLAG__H__
+#ifndef EPLAYERFLAG_H
+#define EPLAYERFLAG_H
 
 #include <cstdint>
 
@@ -170,4 +170,4 @@ enum ePlayerFlag : int32_t {
 	DLU_SKIP_CINEMATICS = 1'000'000,
 };
 
-#endif  //!__EPLAYERFLAG__H__
+#endif  //!EPLAYERFLAG_H

dCommon/dEnums/eQuickBuildFailReason.h

@@ -1,5 +1,5 @@
-#ifndef __EQUICKBUILDFAILREASON__H__
-#define __EQUICKBUILDFAILREASON__H__
+#ifndef EQUICKBUILDFAILREASON_H
+#define EQUICKBUILDFAILREASON_H
 
 #include <cstdint>
 
@@ -10,4 +10,4 @@ enum class eQuickBuildFailReason : uint32_t {
 	BUILD_ENDED
 };
 
-#endif  //!__EQUICKBUILDFAILREASON__H__
+#endif  //!EQUICKBUILDFAILREASON_H

dCommon/dEnums/eQuickBuildState.h

@@ -1,5 +1,5 @@
-#ifndef __EQUICKBUILDSTATE__H__
-#define __EQUICKBUILDSTATE__H__
+#ifndef EQUICKBUILDSTATE_H
+#define EQUICKBUILDSTATE_H
 
 #include <cstdint>
 
@@ -12,4 +12,4 @@ enum class eQuickBuildState : uint32_t {
 };
 
 
-#endif  //!__EQUICKBUILDSTATE__H__
+#endif  //!EQUICKBUILDSTATE_H

dCommon/dEnums/eRacingTaskParam.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __ERACINGTASKPARAM__H__
-#define __ERACINGTASKPARAM__H__
+#ifndef ERACINGTASKPARAM_H
+#define ERACINGTASKPARAM_H
 
 #include <cstdint>
 
@@ -22,4 +22,4 @@ enum class eRacingTaskParam : int32_t {
 	SMASH_SPECIFIC_SMASHABLE
 };
 
-#endif  //!__ERACINGTASKPARAM__H__
+#endif  //!ERACINGTASKPARAM_H

dCommon/dEnums/eRenameResponse.h

@@ -1,5 +1,5 @@
-#ifndef __ERENAMERESPONSE__H__
-#define __ERENAMERESPONSE__H__
+#ifndef ERENAMERESPONSE_H
+#define ERENAMERESPONSE_H
 
 #include <cstdint>
 
@@ -12,4 +12,4 @@ enum class eRenameResponse : uint8_t {
 };
 
 
-#endif  //!__ERENAMERESPONSE__H__
+#endif  //!ERENAMERESPONSE_H

dCommon/dEnums/eReplicaComponentType.h

@@ -1,5 +1,5 @@
-#ifndef __EREPLICACOMPONENTTYPE__H__
-#define __EREPLICACOMPONENTTYPE__H__
+#ifndef EREPLICACOMPONENTTYPE_H
+#define EREPLICACOMPONENTTYPE_H
 
 #include <cstdint>
 
@@ -124,4 +124,4 @@ enum class eReplicaComponentType : uint32_t {
 	DESTROYABLE = 1000 // Actually 7
 };
 
-#endif  //!__EREPLICACOMPONENTTYPE__H__
+#endif  //!EREPLICACOMPONENTTYPE_H

dCommon/dEnums/eReplicaPacketType.h

@@ -1,5 +1,5 @@
-#ifndef __EREPLICAPACKETTYPE__H__
-#define __EREPLICAPACKETTYPE__H__
+#ifndef EREPLICAPACKETTYPE_H
+#define EREPLICAPACKETTYPE_H
 
 #include <cstdint>
 
@@ -9,4 +9,4 @@ enum class eReplicaPacketType : uint8_t {
 	DESTRUCTION
 };
 
-#endif  //!__EREPLICAPACKETTYPE__H__
+#endif  //!EREPLICAPACKETTYPE_H

dCommon/dEnums/eReponseMoveItemBetweenInventoryTypeCode.h

@@ -0,0 +1,21 @@
+#ifndef EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE_H
+#define EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE_H
+
+#include <cstdint>
+
+enum class eReponseMoveItemBetweenInventoryTypeCode : int32_t {
+	SUCCESS,
+	FAIL_GENERIC,
+	FAIL_INV_FULL,
+	FAIL_ITEM_NOT_FOUND,
+	FAIL_CANT_MOVE_TO_THAT_INV_TYPE,
+	FAIL_NOT_NEAR_BANK,
+	FAIL_CANT_SWAP_ITEMS,
+	FAIL_SOURCE_TYPE,
+	FAIL_WRONG_DEST_TYPE,
+	FAIL_SWAP_DEST_TYPE,
+	FAIL_CANT_MOVE_THINKING_HAT,
+	FAIL_DISMOUNT_BEFORE_MOVING
+};
+
+#endif  //!EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE_H

dCommon/dEnums/eServerDisconnectIdentifiers.h

@@ -1,5 +1,5 @@
-#ifndef __ESERVERDISCONNECTIDENTIFIERS__H__
-#define __ESERVERDISCONNECTIDENTIFIERS__H__
+#ifndef ESERVERDISCONNECTIDENTIFIERS_H
+#define ESERVERDISCONNECTIDENTIFIERS_H
 
 #include <cstdint>
 
@@ -21,4 +21,4 @@ enum class eServerDisconnectIdentifiers : uint32_t {
 	PLAY_SCHEDULE_TIME_DONE
 };
 
-#endif  //!__ESERVERDISCONNECTIDENTIFIERS__H__
+#endif  //!ESERVERDISCONNECTIDENTIFIERS_H

dCommon/dEnums/eServerMessageType.h

@@ -1,5 +1,5 @@
-#ifndef __ESERVERMESSAGETYPE__H__
-#define __ESERVERMESSAGETYPE__H__
+#ifndef ESERVERMESSAGETYPE_H
+#define ESERVERMESSAGETYPE_H
 
 #include <cstdint>
 //! The Internal Server Packet Identifiers
@@ -9,4 +9,4 @@ enum class eServerMessageType : uint32_t {
 	GENERAL_NOTIFY
 };
 
-#endif  //!__ESERVERMESSAGETYPE__H__
+#endif  //!ESERVERMESSAGETYPE_H

dCommon/dEnums/eSqliteDataType.h

@@ -1,5 +1,5 @@
-#ifndef __ESQLITEDATATYPE__H__
-#define __ESQLITEDATATYPE__H__
+#ifndef ESQLITEDATATYPE_H
+#define ESQLITEDATATYPE_H
 
 #include <cstdint>
 
@@ -13,4 +13,4 @@ enum class eSqliteDataType : int32_t {
 	TEXT_8 = 8
 };
 
-#endif  //!__ESQLITEDATATYPE__H__
+#endif  //!ESQLITEDATATYPE_H

dCommon/dEnums/eStateChangeType.h

@@ -1,5 +1,5 @@
-#ifndef __ESTATECHANGETYPE__H__
-#define __ESTATECHANGETYPE__H__
+#ifndef ESTATECHANGETYPE_H
+#define ESTATECHANGETYPE_H
 
 #include <cstdint>
 
@@ -8,4 +8,4 @@ enum class eStateChangeType : uint32_t {
 	POP
 };
 
-#endif  //!__ESTATECHANGETYPE__H__
+#endif  //!ESTATECHANGETYPE_H

dCommon/dEnums/eTerminateType.h

@@ -1,5 +1,5 @@
-#ifndef __ETERMINATETYPE__H__
-#define __ETERMINATETYPE__H__
+#ifndef ETERMINATETYPE_H
+#define ETERMINATETYPE_H
 
 #include <cstdint>
 
@@ -9,4 +9,4 @@ enum class eTerminateType : uint32_t {
 	FROM_INTERACTION
 };
 
-#endif  //!__ETERMINATETYPE__H__
+#endif  //!ETERMINATETYPE_H

dCommon/dEnums/eTriggerCommandType.h

@@ -1,5 +1,5 @@
-#ifndef __ETRIGGERCOMMANDTYPE__H__
-#define __ETRIGGERCOMMANDTYPE__H__
+#ifndef ETRIGGERCOMMANDTYPE_H
+#define ETRIGGERCOMMANDTYPE_H
 
 // For info about Trigger Command see:
 // https://docs.lu-dev.net/en/latest/file-structures/lutriggers.html?highlight=trigger#possible-values-commands
@@ -116,4 +116,4 @@ public:
 	};
 };
 
-#endif  //!__ETRIGGERCOMMANDTYPE__H__
+#endif  //!ETRIGGERCOMMANDTYPE_H

dCommon/dEnums/eTriggerEventType.h

@@ -1,5 +1,5 @@
-#ifndef __ETRIGGEREVENTTYPE__H__
-#define __ETRIGGEREVENTTYPE__H__
+#ifndef ETRIGGEREVENTTYPE_H
+#define ETRIGGEREVENTTYPE_H
 
 enum class eTriggerEventType {
 	INVALID,
@@ -50,4 +50,4 @@ public:
 	};
 };
 
-#endif  //!__ETRIGGEREVENTTYPE__H__
+#endif  //!ETRIGGEREVENTTYPE_H

dCommon/dEnums/eUnequippableActiveType.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __EUNEQUIPPABLEACTIVETYPE__H__
-#define __EUNEQUIPPABLEACTIVETYPE__H__
+#ifndef EUNEQUIPPABLEACTIVETYPE_H
+#define EUNEQUIPPABLEACTIVETYPE_H
 
 #include <cstdint>
 
@@ -11,4 +11,4 @@ enum class eUnequippableActiveType : int32_t {
 	MOUNT
 };
 
-#endif  //!__EUNEQUIPPABLEACTIVETYPE__H__
+#endif  //!EUNEQUIPPABLEACTIVETYPE_H

dCommon/dEnums/eUseItemResponse.h

@@ -1,5 +1,5 @@
-#ifndef __EUSEITEMRESPONSE__H__
-#define __EUSEITEMRESPONSE__H__
+#ifndef EUSEITEMRESPONSE_H
+#define EUSEITEMRESPONSE_H
 
 #include <cstdint>
 
@@ -9,4 +9,4 @@ enum class eUseItemResponse : uint32_t {
 	MountsNotAllowed
 };
 
-#endif  //!__EUSEITEMRESPONSE__H__
+#endif  //!EUSEITEMRESPONSE_H

dCommon/dEnums/eVendorTransactionResult.h

@@ -1,5 +1,5 @@
-#ifndef __EVENDORTRANSACTIONRESULT__
-#define __EVENDORTRANSACTIONRESULT__
+#ifndef EVENDORTRANSACTIONRESULT_H
+#define EVENDORTRANSACTIONRESULT_H
 
 #include <cstdint>
 
@@ -12,4 +12,4 @@ enum class eVendorTransactionResult : uint32_t {
 	DONATION_FULL
 };
 
-#endif // !__EVENDORTRANSACTIONRESULT__
+#endif // !EVENDORTRANSACTIONRESULT_H

dCommon/dEnums/eWaypointCommandType.h

@@ -1,6 +1,6 @@
 
-#ifndef __EWAYPOINTCOMMANDTYPES__H__
-#define __EWAYPOINTCOMMANDTYPES__H__
+#ifndef EWAYPOINTCOMMANDTYPES_H
+#define EWAYPOINTCOMMANDTYPES_H
 
 #include <cstdint>
 
@@ -56,4 +56,4 @@ public:
 };
 
 
-#endif  //!__EWAYPOINTCOMMANDTYPES__H__
+#endif  //!EWAYPOINTCOMMANDTYPES_H

dCommon/dEnums/eWorldMessageType.h

@@ -1,5 +1,5 @@
-#ifndef __EWORLDMESSAGETYPE__H__
-#define __EWORLDMESSAGETYPE__H__
+#ifndef EWORLDMESSAGETYPE_H
+#define EWORLDMESSAGETYPE_H
 
 #include <cstdint>
 
@@ -48,4 +48,4 @@ struct magic_enum::customize::enum_range<eWorldMessageType> {
 	static constexpr int max = 91;
 };
 
-#endif  //!__EWORLDMESSAGETYPE__H__
+#endif  //!EWORLDMESSAGETYPE_H

dDatabase/CDClientDatabase/CDClientManager.h

@@ -1,5 +1,5 @@
-#ifndef __CDCLIENTMANAGER__H__
-#define __CDCLIENTMANAGER__H__
+#ifndef CDCLIENTMANAGER_H
+#define CDCLIENTMANAGER_H
 
 #define UNUSED_TABLE(v)
 
@@ -41,4 +41,4 @@ T* CDClientManager::GetTable() {
 	return &T::Instance();
 };
 
-#endif  //!__CDCLIENTMANAGER__H__
+#endif  //!CDCLIENTMANAGER_H

dDatabase/GameDatabase/GameDatabase.h

@@ -1,5 +1,5 @@
-#ifndef __GAMEDATABASE__H__
-#define __GAMEDATABASE__H__
+#ifndef GAMEDATABASE_H
+#define GAMEDATABASE_H
 
 #include <optional>
 
@@ -23,6 +23,7 @@
 #include "IActivityLog.h"
 #include "IIgnoreList.h"
 #include "IAccountsRewardCodes.h"
+#include "IBehaviors.h"
 
 namespace sql {
 	class Statement;
@@ -40,7 +41,8 @@ class GameDatabase :
 	public IMail, public ICommandLog, public IPlayerCheatDetections, public IBugReports,
 	public IPropertyContents, public IProperty, public IPetNames, public ICharXml,
 	public IMigrationHistory, public IUgc, public IFriends, public ICharInfo,
-	public IAccounts, public IActivityLog, public IAccountsRewardCodes, public IIgnoreList {
+	public IAccounts, public IActivityLog, public IAccountsRewardCodes, public IIgnoreList,
+	public IBehaviors {
 public:
 	virtual ~GameDatabase() = default;
 	// TODO: These should be made private.
@@ -54,4 +56,4 @@ public:
 	virtual void DeleteCharacter(const uint32_t characterId) = 0;
 };
 
-#endif  //!__GAMEDATABASE__H__
+#endif  //!GAMEDATABASE_H

dDatabase/GameDatabase/ITables/IAccounts.h

@@ -1,5 +1,5 @@
-#ifndef __IACCOUNTS__H__
-#define __IACCOUNTS__H__
+#ifndef IACCOUNTS_H
+#define IACCOUNTS_H
 
 #include <cstdint>
 #include <optional>
@@ -33,6 +33,9 @@ public:
 
 	// Add a new account to the database.
 	virtual void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) = 0;
+
+	// Update the GameMaster level of an account.
+	virtual void UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) = 0;
 };
 
-#endif  //!__IACCOUNTS__H__
+#endif  //!IACCOUNTS_H

dDatabase/GameDatabase/ITables/IAccountsRewardCodes.h

@@ -1,5 +1,5 @@
-#ifndef __IACCOUNTSREWARDCODES__H__
-#define __IACCOUNTSREWARDCODES__H__
+#ifndef IACCOUNTSREWARDCODES_H
+#define IACCOUNTSREWARDCODES_H
 
 #include <cstdint>
 #include <vector>
@@ -10,4 +10,4 @@ public:
 	virtual std::vector<uint32_t> GetRewardCodesByAccountID(const uint32_t account_id) = 0;
 };
 
-#endif  //!__IACCOUNTSREWARDCODES__H__
+#endif  //!IACCOUNTSREWARDCODES_H

dDatabase/GameDatabase/ITables/IActivityLog.h

@@ -1,5 +1,5 @@
-#ifndef __IACTIVITYLOG__H__
-#define __IACTIVITYLOG__H__
+#ifndef IACTIVITYLOG_H
+#define IACTIVITYLOG_H
 
 #include <cstdint>
 
@@ -16,4 +16,4 @@ public:
 	virtual void UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) = 0;
 };
 
-#endif  //!__IACTIVITYLOG__H__
+#endif  //!IACTIVITYLOG_H

dDatabase/GameDatabase/ITables/IBehaviors.h

@@ -0,0 +1,22 @@
+#ifndef IBEHAVIORS_H
+#define IBEHAVIORS_H
+
+#include <cstdint>
+
+#include "dCommonVars.h"
+
+class IBehaviors {
+public:
+	struct Info {
+		int32_t behaviorId{};
+		uint32_t characterId{};
+		std::string behaviorInfo;
+	};
+
+	// This Add also takes care of updating if it exists.
+	virtual void AddBehavior(const Info& info) = 0;
+	virtual std::string GetBehavior(const int32_t behaviorId) = 0;
+	virtual void RemoveBehavior(const int32_t behaviorId) = 0;
+};
+
+#endif  //!IBEHAVIORS_H

dDatabase/GameDatabase/ITables/IBugReports.h

@@ -1,5 +1,5 @@
-#ifndef __IBUGREPORTS__H__
-#define __IBUGREPORTS__H__
+#ifndef IBUGREPORTS_H
+#define IBUGREPORTS_H
 
 #include <cstdint>
 #include <string_view>
@@ -17,4 +17,4 @@ public:
 	// Add a new bug report to the database.
 	virtual void InsertNewBugReport(const Info& info) = 0;
 };
-#endif  //!__IBUGREPORTS__H__
+#endif  //!IBUGREPORTS_H

dDatabase/GameDatabase/ITables/ICharInfo.h

@@ -1,5 +1,5 @@
-#ifndef __ICHARINFO__H__
-#define __ICHARINFO__H__
+#ifndef ICHARINFO_H
+#define ICHARINFO_H
 
 #include <cstdint>
 #include <optional>
@@ -46,4 +46,4 @@ public:
 	virtual void UpdateLastLoggedInCharacter(const uint32_t characterId) = 0;
 };
 
-#endif  //!__ICHARINFO__H__
+#endif  //!ICHARINFO_H

dDatabase/GameDatabase/ITables/ICharXml.h

@@ -1,5 +1,5 @@
-#ifndef __ICHARXML__H__
-#define __ICHARXML__H__
+#ifndef ICHARXML_H
+#define ICHARXML_H
 
 #include <cstdint>
 #include <string>
@@ -17,4 +17,4 @@ public:
 	virtual void InsertCharacterXml(const uint32_t characterId, const std::string_view lxfml) = 0;
 };
 
-#endif  //!__ICHARXML__H__
+#endif  //!ICHARXML_H

dDatabase/GameDatabase/ITables/ICommandLog.h

@@ -1,5 +1,5 @@
-#ifndef __ICOMMANDLOG__H__
-#define __ICOMMANDLOG__H__
+#ifndef ICOMMANDLOG_H
+#define ICOMMANDLOG_H
 
 #include <cstdint>
 #include <string_view>
@@ -11,4 +11,4 @@ public:
 	virtual void InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) = 0;
 };
 
-#endif  //!__ICOMMANDLOG__H__
+#endif  //!ICOMMANDLOG_H

dDatabase/GameDatabase/ITables/IFriends.h

@@ -1,5 +1,5 @@
-#ifndef __IFRIENDS__H__
-#define __IFRIENDS__H__
+#ifndef IFRIENDS_H
+#define IFRIENDS_H
 
 #include <cstdint>
 #include <optional>
@@ -29,4 +29,4 @@ public:
 	virtual void RemoveFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) = 0;
 };
 
-#endif  //!__IFRIENDS__H__
+#endif  //!IFRIENDS_H

dDatabase/GameDatabase/ITables/IIgnoreList.h

@@ -1,5 +1,5 @@
-#ifndef __IIGNORELIST__H__
-#define __IIGNORELIST__H__
+#ifndef IIGNORELIST_H
+#define IIGNORELIST_H
 
 #include <cstdint>
 #include <string>
@@ -17,4 +17,4 @@ public:
 	virtual void RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) = 0;
 };
 
-#endif  //!__IIGNORELIST__H__
+#endif  //!IIGNORELIST_H

dDatabase/GameDatabase/ITables/ILeaderboard.h

@@ -1,5 +1,5 @@
-#ifndef __ILEADERBOARD__H__
-#define __ILEADERBOARD__H__
+#ifndef ILEADERBOARD_H
+#define ILEADERBOARD_H
 
 #include <cstdint>
 #include <optional>
@@ -11,4 +11,4 @@ public:
 	virtual std::optional<uint32_t> GetDonationTotal(const uint32_t activityId) = 0;
 };
 
-#endif  //!__ILEADERBOARD__H__
+#endif  //!ILEADERBOARD_H

dDatabase/GameDatabase/ITables/IMail.h

@@ -1,5 +1,5 @@
-#ifndef __IMAIL__H__
-#define __IMAIL__H__
+#ifndef IMAIL_H
+#define IMAIL_H
 
 #include <cstdint>
 #include <optional>
@@ -51,4 +51,4 @@ public:
 	virtual void DeleteMail(const uint64_t mailId) = 0;
 };
 
-#endif  //!__IMAIL__H__
+#endif  //!IMAIL_H

dDatabase/GameDatabase/ITables/IMigrationHistory.h

@@ -1,5 +1,5 @@
-#ifndef __IMIGRATIONHISTORY__H__
-#define __IMIGRATIONHISTORY__H__
+#ifndef IMIGRATIONHISTORY_H
+#define IMIGRATIONHISTORY_H
 
 #include <string_view>
 
@@ -14,4 +14,4 @@ public:
 	// Insert the given migration into the migration history table.
 	virtual void InsertMigration(const std::string_view str) = 0;
 };
-#endif  //!__IMIGRATIONHISTORY__H__
+#endif  //!IMIGRATIONHISTORY_H

dDatabase/GameDatabase/ITables/IObjectIdTracker.h

@@ -1,5 +1,5 @@
-#ifndef __IOBJECTIDTRACKER__H__
-#define __IOBJECTIDTRACKER__H__
+#ifndef IOBJECTIDTRACKER_H
+#define IOBJECTIDTRACKER_H
 
 #include <cstdint>
 #include <optional>
@@ -16,4 +16,4 @@ public:
 	virtual void UpdatePersistentId(const uint32_t newId) = 0;
 };
 
-#endif  //!__IOBJECTIDTRACKER__H__
+#endif  //!IOBJECTIDTRACKER_H

dDatabase/GameDatabase/ITables/IPetNames.h

@@ -1,5 +1,5 @@
-#ifndef __IPETNAMES__H__
-#define __IPETNAMES__H__
+#ifndef IPETNAMES_H
+#define IPETNAMES_H
 
 #include <cstdint>
 #include <optional>
@@ -18,4 +18,4 @@ public:
 	virtual std::optional<IPetNames::Info> GetPetNameInfo(const LWOOBJID& petId) = 0;
 };
 
-#endif  //!__IPETNAMES__H__
+#endif  //!IPETNAMES_H

dDatabase/GameDatabase/ITables/IPlayKeys.h

@@ -1,5 +1,5 @@
-#ifndef __IPLAYKEYS__H__
-#define __IPLAYKEYS__H__
+#ifndef IPLAYKEYS_H
+#define IPLAYKEYS_H
 
 #include <cstdint>
 #include <optional>
@@ -12,4 +12,4 @@ public:
 	virtual std::optional<bool> IsPlaykeyActive(const int32_t playkeyId) = 0;
 };
 
-#endif  //!__IPLAYKEYS__H__
+#endif  //!IPLAYKEYS_H