X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=388d1a98298fb953b6c5a940e8057c608b7b2a96;hb=340221e0b0251b0caf1036bc06912f2e40256f88;hp=939e5d77fa80dd57c4ae4c7bb4382f413c85917d;hpb=9e50112561ad6f4cefe6d13bd7185f5dfd1ada4b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 939e5d77f..388d1a982 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -1,6 +1,5 @@
 #include "csqcmodel_hooks.qh"
 #include "autocvars.qh"
-#include "csqcmodel_hooks.qh"
 #include "miscfunctions.qh"
 #include <client/mutators/_mod.qh>
 #include "player_skeleton.qh"
@@ -109,7 +108,6 @@ string forceplayermodels_goodmodel;
 int forceplayermodels_goodmodelindex;
 
 .vector glowmod;
-.vector old_glowmod;
 
 void CSQCPlayer_ModelAppearance_PreUpdate(entity this)
 {
@@ -135,6 +133,9 @@ void CSQCPlayer_ModelAppearance_PostUpdate(entity this)
 }
 void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 {
+	int cm = this.forceplayermodels_savecolormap;
+	cm = (cm >= 1024) ? cm : (entcs_GetClientColors(cm - 1) + 1024);
+
 	if(MUTATOR_CALLHOOK(ForcePlayermodels_Skip, this, islocalplayer))
 		goto skipforcemodels;
 
@@ -195,9 +196,6 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 
 	// apply it
 	bool isfriend;
-	int cm;
-	cm = this.forceplayermodels_savecolormap;
-	cm = (cm >= 1024) ? cm : (entcs_GetClientColors(cm - 1) + 1024);
 
 	if(teamplay)
 		isfriend = (cm == 1024 + 17 * myteam);
@@ -229,6 +227,11 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 		this.skin = this.forceplayermodels_saveskin;
 	}
 
+	LABEL(skipforcemodels)
+
+	if(MUTATOR_CALLHOOK(ForcePlayercolors_Skip, this, islocalplayer))
+		goto skipforcecolors;
+
 	// forceplayercolors too
 	if(teamplay)
 	{
@@ -282,7 +285,14 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 			this.colormap = player_localnum + 1;
 	}
 
-	LABEL(skipforcemodels)
+	LABEL(skipforcecolors)
+
+	if((this.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST) && !autocvar_cl_respawn_ghosts_keepcolors)
+	{
+		this.glowmod = '0 0 0';
+		this.colormap = 0;
+		return;
+	}
 
 	// GLOWMOD AND DEATH FADING
 	if(this.colormap > 0)
@@ -294,16 +304,14 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 	{
 		if(this.csqcmodel_isdead)
 		{
-			// Fade out to black now...
-			if(this.old_glowmod == '0 0 0') { this.old_glowmod = this.glowmod; }
-			this.colormap = 0;
-
-			this.glowmod = this.old_glowmod * bound(0, 1 - (time - this.death_time) / autocvar_cl_deathglow, 1);
-			this.glowmod_x = max(this.glowmod.x, 0.0001);
-			this.glowmod_y = max(this.glowmod.y, 0.0001);
-			this.glowmod_z = max(this.glowmod.z, 0.0001);
+			float min_factor = bound(0, autocvar_cl_deathglow_min, 1);
+			if(this.colormap > 0)
+				min_factor /= 2;
+			float glow_fade = bound(0, 1 - (time - this.death_time) / autocvar_cl_deathglow, 1);
+			this.glowmod *= (min_factor + glow_fade * (1 - min_factor));
+			if (this.glowmod == '0 0 0')
+				this.glowmod.x = 0.000001;
 		}
-		else if(this.old_glowmod != '0 0 0') { this.old_glowmod = '0 0 0'; }
 	}
 
 	//printf("CSQCPlayer_ModelAppearance_Apply(): state = %s, colormap = %f, glowmod = %s\n", (this.csqcmodel_isdead ? "DEAD" : "ALIVE"), this.colormap, vtos(this.glowmod));
@@ -517,9 +525,15 @@ void CSQCModel_Effects_Apply(entity this)
 	if(eff & EF_FULLBRIGHT)
 		this.renderflags |= RF_FULLBRIGHT;
 	if(eff & EF_FLAME)
-		pointparticles(EFFECT_EF_FLAME, this.origin, '0 0 0', bound(0, frametime, 0.1));
+	{
+		boxparticles(particleeffectnum(EFFECT_EF_FLAME), this, this.absmin, this.absmax, this.velocity, this.velocity, bound(0, frametime, 0.1), 0);
+		//pointparticles(EFFECT_EF_FLAME, this.origin, '0 0 0', bound(0, frametime, 0.1));
+	}
 	if(eff & EF_STARDUST)
-		pointparticles(EFFECT_EF_STARDUST, this.origin, '0 0 0', bound(0, frametime, 0.1));
+	{
+		boxparticles(particleeffectnum(EFFECT_EF_STARDUST), this, this.absmin, this.absmax, this.velocity, this.velocity, bound(0, frametime, 0.1), 0);
+		//pointparticles(EFFECT_EF_STARDUST, this.origin, '0 0 0', bound(0, frametime, 0.1));
+	}
 	if(eff & EF_NOSHADOW)
 		this.renderflags |= RF_NOSHADOW;
 	if(eff & EF_NODEPTHTEST)
@@ -540,8 +554,11 @@ void CSQCModel_Effects_Apply(entity this)
 		tref = EFFECT_TR_BLOOD.m_id;
 	if(this.csqcmodel_modelflags & MF_ROTATE)
 	{
+		// This will be hard to replace with MAKE_VECTORS because it's called as part of the predraw function
+		// as documented in csprogs.h in the engine. The globals can then be read in many places in the engine.
+		// However MF_ROTATE is currently only used in one place - might be possible to get rid of it entirely.
 		this.renderflags |= RF_USEAXIS;
-		MAKEVECTORS(makevectors, this.angles + '0 100 0' * fmod(time, 3.6), v_forward, v_right, v_up);
+		makevectors(this.angles + '0 100 0' * fmod(time, 3.6));
 	}
 	if(this.csqcmodel_modelflags & MF_TRACER)
 		tref = EFFECT_TR_WIZSPIKE.m_id;
@@ -601,6 +618,11 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer)
 	if(!this.modelindex || this.model == "null" || this.alpha < 0)
 	{
 		this.drawmask = 0;
+		if(this.snd_looping > 0)
+		{
+			sound(this, this.snd_looping, SND_Null, VOL_BASE, autocvar_cl_jetpack_attenuation);
+			this.snd_looping = 0;
+		}
 		return;
 	}
 	else