From 969365cef5b17f9573da961e635e92b716f129a3 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Sat, 19 Oct 2013 19:28:46 +0200
Subject: [PATCH] fixed listcolumn default selection fixed ActorProject:project
third parameter to function callback
---
game/engines/default/engine/interface/ActorProject.lua | 2 +-
game/engines/default/engine/ui/ListColumns.lua | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/game/engines/default/engine/interface/ActorProject.lua b/game/engines/default/engine/interface/ActorProject.lua
index 886ea386d3..a5a341e95d 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 b15acb8b42..7ab1860142 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
--
GitLab