From 471cca9fd42c9e4a19a7e1d4cc19f4c1696a217c Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Mon, 23 Aug 2010 23:45:24 +0000 Subject: [PATCH] Fix tooltip on grids hit by the Darkness spell git-svn-id: http://svn.net-core.org/repos/t-engine4@1050 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/engine/Tooltip.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game/engine/Tooltip.lua b/game/engine/Tooltip.lua index a4a4aaaa8d..8d61e4e0e9 100644 --- a/game/engine/Tooltip.lua +++ b/game/engine/Tooltip.lua @@ -122,11 +122,11 @@ function _M:displayAtMap(tmx, tmy, mx, my) local tt = {} local seen = game.level.map.seens(tmx, tmy) local remember = game.level.map.remembers(tmx, tmy) - tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.PROJECTILE, "tooltip", game.level.map.actor_player) - tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.ACTOR, "tooltip", game.level.map.actor_player) - tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.OBJECT, "tooltip", game.level.map.actor_player) - tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.TRAP, "tooltip", game.level.map.actor_player) - tt[#tt+1] = remember and game.level.map:checkEntity(tmx, tmy, Map.TERRAIN, "tooltip", game.level.map.actor_player) + tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.PROJECTILE, "tooltip", game.level.map.actor_player) or nil + tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.ACTOR, "tooltip", game.level.map.actor_player) or nil + tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.OBJECT, "tooltip", game.level.map.actor_player) or nil + tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.TRAP, "tooltip", game.level.map.actor_player) or nil + tt[#tt+1] = remember and game.level.map:checkEntity(tmx, tmy, Map.TERRAIN, "tooltip", game.level.map.actor_player) or nil if #tt > 0 then self:set("%s", table.concat(tt, "\n---\n")) self:display() -- GitLab