From ae395fd9ab640763fae46037e916309aef20a9dc Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 5 Sep 2010 13:01:39 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@1148 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/dialogs/ShowText.lua | 2 +-
game/modules/tome/class/Player.lua | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/engines/default/engine/dialogs/ShowText.lua b/game/engines/default/engine/dialogs/ShowText.lua
index 6a8d350b00..63b3aa5c89 100644
--- a/game/engines/default/engine/dialogs/ShowText.lua
+++ b/game/engines/default/engine/dialogs/ShowText.lua
@@ -29,7 +29,7 @@ function _M:init(title, file, replace, w, h)
self.iw = w - 2 * 5 -- Cheat, this is normaly done by Dialog:init but we need it to generate the list and we needto generate it before init
self.font = core.display.newFont("/data/font/Vera.ttf", 12)
self:generateList(file, replace)
- h = math.min(4 + (#self.list) * self.font:lineSkip(), h)
+ h = math.min(4 + 30 + (#self.list) * self.font:lineSkip(), h)
engine.Dialog.init(self, title or "Text", w, h, nil, nil, nil, self.font)
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index cb98633bef..a7f6a6f9fb 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -596,7 +596,7 @@ end
function _M:useOrbPortal(portal)
if portal.special then portal:special(self) return end
- if spotHostiles(self) then game.logPlayer(self, "You can not use the Orb with foes in sight.") end
+ if spotHostiles(self) then game.logPlayer(self, "You can not use the Orb with foes in sight.") return end
if portal.teleport_level then
local x, y = util.findFreeGrid(portal.teleport_level.x, portal.teleport_level.y, 2, true, {[Map.ACTOR]=true})
--
GitLab