Move tocolor to shared definitions

Author: patrikjuvonen

Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.Util.cpp

@@ -73,34 +73,6 @@ int CLuaFunctionDefs::GetTok(lua_State* luaVM)
     return 1;
 }
 
-int CLuaFunctionDefs::tocolor(lua_State* luaVM)
-{
-    //  int tocolor ( int red, int green, int blue [, int alpha = 255] )
-    int iRed;
-    int iGreen;
-    int iBlue;
-    int iAlpha;
-
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadNumber(iRed);
-    argStream.ReadNumber(iGreen);
-    argStream.ReadNumber(iBlue);
-    argStream.ReadNumber(iAlpha, 255);
-
-    if (!argStream.HasErrors())
-    {
-        // Make it into an unsigned long
-        unsigned long ulColor = COLOR_RGBA(iRed, iGreen, iBlue, iAlpha);
-        lua_pushinteger(luaVM, static_cast<lua_Integer>(ulColor));
-        return 1;
-    }
-
-    // Make it black so funcs dont break
-    unsigned long ulColor = COLOR_RGBA(0, 0, 0, 255);
-    lua_pushnumber(luaVM, static_cast<lua_Number>(ulColor));
-    return 1;
-}
-
 int CLuaFunctionDefs::GetValidPedModels(lua_State* luaVM)
 {
     int iIndex = 0;

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

@@ -79,7 +79,6 @@ class CLuaFunctionDefs
     // Util functions to make scripting easier for the end user
     // Some of these are based on standard mIRC script funcs as a lot of people will be used to them
     LUA_DECLARE(GetTok);
-    LUA_DECLARE(tocolor);
     LUA_DECLARE(GetValidPedModels);
     LUA_DECLARE(SetDevelopmentMode);
     LUA_DECLARE(GetDevelopmentMode);

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

@@ -253,7 +253,6 @@ void CLuaManager::LoadCFunctions(void)
 
     // Util functions
     CLuaCFunctions::AddFunction("gettok", CLuaFunctionDefs::GetTok);
-    CLuaCFunctions::AddFunction("tocolor", CLuaFunctionDefs::tocolor);
     CLuaCFunctions::AddFunction("getValidPedModels", CLuaFunctionDefs::GetValidPedModels);
     CLuaCFunctions::AddFunction("downloadFile", CLuaFunctionDefs::DownloadFile);
 

Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp

@@ -41,6 +41,9 @@ void CLuaUtilDefs::LoadFunctions(void)
 
     // Debug functions
     CLuaCFunctions::AddFunction("debugSleep", DebugSleep);
+
+    // Utility functions
+    CLuaCFunctions::AddFunction("tocolor", tocolor);
 }
 
 int CLuaUtilDefs::DisabledFunction(lua_State* luaVM)
@@ -613,3 +616,31 @@ int CLuaUtilDefs::DebugSleep(lua_State* luaVM)
     lua_pushboolean(luaVM, false);
     return 1;
 }
+
+int CLuaUtilDefs::tocolor(lua_State* luaVM)
+{
+    //  int tocolor ( int red, int green, int blue [, int alpha = 255 ] )
+    int iRed;
+    int iGreen;
+    int iBlue;
+    int iAlpha;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadNumber(iRed);
+    argStream.ReadNumber(iGreen);
+    argStream.ReadNumber(iBlue);
+    argStream.ReadNumber(iAlpha, 255);
+
+    if (!argStream.HasErrors())
+    {
+        // Make it into an unsigned long
+        unsigned long ulColor = COLOR_RGBA(iRed, iGreen, iBlue, iAlpha);
+        lua_pushinteger(luaVM, static_cast<lua_Integer>(ulColor));
+        return 1;
+    }
+
+    // Make it black so funcs dont break
+    unsigned long ulColor = COLOR_RGBA(0, 0, 0, 255);
+    lua_pushnumber(luaVM, static_cast<lua_Number>(ulColor));
+    return 1;
+}

Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.h

@@ -48,4 +48,7 @@ class CLuaUtilDefs : public CLuaDefs
 
     // Debug functions
     LUA_DECLARE(DebugSleep);
+
+    // Utility functions
+    LUA_DECLARE(tocolor);
 };