diff options
author | ShadowNinja <shadowninja@minetest.net> | 2014-04-27 21:02:48 -0400 |
---|---|---|
committer | ShadowNinja <shadowninja@minetest.net> | 2014-05-08 13:02:04 -0400 |
commit | c4359ff65cd8e4e754442b9f2ef7051a8eaa4241 (patch) | |
tree | feaad8be8c36cc4a0abdbe8d7b84db3ac68ed87e /src/script/common | |
parent | 1cd512913e4d4ad1fb43d4b6e3d7971bb6c67528 (diff) | |
download | minetest-c4359ff65cd8e4e754442b9f2ef7051a8eaa4241.tar.gz minetest-c4359ff65cd8e4e754442b9f2ef7051a8eaa4241.tar.bz2 minetest-c4359ff65cd8e4e754442b9f2ef7051a8eaa4241.zip |
Use "core" namespace internally
Diffstat (limited to 'src/script/common')
-rw-r--r-- | src/script/common/c_content.cpp | 8 | ||||
-rw-r--r-- | src/script/common/c_internal.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 2898d28ae..2f749043e 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -955,14 +955,14 @@ std::vector<ItemStack> read_items(lua_State *L, int index, Server *srv) /******************************************************************************/ void luaentity_get(lua_State *L, u16 id) { - // Get minetest.luaentities[i] - lua_getglobal(L, "minetest"); + // Get luaentities[i] + lua_getglobal(L, "core"); lua_getfield(L, -1, "luaentities"); luaL_checktype(L, -1, LUA_TTABLE); lua_pushnumber(L, id); lua_gettable(L, -2); - lua_remove(L, -2); // luaentities - lua_remove(L, -2); // minetest + lua_remove(L, -2); // Remove luaentities + lua_remove(L, -2); // Remove core } /******************************************************************************/ diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp index 4c6604f65..4c098f8d5 100644 --- a/src/script/common/c_internal.cpp +++ b/src/script/common/c_internal.cpp @@ -92,8 +92,8 @@ void script_run_callbacks(lua_State *L, int nargs, RunCallbacksMode mode) int errorhandler = lua_gettop(L) - nargs - 1; lua_insert(L, errorhandler); - // Insert minetest.run_callbacks between error handler and table - lua_getglobal(L, "minetest"); + // Insert run_callbacks between error handler and table + lua_getglobal(L, "core"); lua_getfield(L, -1, "run_callbacks"); lua_remove(L, -2); lua_insert(L, errorhandler + 1); |