Improve testSerializeJsonString unit tests

[dragonfireclient.git] / builtin / init.lua

diff --git a/builtin/init.lua b/builtin/init.lua
index f76174be7d5c727fe85b5b20a9a83a584e39646d..8691360169379bc82ede6e9892a41442fea6a3b8 100644 (file)
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -30,21 +30,36 @@ local clientpath = scriptdir .. "client" .. DIR_DELIM
 local commonpath = scriptdir .. "common" .. DIR_DELIM
 local asyncpath = scriptdir .. "async" .. DIR_DELIM
 
+dofile(commonpath .. "vector.lua")
 dofile(commonpath .. "strict.lua")
 dofile(commonpath .. "serialize.lua")
 dofile(commonpath .. "misc_helpers.lua")
 
 if INIT == "game" then
        dofile(gamepath .. "init.lua")
+       assert(not core.get_http_api)
 elseif INIT == "mainmenu" then
        local mm_script = core.settings:get("main_menu_script")
+       local custom_loaded = false
        if mm_script and mm_script ~= "" then
-               dofile(mm_script)
-       else
+               local testfile = io.open(mm_script, "r")
+               if testfile then
+                       testfile:close()
+                       dofile(mm_script)
+                       custom_loaded = true
+                       core.log("info", "Loaded custom main menu script: "..mm_script)
+               else
+                       core.log("error", "Failed to load custom main menu script: "..mm_script)
+                       core.log("info", "Falling back to default main menu script")
+               end
+       end
+       if not custom_loaded then
                dofile(core.get_mainmenu_path() .. DIR_DELIM .. "init.lua")
        end
-elseif INIT == "async" then
-       dofile(asyncpath .. "init.lua")
+elseif INIT == "async"  then
+       dofile(asyncpath .. "mainmenu.lua")
+elseif INIT == "async_game" then
+       dofile(asyncpath .. "game.lua")
 elseif INIT == "client" then
        dofile(clientpath .. "init.lua")
 else