Make setWindowFlashing errors more informative

Also fixes an issue where giving it "-1" as a count would cause the uint to wrap around to a huge integer.
multitheftauto · Dec 4, 2015 · f7d8522 · f7d8522
1 parent 30772de
commit f7d8522
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -334,10 +334,6 @@ bool CStaticFunctionDefinitions::SetWindowFlashing ( bool flash, uint count )
     if ( g_pCore->IsFocused () || !g_pCore->GetCVars ()->GetValue < bool > ( "server-can-flash-window", true ) )
         return false;
 
-    // 0 is infinite flashing
-    if ( count == 0 )
-        return false;
-
     FLASHWINFO flashInfo;
     flashInfo.cbSize = sizeof(FLASHWINFO);
     flashInfo.hwnd = g_pCore->GetHookedWindow ();

diff --git a/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.h
@@ -55,7 +55,7 @@ class CStaticFunctionDefinitions
     static bool                         ShowChat                            ( bool bShow );
     static bool                         SetClipboard                        ( SString& strText );
     static bool                         GetClipboard                        ( SString& strText );
-    static bool                         SetWindowFlashing                   ( bool flash, uint count = 10 );
+    static bool                         SetWindowFlashing                   ( bool flash, uint count );
 
     // Element get funcs
     static CClientEntity*               GetRootElement                      ( void );

diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Output.cpp b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Output.cpp
@@ -200,20 +200,22 @@ int CLuaFunctionDefs::OutputClientDebugString ( lua_State* luaVM )
 int CLuaFunctionDefs::SetWindowFlashing ( lua_State* luaVM )
 {
 //  bool setWindowFlashing ( bool flash [, int count = 10 ] )
-    bool flash; uint count;
+    bool flash; int count;
 
     CScriptArgReader argStream ( luaVM );
     argStream.ReadBool ( flash );
     argStream.ReadNumber ( count, 10 );
 
     if ( !argStream.HasErrors () )
     {
-        lua_pushboolean ( luaVM, CStaticFunctionDefinitions::SetWindowFlashing ( flash, count ) );
-        return 1;
+        if (count > 0) {
+            lua_pushboolean ( luaVM, CStaticFunctionDefinitions::SetWindowFlashing ( flash, count ) );
+            return 1;
+        } else
+            argStream.SetCustomError ( "'count' should be greater than 0" );
     }
-    else
-        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
 
+    m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
     lua_pushboolean ( luaVM, false );
     return 1;
 }