Skip to content
Snippets Groups Projects
Commit d1f200ca authored by DarkGod's avatar DarkGod
Browse files

broken world wont annoy loading

parent f603bfaf
No related branches found
No related tags found
No related merge requests found
......@@ -738,9 +738,11 @@ function _M:instanciate(mod, name, new_game, no_reboot)
local save = Savefile.new("")
_G.world = save:loadWorld()
save:close()
print("======+++WORLD", _G.world)
if not _G.world then
_G.world = W.new()
end
print("======+++WORLD", _G.world)
_G.world:run()
end
......
......@@ -403,7 +403,6 @@ function _M:loadWorld()
core.display.forceRedraw()
local loadedWorld = self:loadReal("main")
if not loadedWorld then return nil, "no savefile" end
-- Delay loaded must run
for i, o in ipairs(self.delayLoad) do
......@@ -450,7 +449,6 @@ function _M:loadGame()
core.display.forceRedraw()
local loadedGame = self:loadReal("main")
if not loadedGame then return nil, "no savefile" end
local checker = self:md5Check("game", self:nameLoadGame(), loadedGame)
......@@ -512,7 +510,6 @@ function _M:loadZone(zone)
core.display.forceRedraw()
local loadedZone = self:loadReal("main")
if not loadedZone then return nil, "no savefile" end
-- Delay loaded must run
for i, o in ipairs(self.delayLoad) do
......@@ -550,7 +547,6 @@ function _M:loadLevel(zone, level)
core.display.forceRedraw()
local loadedLevel = self:loadReal("main")
if not loadedLevel then return nil, "no savefile" end
-- Delay loaded must run
for i, o in ipairs(self.delayLoad) do
......@@ -587,7 +583,6 @@ function _M:loadEntity(name)
core.display.forceRedraw()
local loadedEntity = self:loadReal("main")
if not loadedEntity then return nil, "no savefile" end
-- Delay loaded must run
for i, o in ipairs(self.delayLoad) do
......
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