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

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@1113 51575b47-30f0-44d4-a5cc-537603b46e54
parent 3c4e72ba
No related branches found
No related tags found
No related merge requests found
...@@ -93,6 +93,7 @@ function _M:saveObject(obj, zip) ...@@ -93,6 +93,7 @@ function _M:saveObject(obj, zip)
self.tables[tbl] = self:getFileName(tbl) self.tables[tbl] = self:getFileName(tbl)
zip:add(self:getFileName(tbl), tbl:save()) zip:add(self:getFileName(tbl), tbl:save())
-- If run from a coroutine, we pause every object -- If run from a coroutine, we pause every object
--[[
if coroutine.running() then if coroutine.running() then
local coret = coroutine.yield() local coret = coroutine.yield()
if coret and type(coret) == "string" and coret == "cancel" then if coret and type(coret) == "string" and coret == "cancel" then
...@@ -100,6 +101,7 @@ function _M:saveObject(obj, zip) ...@@ -100,6 +101,7 @@ function _M:saveObject(obj, zip)
break break
end end
end end
]]
end end
return self.tables[obj] return self.tables[obj]
end end
...@@ -112,7 +114,7 @@ function _M:saveWorld(world, no_dialog) ...@@ -112,7 +114,7 @@ function _M:saveWorld(world, no_dialog)
local popup local popup
if not no_dialog then if not no_dialog then
popup = Dialog:simplePopup("Saving world", "Please wait while saving the world...") popup = Dialog:simplePopup("Saving world", "Please wait while saving the world...", nil, true)
popup.__showup = nil popup.__showup = nil
end end
core.display.forceRedraw() core.display.forceRedraw()
...@@ -160,7 +162,7 @@ function _M:saveGame(game, no_dialog) ...@@ -160,7 +162,7 @@ function _M:saveGame(game, no_dialog)
local popup local popup
if not no_dialog then if not no_dialog then
popup = Dialog:simplePopup("Saving game", "Please wait while saving the game...") popup = Dialog:simplePopup("Saving game", "Please wait while saving the game...", nil, true)
popup.__showup = nil popup.__showup = nil
end end
core.display.forceRedraw() core.display.forceRedraw()
...@@ -185,7 +187,7 @@ function _M:saveZone(zone, no_dialog) ...@@ -185,7 +187,7 @@ function _M:saveZone(zone, no_dialog)
local popup local popup
if not no_dialog then if not no_dialog then
popup = Dialog:simplePopup("Saving zone", "Please wait while saving the zone...") popup = Dialog:simplePopup("Saving zone", "Please wait while saving the zone...", nil, true)
popup.__showup = nil popup.__showup = nil
end end
core.display.forceRedraw() core.display.forceRedraw()
...@@ -203,7 +205,7 @@ function _M:saveLevel(level, no_dialog) ...@@ -203,7 +205,7 @@ function _M:saveLevel(level, no_dialog)
local popup local popup
if not no_dialog then if not no_dialog then
popup = Dialog:simplePopup("Saving level", "Please wait while saving the level...") popup = Dialog:simplePopup("Saving level", "Please wait while saving the level...", nil, true)
popup.__showup = nil popup.__showup = nil
end end
core.display.forceRedraw() core.display.forceRedraw()
......
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