Skip to content

Commit

Permalink
xrGame: declare enum forward declarations with u32 for standard compl…
Browse files Browse the repository at this point in the history
…iance

 Used simple script which appends type to all forward declarations,
 finds their definitions and appends type too: https://pastebin.com/MBKEabaB
  • Loading branch information
a1batross authored and Zegeri committed Sep 16, 2018
1 parent b6be30b commit 4d9a3c2
Show file tree
Hide file tree
Showing 41 changed files with 94 additions and 94 deletions.
2 changes: 1 addition & 1 deletion src/editors/ECore/Engine/ai_sounds.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef ai_soundsH
#define ai_soundsH

enum ESoundTypes
enum ESoundTypes : u32
{
SOUND_TYPE_NO_SOUND = 0x00000000ui32,

Expand Down
4 changes: 2 additions & 2 deletions src/xrAICore/Navigation/PatrolPath/patrol_path.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "xrAICore/Navigation/graph_abstract.h"
#include "xrAICore/Navigation/PatrolPath/patrol_point.h"

enum EPatrolStartType
enum EPatrolStartType : u32
{
ePatrolStartTypeFirst = u32(0),
ePatrolStartTypeLast,
Expand All @@ -20,7 +20,7 @@ enum EPatrolStartType
ePatrolStartTypeNext,
ePatrolStartTypeDummy = u32(-1),
};
enum EPatrolRouteType
enum EPatrolRouteType : u32
{
ePatrolRouteTypeStop = u32(0),
ePatrolRouteTypeContinue,
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/line_edit_control.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ enum key_state // Flags32

}; // enum key_state

enum init_mode
enum init_mode : u32
{
im_standart = 0,
im_number_only,
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/GameTaskDefs.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include "alife_abstract_registry.h"

enum ETaskState
enum ETaskState : u32
{
eTaskStateFail = 0,
eTaskStateInProgress,
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/PHMovementControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace ALife
{
enum EHitType;
enum EHitType : u32;
}

namespace DetailPathManager
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/ai/monsters/rats/ai_rat.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

class CBlend;
class CPatrolPath;
enum ESoundTypes;
enum ESoundTypes : u32;
class rat_state_manager;

namespace steering_behaviour
Expand Down
6 changes: 3 additions & 3 deletions src/xrGame/ai/stalker/ai_stalker.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ typedef CActionPlanner<CScriptGameObject, false, CActionBase<CScriptGameObject>,

namespace MonsterSpace
{
enum EMovementDirection;
enum EMovementDirection : u32;
}

namespace StalkerSpace
{
enum EBodyAction;
enum EBodyAction : u32;
}

namespace smart_cover
Expand All @@ -49,7 +49,7 @@ class action;
}
}

enum ECriticalWoundType;
enum ECriticalWoundType : u32;

class CALifeSimulator;
class CCharacterPhysicsSupport;
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/ai/stalker/ai_stalker_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ enum EStalkerSoundMasks
eStalkerSoundMaskDummy = u32(-1),
};

enum EBodyAction
enum EBodyAction : u32
{
eBodyActionNone = u32(0),
eBodyActionHello,
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/ai/trader/trader_animation.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class CAI_Trader;

namespace MonsterSpace
{
enum EMonsterHeadAnimType;
enum EMonsterHeadAnimType : u32;
};

class CTraderAnimation
Expand Down
22 changes: 11 additions & 11 deletions src/xrGame/ai_monster_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,36 @@

namespace MonsterSpace
{
enum EMentalState
enum EMentalState : u32
{
eMentalStateDanger = u32(0),
eMentalStateFree,
eMentalStatePanic,
};

enum EBodyState
enum EBodyState : u32
{
eBodyStateCrouch = u32(0),
eBodyStateStand,
eBodyStateDummy = u32(-1)
};

enum EMovementType
enum EMovementType : u32
{
eMovementTypeWalk = 0,
eMovementTypeRun,
eMovementTypeStand,
};

enum EMovementDirection
enum EMovementDirection : u32
{
eMovementDirectionForward = 0,
eMovementDirectionBackward,
eMovementDirectionLeft,
eMovementDirectionRight,
};

enum EObjectAction
enum EObjectAction : u32
{
eObjectActionSwitch1,
eObjectActionSwitch2,
Expand Down Expand Up @@ -83,7 +83,7 @@ struct SBoneRotation
float speed;
};

enum EScriptMonsterMoveAction
enum EScriptMonsterMoveAction : u32
{
eMA_WalkFwd,
eMA_WalkBkwd,
Expand All @@ -95,14 +95,14 @@ enum EScriptMonsterMoveAction
eMA_RunWithLeader
};

enum EScriptMonsterSpeedParam
enum EScriptMonsterSpeedParam : u32
{
eSP_Default = u32(0),
eSP_ForceSpeed,
eSP_None = u32(-1),
};

enum EScriptMonsterAnimAction
enum EScriptMonsterAnimAction : u32
{
eAA_StandIdle,
eAA_CapturePrepare,
Expand All @@ -117,7 +117,7 @@ enum EScriptMonsterAnimAction
eAA_NoAction = u32(-1)
};

enum EScriptMonsterGlobalAction
enum EScriptMonsterGlobalAction : u32
{
eGA_Rest = u32(0),
eGA_Eat,
Expand All @@ -126,13 +126,13 @@ enum EScriptMonsterGlobalAction
eGA_None = u32(-1)
};

enum EScriptSoundAnim
enum EScriptSoundAnim : u32
{
eAnimSoundCustom = u32(0),
eAnimSoundDefault,
};

enum EMonsterHeadAnimType
enum EMonsterHeadAnimType : u32
{
eHeadAnimNormal = u32(0),
eHeadAnimAngry,
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/alife_update_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

namespace RestrictionSpace
{
enum ERestrictorTypes;
enum ERestrictorTypes : u32;
}

class CALifeUpdateManager : public CALifeSwitchManager,
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/detail_path_manager_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace DetailPathManager
{
enum EDetailPathType
enum EDetailPathType : u32
{
eDetailPathTypeSmooth,
eDetailPathTypeSmoothDodge,
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/game_object_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace GameObject
{
enum ECallbackType
enum ECallbackType : u32
{
eTradeStart = u32(0),
eTradeStop,
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/movement_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ class CSE_Abstract;

namespace MovementManager
{
enum EPathType;
enum EPathType : u32;
};

namespace DetailPathManager
{
enum EDetailPathType;
enum EDetailPathType : u32;
};

template <typename _Graph, typename _VertexEvaluator, typename _vertex_id_type>
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/movement_manager_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace MovementManager
{
enum EPathType
enum EPathType : u32
{
ePathTypeGamePath = u32(0),
ePathTypeLevelPath,
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/object_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace MonsterSpace
{
enum EObjectAction;
enum EObjectAction : u32;
}

class CAI_Stalker;
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/object_handler_planner.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ class CFoodItem;

namespace ObjectHandlerSpace
{
enum EWorldProperties;
enum EWorldProperties : u32;
};

namespace MonsterSpace
{
enum EObjectAction;
enum EObjectAction : u32;
};

class CObjectHandlerPlanner : public CActionPlanner<CAI_Stalker, true>
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/object_handler_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace ObjectHandlerSpace
{
enum EWorldProperties
enum EWorldProperties : u32
{
eWorldPropertyItemID = u32(0),
eWorldPropertyHidden,
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/pda_space.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

//типы сообщений PDA
enum EPdaMsg
enum EPdaMsg : u32
{
ePdaMsgDialog, //диалог
ePdaMsgInfo, //сообщение передает некоторую информацию
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/restricted_object.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class CGameObject;

namespace RestrictionSpace
{
enum ERestrictorTypes;
enum ERestrictorTypes : u32;
}

template <bool add>
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/script_entity_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace ScriptEntity
{
enum EActionType
enum EActionType : u32
{
eActionTypeMovement = u32(0),
eActionTypeWatch,
Expand Down
Loading

0 comments on commit 4d9a3c2

Please sign in to comment.