X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=264f4797e58915db809e3154ddfbf73a97305c83;hb=f2804031fdb2889c46959e91ea9da121e6731686;hp=9639ea8ef553475670171069d969b7e648321eab;hpb=d82b2d32a258461cb8416e16f87dcb41a5a98fff;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 9639ea8ef..264f4797e 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -69,7 +69,7 @@ void CSQCPlayer_LOD_Apply(void)
 	}
 }
 
-// FEATURE: forcemodel (MUST be called BEFORE LOD!)
+// FEATURE: forcemodel and model color selection (MUST be called BEFORE LOD!)
 string forceplayermodels_model;
 float forceplayermodels_modelisgoodmodel;
 float forceplayermodels_modelindex;
@@ -92,14 +92,17 @@ float forceplayermodels_attempted;
 string forceplayermodels_goodmodel;
 float forceplayermodels_goodmodelindex;
 
-void CSQCPlayer_ForceModel_PreUpdate(void)
+.vector glowmod;
+.vector old_glowmod; 
+
+void CSQCPlayer_ModelAppearance_PreUpdate(void)
 {
 	self.model = self.forceplayermodels_savemodel;
 	self.modelindex = self.forceplayermodels_savemodelindex;
 	self.skin = self.forceplayermodels_saveskin;
 	self.colormap = self.forceplayermodels_savecolormap;
 }
-void CSQCPlayer_ForceModel_PostUpdate(void)
+void CSQCPlayer_ModelAppearance_PostUpdate(void)
 {
 	self.forceplayermodels_savemodel = self.model;
 	self.forceplayermodels_savemodelindex = self.modelindex;
@@ -114,8 +117,9 @@ void CSQCPlayer_ForceModel_PostUpdate(void)
 			print(sprintf("Warning: missing model %s has been used\n", self.forceplayermodels_savemodel));
 	}
 }
-void CSQCPlayer_ForceModel_Apply(float islocalplayer)
+void CSQCPlayer_ModelAppearance_Apply(float islocalplayer)
 {
+	// FORCEMODEL
 	// which one is ALWAYS good?
 	if not(forceplayermodels_goodmodel)
 	{
@@ -218,7 +222,7 @@ void CSQCPlayer_ForceModel_Apply(float islocalplayer)
 		entity tm;
 
 		for(tm = teams.sort_next; tm; tm = tm.sort_next)
-			if(tm.team != COLOR_SPECTATOR)
+			if(tm.team != NUM_SPECTATOR)
 				++teams_count;
 
 		if(autocvar_cl_forcemyplayercolors)
@@ -265,6 +269,30 @@ void CSQCPlayer_ForceModel_Apply(float islocalplayer)
 		else if(autocvar_cl_forceplayercolors)
 			self.colormap = player_localnum + 1;
 	}
+
+	// GLOWMOD AND DEATH FADING
+	if(self.colormap > 0)
+		self.glowmod = colormapPaletteColor(((self.colormap >= 1024) ? self.colormap : stof(getplayerkeyvalue(self.colormap - 1, "colors"))) & 0x0F, TRUE) * 2;
+	else
+		self.glowmod = '1 1 1';
+
+	if(autocvar_cl_deathglow > 0)
+	{
+		if(self.csqcmodel_isdead)
+		{
+			// Fade out to black now...
+			if(self.old_glowmod == '0 0 0') { self.old_glowmod = self.glowmod; }
+			self.colormap = 0;
+			
+			self.glowmod = self.old_glowmod * bound(0, 1 - (time - self.death_time) / autocvar_cl_deathglow, 1);
+			self.glowmod_x = max(self.glowmod_x, 0.0001);
+			self.glowmod_y = max(self.glowmod_y, 0.0001);
+			self.glowmod_z = max(self.glowmod_z, 0.0001);
+		}
+		else if(self.old_glowmod != '0 0 0') { self.old_glowmod = '0 0 0'; }
+	}
+
+	//print(sprintf("CSQCPlayer_ModelAppearance_Apply(): state = %s, colormap = %f, glowmod = %s\n", (self.csqcmodel_isdead ? "DEAD" : "ALIVE"), self.colormap, vtos(self.glowmod)));
 }
 
 // FEATURE: fallback frames
@@ -313,6 +341,10 @@ void CSQCPlayer_FallbackFrame_PostUpdate(float isnew)
 	}
 	self.csqcmodel_isdead = IS_DEAD_FRAME(self.frame);
 }
+void CSQCPlayer_AnimDecide_PostUpdate(float isnew)
+{
+	self.csqcmodel_isdead = !!(self.anim_state & (ANIMSTATE_DEAD1 | ANIMSTATE_DEAD2));
+}
 float CSQCPlayer_FallbackFrame(float f)
 {
 	if(frameduration(self.modelindex, f) > 0)
@@ -548,31 +580,6 @@ void CSQCPlayer_Precache()
 	precache_sound("misc/jetpack_fly.wav");
 }
 
-// FEATURE: auto glowmod
-.vector glowmod;
-void CSQCPlayer_GlowMod_Apply(void)
-{
-	float cm = self.colormap;
-
-	if(self.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST)
-		cm = 1024;
-
-	if(self.colormap > 0)
-		self.glowmod = colormapPaletteColor(((self.colormap >= 1024) ? self.colormap : stof(getplayerkeyvalue(self.colormap - 1, "colors"))) & 0x0F, TRUE) * 2;
-	else
-		self.glowmod = '1 1 1';
-
-	if(autocvar_cl_deathglow > 0)
-		if(self.csqcmodel_isdead)
-		{
-			self.glowmod = self.glowmod * bound(0, 1 - (time - self.death_time) / autocvar_cl_deathglow, 1);
-			// prevent the zero vector
-			self.glowmod_x = max(self.glowmod_x, 0.0001);
-			self.glowmod_y = max(self.glowmod_y, 0.0001);
-			self.glowmod_z = max(self.glowmod_z, 0.0001);
-		}
-}
-
 // general functions
 .float csqcmodel_predraw_run;
 .float anim_frame;
@@ -600,8 +607,7 @@ void CSQCModel_Hook_PreDraw(float isplayer)
 
 	if(self.isplayermodel) // this checks if it's a player MODEL!
 	{
-		CSQCPlayer_ForceModel_Apply(self.entnum == player_localnum + 1);
-		CSQCPlayer_GlowMod_Apply();
+		CSQCPlayer_ModelAppearance_Apply(self.entnum == player_localnum + 1);
 		CSQCPlayer_LOD_Apply();
 		if(!isplayer)
 			CSQCPlayer_FallbackFrame_Apply();
@@ -623,7 +629,7 @@ void CSQCModel_Hook_PreDraw(float isplayer)
 			}
 			else
 			{
-				traceline(self.origin + '0 0 1' * self.maxs_z, self.origin + '0 0 1' * (self.mins_z - 4), MOVE_NOMONSTERS, self);
+				tracebox(self.origin + '0 0 1', self.mins, self.maxs, self.origin - '0 0 4', MOVE_NORMAL, self);
 				if(trace_startsolid || trace_fraction < 1)
 					onground = 1;
 			}
@@ -652,7 +658,7 @@ void CSQCModel_Hook_PreDraw(float isplayer)
 			CSQCModel_InterpolateAnimation_2To4_Do();
 			if(doblend)
 			{
-				skeleton_from_frames(self);
+				skeleton_from_frames(self, self.csqcmodel_isdead);
 			}
 			else
 			{
@@ -679,7 +685,7 @@ void CSQCModel_Hook_PreUpdate(float isnew, float isplayer, float islocalplayer)
 	{
 		if(!isplayer)
 			CSQCPlayer_FallbackFrame_PreUpdate();
-		CSQCPlayer_ForceModel_PreUpdate();
+		CSQCPlayer_ModelAppearance_PreUpdate();
 	}
 }
 
@@ -691,8 +697,10 @@ void CSQCModel_Hook_PostUpdate(float isnew, float isplayer, float islocalplayer)
 	// save values set by server
 	if(self.isplayermodel)
 	{
-		CSQCPlayer_ForceModel_PostUpdate();
-		if(!isplayer)
+		CSQCPlayer_ModelAppearance_PostUpdate();
+		if(isplayer)
+			CSQCPlayer_AnimDecide_PostUpdate(isnew);
+		else
 			CSQCPlayer_FallbackFrame_PostUpdate(isnew);
 	}
 	CSQCModel_Effects_PostUpdate();