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

plop--This line, and those below, will be ignored--

M    game/engines/default/engine/Projectile.lua
M    game/engines/default/engine/interface/ActorProject.lua


git-svn-id: http://svn.net-core.org/repos/t-engine4@1401 51575b47-30f0-44d4-a5cc-537603b46e54
parent 12ea9ef8
No related branches found
No related tags found
No related merge requests found
......@@ -146,7 +146,7 @@ function _M:act()
while self:enoughEnergy() and not self.dead do
if self.project then
local x, y, act, stop = self.src:projectDoMove(self.project.def.typ, self.project.def.x, self.project.def.y, self.x, self.y, self.project.def.start_x, self.project.def.start_y, self)
local x, y, act, stop = self.src:projectDoMove(self.project.def.typ, self.project.def.x, self.project.def.y, self.x, self.y, self.project.def.start_x, self.project.def.start_y)
if x and y then self:move(x, y) end
if act then self.src:projectDoAct(self.project.def.typ, self.project.def.tg, self.project.def.damtype, self.project.def.dam, self.project.def.particles, self.x, self.y, self.tmp_proj) end
if stop then
......
......@@ -183,7 +183,7 @@ function _M:projectile(t, x, y, damtype, dam, particles)
game.zone:addEntity(game.level, proj, "projectile", self.x, self.y)
end
function _M:projectDoMove(typ, tgtx, tgty, x, y, srcx, srcy, projectile)
function _M:projectDoMove(typ, tgtx, tgty, x, y, srcx, srcy)
-- Stop at range or on block
local l = line.new(srcx, srcy, tgtx, tgty)
local lx, ly = srcx, srcy
......
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