From 1c72ae7d4b3a7bbe0d0dd9ae3f58b5f4c3dee7d7 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 20 Aug 2012 11:13:43 +0000
Subject: [PATCH] Fix the lost wife dream when using no shaders
git-svn-id: http://svn.net-core.org/repos/t-engine4@5543 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/zones/dreams/zone.lua | 2 +-
game/modules/tome/dialogs/LevelupDialog.lua | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/game/modules/tome/data/zones/dreams/zone.lua b/game/modules/tome/data/zones/dreams/zone.lua
index 3a818f871c..389e6d1678 100644
--- a/game/modules/tome/data/zones/dreams/zone.lua
+++ b/game/modules/tome/data/zones/dreams/zone.lua
@@ -181,7 +181,7 @@ return {
level.back_shader = require("engine.Shader").new("funky_bubbles", {})
end,
background = function(level, x, y, nb_keyframes)
- if not level.back_shader then return end
+ if not level.back_shader or not level.back_shader.shad then return end
local sx, sy = level.map._map:getScroll()
local mapcoords = {(-sx + level.map.mx * level.map.tile_w) / level.map.viewport.width , (-sy + level.map.my * level.map.tile_h) / level.map.viewport.height}
level.back_shader:setUniform("xy", mapcoords)
diff --git a/game/modules/tome/dialogs/LevelupDialog.lua b/game/modules/tome/dialogs/LevelupDialog.lua
index 2a9f68b518..a88b882ee1 100644
--- a/game/modules/tome/dialogs/LevelupDialog.lua
+++ b/game/modules/tome/dialogs/LevelupDialog.lua
@@ -73,10 +73,12 @@ function _M:init(actor, on_finish, on_birth)
self.key:addCommands{
__TEXTINPUT = function(c)
- if c == "+" and self.focus_ui and self.focus_ui.ui.onUse then
- self.focus_ui.ui:onUse(self.focus_ui.ui.last_mz.item, true)
- elseif c == "-" then
- self.focus_ui.ui:onUse(self.focus_ui.ui.last_mz.item, false)
+ if self.focus_ui.ui.last_mz then
+ if c == "+" and self.focus_ui and self.focus_ui.ui.onUse then
+ self.focus_ui.ui:onUse(self.focus_ui.ui.last_mz.item, true)
+ elseif c == "-" then
+ self.focus_ui.ui:onUse(self.focus_ui.ui.last_mz.item, false)
+ end
end
end,
}
--
GitLab