Improve error messages for setCameraFieldOfView

multitheftauto · Dec 4, 2015 · 71fb329 · 71fb329
1 parent 3491c37
commit 71fb329
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Camera.cpp b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Camera.cpp
@@ -172,30 +172,33 @@ int CLuaFunctionDefs::SetCameraFieldOfView ( lua_State* luaVM )
 
     argStream.ReadEnumString ( eMode );
     argStream.ReadNumber ( fFOV );
-
-    if ( fFOV < 0 || fFOV > 179 )
-        argStream.SetCustomError ( "Outside 0-179 boundaries" );
-
+
     if ( !argStream.HasErrors () )
     {
-        if (eMode == FOV_MODE_PLAYER)
-            g_pGame->GetSettings ()->SetFieldOfViewPlayer ( fFOV );
-        else if ( eMode == FOV_MODE_VEHICLE )
-            g_pGame->GetSettings ()->SetFieldOfViewVehicle ( fFOV );
-        else if ( eMode == FOV_MODE_VEHICLE_MAX )
-            g_pGame->GetSettings ()->SetFieldOfViewVehicleMax ( fFOV );
-        else {
-            argStream.m_iIndex = 1;
-            m_pScriptDebugging->LogCustom ( luaVM, SString("Enum not yet implemented: " + EnumToString ( eMode )) );
-            lua_pushboolean ( luaVM, false );
+        while (true) {
+            if ( fFOV < 0 || fFOV > 179 ) {
+                argStream.SetCustomError ( "FOV is outside the 0-179 boundary" );
+                break;
+            }
+
+            if (eMode == FOV_MODE_PLAYER)
+                g_pGame->GetSettings ()->SetFieldOfViewPlayer ( fFOV );
+            else if ( eMode == FOV_MODE_VEHICLE )
+                g_pGame->GetSettings ()->SetFieldOfViewVehicle ( fFOV );
+            else if ( eMode == FOV_MODE_VEHICLE_MAX )
+                g_pGame->GetSettings ()->SetFieldOfViewVehicleMax ( fFOV );
+            else {
+                argStream.m_iIndex = 1;
+                argStream.SetCustomError( SString( "Enum not yet implemented: " + EnumToString ( eMode ) ) );
+                break;
+            }
+
+            lua_pushboolean ( luaVM, true );
             return 1;
-        }
-        lua_pushboolean ( luaVM, true );
-        return 1;
+        }        
     }
-    else
-        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
 
+    m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
     lua_pushboolean ( luaVM, false );
     return 1;
 }