X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fweapons%2Fprojectile.qc;h=973005e1256c0fb3de543f275c7a9aa30c6450b2;hp=ea2f5f3d6dc87be3ac19515754715556755dd638;hb=7666560c6a475aefe6b55ff74a20444f328e0093;hpb=f72821fdcebe3ca01181a99727a06198de65ea08

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index ea2f5f3d6d..973005e125 100644
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -16,18 +16,12 @@
 .float scale;
 .vector colormod;
 
-void SUB_Stop(entity this)
+void SUB_Stop(entity this, entity toucher)
 {
-	this.move_velocity = this.move_avelocity = '0 0 0';
+	this.velocity = this.avelocity = '0 0 0';
 	this.move_movetype = MOVETYPE_NONE;
 }
 
-void SUB_Stop_self()
-{
-	SELFPARAM();
-	SUB_Stop(this);
-}
-
 void Projectile_ResetTrail(entity this, vector to)
 {
 	this.trail_oldorigin = to;
@@ -64,11 +58,11 @@ void Projectile_Draw(entity this)
 	float t;
 	float a;
 
-	f = this.move_flags;
+	f = this.flags;
 
 	if (this.count & 0x80)
 	{
-		// this.move_flags &= ~FL_ONGROUND;
+		// this.flags &= ~FL_ONGROUND;
 		if (this.move_movetype == MOVETYPE_NONE || this.move_movetype == MOVETYPE_FLY)
 			Movetype_Physics_NoMatchServer(this);
 		// the trivial movetypes do not have to match the
@@ -78,9 +72,9 @@ void Projectile_Draw(entity this)
 		// moving, we might still be ticrate dependent.
 		else
 			Movetype_Physics_MatchServer(this, autocvar_cl_projectiles_sloppy);
-		if (!(this.move_flags & FL_ONGROUND))
+		if (!(this.flags & FL_ONGROUND))
 			if (this.velocity != '0 0 0')
-				this.move_angles = this.angles = vectoangles(this.velocity);
+				this.angles = vectoangles(this.velocity);
 	}
 	else
 	{
@@ -215,9 +209,9 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 	// projectiles no longer being able to lie on a bmodel
 	this.move_nomonsters = MOVE_WORLDONLY;
 	if (f & 0x40)
-		this.move_flags |= FL_ONGROUND;
+		this.flags |= FL_ONGROUND;
 	else
-		this.move_flags &= ~FL_ONGROUND;
+		this.flags &= ~FL_ONGROUND;
 
 	if (!this.move_time)
 	{
@@ -249,8 +243,6 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 				this.gravity = ReadCoord();
 			else
 				this.gravity = 0;  // none
-			this.move_origin = this.origin;
-			this.move_velocity = this.velocity;
 		}
 
 		if (time == this.spawntime || (this.count & 0x80) || (f & 0x08))
@@ -337,7 +329,7 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 		this.mins = '0 0 0';
 		this.maxs = '0 0 0';
 		this.colormod = '0 0 0';
-		this.move_touch = SUB_Stop_self;
+		settouch(this, SUB_Stop);
 		this.move_movetype = MOVETYPE_TOSS;
 		this.alphamod = 1;
 
@@ -349,9 +341,9 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 				this.mins = '0 0 -4';
 				this.maxs = '0 0 -4';
 				this.move_movetype = MOVETYPE_BOUNCE;
-				this.move_touch = func_null;
-				this.move_bounce_factor = WEP_CVAR_SEC(electro, bouncefactor);
-				this.move_bounce_stopspeed = WEP_CVAR_SEC(electro, bouncestop);
+				settouch(this, func_null);
+				this.bouncefactor = WEP_CVAR_SEC(electro, bouncefactor);
+				this.bouncestop = WEP_CVAR_SEC(electro, bouncestop);
 				break;
 			case PROJECTILE_RPC:
 			case PROJECTILE_ROCKET:
@@ -367,9 +359,9 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 				this.mins = '-3 -3 -3';
 				this.maxs = '3 3 3';
 				this.move_movetype = MOVETYPE_BOUNCE;
-				this.move_touch = func_null;
-				this.move_bounce_factor = WEP_CVAR(mortar, bouncefactor);
-				this.move_bounce_stopspeed = WEP_CVAR(mortar, bouncestop);
+				settouch(this, func_null);
+				this.bouncefactor = WEP_CVAR(mortar, bouncefactor);
+				this.bouncestop = WEP_CVAR(mortar, bouncestop);
 				break;
 			case PROJECTILE_SHAMBLER_LIGHTNING:
 				this.mins = '-8 -8 -8';
@@ -385,21 +377,21 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 				this.colormod = '2 1 1';
 				this.alphamod = 0.5;
 				this.move_movetype = MOVETYPE_BOUNCE;
-				this.move_touch = func_null;
+				settouch(this, func_null);
 				break;
 			case PROJECTILE_PORTO_BLUE:
 				this.colormod = '1 1 2';
 				this.alphamod = 0.5;
 				this.move_movetype = MOVETYPE_BOUNCE;
-				this.move_touch = func_null;
+				settouch(this, func_null);
 				break;
 			case PROJECTILE_HAGAR_BOUNCING:
 				this.move_movetype = MOVETYPE_BOUNCE;
-				this.move_touch = func_null;
+				settouch(this, func_null);
 				break;
 			case PROJECTILE_CRYLINK_BOUNCING:
 				this.move_movetype = MOVETYPE_BOUNCE;
-				this.move_touch = func_null;
+				settouch(this, func_null);
 				break;
 			case PROJECTILE_FIREBALL:
 				loopsound(this, CH_SHOTS_SINGLE, SND(FIREBALL_FLY2), VOL_BASE, ATTEN_NORM);
@@ -409,7 +401,7 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 			case PROJECTILE_FIREMINE:
 				loopsound(this, CH_SHOTS_SINGLE, SND(FIREBALL_FLY), VOL_BASE, ATTEN_NORM);
 				this.move_movetype = MOVETYPE_BOUNCE;
-				this.move_touch = func_null;
+				settouch(this, func_null);
 				this.mins = '-4 -4 -4';
 				this.maxs = '4 4 4';
 				break;
@@ -449,9 +441,9 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 			    this.mins = '0 0 -4';
 			    this.maxs = '0 0 -4';
 			    this.move_movetype = MOVETYPE_BOUNCE;
-			    this.move_touch = func_null;
-			    this.move_bounce_factor = WEP_CVAR_SEC(electro, bouncefactor);
-			    this.move_bounce_stopspeed = WEP_CVAR_SEC(electro, bouncestop);
+			    settouch(this, func_null);
+			    this.bouncefactor = WEP_CVAR_SEC(electro, bouncefactor);
+			    this.bouncestop = WEP_CVAR_SEC(electro, bouncestop);
 			    break;
 			*/
 			default: