From e7c1246a7c3e064b29b5e989c9e6094c7cc6202f Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 19 Aug 2012 12:42:28 +0000
Subject: [PATCH] Transmo popup happens before level switch instead of after
git-svn-id: http://svn.net-core.org/repos/t-engine4@5519 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 4b3938af18..75a092e90d 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -565,9 +565,6 @@ function _M:changeLevel(lev, zone, params)
return
end
- local st = core.game.getTime()
- local sti = 1
-
-- Transmo!
local p = self:getPlayer(true)
if p:attr("has_transmo") and p:transmoGetNumberItems() > 0 then
@@ -591,12 +588,20 @@ function _M:changeLevel(lev, zone, params)
p:transmoInven(inven, i, o)
end
end
+ self:changeLevelReal(lev, zone, params)
end
-- Select the chest tab
d.c_inven.dont_update_last_tabs = true
d.c_inven:switchTab{kind="transmo"}
d:simplePopup("Transmogrification Chest", "When you close the inventory window, all items in the chest will be transmogrified.")
+ else
+ self:changeLevelReal(lev, zone, params)
end
+end
+
+function _M:changeLevelReal(lev, zone, params)
+ local st = core.game.getTime()
+ local sti = 1
-- Finish stuff registered for the previous level
self:onTickEndExecute()
--
GitLab