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

fix

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