From cb7895d981d4d394c604da0fe755edfe31c9f007 Mon Sep 17 00:00:00 2001 From: "M. Liebmann" Date: Thu, 21 Jan 2016 09:09:33 +0100 Subject: [PATCH] CLuaInstMisc: Add getTimeOfDay() script function - Set Lua api version to 1.39 --- src/gui/lua/lua_api_version.h | 2 +- src/gui/lua/lua_misc.cpp | 15 +++++++++++++++ src/gui/lua/lua_misc.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/gui/lua/lua_api_version.h b/src/gui/lua/lua_api_version.h index 9fe6f1a67..f95bdbc54 100644 --- a/src/gui/lua/lua_api_version.h +++ b/src/gui/lua/lua_api_version.h @@ -4,4 +4,4 @@ * to luainstance.h changes */ #define LUA_API_VERSION_MAJOR 1 -#define LUA_API_VERSION_MINOR 38 +#define LUA_API_VERSION_MINOR 39 diff --git a/src/gui/lua/lua_misc.cpp b/src/gui/lua/lua_misc.cpp index 2c173fe0f..3514f19c8 100644 --- a/src/gui/lua/lua_misc.cpp +++ b/src/gui/lua/lua_misc.cpp @@ -71,6 +71,7 @@ void CLuaInstMisc::LuaMiscRegister(lua_State *L) { "GetRevision", CLuaInstMisc::GetRevision }, { "checkVersion", CLuaInstMisc::checkVersion }, { "postMsg", CLuaInstMisc::postMsg }, + { "getTimeOfDay", CLuaInstMisc::getTimeOfDay }, { "__gc", CLuaInstMisc::MiscDelete }, { NULL, NULL } }; @@ -338,6 +339,20 @@ int CLuaInstMisc::postMsg(lua_State *L) return 0; } +int CLuaInstMisc::getTimeOfDay(lua_State *L) +{ + CLuaMisc *D = MiscCheckData(L, 1); + if (!D) return 0; + + struct timeval t1; + double dt; + gettimeofday(&t1, NULL); + dt = (double)t1.tv_sec + ((double)t1.tv_usec)/1000000ULL; + + lua_pushnumber(L, (lua_Number)dt); + return 1; +} + int CLuaInstMisc::MiscDelete(lua_State *L) { CLuaMisc *D = MiscCheckData(L, 1); diff --git a/src/gui/lua/lua_misc.h b/src/gui/lua/lua_misc.h index 0d4969be7..56ea4023f 100644 --- a/src/gui/lua/lua_misc.h +++ b/src/gui/lua/lua_misc.h @@ -63,6 +63,7 @@ class CLuaInstMisc static int GetRevision(lua_State *L); static int checkVersion(lua_State *L); static int postMsg(lua_State *L); + static int getTimeOfDay(lua_State *L); static int MiscDelete(lua_State *L); static void miscFunctionDeprecated(lua_State *L, std::string oldFunc);