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

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@1148 51575b47-30f0-44d4-a5cc-537603b46e54
parent 05cff85f
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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})
......
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