X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fweapons%2Fprojectile.qc;h=7f64e9ab98787708f96a5aa05e9ea783183d4e3f;hp=39032cd70d782aad8606f3d73addccbe61dde822;hb=b6b68fad0ba8fb6901de0fcb14774b709696d8bc;hpb=f2a7c3c0c62985e64a71b475c55bc974d28e0805

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 39032cd70d..7f64e9ab98 100644
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -6,6 +6,7 @@
 #include "../mutators/events.qh"
 
 #include <common/constants.qh>
+#include <common/net_linked.qh>
 #include <common/physics/movetypes/movetypes.qh>
 
 #include <lib/csqcmodel/interpolate.qh>
@@ -18,8 +19,8 @@
 
 void SUB_Stop(entity this, entity toucher)
 {
-	this.move_velocity = this.move_avelocity = '0 0 0';
-	this.move_movetype = MOVETYPE_NONE;
+	this.velocity = this.avelocity = '0 0 0';
+	set_movetype(this, MOVETYPE_NONE);
 }
 
 void Projectile_ResetTrail(entity this, vector to)
@@ -58,11 +59,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;
+		// UNSET_ONGROUND(this);
 		if (this.move_movetype == MOVETYPE_NONE || this.move_movetype == MOVETYPE_FLY)
 			Movetype_Physics_NoMatchServer(this);
 		// the trivial movetypes do not have to match the
@@ -72,9 +73,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 (!IS_ONGROUND(this))
 			if (this.velocity != '0 0 0')
-				this.move_angles = this.angles = vectoangles(this.velocity);
+				this.angles = vectoangles(this.velocity);
 	}
 	else
 	{
@@ -108,6 +109,9 @@ void Projectile_Draw(entity this)
 			case PROJECTILE_HOOKBOMB:
 				rot = '1000 0 0';  // forward
 				break;
+			case PROJECTILE_ROCKET:
+				rot = '0 0 720'; // spinning
+				break;
 			default:
 				break;
 		}
@@ -163,13 +167,13 @@ void Projectile_Draw(entity this)
 	this.drawmask = MASK_NORMAL;
 }
 
-void loopsound(entity e, int ch, string samp, float vol, float attn)
+void loopsound(entity e, int ch, Sound samp, float vol, float attn)
 {
     TC(int, ch);
 	if (e.silent)
 		return;
 
-	_sound(e, ch, samp, vol, attn);
+	sound(e, ch, samp, vol, attn);
 	e.snd_looping = ch;
 }
 
@@ -209,9 +213,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;
+		SET_ONGROUND(this);
 	else
-		this.move_flags &= ~FL_ONGROUND;
+		UNSET_ONGROUND(this);
 
 	if (!this.move_time)
 	{
@@ -243,8 +247,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))
@@ -265,7 +267,26 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 			this.fade_rate = 0;
 		}
 
-		this.team = ReadByte() - 1;
+		int myteam = ReadByte();
+		this.team = myteam - 1;
+
+		if(teamplay)
+		{
+			if(myteam)
+				this.colormap = (this.team) * 0x11; // note: team - 1 on server (client uses different numbers)
+			else
+				this.colormap = 0x00;
+			this.colormap |= BIT(10); // RENDER_COLORMAPPED
+		}
+		else
+			this.colormap = myteam;
+		// TODO: projectiles use glowmaps for their color, not teams
+		#if 0
+		if(this.colormap > 0)
+			this.glowmod = colormapPaletteColor(this.colormap & 0x0F, true) * 2;
+		else
+			this.glowmod = '1 1 1';
+		#endif
 	}
 
 	if (f & 2)
@@ -332,24 +353,24 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 		this.maxs = '0 0 0';
 		this.colormod = '0 0 0';
 		settouch(this, SUB_Stop);
-		this.move_movetype = MOVETYPE_TOSS;
+		set_movetype(this, MOVETYPE_TOSS);
 		this.alphamod = 1;
 
 		switch (this.cnt)
 		{
 			case PROJECTILE_ELECTRO:
 				// only new engines support sound moving with object
-				loopsound(this, CH_SHOTS_SINGLE, SND(ELECTRO_FLY), VOL_BASE, ATTEN_NORM);
-				this.mins = '0 0 -4';
-				this.maxs = '0 0 -4';
-				this.move_movetype = MOVETYPE_BOUNCE;
+				loopsound(this, CH_SHOTS_SINGLE, SND_ELECTRO_FLY, VOL_BASE, ATTEN_NORM);
+				this.mins = '-4 -4 -4';
+				this.maxs = '4 4 4';
+				set_movetype(this, MOVETYPE_BOUNCE);
 				settouch(this, func_null);
-				this.move_bounce_factor = WEP_CVAR_SEC(electro, bouncefactor);
-				this.move_bounce_stopspeed = WEP_CVAR_SEC(electro, bouncestop);
+				this.bouncefactor = WEP_CVAR_SEC(electro, bouncefactor);
+				this.bouncestop = WEP_CVAR_SEC(electro, bouncestop);
 				break;
 			case PROJECTILE_RPC:
 			case PROJECTILE_ROCKET:
-				loopsound(this, CH_SHOTS_SINGLE, SND(ROCKET_FLY), VOL_BASE, ATTEN_NORM);
+				loopsound(this, CH_SHOTS_SINGLE, SND_ROCKET_FLY, VOL_BASE, ATTEN_NORM);
 				this.mins = '-3 -3 -3';
 				this.maxs = '3 3 3';
 				break;
@@ -360,10 +381,10 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 			case PROJECTILE_GRENADE_BOUNCING:
 				this.mins = '-3 -3 -3';
 				this.maxs = '3 3 3';
-				this.move_movetype = MOVETYPE_BOUNCE;
+				set_movetype(this, MOVETYPE_BOUNCE);
 				settouch(this, func_null);
-				this.move_bounce_factor = WEP_CVAR(mortar, bouncefactor);
-				this.move_bounce_stopspeed = WEP_CVAR(mortar, bouncestop);
+				this.bouncefactor = WEP_CVAR(mortar, bouncefactor);
+				this.bouncestop = WEP_CVAR(mortar, bouncestop);
 				break;
 			case PROJECTILE_SHAMBLER_LIGHTNING:
 				this.mins = '-8 -8 -8';
@@ -378,31 +399,31 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 			case PROJECTILE_PORTO_RED:
 				this.colormod = '2 1 1';
 				this.alphamod = 0.5;
-				this.move_movetype = MOVETYPE_BOUNCE;
+				set_movetype(this, MOVETYPE_BOUNCE);
 				settouch(this, func_null);
 				break;
 			case PROJECTILE_PORTO_BLUE:
 				this.colormod = '1 1 2';
 				this.alphamod = 0.5;
-				this.move_movetype = MOVETYPE_BOUNCE;
+				set_movetype(this, MOVETYPE_BOUNCE);
 				settouch(this, func_null);
 				break;
 			case PROJECTILE_HAGAR_BOUNCING:
-				this.move_movetype = MOVETYPE_BOUNCE;
+				set_movetype(this, MOVETYPE_BOUNCE);
 				settouch(this, func_null);
 				break;
 			case PROJECTILE_CRYLINK_BOUNCING:
-				this.move_movetype = MOVETYPE_BOUNCE;
+				set_movetype(this, MOVETYPE_BOUNCE);
 				settouch(this, func_null);
 				break;
 			case PROJECTILE_FIREBALL:
-				loopsound(this, CH_SHOTS_SINGLE, SND(FIREBALL_FLY2), VOL_BASE, ATTEN_NORM);
+				loopsound(this, CH_SHOTS_SINGLE, SND_FIREBALL_FLY2, VOL_BASE, ATTEN_NORM);
 				this.mins = '-16 -16 -16';
 				this.maxs = '16 16 16';
 				break;
 			case PROJECTILE_FIREMINE:
-				loopsound(this, CH_SHOTS_SINGLE, SND(FIREBALL_FLY), VOL_BASE, ATTEN_NORM);
-				this.move_movetype = MOVETYPE_BOUNCE;
+				loopsound(this, CH_SHOTS_SINGLE, SND_FIREBALL_FLY, VOL_BASE, ATTEN_NORM);
+				set_movetype(this, MOVETYPE_BOUNCE);
 				settouch(this, func_null);
 				this.mins = '-4 -4 -4';
 				this.maxs = '4 4 4';
@@ -416,7 +437,7 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 				this.maxs = '2 2 2';
 				break;
 			case PROJECTILE_SEEKER:
-				loopsound(this, CH_SHOTS_SINGLE, SND(TAG_ROCKET_FLY), VOL_BASE, ATTEN_NORM);
+				loopsound(this, CH_SHOTS_SINGLE, SND_TAG_ROCKET_FLY, VOL_BASE, ATTEN_NORM);
 				this.mins = '-4 -4 -4';
 				this.maxs = '4 4 4';
 				break;
@@ -429,23 +450,23 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 			case PROJECTILE_RAPTORCANNON:
 				break;
 			case PROJECTILE_SPIDERROCKET:
-				loopsound(this, CH_SHOTS_SINGLE, SND(TAG_ROCKET_FLY), VOL_BASE, ATTEN_NORM);
+				loopsound(this, CH_SHOTS_SINGLE, SND_TAG_ROCKET_FLY, VOL_BASE, ATTEN_NORM);
 				break;
 			case PROJECTILE_WAKIROCKET:
-				loopsound(this, CH_SHOTS_SINGLE, SND(TAG_ROCKET_FLY), VOL_BASE, ATTEN_NORM);
+				loopsound(this, CH_SHOTS_SINGLE, SND_TAG_ROCKET_FLY, VOL_BASE, ATTEN_NORM);
 				break;
 			/*
 			case PROJECTILE_WAKICANNON:
 			    break;
 			case PROJECTILE_BUMBLE_GUN:
 			    // only new engines support sound moving with object
-			    loopsound(this, CH_SHOTS_SINGLE, SND(ELECTRO_FLY), VOL_BASE, ATTEN_NORM);
+			    loopsound(this, CH_SHOTS_SINGLE, SND_ELECTRO_FLY, VOL_BASE, ATTEN_NORM);
 			    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:
@@ -462,16 +483,16 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 	if (this.gravity)
 	{
 		if (this.move_movetype == MOVETYPE_FLY)
-			this.move_movetype = MOVETYPE_TOSS;
+			set_movetype(this, MOVETYPE_TOSS);
 		if (this.move_movetype == MOVETYPE_BOUNCEMISSILE)
-			this.move_movetype = MOVETYPE_BOUNCE;
+			set_movetype(this, MOVETYPE_BOUNCE);
 	}
 	else
 	{
 		if (this.move_movetype == MOVETYPE_TOSS)
-			this.move_movetype = MOVETYPE_FLY;
+			set_movetype(this, MOVETYPE_FLY);
 		if (this.move_movetype == MOVETYPE_BOUNCE)
-			this.move_movetype = MOVETYPE_BOUNCEMISSILE;
+			set_movetype(this, MOVETYPE_BOUNCEMISSILE);
 	}
 
 	if (!(this.count & 0x80))
@@ -479,6 +500,7 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 
 	this.classname = "csqcprojectile";
 	this.draw = Projectile_Draw;
+	if (isnew) IL_PUSH(g_drawables, this);
 	this.entremove = Ent_RemoveProjectile;
 }