diff --git a/dChatServer/ChatIgnoreList.h b/dChatServer/ChatIgnoreList.h index c713c966..4462fc11 100644 --- a/dChatServer/ChatIgnoreList.h +++ b/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 diff --git a/dCommon/Amf3.h b/dCommon/Amf3.h index 9fe728c0..7f4f59be 100644 --- a/dCommon/Amf3.h +++ b/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 diff --git a/dCommon/BinaryIO.h b/dCommon/BinaryIO.h index d1e728ca..142d037c 100644 --- a/dCommon/BinaryIO.h +++ b/dCommon/BinaryIO.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __BINARYIO__H__ -#define __BINARYIO__H__ +#ifndef BINARYIO_H +#define BINARYIO_H #include #include @@ -71,4 +71,4 @@ namespace BinaryIO { } } -#endif //!__BINARYIO__H__ +#endif //!BINARYIO_H diff --git a/dCommon/BinaryPathFinder.h b/dCommon/BinaryPathFinder.h index c4ca6da2..a970857e 100644 --- a/dCommon/BinaryPathFinder.h +++ b/dCommon/BinaryPathFinder.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __BINARYPATHFINDER__H__ -#define __BINARYPATHFINDER__H__ +#ifndef BINARYPATHFINDER_H +#define BINARYPATHFINDER_H #include @@ -12,4 +12,4 @@ public: static std::filesystem::path GetBinaryDir(); }; -#endif //!__BINARYPATHFINDER__H__ +#endif //!BINARYPATHFINDER_H diff --git a/dCommon/Brick.h b/dCommon/Brick.h index e8bd747e..ca7c97ec 100644 --- a/dCommon/Brick.h +++ b/dCommon/Brick.h @@ -1,5 +1,5 @@ -#ifndef __BRICK__H__ -#define __BRICK__H__ +#ifndef BRICK_H +#define BRICK_H #include @@ -8,4 +8,4 @@ struct Brick { uint32_t materialID; }; -#endif //!__BRICK__H__ +#endif //!BRICK_H diff --git a/dCommon/DluAssert.h b/dCommon/DluAssert.h index c54dd54e..6dd48907 100644 --- a/dCommon/DluAssert.h +++ b/dCommon/DluAssert.h @@ -1,5 +1,5 @@ -#ifndef __DLUASSERT__H__ -#define __DLUASSERT__H__ +#ifndef DLUASSERT_H +#define DLUASSERT_H #include @@ -9,4 +9,4 @@ # define DluAssert(expression) #endif -#endif //!__DLUASSERT__H__ +#endif //!DLUASSERT_H diff --git a/dCommon/FdbToSqlite.h b/dCommon/FdbToSqlite.h index b0d20aee..83930488 100644 --- a/dCommon/FdbToSqlite.h +++ b/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 diff --git a/dCommon/LDFFormat.h b/dCommon/LDFFormat.h index 054ddb42..77891e7b 100644 --- a/dCommon/LDFFormat.h +++ b/dCommon/LDFFormat.h @@ -1,5 +1,5 @@ -#ifndef __LDFFORMAT__H__ -#define __LDFFORMAT__H__ +#ifndef LDFFORMAT_H +#define LDFFORMAT_H // Custom Classes #include "dCommonVars.h" @@ -220,4 +220,4 @@ template<> inline std::string LDFData::GetValueString() const { return template<> inline std::string LDFData::GetValueString() const { return this->value; } -#endif //!__LDFFORMAT__H__ +#endif //!LDFFORMAT_H diff --git a/dCommon/NiPoint3.h b/dCommon/NiPoint3.h index 00d09083..52addd5c 100644 --- a/dCommon/NiPoint3.h +++ b/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 diff --git a/dCommon/NiPoint3.inl b/dCommon/NiPoint3.inl index 48aa3ae1..a57288be 100644 --- a/dCommon/NiPoint3.inl +++ b/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 diff --git a/dCommon/NiQuaternion.h b/dCommon/NiQuaternion.h index 482b86fa..fd26eefa 100644 --- a/dCommon/NiQuaternion.h +++ b/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 diff --git a/dCommon/NiQuaternion.inl b/dCommon/NiQuaternion.inl index 9ed84ffc..15ea7caf 100644 --- a/dCommon/NiQuaternion.inl +++ b/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 diff --git a/dCommon/PositionUpdate.h b/dCommon/PositionUpdate.h index f28c682d..69628094 100644 --- a/dCommon/PositionUpdate.h +++ b/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 diff --git a/dCommon/dClient/ClientVersion.h b/dCommon/dClient/ClientVersion.h index 393103ab..c891cb45 100644 --- a/dCommon/dClient/ClientVersion.h +++ b/dCommon/dClient/ClientVersion.h @@ -1,5 +1,5 @@ -#ifndef __CLIENTVERSION_H__ -#define __CLIENTVERSION_H__ +#ifndef CLIENTVERSION_H +#define CLIENTVERSION_H #include @@ -9,4 +9,4 @@ namespace ClientVersion { constexpr uint16_t minor = 64; } -#endif // !__CLIENTVERSION_H__ +#endif // !CLIENTVERSION_H diff --git a/dCommon/dEnums/StringifiedEnum.h b/dCommon/dEnums/StringifiedEnum.h index 1816d705..f0ec1d8a 100644 --- a/dCommon/dEnums/StringifiedEnum.h +++ b/dCommon/dEnums/StringifiedEnum.h @@ -1,5 +1,5 @@ -#ifndef __STRINGIFIEDENUM_H__ -#define __STRINGIFIEDENUM_H__ +#ifndef STRINGIFIEDENUM_H +#define STRINGIFIEDENUM_H #include #include "magic_enum.hpp" @@ -26,4 +26,4 @@ namespace StringifiedEnum { } } -#endif // !__STRINGIFIEDENUM_H__ +#endif // !STRINGIFIEDENUM_H diff --git a/dCommon/dEnums/dCommonVars.h b/dCommon/dEnums/dCommonVars.h index 7cdbfdb6..fa18cc1c 100644 --- a/dCommon/dEnums/dCommonVars.h +++ b/dCommon/dEnums/dCommonVars.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __DCOMMONVARS__H__ -#define __DCOMMONVARS__H__ +#ifndef DCOMMONVARS_H +#define DCOMMONVARS_H #include #include @@ -158,4 +158,4 @@ public: } }; -#endif //!__DCOMMONVARS__H__ +#endif //!DCOMMONVARS_H diff --git a/dCommon/dEnums/eAddFriendResponseCode.h b/dCommon/dEnums/eAddFriendResponseCode.h index 56304c82..640d191d 100644 --- a/dCommon/dEnums/eAddFriendResponseCode.h +++ b/dCommon/dEnums/eAddFriendResponseCode.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __EADDFRIENDRESPONSECODE__H__ -#define __EADDFRIENDRESPONSECODE__H__ +#ifndef EADDFRIENDRESPONSECODE_H +#define EADDFRIENDRESPONSECODE_H #include @@ -12,4 +12,4 @@ enum class eAddFriendResponseCode : uint8_t { CANCELLED }; -#endif //!__ADDFRIENDRESPONSECODE__H__ +#endif //!ADDFRIENDRESPONSECODE_H diff --git a/dCommon/dEnums/eAddFriendResponseType.h b/dCommon/dEnums/eAddFriendResponseType.h index 5568aafb..1533dc1d 100644 --- a/dCommon/dEnums/eAddFriendResponseType.h +++ b/dCommon/dEnums/eAddFriendResponseType.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __EADDFRIENDRESPONSETYPE__H__ -#define __EADDFRIENDRESPONSETYPE__H__ +#ifndef EADDFRIENDRESPONSETYPE_H +#define EADDFRIENDRESPONSETYPE_H #include @@ -21,4 +21,4 @@ enum class eAddFriendResponseType : uint8_t { FRIENDISFREETRIAL }; -#endif //!__EADDFRIENDRESPONSETYPE__H__ +#endif //!EADDFRIENDRESPONSETYPE_H diff --git a/dCommon/dEnums/eAninmationFlags.h b/dCommon/dEnums/eAninmationFlags.h index ce235ae9..e01dd3f9 100644 --- a/dCommon/dEnums/eAninmationFlags.h +++ b/dCommon/dEnums/eAninmationFlags.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __EANINMATIONFLAGS__H__ -#define __EANINMATIONFLAGS__H__ +#ifndef EANINMATIONFLAGS_H +#define EANINMATIONFLAGS_H #include @@ -41,4 +41,4 @@ enum class eAnimationFlags : uint32_t { IDLE_MISC12 }; -#endif //!__EANINMATIONFLAGS__H__ +#endif //!EANINMATIONFLAGS_H diff --git a/dCommon/dEnums/eAuthMessageType.h b/dCommon/dEnums/eAuthMessageType.h index ecc17a37..5092d7eb 100644 --- a/dCommon/dEnums/eAuthMessageType.h +++ b/dCommon/dEnums/eAuthMessageType.h @@ -1,5 +1,5 @@ -#ifndef __EAUTHMESSAGETYPE__H__ -#define __EAUTHMESSAGETYPE__H__ +#ifndef EAUTHMESSAGETYPE_H +#define EAUTHMESSAGETYPE_H #include @@ -12,4 +12,4 @@ enum class eAuthMessageType : uint32_t { RUNTIME_CONFIG }; -#endif //!__EAUTHMESSAGETYPE__H__ +#endif //!EAUTHMESSAGETYPE_H diff --git a/dCommon/dEnums/eBasicAttackSuccessTypes.h b/dCommon/dEnums/eBasicAttackSuccessTypes.h index 8c06da8a..4b9ba54c 100644 --- a/dCommon/dEnums/eBasicAttackSuccessTypes.h +++ b/dCommon/dEnums/eBasicAttackSuccessTypes.h @@ -1,5 +1,5 @@ -#ifndef __EBASICATTACKSUCCESSTYPES__H__ -#define __EBASICATTACKSUCCESSTYPES__H__ +#ifndef EBASICATTACKSUCCESSTYPES_H +#define EBASICATTACKSUCCESSTYPES_H #include @@ -9,4 +9,4 @@ enum class eBasicAttackSuccessTypes : uint8_t { FAILIMMUNE }; -#endif //!__EBASICATTACKSUCCESSTYPES__H__ +#endif //!EBASICATTACKSUCCESSTYPES_H diff --git a/dCommon/dEnums/eBlueprintSaveResponseType.h b/dCommon/dEnums/eBlueprintSaveResponseType.h index 29d15695..835daa46 100644 --- a/dCommon/dEnums/eBlueprintSaveResponseType.h +++ b/dCommon/dEnums/eBlueprintSaveResponseType.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __EBLUEPRINTSAVERESPONSETYPE__H__ -#define __EBLUEPRINTSAVERESPONSETYPE__H__ +#ifndef EBLUEPRINTSAVERESPONSETYPE_H +#define EBLUEPRINTSAVERESPONSETYPE_H #include @@ -23,4 +23,4 @@ enum class eBlueprintSaveResponseType : uint32_t { FindMatchesFailed }; -#endif //!__EBLUEPRINTSAVERESPONSETYPE__H__ +#endif //!EBLUEPRINTSAVERESPONSETYPE_H diff --git a/dCommon/dEnums/eBubbleType.h b/dCommon/dEnums/eBubbleType.h index 9ceef4b5..c90fb8ab 100644 --- a/dCommon/dEnums/eBubbleType.h +++ b/dCommon/dEnums/eBubbleType.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __EBUBBLETYPE__H__ -#define __EBUBBLETYPE__H__ +#ifndef EBUBBLETYPE_H +#define EBUBBLETYPE_H #include @@ -11,4 +11,4 @@ enum class eBubbleType : uint32_t { SKUNK }; -#endif //!__EBUBBLETYPE__H__ +#endif //!EBUBBLETYPE_H diff --git a/dCommon/dEnums/eBuildType.h b/dCommon/dEnums/eBuildType.h index f28f43cc..5eefa150 100644 --- a/dCommon/dEnums/eBuildType.h +++ b/dCommon/dEnums/eBuildType.h @@ -1,5 +1,5 @@ -#ifndef __EBUILDTYPE__H__ -#define __EBUILDTYPE__H__ +#ifndef EBUILDTYPE_H +#define EBUILDTYPE_H #include @@ -9,4 +9,4 @@ enum class eBuildType :uint32_t { ON_PROPERTY }; -#endif //!__EBUILDTYPE__H__ +#endif //!EBUILDTYPE_H diff --git a/dCommon/dEnums/eCharacterCreationResponse.h b/dCommon/dEnums/eCharacterCreationResponse.h index da1ec0f2..4151a887 100644 --- a/dCommon/dEnums/eCharacterCreationResponse.h +++ b/dCommon/dEnums/eCharacterCreationResponse.h @@ -1,5 +1,5 @@ -#ifndef __ECHARACTERCREATIONRESPONSE__H__ -#define __ECHARACTERCREATIONRESPONSE__H__ +#ifndef ECHARACTERCREATIONRESPONSE_H +#define ECHARACTERCREATIONRESPONSE_H #include @@ -11,4 +11,4 @@ enum class eCharacterCreationResponse : uint8_t { CUSTOM_NAME_IN_USE }; -#endif //!__ECHARACTERCREATIONRESPONSE__H__ +#endif //!ECHARACTERCREATIONRESPONSE_H diff --git a/dCommon/dEnums/eCharacterVersion.h b/dCommon/dEnums/eCharacterVersion.h index 0fab4498..74cbe663 100644 --- a/dCommon/dEnums/eCharacterVersion.h +++ b/dCommon/dEnums/eCharacterVersion.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __ECHARACTERVERSION__H__ -#define __ECHARACTERVERSION__H__ +#ifndef ECHARACTERVERSION_H +#define ECHARACTERVERSION_H #include @@ -18,4 +18,4 @@ enum class eCharacterVersion : uint32_t { UP_TO_DATE, // will become SPEED_BASE }; -#endif //!__ECHARACTERVERSION__H__ +#endif //!ECHARACTERVERSION_H diff --git a/dCommon/dEnums/eChatMessageType.h b/dCommon/dEnums/eChatMessageType.h index 38cd86de..6258e13e 100644 --- a/dCommon/dEnums/eChatMessageType.h +++ b/dCommon/dEnums/eChatMessageType.h @@ -1,5 +1,5 @@ -#ifndef __ECHATMESSAGETYPE__H__ -#define __ECHATMESSAGETYPE__H__ +#ifndef ECHATMESSAGETYPE_H +#define ECHATMESSAGETYPE_H #include @@ -77,4 +77,4 @@ enum class eChatMessageType :uint32_t { CREATE_TEAM, }; -#endif //!__ECHATMESSAGETYPE__H__ +#endif //!ECHATMESSAGETYPE_H diff --git a/dCommon/dEnums/eCinematicEvent.h b/dCommon/dEnums/eCinematicEvent.h index 7fb82ca7..3dd7b6f5 100644 --- a/dCommon/dEnums/eCinematicEvent.h +++ b/dCommon/dEnums/eCinematicEvent.h @@ -1,5 +1,5 @@ -#ifndef __ECINEMATICEVENT__H__ -#define __ECINEMATICEVENT__H__ +#ifndef ECINEMATICEVENT_H +#define ECINEMATICEVENT_H #include @@ -9,4 +9,4 @@ enum class eCinematicEvent : uint32_t { ENDED, }; -#endif //!__ECINEMATICEVENT__H__ +#endif //!ECINEMATICEVENT_H diff --git a/dCommon/dEnums/eClientMessageType.h b/dCommon/dEnums/eClientMessageType.h index aafccc36..f33f222e 100644 --- a/dCommon/dEnums/eClientMessageType.h +++ b/dCommon/dEnums/eClientMessageType.h @@ -1,5 +1,5 @@ -#ifndef __ECLIENTMESSAGETYPE__H__ -#define __ECLIENTMESSAGETYPE__H__ +#ifndef ECLIENTMESSAGETYPE_H +#define ECLIENTMESSAGETYPE_H #include @@ -73,4 +73,4 @@ enum class eClientMessageType : uint32_t { UGC_DOWNLOAD_FAILED = 120 }; -#endif //!__ECLIENTMESSAGETYPE__H__ +#endif //!ECLIENTMESSAGETYPE_H diff --git a/dCommon/dEnums/eConnectionType.h b/dCommon/dEnums/eConnectionType.h index 406110a9..ad047c8d 100644 --- a/dCommon/dEnums/eConnectionType.h +++ b/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 diff --git a/dCommon/dEnums/eControlScheme.h b/dCommon/dEnums/eControlScheme.h index f7585ebb..ae43d28f 100644 --- a/dCommon/dEnums/eControlScheme.h +++ b/dCommon/dEnums/eControlScheme.h @@ -1,5 +1,5 @@ -#ifndef __ECONTROLSCHEME__H__ -#define __ECONTROLSCHEME__H__ +#ifndef ECONTROLSCHEME_H +#define ECONTROLSCHEME_H #include @@ -15,4 +15,4 @@ enum class eControlScheme : uint32_t { SCHEME_WEAR_A_ROBOT //== freecam? }; -#endif //!__ECONTROLSCHEME__H__ +#endif //!ECONTROLSCHEME_H diff --git a/dCommon/dEnums/eCyclingMode.h b/dCommon/dEnums/eCyclingMode.h index b5e3248b..1f2d1bd9 100644 --- a/dCommon/dEnums/eCyclingMode.h +++ b/dCommon/dEnums/eCyclingMode.h @@ -1,5 +1,5 @@ -#ifndef __ECYCLINGMODE__H__ -#define __ECYCLINGMODE__H__ +#ifndef ECYCLINGMODE_H +#define ECYCLINGMODE_H #include @@ -8,4 +8,4 @@ enum class eCyclingMode : uint32_t { DISALLOW_CYCLING }; -#endif //!__ECYCLINGMODE__H__ +#endif //!ECYCLINGMODE_H diff --git a/dCommon/dEnums/eEndBehavior.h b/dCommon/dEnums/eEndBehavior.h index 77afaab4..bc189071 100644 --- a/dCommon/dEnums/eEndBehavior.h +++ b/dCommon/dEnums/eEndBehavior.h @@ -1,5 +1,5 @@ -#ifndef __EENDBEHAVIOR__H__ -#define __EENDBEHAVIOR__H__ +#ifndef EENDBEHAVIOR_H +#define EENDBEHAVIOR_H #include @@ -8,4 +8,4 @@ enum class eEndBehavior : uint32_t { WAIT }; -#endif //!__EENDBEHAVIOR__H__ +#endif //!EENDBEHAVIOR_H diff --git a/dCommon/dEnums/eGameActivity.h b/dCommon/dEnums/eGameActivity.h index 16b75380..843425b2 100644 --- a/dCommon/dEnums/eGameActivity.h +++ b/dCommon/dEnums/eGameActivity.h @@ -1,5 +1,5 @@ -#ifndef __EGAMEACTIVITY__H__ -#define __EGAMEACTIVITY__H__ +#ifndef EGAMEACTIVITY_H +#define EGAMEACTIVITY_H #include @@ -12,4 +12,4 @@ enum class eGameActivity : uint32_t { PET_TAMING }; -#endif //!__EGAMEACTIVITY__H__ +#endif //!EGAMEACTIVITY_H diff --git a/dCommon/dEnums/eGameMasterLevel.h b/dCommon/dEnums/eGameMasterLevel.h index a63c1caf..cda0b86c 100644 --- a/dCommon/dEnums/eGameMasterLevel.h +++ b/dCommon/dEnums/eGameMasterLevel.h @@ -1,5 +1,5 @@ -#ifndef __EGAMEMASTERLEVEL__H__ -#define __EGAMEMASTERLEVEL__H__ +#ifndef EGAMEMASTERLEVEL_H +#define EGAMEMASTERLEVEL_H #include @@ -17,4 +17,4 @@ enum class eGameMasterLevel : uint8_t { }; -#endif //!__EGAMEMASTERLEVEL__H__ +#endif //!EGAMEMASTERLEVEL_H diff --git a/dCommon/dEnums/eGameMessageType.h b/dCommon/dEnums/eGameMessageType.h index 8e6980d6..1b6a0633 100644 --- a/dCommon/dEnums/eGameMessageType.h +++ b/dCommon/dEnums/eGameMessageType.h @@ -1,5 +1,5 @@ -#ifndef __EGAMEMESSAGETYPE__H__ -#define __EGAMEMESSAGETYPE__H__ +#ifndef EGAMEMESSAGETYPE_H +#define EGAMEMESSAGETYPE_H #include @@ -1611,4 +1611,4 @@ struct magic_enum::customize::enum_range { static constexpr int max = 1772; }; -#endif //!__EGAMEMESSAGETYPE__H__ +#endif //!EGAMEMESSAGETYPE_H diff --git a/dCommon/dEnums/eHelpType.h b/dCommon/dEnums/eHelpType.h index d1838cc6..952d0ee3 100644 --- a/dCommon/dEnums/eHelpType.h +++ b/dCommon/dEnums/eHelpType.h @@ -1,6 +1,6 @@ -#ifndef __EHELPTYPE__H__ -#define __EHELPTYPE__H__ +#ifndef EHELPTYPE_H +#define EHELPTYPE_H #include @@ -38,4 +38,4 @@ enum class eHelpType : int32_t { UI_INVENTORY_FULL_CANNOT_PICKUP_ITEM = 86 }; -#endif //!__EHELPTYPE__H__ +#endif //!EHELPTYPE_H diff --git a/dCommon/dEnums/eInventoryType.h b/dCommon/dEnums/eInventoryType.h index 1c6688b2..34ca2ef3 100644 --- a/dCommon/dEnums/eInventoryType.h +++ b/dCommon/dEnums/eInventoryType.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __EINVENTORYTYPE__H__ -#define __EINVENTORYTYPE__H__ +#ifndef EINVENTORYTYPE_H +#define EINVENTORYTYPE_H #include @@ -65,4 +65,4 @@ struct magic_enum::customize::enum_range { static constexpr int max = 16; }; -#endif //!__EINVENTORYTYPE__H__ +#endif //!EINVENTORYTYPE_H diff --git a/dCommon/dEnums/eItemSetPassiveAbilityID.h b/dCommon/dEnums/eItemSetPassiveAbilityID.h index 8641d0f2..743ed7df 100644 --- a/dCommon/dEnums/eItemSetPassiveAbilityID.h +++ b/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 diff --git a/dCommon/dEnums/eItemType.h b/dCommon/dEnums/eItemType.h index 41c7765b..61f9b423 100644 --- a/dCommon/dEnums/eItemType.h +++ b/dCommon/dEnums/eItemType.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __EITEMTYPE__H__ -#define __EITEMTYPE__H__ +#ifndef EITEMTYPE_H +#define EITEMTYPE_H #include @@ -33,4 +33,4 @@ enum class eItemType : int32_t { MOUNT }; -#endif //!__EITEMTYPE__H__ +#endif //!EITEMTYPE_H diff --git a/dCommon/dEnums/eKillType.h b/dCommon/dEnums/eKillType.h index fe3908c8..bcf58541 100644 --- a/dCommon/dEnums/eKillType.h +++ b/dCommon/dEnums/eKillType.h @@ -1,5 +1,5 @@ -#ifndef __EKILLTYPE__H__ -#define __EKILLTYPE__H__ +#ifndef EKILLTYPE_H +#define EKILLTYPE_H #include @@ -8,4 +8,4 @@ enum class eKillType : uint32_t { SILENT }; -#endif //!__EKILLTYPE__H__ +#endif //!EKILLTYPE_H diff --git a/dCommon/dEnums/eLoginResponse.h b/dCommon/dEnums/eLoginResponse.h index 01bba3d5..45c3326a 100644 --- a/dCommon/dEnums/eLoginResponse.h +++ b/dCommon/dEnums/eLoginResponse.h @@ -1,5 +1,5 @@ -#ifndef __ELOGINRESPONSE__H__ -#define __ELOGINRESPONSE__H__ +#ifndef ELOGINRESPONSE_H +#define ELOGINRESPONSE_H #include @@ -21,4 +21,4 @@ enum class eLoginResponse : uint8_t { ACCOUNT_NOT_ACTIVATED }; -#endif //!__ELOGINRESPONSE__H__ +#endif //!ELOGINRESPONSE_H diff --git a/dCommon/dEnums/eLootSourceType.h b/dCommon/dEnums/eLootSourceType.h index b8ecca4a..8c37db80 100644 --- a/dCommon/dEnums/eLootSourceType.h +++ b/dCommon/dEnums/eLootSourceType.h @@ -1,5 +1,5 @@ -#ifndef __ELOOTSOURCETYPE__H__ -#define __ELOOTSOURCETYPE__H__ +#ifndef ELOOTSOURCETYPE_H +#define ELOOTSOURCETYPE_H #include @@ -28,4 +28,4 @@ enum class eLootSourceType : uint32_t { RELOCATE }; -#endif //!__ELOOTSOURCETYPE__H__ +#endif //!ELOOTSOURCETYPE_H diff --git a/dCommon/dEnums/eMasterMessageType.h b/dCommon/dEnums/eMasterMessageType.h index 5c867d70..2d7bd88d 100644 --- a/dCommon/dEnums/eMasterMessageType.h +++ b/dCommon/dEnums/eMasterMessageType.h @@ -1,5 +1,5 @@ -#ifndef __EMASTERMESSAGETYPE__H__ -#define __EMASTERMESSAGETYPE__H__ +#ifndef EMASTERMESSAGETYPE_H +#define EMASTERMESSAGETYPE_H #include @@ -33,4 +33,4 @@ enum class eMasterMessageType : uint32_t { NEW_SESSION_ALERT }; -#endif //!__EMASTERMESSAGETYPE__H__ +#endif //!EMASTERMESSAGETYPE_H diff --git a/dCommon/dEnums/eMatchUpdate.h b/dCommon/dEnums/eMatchUpdate.h index a42eecd3..83901283 100644 --- a/dCommon/dEnums/eMatchUpdate.h +++ b/dCommon/dEnums/eMatchUpdate.h @@ -1,5 +1,5 @@ -#ifndef __EMATCHUPDATE__H__ -#define __EMATCHUPDATE__H__ +#ifndef EMATCHUPDATE_H +#define EMATCHUPDATE_H #include @@ -14,4 +14,4 @@ enum class eMatchUpdate : int32_t { PLAYER_UPDATE }; -#endif //!__EMATCHUPDATE__H__ +#endif //!EMATCHUPDATE_H diff --git a/dCommon/dEnums/eMissionLockState.h b/dCommon/dEnums/eMissionLockState.h index 52752767..ce030d49 100644 --- a/dCommon/dEnums/eMissionLockState.h +++ b/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 diff --git a/dCommon/dEnums/eMissionState.h b/dCommon/dEnums/eMissionState.h index e080f455..78c32d6a 100644 --- a/dCommon/dEnums/eMissionState.h +++ b/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 diff --git a/dCommon/dEnums/eMissionTaskType.h b/dCommon/dEnums/eMissionTaskType.h index 2636f88c..f449a220 100644 --- a/dCommon/dEnums/eMissionTaskType.h +++ b/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 diff --git a/dCommon/dEnums/eMovementPlatformState.h b/dCommon/dEnums/eMovementPlatformState.h index 1df437d8..23af025b 100644 --- a/dCommon/dEnums/eMovementPlatformState.h +++ b/dCommon/dEnums/eMovementPlatformState.h @@ -1,5 +1,5 @@ -#ifndef __EMOVEMENTPLATFORMSTATE__H__ -#define __EMOVEMENTPLATFORMSTATE__H__ +#ifndef EMOVEMENTPLATFORMSTATE_H +#define EMOVEMENTPLATFORMSTATE_H #include @@ -13,4 +13,4 @@ enum class eMovementPlatformState : uint32_t Stopped = 0b01100 }; -#endif //!__EMOVEMENTPLATFORMSTATE__H__ +#endif //!EMOVEMENTPLATFORMSTATE_H diff --git a/dCommon/dEnums/eObjectBits.h b/dCommon/dEnums/eObjectBits.h index b978aad6..fe2905dc 100644 --- a/dCommon/dEnums/eObjectBits.h +++ b/dCommon/dEnums/eObjectBits.h @@ -1,5 +1,5 @@ -#ifndef __EOBJECTBITS__H__ -#define __EOBJECTBITS__H__ +#ifndef EOBJECTBITS_H +#define EOBJECTBITS_H #include @@ -10,4 +10,4 @@ enum class eObjectBits : size_t { CHARACTER = 60 }; -#endif //!__EOBJECTBITS__H__ +#endif //!EOBJECTBITS_H diff --git a/dCommon/dEnums/eObjectWorldState.h b/dCommon/dEnums/eObjectWorldState.h index 9735a072..ce9a002f 100644 --- a/dCommon/dEnums/eObjectWorldState.h +++ b/dCommon/dEnums/eObjectWorldState.h @@ -1,5 +1,5 @@ -#ifndef __EOBJECTWORLDSTATE__H__ -#define __EOBJECTWORLDSTATE__H__ +#ifndef EOBJECTWORLDSTATE_H +#define EOBJECTWORLDSTATE_H #include @@ -9,4 +9,4 @@ enum class eObjectWorldState : uint32_t { INVENTORY }; -#endif //!__EOBJECTWORLDSTATE__H__ +#endif //!EOBJECTWORLDSTATE_H diff --git a/dCommon/dEnums/ePackageType.h b/dCommon/dEnums/ePackageType.h index 2c1c9977..462bfd48 100644 --- a/dCommon/dEnums/ePackageType.h +++ b/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 diff --git a/dCommon/dEnums/ePermissionMap.h b/dCommon/dEnums/ePermissionMap.h index d3cb12e5..40048642 100644 --- a/dCommon/dEnums/ePermissionMap.h +++ b/dCommon/dEnums/ePermissionMap.h @@ -2,8 +2,8 @@ #include -#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 diff --git a/dCommon/dEnums/ePetAbilityType.h b/dCommon/dEnums/ePetAbilityType.h index 0cc6d6bd..d5d8121d 100644 --- a/dCommon/dEnums/ePetAbilityType.h +++ b/dCommon/dEnums/ePetAbilityType.h @@ -1,5 +1,5 @@ -#ifndef __EPETABILITYTYPE__H__ -#define __EPETABILITYTYPE__H__ +#ifndef EPETABILITYTYPE_H +#define EPETABILITYTYPE_H #include @@ -10,4 +10,4 @@ enum class ePetAbilityType : uint32_t { DigAtPosition }; -#endif //!__EPETABILITYTYPE__H__ +#endif //!EPETABILITYTYPE_H diff --git a/dCommon/dEnums/ePetTamingNotifyType.h b/dCommon/dEnums/ePetTamingNotifyType.h index 564e932f..9356619f 100644 --- a/dCommon/dEnums/ePetTamingNotifyType.h +++ b/dCommon/dEnums/ePetTamingNotifyType.h @@ -1,5 +1,5 @@ -#ifndef __EPETTAMINGNOTIFYTYPE__H__ -#define __EPETTAMINGNOTIFYTYPE__H__ +#ifndef EPETTAMINGNOTIFYTYPE_H +#define EPETTAMINGNOTIFYTYPE_H #include @@ -12,4 +12,4 @@ enum class ePetTamingNotifyType : uint32_t { NAMINGPET }; -#endif //!__EPETTAMINGNOTIFYTYPE__H__ +#endif //!EPETTAMINGNOTIFYTYPE_H diff --git a/dCommon/dEnums/ePhysicsEffectType.h b/dCommon/dEnums/ePhysicsEffectType.h index 1aa68b34..613281c1 100644 --- a/dCommon/dEnums/ePhysicsEffectType.h +++ b/dCommon/dEnums/ePhysicsEffectType.h @@ -1,5 +1,5 @@ -#ifndef __EPHYSICSEFFECTTYPE__H__ -#define __EPHYSICSEFFECTTYPE__H__ +#ifndef EPHYSICSEFFECTTYPE_H +#define EPHYSICSEFFECTTYPE_H #include @@ -12,4 +12,4 @@ enum class ePhysicsEffectType : uint32_t { FRICTION }; -#endif //!__EPHYSICSEFFECTTYPE__H__ +#endif //!EPHYSICSEFFECTTYPE_H diff --git a/dCommon/dEnums/ePlayerFlag.h b/dCommon/dEnums/ePlayerFlag.h index 01adcb0e..6761e4f0 100644 --- a/dCommon/dEnums/ePlayerFlag.h +++ b/dCommon/dEnums/ePlayerFlag.h @@ -1,5 +1,5 @@ -#ifndef __EPLAYERFLAG__H__ -#define __EPLAYERFLAG__H__ +#ifndef EPLAYERFLAG_H +#define EPLAYERFLAG_H #include @@ -170,4 +170,4 @@ enum ePlayerFlag : int32_t { DLU_SKIP_CINEMATICS = 1'000'000, }; -#endif //!__EPLAYERFLAG__H__ +#endif //!EPLAYERFLAG_H diff --git a/dCommon/dEnums/eQuickBuildFailReason.h b/dCommon/dEnums/eQuickBuildFailReason.h index a6144bd5..8b67b742 100644 --- a/dCommon/dEnums/eQuickBuildFailReason.h +++ b/dCommon/dEnums/eQuickBuildFailReason.h @@ -1,5 +1,5 @@ -#ifndef __EQUICKBUILDFAILREASON__H__ -#define __EQUICKBUILDFAILREASON__H__ +#ifndef EQUICKBUILDFAILREASON_H +#define EQUICKBUILDFAILREASON_H #include @@ -10,4 +10,4 @@ enum class eQuickBuildFailReason : uint32_t { BUILD_ENDED }; -#endif //!__EQUICKBUILDFAILREASON__H__ +#endif //!EQUICKBUILDFAILREASON_H diff --git a/dCommon/dEnums/eQuickBuildState.h b/dCommon/dEnums/eQuickBuildState.h index 15acbfb5..0ba5de39 100644 --- a/dCommon/dEnums/eQuickBuildState.h +++ b/dCommon/dEnums/eQuickBuildState.h @@ -1,5 +1,5 @@ -#ifndef __EQUICKBUILDSTATE__H__ -#define __EQUICKBUILDSTATE__H__ +#ifndef EQUICKBUILDSTATE_H +#define EQUICKBUILDSTATE_H #include @@ -12,4 +12,4 @@ enum class eQuickBuildState : uint32_t { }; -#endif //!__EQUICKBUILDSTATE__H__ +#endif //!EQUICKBUILDSTATE_H diff --git a/dCommon/dEnums/eRacingTaskParam.h b/dCommon/dEnums/eRacingTaskParam.h index df50e382..6a6dd7dc 100644 --- a/dCommon/dEnums/eRacingTaskParam.h +++ b/dCommon/dEnums/eRacingTaskParam.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __ERACINGTASKPARAM__H__ -#define __ERACINGTASKPARAM__H__ +#ifndef ERACINGTASKPARAM_H +#define ERACINGTASKPARAM_H #include @@ -22,4 +22,4 @@ enum class eRacingTaskParam : int32_t { SMASH_SPECIFIC_SMASHABLE }; -#endif //!__ERACINGTASKPARAM__H__ +#endif //!ERACINGTASKPARAM_H diff --git a/dCommon/dEnums/eRenameResponse.h b/dCommon/dEnums/eRenameResponse.h index 2298e922..3344418d 100644 --- a/dCommon/dEnums/eRenameResponse.h +++ b/dCommon/dEnums/eRenameResponse.h @@ -1,5 +1,5 @@ -#ifndef __ERENAMERESPONSE__H__ -#define __ERENAMERESPONSE__H__ +#ifndef ERENAMERESPONSE_H +#define ERENAMERESPONSE_H #include @@ -12,4 +12,4 @@ enum class eRenameResponse : uint8_t { }; -#endif //!__ERENAMERESPONSE__H__ +#endif //!ERENAMERESPONSE_H diff --git a/dCommon/dEnums/eReplicaComponentType.h b/dCommon/dEnums/eReplicaComponentType.h index 2b991dfb..c41547d2 100644 --- a/dCommon/dEnums/eReplicaComponentType.h +++ b/dCommon/dEnums/eReplicaComponentType.h @@ -1,5 +1,5 @@ -#ifndef __EREPLICACOMPONENTTYPE__H__ -#define __EREPLICACOMPONENTTYPE__H__ +#ifndef EREPLICACOMPONENTTYPE_H +#define EREPLICACOMPONENTTYPE_H #include @@ -124,4 +124,4 @@ enum class eReplicaComponentType : uint32_t { DESTROYABLE = 1000 // Actually 7 }; -#endif //!__EREPLICACOMPONENTTYPE__H__ +#endif //!EREPLICACOMPONENTTYPE_H diff --git a/dCommon/dEnums/eReplicaPacketType.h b/dCommon/dEnums/eReplicaPacketType.h index 2650fb30..14089ca2 100644 --- a/dCommon/dEnums/eReplicaPacketType.h +++ b/dCommon/dEnums/eReplicaPacketType.h @@ -1,5 +1,5 @@ -#ifndef __EREPLICAPACKETTYPE__H__ -#define __EREPLICAPACKETTYPE__H__ +#ifndef EREPLICAPACKETTYPE_H +#define EREPLICAPACKETTYPE_H #include @@ -9,4 +9,4 @@ enum class eReplicaPacketType : uint8_t { DESTRUCTION }; -#endif //!__EREPLICAPACKETTYPE__H__ +#endif //!EREPLICAPACKETTYPE_H diff --git a/dCommon/dEnums/eReponseMoveItemBetweenInventoryTypeCode.h b/dCommon/dEnums/eReponseMoveItemBetweenInventoryTypeCode.h index b99687d0..c146525b 100644 --- a/dCommon/dEnums/eReponseMoveItemBetweenInventoryTypeCode.h +++ b/dCommon/dEnums/eReponseMoveItemBetweenInventoryTypeCode.h @@ -1,5 +1,5 @@ -#ifndef __EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE__H__ -#define __EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE__H__ +#ifndef EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE_H +#define EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE_H #include @@ -18,4 +18,4 @@ enum class eReponseMoveItemBetweenInventoryTypeCode : int32_t { FAIL_DISMOUNT_BEFORE_MOVING }; -#endif //!__EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE__H__ +#endif //!EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE_H diff --git a/dCommon/dEnums/eServerDisconnectIdentifiers.h b/dCommon/dEnums/eServerDisconnectIdentifiers.h index 99d2cd44..7fec358c 100644 --- a/dCommon/dEnums/eServerDisconnectIdentifiers.h +++ b/dCommon/dEnums/eServerDisconnectIdentifiers.h @@ -1,5 +1,5 @@ -#ifndef __ESERVERDISCONNECTIDENTIFIERS__H__ -#define __ESERVERDISCONNECTIDENTIFIERS__H__ +#ifndef ESERVERDISCONNECTIDENTIFIERS_H +#define ESERVERDISCONNECTIDENTIFIERS_H #include @@ -21,4 +21,4 @@ enum class eServerDisconnectIdentifiers : uint32_t { PLAY_SCHEDULE_TIME_DONE }; -#endif //!__ESERVERDISCONNECTIDENTIFIERS__H__ +#endif //!ESERVERDISCONNECTIDENTIFIERS_H diff --git a/dCommon/dEnums/eServerMessageType.h b/dCommon/dEnums/eServerMessageType.h index 7f211ffb..71244f56 100644 --- a/dCommon/dEnums/eServerMessageType.h +++ b/dCommon/dEnums/eServerMessageType.h @@ -1,5 +1,5 @@ -#ifndef __ESERVERMESSAGETYPE__H__ -#define __ESERVERMESSAGETYPE__H__ +#ifndef ESERVERMESSAGETYPE_H +#define ESERVERMESSAGETYPE_H #include //! The Internal Server Packet Identifiers @@ -9,4 +9,4 @@ enum class eServerMessageType : uint32_t { GENERAL_NOTIFY }; -#endif //!__ESERVERMESSAGETYPE__H__ +#endif //!ESERVERMESSAGETYPE_H diff --git a/dCommon/dEnums/eSqliteDataType.h b/dCommon/dEnums/eSqliteDataType.h index 26e1233b..68222d96 100644 --- a/dCommon/dEnums/eSqliteDataType.h +++ b/dCommon/dEnums/eSqliteDataType.h @@ -1,5 +1,5 @@ -#ifndef __ESQLITEDATATYPE__H__ -#define __ESQLITEDATATYPE__H__ +#ifndef ESQLITEDATATYPE_H +#define ESQLITEDATATYPE_H #include @@ -13,4 +13,4 @@ enum class eSqliteDataType : int32_t { TEXT_8 = 8 }; -#endif //!__ESQLITEDATATYPE__H__ +#endif //!ESQLITEDATATYPE_H diff --git a/dCommon/dEnums/eStateChangeType.h b/dCommon/dEnums/eStateChangeType.h index e187e265..2517c111 100644 --- a/dCommon/dEnums/eStateChangeType.h +++ b/dCommon/dEnums/eStateChangeType.h @@ -1,5 +1,5 @@ -#ifndef __ESTATECHANGETYPE__H__ -#define __ESTATECHANGETYPE__H__ +#ifndef ESTATECHANGETYPE_H +#define ESTATECHANGETYPE_H #include @@ -8,4 +8,4 @@ enum class eStateChangeType : uint32_t { POP }; -#endif //!__ESTATECHANGETYPE__H__ +#endif //!ESTATECHANGETYPE_H diff --git a/dCommon/dEnums/eTerminateType.h b/dCommon/dEnums/eTerminateType.h index 189734f8..a571ef47 100644 --- a/dCommon/dEnums/eTerminateType.h +++ b/dCommon/dEnums/eTerminateType.h @@ -1,5 +1,5 @@ -#ifndef __ETERMINATETYPE__H__ -#define __ETERMINATETYPE__H__ +#ifndef ETERMINATETYPE_H +#define ETERMINATETYPE_H #include @@ -9,4 +9,4 @@ enum class eTerminateType : uint32_t { FROM_INTERACTION }; -#endif //!__ETERMINATETYPE__H__ +#endif //!ETERMINATETYPE_H diff --git a/dCommon/dEnums/eTriggerCommandType.h b/dCommon/dEnums/eTriggerCommandType.h index fadfafb8..96d0062a 100644 --- a/dCommon/dEnums/eTriggerCommandType.h +++ b/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 diff --git a/dCommon/dEnums/eTriggerEventType.h b/dCommon/dEnums/eTriggerEventType.h index a2daa256..e913840f 100644 --- a/dCommon/dEnums/eTriggerEventType.h +++ b/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 diff --git a/dCommon/dEnums/eUnequippableActiveType.h b/dCommon/dEnums/eUnequippableActiveType.h index 8a6d29ba..023a8ac9 100644 --- a/dCommon/dEnums/eUnequippableActiveType.h +++ b/dCommon/dEnums/eUnequippableActiveType.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __EUNEQUIPPABLEACTIVETYPE__H__ -#define __EUNEQUIPPABLEACTIVETYPE__H__ +#ifndef EUNEQUIPPABLEACTIVETYPE_H +#define EUNEQUIPPABLEACTIVETYPE_H #include @@ -11,4 +11,4 @@ enum class eUnequippableActiveType : int32_t { MOUNT }; -#endif //!__EUNEQUIPPABLEACTIVETYPE__H__ +#endif //!EUNEQUIPPABLEACTIVETYPE_H diff --git a/dCommon/dEnums/eUseItemResponse.h b/dCommon/dEnums/eUseItemResponse.h index ba0ece7f..08c39be5 100644 --- a/dCommon/dEnums/eUseItemResponse.h +++ b/dCommon/dEnums/eUseItemResponse.h @@ -1,5 +1,5 @@ -#ifndef __EUSEITEMRESPONSE__H__ -#define __EUSEITEMRESPONSE__H__ +#ifndef EUSEITEMRESPONSE_H +#define EUSEITEMRESPONSE_H #include @@ -9,4 +9,4 @@ enum class eUseItemResponse : uint32_t { MountsNotAllowed }; -#endif //!__EUSEITEMRESPONSE__H__ +#endif //!EUSEITEMRESPONSE_H diff --git a/dCommon/dEnums/eVendorTransactionResult.h b/dCommon/dEnums/eVendorTransactionResult.h index e61ee0ee..c52fc6e1 100644 --- a/dCommon/dEnums/eVendorTransactionResult.h +++ b/dCommon/dEnums/eVendorTransactionResult.h @@ -1,5 +1,5 @@ -#ifndef __EVENDORTRANSACTIONRESULT__ -#define __EVENDORTRANSACTIONRESULT__ +#ifndef EVENDORTRANSACTIONRESULT_H +#define EVENDORTRANSACTIONRESULT_H #include @@ -12,4 +12,4 @@ enum class eVendorTransactionResult : uint32_t { DONATION_FULL }; -#endif // !__EVENDORTRANSACTIONRESULT__ +#endif // !EVENDORTRANSACTIONRESULT_H diff --git a/dCommon/dEnums/eWaypointCommandType.h b/dCommon/dEnums/eWaypointCommandType.h index 308f3764..b3a3f32b 100644 --- a/dCommon/dEnums/eWaypointCommandType.h +++ b/dCommon/dEnums/eWaypointCommandType.h @@ -1,6 +1,6 @@ -#ifndef __EWAYPOINTCOMMANDTYPES__H__ -#define __EWAYPOINTCOMMANDTYPES__H__ +#ifndef EWAYPOINTCOMMANDTYPES_H +#define EWAYPOINTCOMMANDTYPES_H #include @@ -56,4 +56,4 @@ public: }; -#endif //!__EWAYPOINTCOMMANDTYPES__H__ +#endif //!EWAYPOINTCOMMANDTYPES_H diff --git a/dCommon/dEnums/eWorldMessageType.h b/dCommon/dEnums/eWorldMessageType.h index 92081055..007df6b9 100644 --- a/dCommon/dEnums/eWorldMessageType.h +++ b/dCommon/dEnums/eWorldMessageType.h @@ -1,5 +1,5 @@ -#ifndef __EWORLDMESSAGETYPE__H__ -#define __EWORLDMESSAGETYPE__H__ +#ifndef EWORLDMESSAGETYPE_H +#define EWORLDMESSAGETYPE_H #include @@ -48,4 +48,4 @@ struct magic_enum::customize::enum_range { static constexpr int max = 91; }; -#endif //!__EWORLDMESSAGETYPE__H__ +#endif //!EWORLDMESSAGETYPE_H diff --git a/dDatabase/CDClientDatabase/CDClientManager.h b/dDatabase/CDClientDatabase/CDClientManager.h index c1c4443d..92d5e055 100644 --- a/dDatabase/CDClientDatabase/CDClientManager.h +++ b/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 diff --git a/dDatabase/GameDatabase/GameDatabase.h b/dDatabase/GameDatabase/GameDatabase.h index f52c8c4e..1d459f5b 100644 --- a/dDatabase/GameDatabase/GameDatabase.h +++ b/dDatabase/GameDatabase/GameDatabase.h @@ -1,5 +1,5 @@ -#ifndef __GAMEDATABASE__H__ -#define __GAMEDATABASE__H__ +#ifndef GAMEDATABASE_H +#define GAMEDATABASE_H #include @@ -56,4 +56,4 @@ public: virtual void DeleteCharacter(const uint32_t characterId) = 0; }; -#endif //!__GAMEDATABASE__H__ +#endif //!GAMEDATABASE_H diff --git a/dDatabase/GameDatabase/ITables/IAccounts.h b/dDatabase/GameDatabase/ITables/IAccounts.h index a0377f4b..e130ddc5 100644 --- a/dDatabase/GameDatabase/ITables/IAccounts.h +++ b/dDatabase/GameDatabase/ITables/IAccounts.h @@ -1,5 +1,5 @@ -#ifndef __IACCOUNTS__H__ -#define __IACCOUNTS__H__ +#ifndef IACCOUNTS_H +#define IACCOUNTS_H #include #include @@ -38,4 +38,4 @@ public: virtual void UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) = 0; }; -#endif //!__IACCOUNTS__H__ +#endif //!IACCOUNTS_H diff --git a/dDatabase/GameDatabase/ITables/IAccountsRewardCodes.h b/dDatabase/GameDatabase/ITables/IAccountsRewardCodes.h index 2fcb9d2a..7854684b 100644 --- a/dDatabase/GameDatabase/ITables/IAccountsRewardCodes.h +++ b/dDatabase/GameDatabase/ITables/IAccountsRewardCodes.h @@ -1,5 +1,5 @@ -#ifndef __IACCOUNTSREWARDCODES__H__ -#define __IACCOUNTSREWARDCODES__H__ +#ifndef IACCOUNTSREWARDCODES_H +#define IACCOUNTSREWARDCODES_H #include #include @@ -10,4 +10,4 @@ public: virtual std::vector GetRewardCodesByAccountID(const uint32_t account_id) = 0; }; -#endif //!__IACCOUNTSREWARDCODES__H__ +#endif //!IACCOUNTSREWARDCODES_H diff --git a/dDatabase/GameDatabase/ITables/IActivityLog.h b/dDatabase/GameDatabase/ITables/IActivityLog.h index a67b61a4..49ad1a4a 100644 --- a/dDatabase/GameDatabase/ITables/IActivityLog.h +++ b/dDatabase/GameDatabase/ITables/IActivityLog.h @@ -1,5 +1,5 @@ -#ifndef __IACTIVITYLOG__H__ -#define __IACTIVITYLOG__H__ +#ifndef IACTIVITYLOG_H +#define IACTIVITYLOG_H #include @@ -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 diff --git a/dDatabase/GameDatabase/ITables/IBugReports.h b/dDatabase/GameDatabase/ITables/IBugReports.h index 29a6180f..9f258f78 100644 --- a/dDatabase/GameDatabase/ITables/IBugReports.h +++ b/dDatabase/GameDatabase/ITables/IBugReports.h @@ -1,5 +1,5 @@ -#ifndef __IBUGREPORTS__H__ -#define __IBUGREPORTS__H__ +#ifndef IBUGREPORTS_H +#define IBUGREPORTS_H #include #include @@ -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 diff --git a/dDatabase/GameDatabase/ITables/ICharInfo.h b/dDatabase/GameDatabase/ITables/ICharInfo.h index 416dad2c..29cc1095 100644 --- a/dDatabase/GameDatabase/ITables/ICharInfo.h +++ b/dDatabase/GameDatabase/ITables/ICharInfo.h @@ -1,5 +1,5 @@ -#ifndef __ICHARINFO__H__ -#define __ICHARINFO__H__ +#ifndef ICHARINFO_H +#define ICHARINFO_H #include #include @@ -46,4 +46,4 @@ public: virtual void UpdateLastLoggedInCharacter(const uint32_t characterId) = 0; }; -#endif //!__ICHARINFO__H__ +#endif //!ICHARINFO_H diff --git a/dDatabase/GameDatabase/ITables/ICharXml.h b/dDatabase/GameDatabase/ITables/ICharXml.h index c7ada075..fb28906e 100644 --- a/dDatabase/GameDatabase/ITables/ICharXml.h +++ b/dDatabase/GameDatabase/ITables/ICharXml.h @@ -1,5 +1,5 @@ -#ifndef __ICHARXML__H__ -#define __ICHARXML__H__ +#ifndef ICHARXML_H +#define ICHARXML_H #include #include @@ -17,4 +17,4 @@ public: virtual void InsertCharacterXml(const uint32_t characterId, const std::string_view lxfml) = 0; }; -#endif //!__ICHARXML__H__ +#endif //!ICHARXML_H diff --git a/dDatabase/GameDatabase/ITables/ICommandLog.h b/dDatabase/GameDatabase/ITables/ICommandLog.h index 63595360..db5c353a 100644 --- a/dDatabase/GameDatabase/ITables/ICommandLog.h +++ b/dDatabase/GameDatabase/ITables/ICommandLog.h @@ -1,5 +1,5 @@ -#ifndef __ICOMMANDLOG__H__ -#define __ICOMMANDLOG__H__ +#ifndef ICOMMANDLOG_H +#define ICOMMANDLOG_H #include #include @@ -11,4 +11,4 @@ public: virtual void InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) = 0; }; -#endif //!__ICOMMANDLOG__H__ +#endif //!ICOMMANDLOG_H diff --git a/dDatabase/GameDatabase/ITables/IFriends.h b/dDatabase/GameDatabase/ITables/IFriends.h index 6f96f441..bf0e1c3a 100644 --- a/dDatabase/GameDatabase/ITables/IFriends.h +++ b/dDatabase/GameDatabase/ITables/IFriends.h @@ -1,5 +1,5 @@ -#ifndef __IFRIENDS__H__ -#define __IFRIENDS__H__ +#ifndef IFRIENDS_H +#define IFRIENDS_H #include #include @@ -29,4 +29,4 @@ public: virtual void RemoveFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) = 0; }; -#endif //!__IFRIENDS__H__ +#endif //!IFRIENDS_H diff --git a/dDatabase/GameDatabase/ITables/IIgnoreList.h b/dDatabase/GameDatabase/ITables/IIgnoreList.h index cf831203..d6a8d7db 100644 --- a/dDatabase/GameDatabase/ITables/IIgnoreList.h +++ b/dDatabase/GameDatabase/ITables/IIgnoreList.h @@ -1,5 +1,5 @@ -#ifndef __IIGNORELIST__H__ -#define __IIGNORELIST__H__ +#ifndef IIGNORELIST_H +#define IIGNORELIST_H #include #include @@ -17,4 +17,4 @@ public: virtual void RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) = 0; }; -#endif //!__IIGNORELIST__H__ +#endif //!IIGNORELIST_H diff --git a/dDatabase/GameDatabase/ITables/ILeaderboard.h b/dDatabase/GameDatabase/ITables/ILeaderboard.h index 84d44eb2..b8d6621a 100644 --- a/dDatabase/GameDatabase/ITables/ILeaderboard.h +++ b/dDatabase/GameDatabase/ITables/ILeaderboard.h @@ -1,5 +1,5 @@ -#ifndef __ILEADERBOARD__H__ -#define __ILEADERBOARD__H__ +#ifndef ILEADERBOARD_H +#define ILEADERBOARD_H #include #include @@ -11,4 +11,4 @@ public: virtual std::optional GetDonationTotal(const uint32_t activityId) = 0; }; -#endif //!__ILEADERBOARD__H__ +#endif //!ILEADERBOARD_H diff --git a/dDatabase/GameDatabase/ITables/IMail.h b/dDatabase/GameDatabase/ITables/IMail.h index 7fbc8230..01e858f6 100644 --- a/dDatabase/GameDatabase/ITables/IMail.h +++ b/dDatabase/GameDatabase/ITables/IMail.h @@ -1,5 +1,5 @@ -#ifndef __IMAIL__H__ -#define __IMAIL__H__ +#ifndef IMAIL_H +#define IMAIL_H #include #include @@ -51,4 +51,4 @@ public: virtual void DeleteMail(const uint64_t mailId) = 0; }; -#endif //!__IMAIL__H__ +#endif //!IMAIL_H diff --git a/dDatabase/GameDatabase/ITables/IMigrationHistory.h b/dDatabase/GameDatabase/ITables/IMigrationHistory.h index 21f27b4a..e5b03686 100644 --- a/dDatabase/GameDatabase/ITables/IMigrationHistory.h +++ b/dDatabase/GameDatabase/ITables/IMigrationHistory.h @@ -1,5 +1,5 @@ -#ifndef __IMIGRATIONHISTORY__H__ -#define __IMIGRATIONHISTORY__H__ +#ifndef IMIGRATIONHISTORY_H +#define IMIGRATIONHISTORY_H #include @@ -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 diff --git a/dDatabase/GameDatabase/ITables/IObjectIdTracker.h b/dDatabase/GameDatabase/ITables/IObjectIdTracker.h index cbe34b6d..72f6c909 100644 --- a/dDatabase/GameDatabase/ITables/IObjectIdTracker.h +++ b/dDatabase/GameDatabase/ITables/IObjectIdTracker.h @@ -1,5 +1,5 @@ -#ifndef __IOBJECTIDTRACKER__H__ -#define __IOBJECTIDTRACKER__H__ +#ifndef IOBJECTIDTRACKER_H +#define IOBJECTIDTRACKER_H #include #include @@ -16,4 +16,4 @@ public: virtual void UpdatePersistentId(const uint32_t newId) = 0; }; -#endif //!__IOBJECTIDTRACKER__H__ +#endif //!IOBJECTIDTRACKER_H diff --git a/dDatabase/GameDatabase/ITables/IPetNames.h b/dDatabase/GameDatabase/ITables/IPetNames.h index e82f4905..37d9f321 100644 --- a/dDatabase/GameDatabase/ITables/IPetNames.h +++ b/dDatabase/GameDatabase/ITables/IPetNames.h @@ -1,5 +1,5 @@ -#ifndef __IPETNAMES__H__ -#define __IPETNAMES__H__ +#ifndef IPETNAMES_H +#define IPETNAMES_H #include #include @@ -18,4 +18,4 @@ public: virtual std::optional GetPetNameInfo(const LWOOBJID& petId) = 0; }; -#endif //!__IPETNAMES__H__ +#endif //!IPETNAMES_H diff --git a/dDatabase/GameDatabase/ITables/IPlayKeys.h b/dDatabase/GameDatabase/ITables/IPlayKeys.h index 0a1db389..90cc3bf1 100644 --- a/dDatabase/GameDatabase/ITables/IPlayKeys.h +++ b/dDatabase/GameDatabase/ITables/IPlayKeys.h @@ -1,5 +1,5 @@ -#ifndef __IPLAYKEYS__H__ -#define __IPLAYKEYS__H__ +#ifndef IPLAYKEYS_H +#define IPLAYKEYS_H #include #include @@ -12,4 +12,4 @@ public: virtual std::optional IsPlaykeyActive(const int32_t playkeyId) = 0; }; -#endif //!__IPLAYKEYS__H__ +#endif //!IPLAYKEYS_H diff --git a/dDatabase/GameDatabase/ITables/IPlayerCheatDetections.h b/dDatabase/GameDatabase/ITables/IPlayerCheatDetections.h index 939f5118..4423a15d 100644 --- a/dDatabase/GameDatabase/ITables/IPlayerCheatDetections.h +++ b/dDatabase/GameDatabase/ITables/IPlayerCheatDetections.h @@ -1,5 +1,5 @@ -#ifndef __IPLAYERCHEATDETECTIONS__H__ -#define __IPLAYERCHEATDETECTIONS__H__ +#ifndef IPLAYERCHEATDETECTIONS_H +#define IPLAYERCHEATDETECTIONS_H #include #include @@ -17,4 +17,4 @@ public: virtual void InsertCheatDetection(const IPlayerCheatDetections::Info& info) = 0; }; -#endif //!__IPLAYERCHEATDETECTIONS__H__ +#endif //!IPLAYERCHEATDETECTIONS_H diff --git a/dDatabase/GameDatabase/ITables/IProperty.h b/dDatabase/GameDatabase/ITables/IProperty.h index 54994b51..304f4750 100644 --- a/dDatabase/GameDatabase/ITables/IProperty.h +++ b/dDatabase/GameDatabase/ITables/IProperty.h @@ -1,5 +1,5 @@ -#ifndef __IPROPERTY__H__ -#define __IPROPERTY__H__ +#ifndef IPROPERTY_H +#define IPROPERTY_H #include #include @@ -35,4 +35,4 @@ public: // Insert a new property into the database. virtual void InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) = 0; }; -#endif //!__IPROPERTY__H__ +#endif //!IPROPERTY_H diff --git a/dDatabase/GameDatabase/ITables/IPropertyContents.h b/dDatabase/GameDatabase/ITables/IPropertyContents.h index 0d8d8b5c..82f0f83e 100644 --- a/dDatabase/GameDatabase/ITables/IPropertyContents.h +++ b/dDatabase/GameDatabase/ITables/IPropertyContents.h @@ -1,5 +1,5 @@ -#ifndef __IPROPERTIESCONTENTS__H__ -#define __IPROPERTIESCONTENTS__H__ +#ifndef IPROPERTIESCONTENTS_H +#define IPROPERTIESCONTENTS_H #include #include @@ -39,4 +39,4 @@ public: // Remove the model for the given property id. virtual void RemoveModel(const LWOOBJID& modelId) = 0; }; -#endif //!__IPROPERTIESCONTENTS__H__ +#endif //!IPROPERTIESCONTENTS_H diff --git a/dDatabase/GameDatabase/ITables/IServers.h b/dDatabase/GameDatabase/ITables/IServers.h index ee74bbb8..b3bee330 100644 --- a/dDatabase/GameDatabase/ITables/IServers.h +++ b/dDatabase/GameDatabase/ITables/IServers.h @@ -1,5 +1,5 @@ -#ifndef __ISERVERS__H__ -#define __ISERVERS__H__ +#ifndef ISERVERS_H +#define ISERVERS_H #include #include @@ -18,4 +18,4 @@ public: virtual std::optional GetMasterInfo() = 0; }; -#endif //!__ISERVERS__H__ +#endif //!ISERVERS_H diff --git a/dDatabase/GameDatabase/ITables/IUgc.h b/dDatabase/GameDatabase/ITables/IUgc.h index 024636ac..98f2a066 100644 --- a/dDatabase/GameDatabase/ITables/IUgc.h +++ b/dDatabase/GameDatabase/ITables/IUgc.h @@ -1,5 +1,5 @@ -#ifndef __IUGC__H__ -#define __IUGC__H__ +#ifndef IUGC_H +#define IUGC_H #include #include @@ -29,4 +29,4 @@ public: // Inserts a new UGC model into the database. virtual void UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) = 0; }; -#endif //!__IUGC__H__ +#endif //!IUGC_H diff --git a/dDatabase/GameDatabase/MySQL/MySQLDatabase.h b/dDatabase/GameDatabase/MySQL/MySQLDatabase.h index a3019bea..179a42cc 100644 --- a/dDatabase/GameDatabase/MySQL/MySQLDatabase.h +++ b/dDatabase/GameDatabase/MySQL/MySQLDatabase.h @@ -1,5 +1,5 @@ -#ifndef __MYSQLDATABASE__H__ -#define __MYSQLDATABASE__H__ +#ifndef MYSQLDATABASE_H +#define MYSQLDATABASE_H #include #include @@ -251,4 +251,4 @@ inline void SetParam(UniquePreppedStmtRef stmt, const int index, const std::opti } } -#endif //!__MYSQLDATABASE__H__ +#endif //!MYSQLDATABASE_H diff --git a/dGame/LeaderboardManager.h b/dGame/LeaderboardManager.h index 527ae02d..ba706c1b 100644 --- a/dGame/LeaderboardManager.h +++ b/dGame/LeaderboardManager.h @@ -1,5 +1,5 @@ -#ifndef __LEADERBOARDMANAGER__H__ -#define __LEADERBOARDMANAGER__H__ +#ifndef LEADERBOARDMANAGER_H +#define LEADERBOARDMANAGER_H #include #include @@ -130,4 +130,4 @@ namespace LeaderboardManager { extern std::map leaderboardCache; }; -#endif //!__LEADERBOARDMANAGER__H__ +#endif //!LEADERBOARDMANAGER_H diff --git a/dGame/PlayerManager.h b/dGame/PlayerManager.h index 7f6be5ba..8ea1efbf 100644 --- a/dGame/PlayerManager.h +++ b/dGame/PlayerManager.h @@ -1,5 +1,5 @@ -#ifndef __PLAYERMANAGER__H__ -#define __PLAYERMANAGER__H__ +#ifndef PLAYERMANAGER_H +#define PLAYERMANAGER_H #include "dCommonVars.h" @@ -22,4 +22,4 @@ namespace PlayerManager { const std::vector& GetAllPlayers(); }; -#endif //!__PLAYERMANAGER__H__ +#endif //!PLAYERMANAGER_H diff --git a/dGame/dBehaviors/VentureVisionBehavior.h b/dGame/dBehaviors/VentureVisionBehavior.h index ee89dae9..16cda64b 100644 --- a/dGame/dBehaviors/VentureVisionBehavior.h +++ b/dGame/dBehaviors/VentureVisionBehavior.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __VENTUREVISIONBEHAVIOR__H__ -#define __VENTUREVISIONBEHAVIOR__H__ +#ifndef VENTUREVISIONBEHAVIOR_H +#define VENTUREVISIONBEHAVIOR_H #include "Behavior.h" @@ -37,4 +37,4 @@ public: void Load() override; }; -#endif //!__VENTUREVISIONBEHAVIOR__H__ +#endif //!VENTUREVISIONBEHAVIOR_H diff --git a/dGame/dComponents/AchievementCacheKey.h b/dGame/dComponents/AchievementCacheKey.h index 398e0231..28ff825c 100644 --- a/dGame/dComponents/AchievementCacheKey.h +++ b/dGame/dComponents/AchievementCacheKey.h @@ -1,7 +1,7 @@ #include "eMissionTaskType.h" -#ifndef __ACHIEVEMENTCACHEKEY__H__ -#define __ACHIEVEMENTCACHEKEY__H__ +#ifndef ACHIEVEMENTCACHEKEY_H +#define ACHIEVEMENTCACHEKEY_H class AchievementCacheKey { public: @@ -42,4 +42,4 @@ namespace std { }; }; -#endif //!__ACHIEVEMENTCACHEKEY__H__ +#endif //!ACHIEVEMENTCACHEKEY_H diff --git a/dGame/dComponents/AchievementVendorComponent.h b/dGame/dComponents/AchievementVendorComponent.h index ba6c7c2a..c57220a7 100644 --- a/dGame/dComponents/AchievementVendorComponent.h +++ b/dGame/dComponents/AchievementVendorComponent.h @@ -1,5 +1,5 @@ -#ifndef __ACHIEVEMENTVENDORCOMPONENT__H__ -#define __ACHIEVEMENTVENDORCOMPONENT__H__ +#ifndef ACHIEVEMENTVENDORCOMPONENT_H +#define ACHIEVEMENTVENDORCOMPONENT_H #include "VendorComponent.h" #include "eReplicaComponentType.h" @@ -22,4 +22,4 @@ private: }; -#endif //!__ACHIEVEMENTVENDORCOMPONENT__H__ +#endif //!ACHIEVEMENTVENDORCOMPONENT_H diff --git a/dGame/dComponents/CollectibleComponent.h b/dGame/dComponents/CollectibleComponent.h index 5ecfb97e..095b0ee2 100644 --- a/dGame/dComponents/CollectibleComponent.h +++ b/dGame/dComponents/CollectibleComponent.h @@ -1,5 +1,5 @@ -#ifndef __COLLECTIBLECOMPONENT__H__ -#define __COLLECTIBLECOMPONENT__H__ +#ifndef COLLECTIBLECOMPONENT_H +#define COLLECTIBLECOMPONENT_H #include "Component.h" #include "eReplicaComponentType.h" @@ -15,4 +15,4 @@ private: int16_t m_CollectibleId = 0; }; -#endif //!__COLLECTIBLECOMPONENT__H__ +#endif //!COLLECTIBLECOMPONENT_H diff --git a/dGame/dComponents/DonationVendorComponent.h b/dGame/dComponents/DonationVendorComponent.h index af1eb829..d28166d6 100644 --- a/dGame/dComponents/DonationVendorComponent.h +++ b/dGame/dComponents/DonationVendorComponent.h @@ -1,5 +1,5 @@ -#ifndef __DONATIONVENDORCOMPONENT__H__ -#define __DONATIONVENDORCOMPONENT__H__ +#ifndef DONATIONVENDORCOMPONENT_H +#define DONATIONVENDORCOMPONENT_H #include "VendorComponent.h" #include "eReplicaComponentType.h" @@ -24,4 +24,4 @@ private: }; -#endif //!__DONATIONVENDORCOMPONENT__H__ +#endif //!DONATIONVENDORCOMPONENT_H diff --git a/dGame/dComponents/GhostComponent.h b/dGame/dComponents/GhostComponent.h index de0fb886..96592e4d 100644 --- a/dGame/dComponents/GhostComponent.h +++ b/dGame/dComponents/GhostComponent.h @@ -1,5 +1,5 @@ -#ifndef __GHOSTCOMPONENT__H__ -#define __GHOSTCOMPONENT__H__ +#ifndef GHOSTCOMPONENT_H +#define GHOSTCOMPONENT_H #include "Component.h" #include "eReplicaComponentType.h" @@ -51,4 +51,4 @@ private: bool m_GhostOverride; }; -#endif //!__GHOSTCOMPONENT__H__ +#endif //!GHOSTCOMPONENT_H diff --git a/dGame/dComponents/ItemComponent.h b/dGame/dComponents/ItemComponent.h index 1a02ad11..90f12b0f 100644 --- a/dGame/dComponents/ItemComponent.h +++ b/dGame/dComponents/ItemComponent.h @@ -1,5 +1,5 @@ -#ifndef __ITEMCOMPONENT__H__ -#define __ITEMCOMPONENT__H__ +#ifndef ITEMCOMPONENT_H +#define ITEMCOMPONENT_H #include "Component.h" #include "eReplicaComponentType.h" @@ -13,4 +13,4 @@ public: void Serialize(RakNet::BitStream& bitStream, bool isConstruction) override; }; -#endif //!__ITEMCOMPONENT__H__ +#endif //!ITEMCOMPONENT_H diff --git a/dGame/dComponents/MiniGameControlComponent.h b/dGame/dComponents/MiniGameControlComponent.h index 2cd9ac6a..36d78464 100644 --- a/dGame/dComponents/MiniGameControlComponent.h +++ b/dGame/dComponents/MiniGameControlComponent.h @@ -1,5 +1,5 @@ -#ifndef __MINIGAMECONTROLCOMPONENT__H__ -#define __MINIGAMECONTROLCOMPONENT__H__ +#ifndef MINIGAMECONTROLCOMPONENT_H +#define MINIGAMECONTROLCOMPONENT_H #include "Component.h" #include "eReplicaComponentType.h" @@ -12,4 +12,4 @@ public: void Serialize(RakNet::BitStream& outBitStream, bool isConstruction); }; -#endif //!__MINIGAMECONTROLCOMPONENT__H__ +#endif //!MINIGAMECONTROLCOMPONENT_H diff --git a/dGame/dComponents/PhysicsComponent.h b/dGame/dComponents/PhysicsComponent.h index 4bf0828a..e73b4c32 100644 --- a/dGame/dComponents/PhysicsComponent.h +++ b/dGame/dComponents/PhysicsComponent.h @@ -1,5 +1,5 @@ -#ifndef __PHYSICSCOMPONENT__H__ -#define __PHYSICSCOMPONENT__H__ +#ifndef PHYSICSCOMPONENT_H +#define PHYSICSCOMPONENT_H #include "Component.h" #include "NiPoint3.h" @@ -39,4 +39,4 @@ protected: bool m_DirtyPosition; }; -#endif //!__PHYSICSCOMPONENT__H__ +#endif //!PHYSICSCOMPONENT_H diff --git a/dGame/dComponents/RacingSoundTriggerComponent.h b/dGame/dComponents/RacingSoundTriggerComponent.h index 140bbe20..744b5354 100644 --- a/dGame/dComponents/RacingSoundTriggerComponent.h +++ b/dGame/dComponents/RacingSoundTriggerComponent.h @@ -1,5 +1,5 @@ -#ifndef __RACINGSOUNDTRIGGERCOMPONENT__H__ -#define __RACINGSOUNDTRIGGERCOMPONENT__H__ +#ifndef RACINGSOUNDTRIGGERCOMPONENT_H +#define RACINGSOUNDTRIGGERCOMPONENT_H #include "SoundTriggerComponent.h" #include "eReplicaComponentType.h" @@ -12,4 +12,4 @@ public: RacingSoundTriggerComponent(Entity* parent) : SoundTriggerComponent(parent){}; }; -#endif //!__RACINGSOUNDTRIGGERCOMPONENT__H__ +#endif //!RACINGSOUNDTRIGGERCOMPONENT_H diff --git a/dGame/dComponents/RacingStatsComponent.h b/dGame/dComponents/RacingStatsComponent.h index ad1b35bf..8c503563 100644 --- a/dGame/dComponents/RacingStatsComponent.h +++ b/dGame/dComponents/RacingStatsComponent.h @@ -1,5 +1,5 @@ -#ifndef __RACINGSTATSCOMPONENT__H__ -#define __RACINGSTATSCOMPONENT__H__ +#ifndef RACINGSTATSCOMPONENT_H +#define RACINGSTATSCOMPONENT_H #include "Component.h" #include "eReplicaComponentType.h" @@ -11,4 +11,4 @@ public: RacingStatsComponent(Entity* parent) : Component(parent) {} }; -#endif //!__RACINGSTATSCOMPONENT__H__ +#endif //!RACINGSTATSCOMPONENT_H diff --git a/dGame/dComponents/ScriptedActivityComponent.h b/dGame/dComponents/ScriptedActivityComponent.h index 308a0a86..2a52dbb2 100644 --- a/dGame/dComponents/ScriptedActivityComponent.h +++ b/dGame/dComponents/ScriptedActivityComponent.h @@ -1,5 +1,5 @@ -#ifndef __SCRIPTEDACTIVITYCOMPONENT__H__ -#define __SCRIPTEDACTIVITYCOMPONENT__H__ +#ifndef SCRIPTEDACTIVITYCOMPONENT_H +#define SCRIPTEDACTIVITYCOMPONENT_H #include "ActivityComponent.h" #include "eReplicaComponentType.h" @@ -12,4 +12,4 @@ public: ScriptedActivityComponent(Entity* parent, int activityID) : ActivityComponent(parent, activityID){}; }; -#endif //!__SCRIPTEDACTIVITYCOMPONENT__H__ +#endif //!SCRIPTEDACTIVITYCOMPONENT_H diff --git a/dGame/dComponents/TriggerComponent.h b/dGame/dComponents/TriggerComponent.h index 94a7682e..07bfba89 100644 --- a/dGame/dComponents/TriggerComponent.h +++ b/dGame/dComponents/TriggerComponent.h @@ -1,5 +1,5 @@ -#ifndef __TRIGGERCOMPONENT__H__ -#define __TRIGGERCOMPONENT__H__ +#ifndef TRIGGERCOMPONENT_H +#define TRIGGERCOMPONENT_H #include "Component.h" #include "LUTriggers.h" @@ -53,4 +53,4 @@ private: LUTriggers::Trigger* m_Trigger; }; -#endif //!__TRIGGERCOMPONENT__H__ +#endif //!TRIGGERCOMPONENT_H diff --git a/dGame/dGameMessages/DoClientProjectileImpact.h b/dGame/dGameMessages/DoClientProjectileImpact.h index b8e3b528..1d74b3c7 100644 --- a/dGame/dGameMessages/DoClientProjectileImpact.h +++ b/dGame/dGameMessages/DoClientProjectileImpact.h @@ -1,5 +1,5 @@ -#ifndef __DOCLIENTPROJECTILEIMPACT__H__ -#define __DOCLIENTPROJECTILEIMPACT__H__ +#ifndef DOCLIENTPROJECTILEIMPACT_H +#define DOCLIENTPROJECTILEIMPACT_H #include "dCommonVars.h" @@ -77,4 +77,4 @@ public: std::string sBitStream; }; -#endif //!__DOCLIENTPROJECTILEIMPACT__H__ +#endif //!DOCLIENTPROJECTILEIMPACT_H diff --git a/dGame/dGameMessages/EchoStartSkill.h b/dGame/dGameMessages/EchoStartSkill.h index dfb79021..8ebc5d55 100644 --- a/dGame/dGameMessages/EchoStartSkill.h +++ b/dGame/dGameMessages/EchoStartSkill.h @@ -1,5 +1,5 @@ -#ifndef __ECHOSTARTSKILL__H__ -#define __ECHOSTARTSKILL__H__ +#ifndef ECHOSTARTSKILL_H +#define ECHOSTARTSKILL_H #include "dCommonVars.h" #include "NiPoint3.h" @@ -127,4 +127,4 @@ public: uint32_t uiSkillHandle; }; -#endif //!__ECHOSTARTSKILL__H__ +#endif //!ECHOSTARTSKILL_H diff --git a/dGame/dGameMessages/EchoSyncSkill.h b/dGame/dGameMessages/EchoSyncSkill.h index f65daab7..87b7f1e9 100644 --- a/dGame/dGameMessages/EchoSyncSkill.h +++ b/dGame/dGameMessages/EchoSyncSkill.h @@ -1,5 +1,5 @@ -#ifndef __ECHOSYNCSKILL__H__ -#define __ECHOSYNCSKILL__H__ +#ifndef ECHOSYNCSKILL_H +#define ECHOSYNCSKILL_H #include @@ -65,4 +65,4 @@ public: uint32_t uiSkillHandle{}; }; -#endif //!__ECHOSYNCSKILL__H__ +#endif //!ECHOSYNCSKILL_H diff --git a/dGame/dGameMessages/RequestServerProjectileImpact.h b/dGame/dGameMessages/RequestServerProjectileImpact.h index c15090c0..ff5255db 100644 --- a/dGame/dGameMessages/RequestServerProjectileImpact.h +++ b/dGame/dGameMessages/RequestServerProjectileImpact.h @@ -1,5 +1,5 @@ -#ifndef __REQUESTSERVERPROJECTILEIMPACT__H__ -#define __REQUESTSERVERPROJECTILEIMPACT__H__ +#ifndef REQUESTSERVERPROJECTILEIMPACT_H +#define REQUESTSERVERPROJECTILEIMPACT_H #include "dCommonVars.h" #include "eGameMessageType.h" @@ -69,4 +69,4 @@ public: std::string sBitStream; }; -#endif //!__REQUESTSERVERPROJECTILEIMPACT__H__ +#endif //!REQUESTSERVERPROJECTILEIMPACT_H diff --git a/dGame/dGameMessages/StartSkill.h b/dGame/dGameMessages/StartSkill.h index bc0f18d7..c8e72335 100644 --- a/dGame/dGameMessages/StartSkill.h +++ b/dGame/dGameMessages/StartSkill.h @@ -1,5 +1,5 @@ -#ifndef __STARTSKILL__H__ -#define __STARTSKILL__H__ +#ifndef STARTSKILL_H +#define STARTSKILL_H #include "dCommonVars.h" #include "NiPoint3.h" @@ -139,4 +139,4 @@ public: uint32_t uiSkillHandle = 0; }; -#endif //!__STARTSKILL__H__ +#endif //!STARTSKILL_H diff --git a/dGame/dGameMessages/SyncSkill.h b/dGame/dGameMessages/SyncSkill.h index b881d270..9354e225 100644 --- a/dGame/dGameMessages/SyncSkill.h +++ b/dGame/dGameMessages/SyncSkill.h @@ -1,5 +1,5 @@ -#ifndef __SYNCSKILL__H__ -#define __SYNCSKILL__H__ +#ifndef SYNCSKILL_H +#define SYNCSKILL_H #include #include @@ -64,4 +64,4 @@ public: uint32_t uiSkillHandle{}; }; -#endif //!__SYNCSKILL__H__ +#endif //!SYNCSKILL_H diff --git a/dGame/dPropertyBehaviors/BehaviorStates.h b/dGame/dPropertyBehaviors/BehaviorStates.h index 80cb1dbb..af5e2146 100644 --- a/dGame/dPropertyBehaviors/BehaviorStates.h +++ b/dGame/dPropertyBehaviors/BehaviorStates.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __BEHAVIORSTATES__H__ -#define __BEHAVIORSTATES__H__ +#ifndef BEHAVIORSTATES_H +#define BEHAVIORSTATES_H #include @@ -14,4 +14,4 @@ enum class BehaviorState : uint32_t { STAR_STATE //!< The STAR behavior state }; -#endif //!__BEHAVIORSTATES__H__ +#endif //!BEHAVIORSTATES_H diff --git a/dGame/dPropertyBehaviors/BlockDefinition.h b/dGame/dPropertyBehaviors/BlockDefinition.h index 84722ea2..6d869217 100644 --- a/dGame/dPropertyBehaviors/BlockDefinition.h +++ b/dGame/dPropertyBehaviors/BlockDefinition.h @@ -1,5 +1,5 @@ -#ifndef __BLOCKDEFINITION__H__ -#define __BLOCKDEFINITION__H__ +#ifndef BLOCKDEFINITION_H +#define BLOCKDEFINITION_H #include @@ -23,4 +23,4 @@ private: float m_MaximumValue; }; -#endif //!__BLOCKDEFINITION__H__ +#endif //!BLOCKDEFINITION_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.h index 8146e08d..37b1eaf8 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.h @@ -1,5 +1,5 @@ -#ifndef __ACTION__H__ -#define __ACTION__H__ +#ifndef ACTION_H +#define ACTION_H #include @@ -33,4 +33,4 @@ private: std::string m_ValueParameterString{ "" }; }; -#endif //!__ACTION__H__ +#endif //!ACTION_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/ActionContext.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/ActionContext.h index 8ecea8a2..0494adbc 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/ActionContext.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/ActionContext.h @@ -1,5 +1,5 @@ -#ifndef __ACTIONCONTEXT__H__ -#define __ACTIONCONTEXT__H__ +#ifndef ACTIONCONTEXT_H +#define ACTIONCONTEXT_H #include "BehaviorStates.h" #include "dCommonVars.h" @@ -24,4 +24,4 @@ private: BehaviorState m_StateId{ BehaviorState::HOME_STATE }; }; -#endif //!__ACTIONCONTEXT__H__ +#endif //!ACTIONCONTEXT_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddActionMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddActionMessage.h index 7f94820d..a4d7ec8f 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddActionMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddActionMessage.h @@ -1,5 +1,5 @@ -#ifndef __ADDACTIONMESSAGE__H__ -#define __ADDACTIONMESSAGE__H__ +#ifndef ADDACTIONMESSAGE_H +#define ADDACTIONMESSAGE_H #include "Action.h" #include "ActionContext.h" @@ -27,4 +27,4 @@ private: Action m_Action; }; -#endif //!__ADDACTIONMESSAGE__H__ +#endif //!ADDACTIONMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddMessage.h index 8bf0b70c..b8b9c690 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddMessage.h @@ -1,5 +1,5 @@ -#ifndef __ADDMESSAGE__H__ -#define __ADDMESSAGE__H__ +#ifndef ADDMESSAGE_H +#define ADDMESSAGE_H #include "BehaviorMessageBase.h" @@ -16,4 +16,4 @@ private: uint32_t m_BehaviorIndex{ 0 }; }; -#endif //!__ADDMESSAGE__H__ +#endif //!ADDMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddStripMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddStripMessage.h index a5361034..964a20b3 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddStripMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/AddStripMessage.h @@ -1,5 +1,5 @@ -#ifndef __ADDSTRIPMESSAGE__H__ -#define __ADDSTRIPMESSAGE__H__ +#ifndef ADDSTRIPMESSAGE_H +#define ADDSTRIPMESSAGE_H #include "ActionContext.h" #include "BehaviorMessageBase.h" @@ -32,4 +32,4 @@ private: std::vector m_ActionsToAdd; }; -#endif //!__ADDSTRIPMESSAGE__H__ +#endif //!ADDSTRIPMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/BehaviorMessageBase.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/BehaviorMessageBase.h index bb251a74..b5ba593a 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/BehaviorMessageBase.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/BehaviorMessageBase.h @@ -1,5 +1,5 @@ -#ifndef __BEHAVIORMESSAGEBASE__H__ -#define __BEHAVIORMESSAGEBASE__H__ +#ifndef BEHAVIORMESSAGEBASE_H +#define BEHAVIORMESSAGEBASE_H #include #include @@ -26,4 +26,4 @@ protected: int32_t m_BehaviorId{ DefaultBehaviorId }; }; -#endif //!__BEHAVIORMESSAGEBASE__H__ +#endif //!BEHAVIORMESSAGEBASE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/ControlBehaviorMsgs.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/ControlBehaviorMsgs.h index 0e17060b..346cd884 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/ControlBehaviorMsgs.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/ControlBehaviorMsgs.h @@ -1,5 +1,5 @@ -#ifndef __CONTROLBEHAVIORMSGS__H__ -#define __CONTROLBEHAVIORMSGS__H__ +#ifndef CONTROLBEHAVIORMSGS_H +#define CONTROLBEHAVIORMSGS_H #include "Action.h" #include "ActionContext.h" @@ -20,4 +20,4 @@ #include "UpdateActionMessage.h" #include "UpdateStripUiMessage.h" -#endif //!__CONTROLBEHAVIORMSGS__H__ +#endif //!CONTROLBEHAVIORMSGS_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/MergeStripsMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/MergeStripsMessage.h index d778d632..01a0e16e 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/MergeStripsMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/MergeStripsMessage.h @@ -1,5 +1,5 @@ -#ifndef __MERGESTRIPSMESSAGE__H__ -#define __MERGESTRIPSMESSAGE__H__ +#ifndef MERGESTRIPSMESSAGE_H +#define MERGESTRIPSMESSAGE_H #include "Action.h" #include "ActionContext.h" @@ -32,4 +32,4 @@ private: ActionContext m_DestinationActionContext; }; -#endif //!__MERGESTRIPSMESSAGE__H__ +#endif //!MERGESTRIPSMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/MigrateActionsMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/MigrateActionsMessage.h index 9813fbf4..b815d5f0 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/MigrateActionsMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/MigrateActionsMessage.h @@ -1,5 +1,5 @@ -#ifndef __MIGRATEACTIONSMESSAGE__H__ -#define __MIGRATEACTIONSMESSAGE__H__ +#ifndef MIGRATEACTIONSMESSAGE_H +#define MIGRATEACTIONSMESSAGE_H #include "Action.h" #include "ActionContext.h" @@ -35,4 +35,4 @@ private: ActionContext m_DestinationActionContext; }; -#endif //!__MIGRATEACTIONSMESSAGE__H__ +#endif //!MIGRATEACTIONSMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/MoveToInventoryMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/MoveToInventoryMessage.h index e1f88713..f126c3e2 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/MoveToInventoryMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/MoveToInventoryMessage.h @@ -1,5 +1,5 @@ -#ifndef __MOVETOINVENTORYMESSAGE__H__ -#define __MOVETOINVENTORYMESSAGE__H__ +#ifndef MOVETOINVENTORYMESSAGE_H +#define MOVETOINVENTORYMESSAGE_H #include "BehaviorMessageBase.h" @@ -18,4 +18,4 @@ private: uint32_t m_BehaviorIndex; }; -#endif //!__MOVETOINVENTORYMESSAGE__H__ +#endif //!MOVETOINVENTORYMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/RearrangeStripMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/RearrangeStripMessage.h index 629757bf..d5a593c1 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/RearrangeStripMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/RearrangeStripMessage.h @@ -1,5 +1,5 @@ -#ifndef __REARRANGESTRIPMESSAGE__H__ -#define __REARRANGESTRIPMESSAGE__H__ +#ifndef REARRANGESTRIPMESSAGE_H +#define REARRANGESTRIPMESSAGE_H #include "ActionContext.h" #include "BehaviorMessageBase.h" @@ -23,4 +23,4 @@ private: ActionContext m_ActionContext; }; -#endif //!__REARRANGESTRIPMESSAGE__H__ +#endif //!REARRANGESTRIPMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/RemoveActionsMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/RemoveActionsMessage.h index 2caa6366..448e2397 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/RemoveActionsMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/RemoveActionsMessage.h @@ -1,5 +1,5 @@ -#ifndef __REMOVEACTIONSMESSAGE__H__ -#define __REMOVEACTIONSMESSAGE__H__ +#ifndef REMOVEACTIONSMESSAGE_H +#define REMOVEACTIONSMESSAGE_H #include "ActionContext.h" #include "BehaviorMessageBase.h" @@ -23,4 +23,4 @@ private: ActionContext m_ActionContext; }; -#endif //!__REMOVEACTIONSMESSAGE__H__ +#endif //!REMOVEACTIONSMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/RemoveStripMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/RemoveStripMessage.h index 37501ea6..71bf29ba 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/RemoveStripMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/RemoveStripMessage.h @@ -1,5 +1,5 @@ -#ifndef __REMOVESTRIPMESSAGE__H__ -#define __REMOVESTRIPMESSAGE__H__ +#ifndef REMOVESTRIPMESSAGE_H +#define REMOVESTRIPMESSAGE_H #include "ActionContext.h" #include "BehaviorMessageBase.h" @@ -18,4 +18,4 @@ private: ActionContext m_ActionContext; }; -#endif //!__REMOVESTRIPMESSAGE__H__ +#endif //!REMOVESTRIPMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/RenameMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/RenameMessage.h index 1f4e45c0..4081a813 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/RenameMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/RenameMessage.h @@ -1,5 +1,5 @@ -#ifndef __RENAMEMESSAGE__H__ -#define __RENAMEMESSAGE__H__ +#ifndef RENAMEMESSAGE_H +#define RENAMEMESSAGE_H #include "BehaviorMessageBase.h" @@ -17,4 +17,4 @@ private: std::string m_Name; }; -#endif //!__RENAMEMESSAGE__H__ +#endif //!RENAMEMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/SplitStripMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/SplitStripMessage.h index 33d6ec6a..4a51e9c7 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/SplitStripMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/SplitStripMessage.h @@ -1,5 +1,5 @@ -#ifndef __SPLITSTRIPMESSAGE__H__ -#define __SPLITSTRIPMESSAGE__H__ +#ifndef SPLITSTRIPMESSAGE_H +#define SPLITSTRIPMESSAGE_H #include "Action.h" #include "ActionContext.h" @@ -37,4 +37,4 @@ private: std::vector m_TransferredActions; }; -#endif //!__SPLITSTRIPMESSAGE__H__ +#endif //!SPLITSTRIPMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.h index 47501ff7..8097c78a 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.h @@ -1,5 +1,5 @@ -#ifndef __STRIPUIPOSITION__H__ -#define __STRIPUIPOSITION__H__ +#ifndef STRIPUIPOSITION_H +#define STRIPUIPOSITION_H class AMFArrayValue; @@ -26,4 +26,4 @@ private: double m_YPosition{ 0.0 }; }; -#endif //!__STRIPUIPOSITION__H__ +#endif //!STRIPUIPOSITION_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateActionMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateActionMessage.h index c53a4d47..cdcb7167 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateActionMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateActionMessage.h @@ -1,5 +1,5 @@ -#ifndef __UPDATEACTIONMESSAGE__H__ -#define __UPDATEACTIONMESSAGE__H__ +#ifndef UPDATEACTIONMESSAGE_H +#define UPDATEACTIONMESSAGE_H #include "Action.h" #include "ActionContext.h" @@ -27,4 +27,4 @@ private: Action m_Action; }; -#endif //!__UPDATEACTIONMESSAGE__H__ +#endif //!UPDATEACTIONMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateStripUiMessage.h b/dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateStripUiMessage.h index e684fd4a..cb299324 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateStripUiMessage.h +++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateStripUiMessage.h @@ -1,5 +1,5 @@ -#ifndef __UPDATESTRIPUIMESSAGE__H__ -#define __UPDATESTRIPUIMESSAGE__H__ +#ifndef UPDATESTRIPUIMESSAGE_H +#define UPDATESTRIPUIMESSAGE_H #include "ActionContext.h" #include "BehaviorMessageBase.h" @@ -24,4 +24,4 @@ private: ActionContext m_ActionContext; }; -#endif //!__UPDATESTRIPUIMESSAGE__H__ +#endif //!UPDATESTRIPUIMESSAGE_H diff --git a/dGame/dPropertyBehaviors/ControlBehaviors.h b/dGame/dPropertyBehaviors/ControlBehaviors.h index f176a070..72909d59 100644 --- a/dGame/dPropertyBehaviors/ControlBehaviors.h +++ b/dGame/dPropertyBehaviors/ControlBehaviors.h @@ -1,7 +1,7 @@ #pragma once -#ifndef __CONTROLBEHAVIORS__H__ -#define __CONTROLBEHAVIORS__H__ +#ifndef CONTROLBEHAVIORS_H +#define CONTROLBEHAVIORS_H #include #include @@ -65,4 +65,4 @@ private: bool isInitialized = false; }; -#endif //!__CONTROLBEHAVIORS__H__ +#endif //!CONTROLBEHAVIORS_H diff --git a/dGame/dPropertyBehaviors/PropertyBehavior.h b/dGame/dPropertyBehaviors/PropertyBehavior.h index 01eb1968..0aa11ec7 100644 --- a/dGame/dPropertyBehaviors/PropertyBehavior.h +++ b/dGame/dPropertyBehaviors/PropertyBehavior.h @@ -1,5 +1,5 @@ -#ifndef __PROPERTYBEHAVIOR__H__ -#define __PROPERTYBEHAVIOR__H__ +#ifndef PROPERTYBEHAVIOR_H +#define PROPERTYBEHAVIOR_H #include "State.h" @@ -54,4 +54,4 @@ private: int32_t m_BehaviorId = -1; }; -#endif //!__PROPERTYBEHAVIOR__H__ +#endif //!PROPERTYBEHAVIOR_H diff --git a/dGame/dPropertyBehaviors/State.h b/dGame/dPropertyBehaviors/State.h index 3e8c827f..4837e583 100644 --- a/dGame/dPropertyBehaviors/State.h +++ b/dGame/dPropertyBehaviors/State.h @@ -1,5 +1,5 @@ -#ifndef __STATE__H__ -#define __STATE__H__ +#ifndef STATE_H +#define STATE_H #include "Strip.h" @@ -23,4 +23,4 @@ private: std::vector m_Strips; }; -#endif //!__STATE__H__ +#endif //!STATE_H diff --git a/dGame/dPropertyBehaviors/Strip.h b/dGame/dPropertyBehaviors/Strip.h index 8fd7d0fe..c659c226 100644 --- a/dGame/dPropertyBehaviors/Strip.h +++ b/dGame/dPropertyBehaviors/Strip.h @@ -1,5 +1,5 @@ -#ifndef __STRIP__H__ -#define __STRIP__H__ +#ifndef STRIP_H +#define STRIP_H #include "Action.h" #include "StripUiPosition.h" @@ -27,4 +27,4 @@ private: StripUiPosition m_Position; }; -#endif //!__STRIP__H__ +#endif //!STRIP_H diff --git a/dGame/dUtilities/BrickDatabase.h b/dGame/dUtilities/BrickDatabase.h index 11c64416..686fae74 100644 --- a/dGame/dUtilities/BrickDatabase.h +++ b/dGame/dUtilities/BrickDatabase.h @@ -1,5 +1,5 @@ -#ifndef __BRICKDATABASE__H__ -#define __BRICKDATABASE__H__ +#ifndef BRICKDATABASE_H +#define BRICKDATABASE_H #pragma once @@ -13,4 +13,4 @@ namespace BrickDatabase { const BrickList& GetBricks(const LxfmlPath& lxfmlPath); }; -#endif //!__BRICKDATABASE__H__ +#endif //!BRICKDATABASE_H diff --git a/dGame/dUtilities/CheatDetection.h b/dGame/dUtilities/CheatDetection.h index ee0dce89..682ccbfc 100644 --- a/dGame/dUtilities/CheatDetection.h +++ b/dGame/dUtilities/CheatDetection.h @@ -1,5 +1,5 @@ -#ifndef __CHEATDETECTION__H__ -#define __CHEATDETECTION__H__ +#ifndef CHEATDETECTION_H +#define CHEATDETECTION_H #include "dCommonVars.h" @@ -26,5 +26,5 @@ namespace CheatDetection { void ReportCheat(User* user, const SystemAddress& sysAddr, const char* messageIfNotSender, ...); }; -#endif //!__CHEATDETECTION__H__ +#endif //!CHEATDETECTION_H diff --git a/dNet/BitStreamUtils.h b/dNet/BitStreamUtils.h index 33fde564..127b770e 100644 --- a/dNet/BitStreamUtils.h +++ b/dNet/BitStreamUtils.h @@ -1,5 +1,5 @@ -#ifndef __BITSTREAMUTILS__H__ -#define __BITSTREAMUTILS__H__ +#ifndef BITSTREAMUTILS_H +#define BITSTREAMUTILS_H #include "GeneralUtils.h" #include "MessageIdentifiers.h" @@ -102,4 +102,4 @@ namespace RakNet { } }; -#endif //!__BITSTREAMUTILS__H__ +#endif //!BITSTREAMUTILS_H diff --git a/dScripts/02_server/Map/AM/WanderingVendor.h b/dScripts/02_server/Map/AM/WanderingVendor.h index e0cb1645..e6a4b424 100644 --- a/dScripts/02_server/Map/AM/WanderingVendor.h +++ b/dScripts/02_server/Map/AM/WanderingVendor.h @@ -1,5 +1,5 @@ -#ifndef __WANDERINGVENDOR__H__ -#define __WANDERINGVENDOR__H__ +#ifndef WANDERINGVENDOR_H +#define WANDERINGVENDOR_H #include "CppScripts.h" @@ -10,4 +10,4 @@ public: void OnTimerDone(Entity* self, std::string timerName) override; }; -#endif //!__WANDERINGVENDOR__H__ +#endif //!WANDERINGVENDOR_H diff --git a/dScripts/02_server/Map/General/FrictionVolumeServer.h b/dScripts/02_server/Map/General/FrictionVolumeServer.h index 9824daef..f1ad5ed6 100644 --- a/dScripts/02_server/Map/General/FrictionVolumeServer.h +++ b/dScripts/02_server/Map/General/FrictionVolumeServer.h @@ -1,5 +1,5 @@ -#ifndef __FRICTIONVOLUMESERVER__H__ -#define __FRICTIONVOLUMESERVER__H__ +#ifndef FRICTIONVOLUMESERVER_H +#define FRICTIONVOLUMESERVER_H #include "CppScripts.h" @@ -10,4 +10,4 @@ private: const float DefaultFrictionAmount = 1.5f; }; -#endif //!__FRICTIONVOLUMESERVER__H__ +#endif //!FRICTIONVOLUMESERVER_H diff --git a/dScripts/02_server/Map/General/NTNaomiDirtServer.h b/dScripts/02_server/Map/General/NTNaomiDirtServer.h index ed03df47..fbe2afe8 100644 --- a/dScripts/02_server/Map/General/NTNaomiDirtServer.h +++ b/dScripts/02_server/Map/General/NTNaomiDirtServer.h @@ -1,5 +1,5 @@ -#ifndef __NTNAOMIDIRTSERVER__H__ -#define __NTNAOMIDIRTSERVER__H__ +#ifndef NTNAOMIDIRTSERVER_H +#define NTNAOMIDIRTSERVER_H #include "VisToggleNotifierServer.h" @@ -8,4 +8,4 @@ public: void OnStartup(Entity* self) override; }; -#endif //!__NTNAOMIDIRTSERVER__H__ +#endif //!NTNAOMIDIRTSERVER_H diff --git a/dScripts/02_server/Map/General/VisToggleNotifierServer.h b/dScripts/02_server/Map/General/VisToggleNotifierServer.h index c19b65df..abc7f286 100644 --- a/dScripts/02_server/Map/General/VisToggleNotifierServer.h +++ b/dScripts/02_server/Map/General/VisToggleNotifierServer.h @@ -1,5 +1,5 @@ -#ifndef __VISTOGGLENOTIFIERSERVER__H__ -#define __VISTOGGLENOTIFIERSERVER__H__ +#ifndef VISTOGGLENOTIFIERSERVER_H +#define VISTOGGLENOTIFIERSERVER_H #include "CppScripts.h" @@ -12,4 +12,4 @@ private: std::map m_GameVariables; }; -#endif //!__VISTOGGLENOTIFIERSERVER__H__ +#endif //!VISTOGGLENOTIFIERSERVER_H diff --git a/dScripts/02_server/Map/NT/NTPipeVisibilityServer.h b/dScripts/02_server/Map/NT/NTPipeVisibilityServer.h index 2eff5bc3..3e045fa9 100644 --- a/dScripts/02_server/Map/NT/NTPipeVisibilityServer.h +++ b/dScripts/02_server/Map/NT/NTPipeVisibilityServer.h @@ -1,5 +1,5 @@ -#ifndef __NTPIPEVISIBILITYSERVER__H__ -#define __NTPIPEVISIBILITYSERVER__H__ +#ifndef NTPIPEVISIBILITYSERVER_H +#define NTPIPEVISIBILITYSERVER_H #include "CppScripts.h" @@ -8,4 +8,4 @@ public: void OnQuickBuildComplete(Entity* self, Entity* target) override; }; -#endif //!__NTPIPEVISIBILITYSERVER__H__ +#endif //!NTPIPEVISIBILITYSERVER_H diff --git a/dScripts/02_server/Map/NT/NtBcSubmitServer.h b/dScripts/02_server/Map/NT/NtBcSubmitServer.h index 46efa935..3e844b24 100644 --- a/dScripts/02_server/Map/NT/NtBcSubmitServer.h +++ b/dScripts/02_server/Map/NT/NtBcSubmitServer.h @@ -1,5 +1,5 @@ -#ifndef __NTBCSUBMITSERVER__H__ -#define __NTBCSUBMITSERVER__H__ +#ifndef NTBCSUBMITSERVER_H +#define NTBCSUBMITSERVER_H #include "CppScripts.h" @@ -8,4 +8,4 @@ public: void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override; }; -#endif //!__NTBCSUBMITSERVER__H__ +#endif //!NTBCSUBMITSERVER_H diff --git a/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.h b/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.h index 6a82cac7..ac710b9a 100644 --- a/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.h +++ b/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.h @@ -1,5 +1,5 @@ -#ifndef __NTNAOMIBREADCRUMBSERVER__H__ -#define __NTNAOMIBREADCRUMBSERVER__H__ +#ifndef NTNAOMIBREADCRUMBSERVER_H +#define NTNAOMIBREADCRUMBSERVER_H #include "CppScripts.h" @@ -8,4 +8,4 @@ public: void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override; }; -#endif //!__NTNAOMIBREADCRUMBSERVER__H__ +#endif //!NTNAOMIBREADCRUMBSERVER_H diff --git a/dScripts/EquipmentScripts/FireFirstSkillonStartup.h b/dScripts/EquipmentScripts/FireFirstSkillonStartup.h index 6b10f362..512b71dc 100644 --- a/dScripts/EquipmentScripts/FireFirstSkillonStartup.h +++ b/dScripts/EquipmentScripts/FireFirstSkillonStartup.h @@ -1,6 +1,6 @@ #pragma once -#ifndef __FIREFIRSTSKILLONSTARTUP__H__ -#define __FIREFIRSTSKILLONSTARTUP__H__ +#ifndef FIREFIRSTSKILLONSTARTUP_H +#define FIREFIRSTSKILLONSTARTUP_H #include "CppScripts.h" @@ -9,4 +9,4 @@ public: void OnStartup(Entity* self) override; }; -#endif //!__FIREFIRSTSKILLONSTARTUP__H__ +#endif //!FIREFIRSTSKILLONSTARTUP_H diff --git a/dScripts/EquipmentTriggers/CoilBackpackBase.h b/dScripts/EquipmentTriggers/CoilBackpackBase.h index 2d641346..06685a9e 100644 --- a/dScripts/EquipmentTriggers/CoilBackpackBase.h +++ b/dScripts/EquipmentTriggers/CoilBackpackBase.h @@ -1,5 +1,5 @@ -#ifndef __GemPackBase__H__ -#define __GemPackBase__H__ +#ifndef GemPackBase_H +#define GemPackBase_H #include "CppScripts.h" @@ -16,4 +16,4 @@ private: uint32_t m_SkillId = 0; }; -#endif //!__GemPackBase__H__ +#endif //!GemPackBase_H diff --git a/dScripts/EquipmentTriggers/GemPack.h b/dScripts/EquipmentTriggers/GemPack.h index d71181ab..b9cf9e61 100644 --- a/dScripts/EquipmentTriggers/GemPack.h +++ b/dScripts/EquipmentTriggers/GemPack.h @@ -1,5 +1,5 @@ -#ifndef __GEMPACK__H__ -#define __GEMPACK__H__ +#ifndef GEMPACK_H +#define GEMPACK_H #include "CoilBackpackBase.h" @@ -10,4 +10,4 @@ private: static const uint32_t skillId = 1488; }; -#endif //!__GEMPACK__H__ +#endif //!GEMPACK_H diff --git a/dScripts/EquipmentTriggers/ShardArmor.h b/dScripts/EquipmentTriggers/ShardArmor.h index 5486db54..ce6fe1ed 100644 --- a/dScripts/EquipmentTriggers/ShardArmor.h +++ b/dScripts/EquipmentTriggers/ShardArmor.h @@ -1,5 +1,5 @@ -#ifndef __SHARDARMOR__H__ -#define __SHARDARMOR__H__ +#ifndef SHARDARMOR_H +#define SHARDARMOR_H #include "CoilBackpackBase.h" @@ -10,4 +10,4 @@ private: static const uint32_t skillId = 1249; }; -#endif //!__SHARDARMOR__H__ +#endif //!SHARDARMOR_H diff --git a/dScripts/EquipmentTriggers/TeslaPack.h b/dScripts/EquipmentTriggers/TeslaPack.h index 3ba09f5c..06d39886 100644 --- a/dScripts/EquipmentTriggers/TeslaPack.h +++ b/dScripts/EquipmentTriggers/TeslaPack.h @@ -1,5 +1,5 @@ -#ifndef __TESLAPACK__H__ -#define __TESLAPACK__H__ +#ifndef TESLAPACK_H +#define TESLAPACK_H #include "CoilBackpackBase.h" @@ -10,4 +10,4 @@ private: static const uint32_t skillId = 1001; }; -#endif //!__TESLAPACK__H__ +#endif //!TESLAPACK_H diff --git a/dScripts/ai/RACING/OBJECTS/FvRacePillarServer.h b/dScripts/ai/RACING/OBJECTS/FvRacePillarServer.h index 9249177a..58408f26 100644 --- a/dScripts/ai/RACING/OBJECTS/FvRacePillarServer.h +++ b/dScripts/ai/RACING/OBJECTS/FvRacePillarServer.h @@ -1,5 +1,5 @@ -#ifndef FVRACEPILLARSERVER__H -#define FVRACEPILLARSERVER__H +#ifndef FVRACEPILLARSERVER_H +#define FVRACEPILLARSERVER_H #include "CppScripts.h" @@ -9,4 +9,4 @@ protected: void PlayAnimation(const std::string animName, const std::string group, const LOT lot); }; -#endif // FVRACEPILLARSERVER__H +#endif // FVRACEPILLARSERVER_H diff --git a/dScripts/ai/WILD/LupGenericInteract.h b/dScripts/ai/WILD/LupGenericInteract.h index 68949bbf..fdd8d9cb 100644 --- a/dScripts/ai/WILD/LupGenericInteract.h +++ b/dScripts/ai/WILD/LupGenericInteract.h @@ -1,5 +1,5 @@ -#ifndef __LUCGENERICINTERACT__H__ -#define __LUCGENERICINTERACT__H__ +#ifndef LUCGENERICINTERACT_H +#define LUCGENERICINTERACT_H #include "CppScripts.h" @@ -8,5 +8,5 @@ public: void OnUse(Entity* self, Entity* user) override; }; -#endif //!__LUCGENERICINTERACT__H__ +#endif //!LUCGENERICINTERACT_H diff --git a/dScripts/zone/LUPs/RobotCity_Intro/WblRobotCitizen.h b/dScripts/zone/LUPs/RobotCity_Intro/WblRobotCitizen.h index 2f720764..21e2440e 100644 --- a/dScripts/zone/LUPs/RobotCity_Intro/WblRobotCitizen.h +++ b/dScripts/zone/LUPs/RobotCity_Intro/WblRobotCitizen.h @@ -1,5 +1,5 @@ -#ifndef __WBLROBOTCITIZEN__H__ -#define __WBLROBOTCITIZEN__H__ +#ifndef WBLROBOTCITIZEN_H +#define WBLROBOTCITIZEN_H #include "CppScripts.h" @@ -10,4 +10,4 @@ public: void OnTimerDone(Entity* self, std::string timerName) override; }; -#endif //!__WBLROBOTCITIZEN__H__ +#endif //!WBLROBOTCITIZEN_H diff --git a/dServer/Server.h b/dServer/Server.h index 4e9f2543..a1a7c687 100644 --- a/dServer/Server.h +++ b/dServer/Server.h @@ -1,5 +1,5 @@ -#ifndef __SERVER__H__ -#define __SERVER__H__ +#ifndef SERVER_H +#define SERVER_H #include @@ -7,4 +7,4 @@ namespace Server { void SetupLogger(const std::string_view serviceName); }; -#endif //!__SERVER__H__ +#endif //!SERVER_H diff --git a/dZoneManager/LUTriggers.h b/dZoneManager/LUTriggers.h index 75662778..8d0eabc6 100644 --- a/dZoneManager/LUTriggers.h +++ b/dZoneManager/LUTriggers.h @@ -1,5 +1,5 @@ -#ifndef __LUTRIGGERS__H__ -#define __LUTRIGGERS__H__ +#ifndef LUTRIGGERS_H +#define LUTRIGGERS_H #include #include @@ -31,4 +31,4 @@ namespace LUTriggers { }; }; -#endif //!__LUTRIGGERS__H__ +#endif //!LUTRIGGERS_H diff --git a/dZoneManager/WorldConfig.h b/dZoneManager/WorldConfig.h index a98433a1..9671bf08 100644 --- a/dZoneManager/WorldConfig.h +++ b/dZoneManager/WorldConfig.h @@ -1,5 +1,5 @@ -#ifndef __WORLDCONFIG__H__ -#define __WORLDCONFIG__H__ +#ifndef WORLDCONFIG_H +#define WORLDCONFIG_H #include #include @@ -64,4 +64,4 @@ struct WorldConfig { int32_t levelCapCurrencyConversion{}; //! The ratio of UScore (LEGO Score) to coins }; -#endif //! __WORLDCONFIG__H__ +#endif //! WORLDCONFIG_H diff --git a/tests/dCommonTests/dCommonDependencies.h b/tests/dCommonTests/dCommonDependencies.h index e82f4a4b..31246cda 100644 --- a/tests/dCommonTests/dCommonDependencies.h +++ b/tests/dCommonTests/dCommonDependencies.h @@ -1,5 +1,5 @@ -#ifndef __DCOMMONDEPENDENCIES__H__ -#define __DCOMMONDEPENDENCIES__H__ +#ifndef DCOMMONDEPENDENCIES_H +#define DCOMMONDEPENDENCIES_H #include "Game.h" #include "Logger.h" @@ -21,4 +21,4 @@ protected: } }; -#endif //!__DCOMMONDEPENDENCIES__H__ +#endif //!DCOMMONDEPENDENCIES_H diff --git a/tests/dGameTests/GameDependencies.h b/tests/dGameTests/GameDependencies.h index 52e3919a..a08e8c27 100644 --- a/tests/dGameTests/GameDependencies.h +++ b/tests/dGameTests/GameDependencies.h @@ -1,5 +1,5 @@ -#ifndef __GAMEDEPENDENCIES__H__ -#define __GAMEDEPENDENCIES__H__ +#ifndef GAMEDEPENDENCIES_H +#define GAMEDEPENDENCIES_H #include "Game.h" #include "Logger.h" @@ -52,4 +52,4 @@ protected: EntityInfo info{}; }; -#endif //!__GAMEDEPENDENCIES__H__ +#endif //!GAMEDEPENDENCIES_H