aboutsummaryrefslogtreecommitdiff
path: root/gamemode/core/combat
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2017-08-17 16:23:19 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2017-08-17 16:23:19 -0400
commit500329e73f7bc9ba73cf63036d3283f081281ed4 (patch)
treedf10df10be4762e5abe16094398bfadd0e009139 /gamemode/core/combat
parent7854175815e88b0d25cd4f0c0f170602ffb8169f (diff)
downloadartery-500329e73f7bc9ba73cf63036d3283f081281ed4.tar.gz
artery-500329e73f7bc9ba73cf63036d3283f081281ed4.tar.bz2
artery-500329e73f7bc9ba73cf63036d3283f081281ed4.zip
Added a callback for weapon swings
Diffstat (limited to 'gamemode/core/combat')
-rw-r--r--gamemode/core/combat/sv_weaponswing.lua10
1 files changed, 4 insertions, 6 deletions
diff --git a/gamemode/core/combat/sv_weaponswing.lua b/gamemode/core/combat/sv_weaponswing.lua
index 9dd1924..059d1d4 100644
--- a/gamemode/core/combat/sv_weaponswing.lua
+++ b/gamemode/core/combat/sv_weaponswing.lua
@@ -50,13 +50,10 @@ function ws.makeSwingable(tbl)
swingable[tbl.Name] = tbl
end
-function ws.doSwing(weapon,ply)
+function ws.doSwing(weapon,ply,callback)
local dir = wep.playermovedir(ply)
local fdata = file.Read("artery/dynamic/swingdata/" .. weapon.Name .. ".txt")
local swingtbl = util.JSONToTable(util.Decompress(fdata))
- print("swingtable was", swingtbl)
- PrintTable(swingtbl)
- print("dir was",dir)
if swingtbl[dir] == nil then return end
local tswing = swingtbl[dir]
for k,v in pairs(tswing) do
@@ -86,8 +83,9 @@ function ws.doSwing(weapon,ply)
hitthings[#hitthings + 1] = tr.Entity
end
end
- print("Hit:")
- PrintTable(hitthings)
+ for k,v in hitthings do
+ callback(v)
+ end
end)
end