mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2025-10-20 14:28:07 +00:00
make include guards standards conforming
fix compile issues
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user