From 55dc2120eb6ce146df10e744725373fa7ed157d7 Mon Sep 17 00:00:00 2001 From: Flobu Date: Fri, 23 Apr 2010 15:02:49 +0200 Subject: [PATCH] Rename getTimer to getTimerDetails --- MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Util.cpp | 4 ++-- MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h | 2 +- MTA10/mods/shared_logic/lua/CLuaManager.cpp | 2 +- .../mods/deathmatch/logic/lua/CLuaFunctionDefinitions.cpp | 4 ++-- .../mods/deathmatch/logic/lua/CLuaFunctionDefinitions.h | 2 +- MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Util.cpp b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Util.cpp index ce6a528ac2..d15c2deb09 100644 --- a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Util.cpp +++ b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Util.cpp @@ -233,7 +233,7 @@ int CLuaFunctionDefs::IsTimer ( lua_State* luaVM ) return 1; } -int CLuaFunctionDefs::GetTimer ( lua_State* luaVM ) +int CLuaFunctionDefs::GetTimerDetails ( lua_State* luaVM ) { CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM ); if ( pLuaMain ) @@ -247,7 +247,7 @@ int CLuaFunctionDefs::GetTimer ( lua_State* luaVM ) return 3; } else - m_pScriptDebugging->LogBadType ( luaVM, "getTimer" ); + m_pScriptDebugging->LogBadType ( luaVM, "getTimerDetails" ); } lua_pushboolean ( luaVM, false ); diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h index e825afcfdb..95c57b03b0 100644 --- a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h +++ b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h @@ -464,7 +464,7 @@ class CLuaFunctionDefs LUA_DECLARE ( ResetTimer ); LUA_DECLARE ( GetTimers ); LUA_DECLARE ( IsTimer ); - LUA_DECLARE ( GetTimer ); + LUA_DECLARE ( GetTimerDetails ); LUA_DECLARE ( GetTickCount_ ); LUA_DECLARE ( GetCTime ); LUA_DECLARE ( tocolor ); diff --git a/MTA10/mods/shared_logic/lua/CLuaManager.cpp b/MTA10/mods/shared_logic/lua/CLuaManager.cpp index f76e136261..b935b91427 100644 --- a/MTA10/mods/shared_logic/lua/CLuaManager.cpp +++ b/MTA10/mods/shared_logic/lua/CLuaManager.cpp @@ -761,7 +761,7 @@ void CLuaManager::LoadCFunctions ( void ) CLuaCFunctions::AddFunction ( "killTimer", CLuaFunctionDefs::KillTimer ); CLuaCFunctions::AddFunction ( "getTimers", CLuaFunctionDefs::GetTimers ); CLuaCFunctions::AddFunction ( "isTimer", CLuaFunctionDefs::IsTimer ); - CLuaCFunctions::AddFunction ( "getTimer", CLuaFunctionDefs::GetTimer ); + CLuaCFunctions::AddFunction ( "getTimerDetails", CLuaFunctionDefs::GetTimerDetails ); CLuaCFunctions::AddFunction ( "getTickCount", CLuaFunctionDefs::GetTickCount_ ); CLuaCFunctions::AddFunction ( "getRealTime", CLuaFunctionDefs::GetCTime ); CLuaCFunctions::AddFunction ( "tocolor", CLuaFunctionDefs::tocolor ); diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefinitions.cpp b/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefinitions.cpp index f170ecc06e..594bc2fe8d 100644 --- a/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefinitions.cpp +++ b/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefinitions.cpp @@ -9430,7 +9430,7 @@ int CLuaFunctionDefinitions::GetTimers ( lua_State* luaVM ) } -int CLuaFunctionDefinitions::GetTimer ( lua_State* luaVM ) +int CLuaFunctionDefinitions::GetTimerDetails ( lua_State* luaVM ) { CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM ); if ( pLuaMain ) @@ -9444,7 +9444,7 @@ int CLuaFunctionDefinitions::GetTimer ( lua_State* luaVM ) return 3; } else - m_pScriptDebugging->LogBadType ( luaVM, "getTimer" ); + m_pScriptDebugging->LogBadType ( luaVM, "getTimerDetails" ); } lua_pushboolean ( luaVM, false ); diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefinitions.h b/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefinitions.h index f696c3a4cf..b031d3fd42 100644 --- a/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefinitions.h +++ b/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefinitions.h @@ -418,7 +418,7 @@ class CLuaFunctionDefinitions static int ResetTimer ( lua_State* luaVM ); static int GetTimers ( lua_State* luaVM ); static int IsTimer ( lua_State* luaVM ); - static int GetTimer ( lua_State* luaVM ); + static int GetTimerDetails ( lua_State* luaVM ); static int GetColorFromString ( lua_State* luaVM ); static int Reference ( lua_State* luaVM ); static int Dereference ( lua_State* luaVM ); diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp b/MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp index 3dd8473696..df5d2ed8f6 100644 --- a/MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp +++ b/MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp @@ -586,7 +586,7 @@ void CLuaManager::LoadCFunctions ( void ) CLuaCFunctions::AddFunction ( "resetTimer", CLuaFunctionDefinitions::ResetTimer ); CLuaCFunctions::AddFunction ( "getTimers", CLuaFunctionDefinitions::GetTimers ); CLuaCFunctions::AddFunction ( "isTimer", CLuaFunctionDefinitions::IsTimer ); - CLuaCFunctions::AddFunction ( "getTimer", CLuaFunctionDefinitions::GetTimer ); + CLuaCFunctions::AddFunction ( "getTimerDetails", CLuaFunctionDefinitions::GetTimerDetails ); CLuaCFunctions::AddFunction ( "getColorFromString", CLuaFunctionDefinitions::GetColorFromString ); CLuaCFunctions::AddFunction ( "ref", CLuaFunctionDefinitions::Reference ); CLuaCFunctions::AddFunction ( "deref", CLuaFunctionDefinitions::Dereference );