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

so bad

git-svn-id: http://svn.net-core.org/repos/t-engine4@4679 51575b47-30f0-44d4-a5cc-537603b46e54
parent b51347a7
No related branches found
No related tags found
No related merge requests found
......@@ -101,7 +101,7 @@ function _M:moveDirection(x, y, force)
local l = {}
-- Find possibilities
for i = 1, #list do if dir_to_coord[list[i]] then
local dx, dy = self.x + dir_to_coord[list[i]][1], self.y + dir_to_coord[list[i]][2]
local dx, dy = self.x + (dir_to_coord[list[i]][1] or 0), self.y + (dir_to_coord[list[i]][2] or 0)
if self:aiCanPass(dx, dy) then
l[#l+1] = {dx,dy, (dx-x)^2 + (dy-y)^2}
end
......
......@@ -334,7 +334,15 @@ function _M:generateRandart(add, base, lev, nb_egos)
ego.name = nil
ego.unided_name = nil
table.mergeAddAppendArray(o, ego, true)
-- OMFG this is ugly, there is a very rare combinaison that can result in a crash there, so we .. well, ignore it :/
-- Sorry.
local ok, err = pcall(table.mergeAddAppendArray, o, ego, true)
if not ok then
print("table.mergeAddAppendArray failed at creating a randart, retrying")
game.level.level = oldlev
resolvers.current_level = oldclev
return self:generateRandart(add, base, lev, nb_egos)
end
end
end
o.egos = nil o.egos_chance = nil o.force_ego = nil
......
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