From fa5e229015c98e53bd773d8bab670b2a2ad2ca1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= Date: Sat, 26 Feb 2022 19:44:49 +0100 Subject: [PATCH] Fixed forward declaration of enums --- src/graphics/engine/camera.h | 2 +- src/graphics/engine/engine.h | 10 +++++----- src/graphics/engine/lightman.h | 2 +- src/level/parser/parserparam.h | 2 +- src/ui/controls/window.h | 2 +- src/ui/studio.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/graphics/engine/camera.h b/src/graphics/engine/camera.h index 04f9c221..95116544 100644 --- a/src/graphics/engine/camera.h +++ b/src/graphics/engine/camera.h @@ -45,7 +45,7 @@ enum class TransparencyMode : unsigned char; /** \enum CameraType \brief Type of camera */ -enum CameraType +enum CameraType : unsigned char { //! Undefined CAM_TYPE_NULL = 0, diff --git a/src/graphics/engine/engine.h b/src/graphics/engine/engine.h index 58bc3885..dd7176c5 100644 --- a/src/graphics/engine/engine.h +++ b/src/graphics/engine/engine.h @@ -81,7 +81,7 @@ enum class TransparencyMode : unsigned char; * \enum EngineTriangleType * \brief Type of triangles drawn for engine objects */ -enum class EngineTriangleType +enum class EngineTriangleType : unsigned char { //! Triangles TRIANGLES = 1, @@ -92,7 +92,7 @@ enum class EngineTriangleType /** \enum EngineObjectType \brief Class of graphics engine object */ -enum EngineObjectType +enum EngineObjectType : unsigned char { //! Object doesn't exist ENG_OBJTYPE_NULL = 0, @@ -224,7 +224,7 @@ struct EngineGroundSpot * \enum EngineGroundMarkPhase * \brief Phase of life of an EngineGroundMark */ -enum EngineGroundMarkPhase +enum EngineGroundMarkPhase : unsigned char { //! Null phase ENG_GR_MARK_PHASE_NULL = 0, @@ -279,7 +279,7 @@ struct EngineGroundMark * \enum EngineTextureMapping * \brief Type of texture mapping */ -enum class EngineTextureMapping +enum class EngineTextureMapping : unsigned char { X = 1, Y = 2, @@ -294,7 +294,7 @@ enum class EngineTextureMapping * \enum EngineMouseType * \brief Type of mouse cursor displayed in-game */ -enum EngineMouseType +enum EngineMouseType : unsigned char { //! Normal cursor (arrow) ENG_MOUSE_NORM = 0, diff --git a/src/graphics/engine/lightman.h b/src/graphics/engine/lightman.h index 916076e8..8e29506e 100644 --- a/src/graphics/engine/lightman.h +++ b/src/graphics/engine/lightman.h @@ -40,7 +40,7 @@ class CEngine; struct Color; -enum EngineObjectType; +enum EngineObjectType : unsigned char; /** * \struct LightProgression diff --git a/src/level/parser/parserparam.h b/src/level/parser/parserparam.h index ef168749..9c9118fd 100644 --- a/src/level/parser/parserparam.h +++ b/src/level/parser/parserparam.h @@ -54,7 +54,7 @@ namespace Gfx { class CEngine; -enum EngineObjectType; +enum EngineObjectType : unsigned char; } class CLevelParserParam diff --git a/src/ui/controls/window.h b/src/ui/controls/window.h index cc37bf1e..410976ca 100644 --- a/src/ui/controls/window.h +++ b/src/ui/controls/window.h @@ -27,7 +27,7 @@ namespace Gfx { -enum EngineMouseType; +enum EngineMouseType : unsigned char; } namespace Ui diff --git a/src/ui/studio.h b/src/ui/studio.h index 94b8005c..8f16bbb5 100644 --- a/src/ui/studio.h +++ b/src/ui/studio.h @@ -42,7 +42,7 @@ namespace Gfx class CCamera; class CEngine; -enum CameraType; +enum CameraType : unsigned char; } namespace Ui