diff --git a/game/engines/default/engine/interface/ActorProject.lua b/game/engines/default/engine/interface/ActorProject.lua index 886ea386d3faaf6e58afbbbb3fdd35992ea1dd72..a5a341e95d511c900dd75f0b870656c4456f188d 100644 --- a/game/engines/default/engine/interface/ActorProject.lua +++ b/game/engines/default/engine/interface/ActorProject.lua @@ -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) diff --git a/game/engines/default/engine/ui/ListColumns.lua b/game/engines/default/engine/ui/ListColumns.lua index b15acb8b428c8ba1b7d8e5db455ae9e2a4a0023c..7ab1860142111c1d4e7884bc32642efdedd14069 100644 --- a/game/engines/default/engine/ui/ListColumns.lua +++ b/game/engines/default/engine/ui/ListColumns.lua @@ -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