lalala

git-svn-id: http://svn.net-core.org/repos/t-engine4@6811 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Projectile.lua

@@ -217,9 +217,7 @@ function _M:act()
 				else
 					radius_x, radius_y = self.old_x, self.old_y
 				end
-				game.level:removeEntity(self, true)
-				self.dead = true
-				self.src:projectDoStop(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, radius_x, radius_y)
+				self.src:projectDoStop(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, radius_x, radius_y, self)
 			end
 		elseif self.homing then
 			self:moveDirection(self.homing.target.x, self.homing.target.y)
@@ -241,9 +239,7 @@ end
 function _M:on_move(x, y, target)
 	if self.project and self.project.def.typ.line 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 self.project and self.project.def.typ.stop_block then
-		game.level:removeEntity(self, true)
-		self.dead = true
-		self.src:projectDoStop(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, self.x, self.y)
+		self.src:projectDoStop(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, self.x, self.y, self)
 	end
 end
 

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

@@ -381,7 +381,7 @@ function _M:projectDoAct(typ, tg, damtype, dam, particles, px, py, tmp)
 	end
 end
 
-function _M:projectDoStop(typ, tg, damtype, dam, particles, lx, ly, tmp, rx, ry)
+function _M:projectDoStop(typ, tg, damtype, dam, particles, lx, ly, tmp, rx, ry, projectile)
 	local grids = {}
 	local function addGrid(x, y)
 		if not grids[x] then grids[x] = {} end
@@ -468,4 +468,14 @@ function _M:projectDoStop(typ, tg, damtype, dam, particles, lx, ly, tmp, rx, ry)
 			particles(self, tg, lx, ly, grids)
 		end
 	end
+
+	if typ.on_stop_check then
+		if typ.on_stop_check(self, typ, tg, damtype, dam, particles, lx, ly, tmp, rx, ry, projectile) then
+			game.level:removeEntity(projectile, true)
+			projectile.dead = true
+		end
+	else
+		game.level:removeEntity(projectile, true)
+		projectile.dead = true
+	end
 end