Skip to content
Snippets Groups Projects
Commit 969365ce authored by DarkGod's avatar DarkGod
Browse files

fixed listcolumn default selection

fixed ActorProject:project third parameter to function callback
parent 1251f19e
No related branches found
No related tags found
No related merge requests found
......@@ -194,7 +194,7 @@ function _M:project(t, x, y, damtype, dam, particles)
elseif act and self.reactionToward and (self:reactionToward(act) >= 0) and not ((type(typ.friendlyfire) == "number" and rng.percent(typ.friendlyfire)) or (type(typ.friendlyfire) ~= "number" and typ.friendlyfire)) then
-- Otherwise hit
else
if type(damtype) == "function" then if damtype(px, py, tg, self) then stop=true break end
if type(damtype) == "function" then if damtype(px, py, t, self) then stop=true break end
else DamageType:get(damtype).projector(self, px, py, damtype, dam, tmp, nil) end
if particles then
game.level.map:particleEmitter(px, py, 1, particles.type, particles.args)
......
......@@ -90,6 +90,9 @@ function _M:generate()
end
function _M:setupInput()
self.prev_sel = 0
self.mouse_pos = { x = 0, y = 0 }
self.mouse:reset()
self.key:reset()
local colx = 0
......
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