From f328b49424dce9e60e4ca652ca5b6e77c0dc8e62 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 20 Jul 2011 13:32:26 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@3920 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/Actor.lua | 1 +
game/engines/default/engine/dialogs/ShowAchievements.lua | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/game/engines/default/engine/Actor.lua b/game/engines/default/engine/Actor.lua
index c78c7fecd8..27da330d2e 100644
--- a/game/engines/default/engine/Actor.lua
+++ b/game/engines/default/engine/Actor.lua
@@ -150,6 +150,7 @@ end
-- @param force if true do not check for the presence of an other entity. *Use wisely*
-- @return true if a move was *ATTEMPTED*. This means the actor will probably want to use energy
function _M:move(x, y, force)
+ if not x or not y then return end
if self.dead then return true end
local map = game.level.map
diff --git a/game/engines/default/engine/dialogs/ShowAchievements.lua b/game/engines/default/engine/dialogs/ShowAchievements.lua
index 485bf3968c..4bcdf06ff7 100644
--- a/game/engines/default/engine/dialogs/ShowAchievements.lua
+++ b/game/engines/default/engine/dialogs/ShowAchievements.lua
@@ -145,7 +145,7 @@ function _M:generateList(kind)
cache[img] = tex
end
end
- if not data.notdone or a.show then
+ if data and (not data.notdone or a.show) then
if a.show == "full" or not data.notdone then
list[#list+1] = { name=a.name, color=color, desc=a.desc, when=data.when, who=data.who, order=a.order, id=id, tex=tex, a=a }
elseif a.show == "none" then
--
GitLab