Skip to content
Snippets Groups Projects
Commit 0600df30 authored by dg's avatar dg
Browse files

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@3728 51575b47-30f0-44d4-a5cc-537603b46e54
parent d758eb2d
No related branches found
No related tags found
No related merge requests found
......@@ -425,6 +425,7 @@ end
-- Threads will be auto joined when the module exits or when it can
-- ALL THREADS registered *MUST* return true when they exit
function _M:registerThread(th, linda)
error("Threads unsuported yet")
print("[THREAD] registering", th, linda, #self.__threads+1)
self.__threads[#self.__threads+1] = {th=th, linda=linda}
return #self.__threads
......@@ -434,6 +435,7 @@ end
-- @param timeout the time in seconds to wait for each thread
function _M:joinThreads(timeout)
for i = #self.__threads, 1, -1 do
error("Threads unsuported yet")
local th = self.__threads[i].th
print("[THREAD] Thread join", i, th)
local v, err = th:join(timeout)
......
......@@ -46,6 +46,7 @@ function _M:init()
game:registerDialog(menu)
end}
l[#l+1] = {name="Exit", fct=function() game:onQuit() end}
if config.settings.cheat then l[#l+1] = {name="Reboot", fct=function() util.showMainMenu() end} end
self.c_background = Button.new{text=game.stopped and "Enable background" or "Disable background", width=150, fct=function() self:switchBackground() end}
self.c_version = Textzone.new{auto_width=true, auto_height=true, text=("#{bold}##B9E100#T-Engine4 version: %d.%d.%d"):format(engine.version[1], engine.version[2], engine.version[3])}
......
......@@ -781,7 +781,7 @@ void boot_lua(int state, bool rebooting, int argc, char *argv[])
SDL_WM_SetCaption("T-Engine4", NULL);
// Now we can open lua lanes, the physfs paths are set and it can load it's lanes-keeper.lua file
luaopen_lanes(L);
// luaopen_lanes(L);
// And run the lua engine scripts
if (!luaL_loadfile(L, "/loader/init.lua"))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment