Skip to content

Commit 71fb329

Browse files
committed
Improve error messages for setCameraFieldOfView
1 parent 3491c37 commit 71fb329

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Camera.cpp

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -172,30 +172,33 @@ int CLuaFunctionDefs::SetCameraFieldOfView ( lua_State* luaVM )
172172

173173
argStream.ReadEnumString ( eMode );
174174
argStream.ReadNumber ( fFOV );
175-
176-
if ( fFOV < 0 || fFOV > 179 )
177-
argStream.SetCustomError ( "Outside 0-179 boundaries" );
178-
175+
179176
if ( !argStream.HasErrors () )
180177
{
181-
if (eMode == FOV_MODE_PLAYER)
182-
g_pGame->GetSettings ()->SetFieldOfViewPlayer ( fFOV );
183-
else if ( eMode == FOV_MODE_VEHICLE )
184-
g_pGame->GetSettings ()->SetFieldOfViewVehicle ( fFOV );
185-
else if ( eMode == FOV_MODE_VEHICLE_MAX )
186-
g_pGame->GetSettings ()->SetFieldOfViewVehicleMax ( fFOV );
187-
else {
188-
argStream.m_iIndex = 1;
189-
m_pScriptDebugging->LogCustom ( luaVM, SString("Enum not yet implemented: " + EnumToString ( eMode )) );
190-
lua_pushboolean ( luaVM, false );
178+
while (true) {
179+
if ( fFOV < 0 || fFOV > 179 ) {
180+
argStream.SetCustomError ( "FOV is outside the 0-179 boundary" );
181+
break;
182+
}
183+
184+
if (eMode == FOV_MODE_PLAYER)
185+
g_pGame->GetSettings ()->SetFieldOfViewPlayer ( fFOV );
186+
else if ( eMode == FOV_MODE_VEHICLE )
187+
g_pGame->GetSettings ()->SetFieldOfViewVehicle ( fFOV );
188+
else if ( eMode == FOV_MODE_VEHICLE_MAX )
189+
g_pGame->GetSettings ()->SetFieldOfViewVehicleMax ( fFOV );
190+
else {
191+
argStream.m_iIndex = 1;
192+
argStream.SetCustomError( SString( "Enum not yet implemented: " + EnumToString ( eMode ) ) );
193+
break;
194+
}
195+
196+
lua_pushboolean ( luaVM, true );
191197
return 1;
192-
}
193-
lua_pushboolean ( luaVM, true );
194-
return 1;
198+
}
195199
}
196-
else
197-
m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
198200

201+
m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
199202
lua_pushboolean ( luaVM, false );
200203
return 1;
201204
}

0 commit comments

Comments
 (0)