diff --git a/game/engines/default/engine/Game.lua b/game/engines/default/engine/Game.lua index 55c184212309c80c8e2fe5e04a15812ddbd6237e..ee3843dd7bc29bc3ee1cdddefc1931348dac51f5 100644 --- a/game/engines/default/engine/Game.lua +++ b/game/engines/default/engine/Game.lua @@ -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) diff --git a/game/engines/default/modules/boot/dialogs/MainMenu.lua b/game/engines/default/modules/boot/dialogs/MainMenu.lua index 89d67522d2ab9539bcf371ecf456c7ad7b203a7f..98a8bf8565dead6f123781afcdd11ac46ede163e 100644 --- a/game/engines/default/modules/boot/dialogs/MainMenu.lua +++ b/game/engines/default/modules/boot/dialogs/MainMenu.lua @@ -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])} diff --git a/src/main.c b/src/main.c index 271ce3d794db2f246af5a0c70cee9aecacd11448..88522aa248eed601fd93bdd784cb089ed020926c 100644 --- a/src/main.c +++ b/src/main.c @@ -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"))