Switch to string instead of integer

Author: omar-o22

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -988,6 +988,13 @@ ADD_ENUM(VehicleAudioSettingProperty::VEHICLE_TYPE_FOR_AUDIO, "vehicle-type-for-
 IMPLEMENT_ENUM_CLASS_END("vehicle-audio-setting")
 
 
+IMPLEMENT_ENUM_CLASS_BEGIN(PostFXType)
+ADD_ENUM(PostFXType::GAMMA, "gamma")
+ADD_ENUM(PostFXType::BRIGHTNESS, "brightness")
+ADD_ENUM(PostFXType::CONTRAST, "contrast")
+ADD_ENUM(PostFXType::SATURATION, "saturation")
+IMPLEMENT_ENUM_CLASS_END("postfx-type")
+
 //
 // CResource from userdata
 //

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h

@@ -25,6 +25,7 @@
 #include "enums/SoundEffectParams.h"
 #include "enums/SoundEffectType.h"
 #include "enums/ObjectGroupPhysicalProperties.h"
+#include "enums/PostFXType.h"
 
 enum eLuaType
 {
@@ -102,6 +103,7 @@ DECLARE_ENUM_CLASS(RestreamOption);
 DECLARE_ENUM_CLASS(taskType);
 DECLARE_ENUM(eEntityType);
 DECLARE_ENUM_CLASS(VehicleAudioSettingProperty);
+DECLARE_ENUM_CLASS(PostFXType);
 
 class CRemoteCall;
 

Client/mods/deathmatch/logic/luadefs/CLuaPostfxDefs.cpp

@@ -26,20 +26,21 @@ void CLuaPostfxDefs::LoadFunctions()
         CLuaCFunctions::AddFunction(name, func);
 }
 
-std::variant<float, bool> CLuaPostfxDefs::GetPostFXValue(int type)
+float CLuaPostfxDefs::GetPostFXValue(PostFXType type)
 {
-    switch (static_cast<int>(type))
+    switch (type)
     {
-        case 0: // Gamma
+        case PostFXType::GAMMA:
             return g_pCore->GetCVars()->GetValue<float>("borderless_gamma_power", 0.0f);
-        case 1: // Brightness
+        case PostFXType::BRIGHTNESS:
             return g_pCore->GetCVars()->GetValue<float>("borderless_brightness_scale", 0.0f);
-        case 2: // Contrast
+        case PostFXType::CONTRAST:
             return g_pCore->GetCVars()->GetValue<float>("borderless_contrast_scale", 0.0f);
-        case 3: // Saturation
+        case PostFXType::SATURATION:
             return g_pCore->GetCVars()->GetValue<float>("borderless_saturation_scale", 0.0f);
+
         default:
-            return false;
+            throw std::invalid_argument("Invalid PostFX type");
     }
 }
 
@@ -50,19 +51,20 @@ int CLuaPostfxDefs::GetPostFXMode()
          : 0;
 }
 
-bool CLuaPostfxDefs::IsPostFXEnabled(int type)
+bool CLuaPostfxDefs::IsPostFXEnabled(PostFXType type)
 {
-    switch (static_cast<int>(type))
+    switch (type)
     {
-        case 0: // Gamma
-            return g_pCore->GetCVars()->GetValue<bool>("borderless_gamma_enabled", false);
-        case 1: // Brightness
-            return g_pCore->GetCVars()->GetValue<bool>("borderless_brightness_enabled", false);
-        case 2: // Contrast
-            return g_pCore->GetCVars()->GetValue<bool>("borderless_contrast_enabled", false);
-        case 3: // Saturation
-            return g_pCore->GetCVars()->GetValue<bool>("borderless_saturation_enabled", false);
+        case PostFXType::GAMMA:
+            return g_pCore->GetCVars()->GetValue<float>("borderless_gamma_enabled", false);
+        case PostFXType::BRIGHTNESS:
+            return g_pCore->GetCVars()->GetValue<float>("borderless_brightness_enabled", false);
+        case PostFXType::CONTRAST:
+            return g_pCore->GetCVars()->GetValue<float>("borderless_brightness_enabled", false);
+        case PostFXType::SATURATION:
+            return g_pCore->GetCVars()->GetValue<float>("borderless_saturation_enabled", false);
+
         default:
-            return false;
+            throw std::invalid_argument("Invalid PostFX type");
     }
 }

Client/mods/deathmatch/logic/luadefs/CLuaPostfxDefs.h

@@ -17,7 +17,7 @@ class CLuaPostfxDefs : public CLuaDefs
     static void LoadFunctions();
 
 private:
-    static std::variant<float, bool> GetPostFXValue(int type);
+    static float GetPostFXValue(PostFXType type);
     static int GetPostFXMode();
-    static bool IsPostFXEnabled(int type);
+    static bool IsPostFXEnabled(PostFXType type);
 };

Shared/sdk/enums/PostFXType.h

@@ -0,0 +1,18 @@
+/*****************************************************************************
+ *
+ *  PROJECT:     Multi Theft Auto
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        sdk/PostFXType.h
+ *  PURPOSE:     Header for common definitions
+ *
+ *  Multi Theft Auto is available from https://www.multitheftauto.com/
+ *
+ *****************************************************************************/
+
+enum class PostFXType
+{
+    GAMMA,
+    BRIGHTNESS,
+    CONTRAST,
+    SATURATION
+};