X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=d2b28e9b08f2a9b4cacd3a49bc0f45076a52de8e;hp=30148bdd44e7f4be1fb88b33d406ae203b525788;hb=6792b5c14ddf90b92ae8f5d15318322a5d4733b7;hpb=b9671f63469586007314131f3f53728795c035cd

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 30148bdd4..d2b28e9b0 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -3,6 +3,7 @@
 #include "player_skeleton.qh"
 #include "weapons/projectile.qh"
 #include <common/animdecide.qh>
+#include <common/ent_cs.qh>
 #include <common/physics/movetypes/movetypes.qh>
 #include <common/viewloc.qh>
 #include <lib/csqcmodel/cl_model.qh>
@@ -142,7 +143,7 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 		_setmodel(e, cvar_defstring("_cl_playermodel"));
 		forceplayermodels_goodmodel = e.model;
 		forceplayermodels_goodmodelindex = e.modelindex;
-		remove(e);
+		delete(e);
 	}
 
 	// first, try finding it from the server
@@ -175,7 +176,7 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 		forceplayermodels_model = e.model;
 		forceplayermodels_modelindex = e.modelindex;
 		forceplayermodels_skin = autocvar__cl_playerskin;
-		remove(e);
+		delete(e);
 	}
 
 	if(autocvar_cl_forcemyplayermodel != "" && autocvar_cl_forcemyplayermodel != forceplayermodels_mymodel)
@@ -185,14 +186,14 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 		forceplayermodels_myisgoodmodel = fexists(e.model);
 		forceplayermodels_mymodel = e.model;
 		forceplayermodels_mymodelindex = e.modelindex;
-		remove(e);
+		delete(e);
 	}
 
 	// apply it
 	bool isfriend;
 	int cm;
 	cm = this.forceplayermodels_savecolormap;
-	cm = (cm >= 1024) ? cm : (stof(getplayerkeyvalue(cm - 1, "colors")) + 1024);
+	cm = (cm >= 1024) ? cm : (entcs_GetClientColors(cm - 1) + 1024);
 
 	if(teamplay)
 		isfriend = (cm == 1024 + 17 * myteam);
@@ -279,7 +280,7 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 
 	// GLOWMOD AND DEATH FADING
 	if(this.colormap > 0)
-		this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : stof(getplayerkeyvalue(this.colormap - 1, "colors"))) & 0x0F, true) * 2;
+		this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true) * 2;
 	else
 		this.glowmod = '1 1 1';
 
@@ -369,7 +370,7 @@ int CSQCPlayer_FallbackFrame(entity this, int f)
 		case 29: return 4; // anim_duckwalkbackright -> anim_duckwalk
 		case 30: return 4; // anim_duckwalkbackleft -> anim_duckwalk
 	}
-	LOG_DEBUGF("Frame %d missing in model %s, and we have no fallback - FAIL!\n", f, this.model);
+	LOG_DEBUGF("Frame %d missing in model %s, and we have no fallback - FAIL!", f, this.model);
 	return f;
 }
 void CSQCPlayer_FallbackFrame_Apply(entity this)
@@ -391,8 +392,6 @@ void CSQCModel_AutoTagIndex_Apply(entity this)
 	if(this.tag_entity && wasfreed(this.tag_entity))
 		this.tag_entity = NULL;
 
-	viewloc_SetTags(this);
-
 	MUTATOR_CALLHOOK(TagIndex_Update, this);
 
 	if(this.tag_networkentity)
@@ -433,7 +432,7 @@ void CSQCModel_AutoTagIndex_Apply(entity this)
 							// we need to prevent this from 'appening
 							this.tag_entity = NULL;
 							this.drawmask = 0;
-							LOG_TRACE("h_ model lacks weapon attachment, but v_ model is attached to it\n");
+							LOG_TRACE("h_ model lacks weapon attachment, but v_ model is attached to it");
 						}
 					}
 					else if(this.tag_entity.isplayermodel)
@@ -562,7 +561,7 @@ void CSQCModel_Effects_Apply(entity this)
 	{
 		if(!this.snd_looping)
 		{
-			sound(this, CH_TRIGGER_SINGLE, SND_JETPACK_FLY, VOL_BASE, autocvar_g_jetpack_attenuation);
+			sound(this, CH_TRIGGER_SINGLE, SND_JETPACK_FLY, VOL_BASE, autocvar_cl_jetpack_attenuation);
 			this.snd_looping = CH_TRIGGER_SINGLE;
 		}
 	}
@@ -570,7 +569,7 @@ void CSQCModel_Effects_Apply(entity this)
 	{
 		if(this.snd_looping)
 		{
-			sound(this, this.snd_looping, SND_Null, VOL_BASE, autocvar_g_jetpack_attenuation);
+			sound(this, this.snd_looping, SND_Null, VOL_BASE, autocvar_cl_jetpack_attenuation);
 			this.snd_looping = 0;
 		}
 	}