X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=077b7d9720a1501e6d9eb72e3a36dabd3c0ec54c;hb=8f8c153ded2fc16282faf86ec673b3d44120801c;hp=fb87f9a7456e07a772c6f05bbbcc4d0b79a3526a;hpb=cf8895a5790c2ae048c71e0f53bae6409a5500c1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index fb87f9a74..077b7d972 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -114,7 +114,7 @@ void CSQCPlayer_ModelAppearance_PostUpdate(void)
 		self.forceplayermodels_isgoodmodel = fexists(self.forceplayermodels_savemodel);
 		self.forceplayermodels_isgoodmodel_mdl = self.forceplayermodels_savemodel;
 		if(!self.forceplayermodels_isgoodmodel)
-			print(sprintf("Warning: missing model %s has been used\n", self.forceplayermodels_savemodel));
+			printf("Warning: missing model %s has been used\n", self.forceplayermodels_savemodel);
 	}
 }
 void CSQCPlayer_ModelAppearance_Apply(float islocalplayer)
@@ -218,16 +218,11 @@ void CSQCPlayer_ModelAppearance_Apply(float islocalplayer)
 		// own team's color is never forced
 		float forcecolor_friend = 0;
 		float forcecolor_enemy = 0;
-		float teams_count = 0;
 		entity tm;
 
-		for(tm = teams.sort_next; tm; tm = tm.sort_next)
-			if(tm.team != NUM_SPECTATOR)
-				++teams_count;
-
 		if(autocvar_cl_forcemyplayercolors)
 			forcecolor_friend = 1024 + autocvar_cl_forcemyplayercolors;
-		if(autocvar_cl_forceplayercolors && teams_count == 2)
+		if(autocvar_cl_forceplayercolors && team_count == 2)
 			forcecolor_enemy = 1024 + autocvar__cl_color;
 
 		if(forcecolor_enemy && !forcecolor_friend)
@@ -292,7 +287,7 @@ void CSQCPlayer_ModelAppearance_Apply(float islocalplayer)
 		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)));
+	//printf("CSQCPlayer_ModelAppearance_Apply(): state = %s, colormap = %f, glowmod = %s\n", (self.csqcmodel_isdead ? "DEAD" : "ALIVE"), self.colormap, vtos(self.glowmod));
 }
 
 // FEATURE: fallback frames
@@ -362,7 +357,7 @@ float CSQCPlayer_FallbackFrame(float f)
 		case 29: return 4; // anim_duckwalkbackright -> anim_duckwalk
 		case 30: return 4; // anim_duckwalkbackleft -> anim_duckwalk
 	}
-	print(sprintf("Frame %d missing in model %s, and we have no fallback - FAIL!\n", f, self.model));
+	printf("Frame %d missing in model %s, and we have no fallback - FAIL!\n", f, self.model);
 	return f;
 }
 void CSQCPlayer_FallbackFrame_Apply(void)
@@ -475,8 +470,14 @@ void CSQCModel_Effects_PreUpdate(void)
 	self.effects = self.csqcmodel_effects;
 	self.modelflags = self.csqcmodel_modelflags;
 }
+void Reset_ArcBeam(void);
 void CSQCModel_Effects_PostUpdate(void)
 {
+	if (self == csqcplayer) {
+		if (self.csqcmodel_teleported) {
+			Reset_ArcBeam();
+		}
+	}
 	self.csqcmodel_effects = self.effects;
 	self.csqcmodel_modelflags = self.modelflags;
 	self.effects = 0;