Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAPI: Move core.get_us_time() to Util module

This commit is contained in:
kwolekr 2015-10-26 03:45:55 -04:00
parent 5f342aa015
commit 306b067091
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/menu_lua_api.txt
View File

@ -191,6 +191,8 @@ core.create_world(worldname, gameid)
core.delete_world(index) core.delete_world(index)
Helpers: Helpers:
core.get_us_time()
^ returns time with microsecond precision
core.gettext(string) -> string core.gettext(string) -> string
^ look up the translation of a string in the gettext message catalog ^ look up the translation of a string in the gettext message catalog
fgettext_ne(string, ...) fgettext_ne(string, ...)

9
src/script/lua_api/l_env.cpp
View File

@ -938,14 +938,6 @@ int ModApiEnvMod::l_forceload_free_block(lua_State *L)
return 0; return 0;
} }
// get_us_time()
int ModApiEnvMod::l_get_us_time(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
lua_pushnumber(L, porting::getTimeUs());
return 1;
}
void ModApiEnvMod::Initialize(lua_State *L, int top) void ModApiEnvMod::Initialize(lua_State *L, int top)
{ {
API_FCT(set_node); API_FCT(set_node);
@ -987,5 +979,4 @@ void ModApiEnvMod::Initialize(lua_State *L, int top)
API_FCT(transforming_liquid_add); API_FCT(transforming_liquid_add);
API_FCT(forceload_block); API_FCT(forceload_block);
API_FCT(forceload_free_block); API_FCT(forceload_free_block);
API_FCT(get_us_time);
} }

3
src/script/lua_api/l_env.h
View File

@ -168,9 +168,6 @@ private:
// stops forceloading a position // stops forceloading a position
static int l_forceload_free_block(lua_State *L); static int l_forceload_free_block(lua_State *L);
// get us precision time
static int l_get_us_time(lua_State *L);
public: public:
static void Initialize(lua_State *L, int top); static void Initialize(lua_State *L, int top);
}; };

12
src/script/lua_api/l_util.cpp
View File

@ -65,6 +65,14 @@ int ModApiUtil::l_log(lua_State *L)
return 0; return 0;
} }
// get_us_time()
int ModApiUtil::l_get_us_time(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
lua_pushnumber(L, porting::getTimeUs());
return 1;
}
#define CHECK_SECURE_SETTING(L, name) \ #define CHECK_SECURE_SETTING(L, name) \
if (name.compare(0, 7, "secure.") == 0) {\ if (name.compare(0, 7, "secure.") == 0) {\
lua_pushliteral(L, "Attempt to set secure setting.");\ lua_pushliteral(L, "Attempt to set secure setting.");\
@ -368,6 +376,8 @@ void ModApiUtil::Initialize(lua_State *L, int top)
{ {
API_FCT(log); API_FCT(log);
API_FCT(get_us_time);
API_FCT(setting_set); API_FCT(setting_set);
API_FCT(setting_get); API_FCT(setting_get);
API_FCT(setting_setbool); API_FCT(setting_setbool);
@ -399,6 +409,8 @@ void ModApiUtil::InitializeAsync(AsyncEngine& engine)
{ {
ASYNC_API_FCT(log); ASYNC_API_FCT(log);
ASYNC_API_FCT(get_us_time);
//ASYNC_API_FCT(setting_set); //ASYNC_API_FCT(setting_set);
ASYNC_API_FCT(setting_get); ASYNC_API_FCT(setting_get);
//ASYNC_API_FCT(setting_setbool); //ASYNC_API_FCT(setting_setbool);

3
src/script/lua_api/l_util.h
View File

@ -41,6 +41,9 @@ private:
// The two-argument version accept a log level: error, action, info, or verbose. // The two-argument version accept a log level: error, action, info, or verbose.
static int l_log(lua_State *L); static int l_log(lua_State *L);
// get us precision time
static int l_get_us_time(lua_State *L);
// setting_set(name, value) // setting_set(name, value)
static int l_setting_set(lua_State *L); static int l_setting_set(lua_State *L);