diff --git a/Engine/source/T3D/gameBase/moveManager.h b/Engine/source/T3D/gameBase/moveManager.h index 3b8dcbc08..6b26c4196 100644 --- a/Engine/source/T3D/gameBase/moveManager.h +++ b/Engine/source/T3D/gameBase/moveManager.h @@ -36,7 +36,12 @@ class BitStream; struct Move { - enum { ChecksumBits = 16, ChecksumMask = ((1< mColumnOffsets; diff --git a/Engine/source/math/mBoxBase.h b/Engine/source/math/mBoxBase.h index ef7e9a9e2..63ea2602a 100644 --- a/Engine/source/math/mBoxBase.h +++ b/Engine/source/math/mBoxBase.h @@ -125,7 +125,7 @@ class BoxBase NUM_PLANES }; - enum PlaneMasks + enum PlaneMasks : U32 { PlaneMaskLeft = ( 1 << LeftPlane ), PlaneMaskRight = ( 1 << RightPlane ), diff --git a/Engine/source/math/util/frustum.h b/Engine/source/math/util/frustum.h index 205e075a1..9de0c4c6a 100644 --- a/Engine/source/math/util/frustum.h +++ b/Engine/source/math/util/frustum.h @@ -118,7 +118,7 @@ struct FrustumData : public PolyhedronData }; /// Used to mask out planes for testing. - enum + enum : U32 { PlaneMaskLeft = ( 1 << PlaneLeft ), PlaneMaskRight = ( 1 << PlaneRight ), diff --git a/Engine/source/platform/platformMemory.cpp b/Engine/source/platform/platformMemory.cpp index 44a68d8a7..72d68ba10 100644 --- a/Engine/source/platform/platformMemory.cpp +++ b/Engine/source/platform/platformMemory.cpp @@ -53,7 +53,8 @@ void * gMemMutex = NULL; #undef new #endif -enum MemConstants { +enum MemConstants : U32 +{ Allocated = BIT(0), Array = BIT(1), DebugFlag = BIT(2), diff --git a/Engine/source/scene/simPath.h b/Engine/source/scene/simPath.h index 4633e0a10..9c31ac507 100644 --- a/Engine/source/scene/simPath.h +++ b/Engine/source/scene/simPath.h @@ -49,7 +49,8 @@ class Path : public SimGroup typedef SimGroup Parent; public: - enum { + enum : U32 + { NoPathIndex = 0xFFFFFFFF }; diff --git a/Engine/source/scene/zones/sceneZoneSpaceManager.h b/Engine/source/scene/zones/sceneZoneSpaceManager.h index 1c7631949..8912fe5c0 100644 --- a/Engine/source/scene/zones/sceneZoneSpaceManager.h +++ b/Engine/source/scene/zones/sceneZoneSpaceManager.h @@ -65,7 +65,7 @@ class SceneZoneSpaceManager /// of time. typedef Signal< void( SceneZoneSpaceManager* ) > ZoningChangedSignal; - enum + enum : U32 { /// Zone ID of the exterior zone. RootZoneId = 0, diff --git a/Engine/source/sfx/sfxSoundscape.h b/Engine/source/sfx/sfxSoundscape.h index 274854777..603a84917 100644 --- a/Engine/source/sfx/sfxSoundscape.h +++ b/Engine/source/sfx/sfxSoundscape.h @@ -73,7 +73,7 @@ class SFXSoundscape FlagUnique = BIT( 1 ), ///< No other instance of this ambience on stack. }; - enum DirtyBits + enum DirtyBits : U32 { AmbienceDirty = BIT( 0 ), ///< Associated ambience has changed. AllDirty = 0xFFFFFFFF diff --git a/Engine/source/sim/netStringTable.h b/Engine/source/sim/netStringTable.h index 629d691bb..948d497ce 100644 --- a/Engine/source/sim/netStringTable.h +++ b/Engine/source/sim/netStringTable.h @@ -44,7 +44,8 @@ class NetStringTable friend class RemoteCommandEvent; #endif - enum Constants { + enum Constants : U32 + { InitialSize = 16, InvalidEntry = 0xFFFFFFFF, HashTableSize = 2128, diff --git a/Engine/source/terrain/terrRender.h b/Engine/source/terrain/terrRender.h index 58fa3a00c..0f4bfbc9a 100644 --- a/Engine/source/terrain/terrRender.h +++ b/Engine/source/terrain/terrRender.h @@ -27,7 +27,7 @@ #include "terrain/terrData.h" #endif -enum TerrConstants +enum TerrConstants : U32 { MaxClipPlanes = 8, ///< left, right, top, bottom - don't need far tho... //MaxTerrainMaterials = 256,