X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=f29139e46ebead4cfa10c20f5b8878adb8cdf771;hb=df110eb632e3d04119c2d0771e0d54c1a1ea27b8;hp=120b6658df8792443433fc40d7192bc89c4e809b;hpb=9aa300c859f50fb6f06e5caef46cc7af1e3bc51b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 120b6658d..f29139e46 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -470,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;
@@ -655,16 +661,15 @@ void CSQCModel_Hook_PreDraw(float isplayer)
 			self.anim_saveframe1time = self.anim_frame1time;
 			self.anim_saveframe2 = self.anim_frame2;
 			self.anim_saveframe2time = self.anim_frame2time;
-			if(sf)
-			{
-				CSQCModel_InterpolateAnimation_2To4_PreNote(sf | CSQCMODEL_PROPERTY_LERPFRAC);
-				self.lerpfrac = (doblend ? 0.5 : 0);
-				self.frame = self.anim_frame;
-				self.frame1time = self.anim_frame1time;
-				self.frame2 = self.anim_frame2;
-				self.frame2time = self.anim_frame2time;
-				CSQCModel_InterpolateAnimation_2To4_Note(sf | CSQCMODEL_PROPERTY_LERPFRAC, FALSE);
-			}
+			// Note: we always consider lerpfrac "changed", as it uses fixed values every time anyway.
+			// This ensures that .frame etc. are always written.
+			CSQCModel_InterpolateAnimation_2To4_PreNote(sf | CSQCMODEL_PROPERTY_LERPFRAC);
+			self.lerpfrac = (doblend ? 0.5 : 0);
+			self.frame = self.anim_frame;
+			self.frame1time = self.anim_frame1time;
+			self.frame2 = self.anim_frame2;
+			self.frame2time = self.anim_frame2time;
+			CSQCModel_InterpolateAnimation_2To4_Note(sf | CSQCMODEL_PROPERTY_LERPFRAC, FALSE);
 			CSQCModel_InterpolateAnimation_2To4_Do();
 			if(doblend)
 			{