From e77768142aca181e995a15ab9dc858d10bc8d6a4 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 6 Jul 2011 16:19:18 +0000
Subject: [PATCH] sanity
git-svn-id: http://svn.net-core.org/repos/t-engine4@3822 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/talents/misc/npcs.lua | 1 +
game/modules/tome/dialogs/CharacterSheet.lua | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index 74312875d2..bc4be08eea 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -304,6 +304,7 @@ newTalent{
action = function(self, t)
local tg = {type="hit", range=self:getTalentRange(t)}
local x, y, target = self:getTarget(tg)
+ if not x then return nil end
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
self:attackTarget(target, DamageType.POISON, 2 + self:getTalentLevel(t), true)
return true
diff --git a/game/modules/tome/dialogs/CharacterSheet.lua b/game/modules/tome/dialogs/CharacterSheet.lua
index 3a4d87afbc..84c288394c 100644
--- a/game/modules/tome/dialogs/CharacterSheet.lua
+++ b/game/modules/tome/dialogs/CharacterSheet.lua
@@ -214,7 +214,7 @@ function _M:drawDialog(kind, actor_to_compare)
end
end
- if value2 and value2 ~= value then
+ if value and value2 and value2 ~= value then
if added == 0 and not nobracets then
ret:add(" (")
elseif added > 1 then
--
GitLab