diff options
author | ShadowNinja <shadowninja@minetest.net> | 2014-04-15 13:41:07 -0400 |
---|---|---|
committer | ShadowNinja <shadowninja@minetest.net> | 2014-04-27 16:15:53 -0400 |
commit | 6ab3b4c83856b5c8a1a526c0e4dc55babe79d50d (patch) | |
tree | 90e64f78dd3ceac12dbb21ac6b045500de0ca603 /src/script/scripting_game.cpp | |
parent | db4ea4658c58772ee447ff0eff8bb39b692081ec (diff) | |
download | minetest-6ab3b4c83856b5c8a1a526c0e4dc55babe79d50d.tar.gz minetest-6ab3b4c83856b5c8a1a526c0e4dc55babe79d50d.tar.bz2 minetest-6ab3b4c83856b5c8a1a526c0e4dc55babe79d50d.zip |
Remove dependency on marshal and many other async changes
This makes a number of changes:
* Remove the dependency on marshal by using string.dump and loadstring.
* Use lua_tolstring rather than having Lua functions pass string lengths to C++.
* Move lua_api/l_async_events.* to cpp_api/s_async.*, where it belongs.
* Make AsyncWorkerThread a child of ScriptApiBase, this removes some duplicate functionality.
* Don't wait for async threads to shut down. (Is this safe? Might result in corruption if the thread is writing to a file.)
* Pop more unused items from the stack
* Code style fixes
* Other misc changes
Diffstat (limited to 'src/script/scripting_game.cpp')
-rw-r--r-- | src/script/scripting_game.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/script/scripting_game.cpp b/src/script/scripting_game.cpp index 043ee4bae..12baac032 100644 --- a/src/script/scripting_game.cpp +++ b/src/script/scripting_game.cpp @@ -56,6 +56,9 @@ GameScripting::GameScripting(Server* server) // Create the main minetest table lua_newtable(L); + lua_setglobal(L, "minetest"); + lua_getglobal(L, "minetest"); + int top = lua_gettop(L); lua_newtable(L); lua_setfield(L, -2, "object_refs"); @@ -63,15 +66,11 @@ GameScripting::GameScripting(Server* server) lua_newtable(L); lua_setfield(L, -2, "luaentities"); - lua_setglobal(L, "minetest"); - // Initialize our lua_api modules - lua_getglobal(L, "minetest"); - int top = lua_gettop(L); InitializeModApi(L, top); lua_pop(L, 1); - infostream << "SCRIPTAPI: initialized game modules" << std::endl; + infostream << "SCRIPTAPI: Initialized game modules" << std::endl; } void GameScripting::InitializeModApi(lua_State *L, int top) |