make include guards standards conforming

fix compile issues

dGame/LeaderboardManager.h

@@ -1,5 +1,5 @@
-#ifndef __LEADERBOARDMANAGER__H__
-#define __LEADERBOARDMANAGER__H__
+#ifndef LEADERBOARDMANAGER_H
+#define LEADERBOARDMANAGER_H
 
 #include <map>
 #include <memory>
@@ -130,4 +130,4 @@ namespace LeaderboardManager {
 	extern std::map<GameID, Leaderboard::Type> leaderboardCache;
 };
 
-#endif  //!__LEADERBOARDMANAGER__H__
+#endif  //!LEADERBOARDMANAGER_H

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<Entity*>& GetAllPlayers();
 };
 
-#endif  //!__PLAYERMANAGER__H__
+#endif  //!PLAYERMANAGER_H

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

dGame/dGameMessages/EchoSyncSkill.h

@@ -1,5 +1,5 @@
-#ifndef __ECHOSYNCSKILL__H__
-#define __ECHOSYNCSKILL__H__
+#ifndef ECHOSYNCSKILL_H
+#define ECHOSYNCSKILL_H
 
 #include <string>
 
@@ -65,4 +65,4 @@ public:
 	uint32_t uiSkillHandle{};
 };
 
-#endif  //!__ECHOSYNCSKILL__H__
+#endif  //!ECHOSYNCSKILL_H

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

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

dGame/dGameMessages/SyncSkill.h

@@ -1,5 +1,5 @@
-#ifndef __SYNCSKILL__H__
-#define __SYNCSKILL__H__
+#ifndef SYNCSKILL_H
+#define SYNCSKILL_H
 
 #include <cstdint>
 #include <string>
@@ -64,4 +64,4 @@ public:
 	uint32_t uiSkillHandle{};
 };
 
-#endif  //!__SYNCSKILL__H__
+#endif  //!SYNCSKILL_H

dGame/dPropertyBehaviors/BehaviorStates.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __BEHAVIORSTATES__H__
-#define __BEHAVIORSTATES__H__
+#ifndef BEHAVIORSTATES_H
+#define BEHAVIORSTATES_H
 
 #include <cstdint>
 
@@ -14,4 +14,4 @@ enum class BehaviorState : uint32_t {
     STAR_STATE                              //!< The STAR behavior state
 };
 
-#endif  //!__BEHAVIORSTATES__H__
+#endif  //!BEHAVIORSTATES_H

dGame/dPropertyBehaviors/BlockDefinition.h

@@ -1,5 +1,5 @@
-#ifndef __BLOCKDEFINITION__H__
-#define __BLOCKDEFINITION__H__
+#ifndef BLOCKDEFINITION_H
+#define BLOCKDEFINITION_H
 
 #include <string>
 
@@ -23,4 +23,4 @@ private:
 	float m_MaximumValue;
 };
 
-#endif  //!__BLOCKDEFINITION__H__
+#endif  //!BLOCKDEFINITION_H

dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.h

@@ -1,5 +1,5 @@
-#ifndef __ACTION__H__
-#define __ACTION__H__
+#ifndef ACTION_H
+#define ACTION_H
 
 #include <string>
 
@@ -33,4 +33,4 @@ private:
 	std::string m_ValueParameterString{ "" };
 };
 
-#endif  //!__ACTION__H__
+#endif  //!ACTION_H

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

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

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

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<Action> m_ActionsToAdd;
 };
 
-#endif  //!__ADDSTRIPMESSAGE__H__
+#endif  //!ADDSTRIPMESSAGE_H

dGame/dPropertyBehaviors/ControlBehaviorMessages/BehaviorMessageBase.h

@@ -1,5 +1,5 @@
-#ifndef __BEHAVIORMESSAGEBASE__H__
-#define __BEHAVIORMESSAGEBASE__H__
+#ifndef BEHAVIORMESSAGEBASE_H
+#define BEHAVIORMESSAGEBASE_H
 
 #include <stdexcept>
 #include <string>
@@ -26,4 +26,4 @@ protected:
 	int32_t m_BehaviorId{ DefaultBehaviorId };
 };
 
-#endif  //!__BEHAVIORMESSAGEBASE__H__
+#endif  //!BEHAVIORMESSAGEBASE_H

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

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

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

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

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

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

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

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

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<Action> m_TransferredActions;
 };
 
-#endif  //!__SPLITSTRIPMESSAGE__H__
+#endif  //!SPLITSTRIPMESSAGE_H

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

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

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

dGame/dPropertyBehaviors/ControlBehaviors.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef __CONTROLBEHAVIORS__H__
-#define __CONTROLBEHAVIORS__H__
+#ifndef CONTROLBEHAVIORS_H
+#define CONTROLBEHAVIORS_H
 
 #include <map>
 #include <optional>
@@ -65,4 +65,4 @@ private:
 	bool isInitialized = false;
 };
 
-#endif  //!__CONTROLBEHAVIORS__H__
+#endif  //!CONTROLBEHAVIORS_H

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

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<Strip> m_Strips;
 };
 
-#endif  //!__STATE__H__
+#endif  //!STATE_H

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

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

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