Rename getTimer to getTimerDetails

Flobu · ccw808 · commit 6f0f560f7877 · 2010-04-23T14:16:03.000+01:00
diff --git 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
@@ -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
@@ -762,7 +762,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
@@ -9429,7 +9429,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 )
@@ -9443,7 +9443,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
@@ -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
@@ -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 );

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ int CLuaFunctionDefs::IsTimer ( lua_State* luaVM )`
`233`	`233`	`return 1;`
`234`	`234`	`}`
`235`	`235`
`236`		`-int CLuaFunctionDefs::GetTimer ( lua_State* luaVM )`
	`236`	`+int CLuaFunctionDefs::GetTimerDetails ( lua_State* luaVM )`
`237`	`237`	`{`
`238`	`238`	`CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM );`
`239`	`239`	`if ( pLuaMain )`
`@@ -247,7 +247,7 @@ int CLuaFunctionDefs::GetTimer ( lua_State* luaVM )`
`247`	`247`	`return 3;`
`248`	`248`	`}`
`249`	`249`	`else`
`250`		`- m_pScriptDebugging->LogBadType ( luaVM, "getTimer" );`
	`250`	`+ m_pScriptDebugging->LogBadType ( luaVM, "getTimerDetails" );`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`lua_pushboolean ( luaVM, false );`
Original file line number	Diff line number	Diff line change
`@@ -9429,7 +9429,7 @@ int CLuaFunctionDefinitions::GetTimers ( lua_State* luaVM )`
`9429`	`9429`	`}`
`9430`	`9430`
`9431`	`9431`
`9432`		`-int CLuaFunctionDefinitions::GetTimer ( lua_State* luaVM )`
	`9432`	`+int CLuaFunctionDefinitions::GetTimerDetails ( lua_State* luaVM )`
`9433`	`9433`	`{`
`9434`	`9434`	`CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM );`
`9435`	`9435`	`if ( pLuaMain )`
`@@ -9443,7 +9443,7 @@ int CLuaFunctionDefinitions::GetTimer ( lua_State* luaVM )`
`9443`	`9443`	`return 3;`
`9444`	`9444`	`}`
`9445`	`9445`	`else`
`9446`		`- m_pScriptDebugging->LogBadType ( luaVM, "getTimer" );`
	`9446`	`+ m_pScriptDebugging->LogBadType ( luaVM, "getTimerDetails" );`
`9447`	`9447`	`}`
`9448`	`9448`
`9449`	`9449`	`lua_pushboolean ( luaVM, false );`