X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fw_common.qc;h=d2f172b4d08c8f6ed581cf93e98bc065ceec3025;hb=c7412d57c97da7e1d8a4e12c08271dbdb492ea94;hp=3343fa7c3f5f24d9977e41b05e4da32a498bc0ac;hpb=8c5c39bee4bc48057f5094d635b80a46b060b207;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc
index 3343fa7c3..d2f172b4d 100644
--- a/qcsrc/server/w_common.qc
+++ b/qcsrc/server/w_common.qc
@@ -38,6 +38,8 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
 	entity pseudoprojectile;
 	float f, ffs;
 
+	pseudoprojectile = world;
+
 	railgun_start = start;
 	railgun_end = end;
 
@@ -241,10 +243,11 @@ void W_BallisticBullet_LeaveSolid_think()
 	UpdateCSQCProjectile(self);
 }
 
-float W_BallisticBullet_LeaveSolid(entity e, vector vel, float constant)
+float W_BallisticBullet_LeaveSolid(float eff)
 {
 	// move the entity along its velocity until it's out of solid, then let it resume
-
+	vector vel = self.velocity;
+	float constant = self.dmg_radius * (other.ballistics_density ? other.ballistics_density : 1);
 	float dt, dst, velfactor, v0, vs;
 	float maxdist;
 	float E0_m, Es_m;
@@ -264,8 +267,7 @@ float W_BallisticBullet_LeaveSolid(entity e, vector vel, float constant)
 	if(maxdist <= autocvar_g_ballistics_mindistance)
 		return 0;
 
-	traceline_inverted (self.origin, self.origin + normalize(vel) * maxdist, MOVE_NORMAL, self);
-
+	traceline_inverted (self.origin, self.origin + normalize(vel) * maxdist, MOVE_NORMAL, self, TRUE);
 	if(trace_fraction == 1) // 1: we never got out of solid
 		return 0;
 
@@ -298,6 +300,13 @@ float W_BallisticBullet_LeaveSolid(entity e, vector vel, float constant)
 	self.flags |= FL_ONGROUND; // prevent moving
 	self.W_BallisticBullet_LeaveSolid_velocity = vel;
 
+	if(eff >= 0)
+		if(vlen(trace_endpos - self.origin) > 4)
+		{
+			endzcurveparticles();
+			trailparticles(self, eff, self.origin, trace_endpos);
+		}
+
 	return 1;
 }
 
@@ -331,12 +340,8 @@ void W_BallisticBullet_Touch (void)
 		return;
 	}
 
-	density = other.ballistics_density;
-	if(density == 0)
-		density = 1;
-
 	// go through solid!
-	if(!W_BallisticBullet_LeaveSolid(self, self.velocity, self.dmg_radius * density))
+	if(!W_BallisticBullet_LeaveSolid(-1))
 	{
 		remove(self);
 		return;
@@ -485,15 +490,13 @@ void fireBallisticBullet(vector start, vector dir, float spread, float pSpeed, f
 			if not(trace_dphitcontents & DPCONTENTS_OPAQUE)
 				break;
 
-			density = other.ballistics_density;
-			if(density == 0)
-				density = 1;
-
 			// go through solid!
-			if(!W_BallisticBullet_LeaveSolid(self, self.velocity, self.dmg_radius * density))
+			if(!W_BallisticBullet_LeaveSolid((other && (other.solid != SOLID_BSP)) ? eff : -1))
 				break;
 
 			W_BallisticBullet_LeaveSolid_think();
+
+			self.projectiledeathtype |= HITTYPE_BOUNCE;
 		}
 		frametime = savetime;
 		self = oldself;
@@ -585,9 +588,13 @@ void W_PrepareExplosionByDamage(entity attacker, void() explode)
 {
 	self.takedamage = DAMAGE_NO;
 	self.event_damage = SUB_Null;
-	self.owner = attacker;
-	self.realowner = attacker;
-
+	
+	if((attacker.flags & FL_CLIENT) && !autocvar_g_projectiles_keep_owner)
+	{
+		self.owner = attacker;
+		self.realowner = attacker;
+	}
+	
 	// do not explode NOW but in the NEXT FRAME!
 	// because recursive calls to RadiusDamage are not allowed
 	self.nextthink = time;