From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 30 Dec 2011 09:10:37 +0000 (+0100)
Subject: fix bugs in last change :)
X-Git-Tag: xonotic-v0.6.0~74^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6292a423fbf03f7499e07405ada2ce709827b092;p=xonotic%2Fxonotic-data.pk3dir.git

fix bugs in last change :)
---

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 3cca609fd..fd8afe117 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -1049,7 +1049,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
 		case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
 		case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
 		case ENT_CLIENT_TURRET: ent_turret(); break; 
-		case ENT_CLIENT_MODEL: CSQCModel_Read(); break; 
+		case ENT_CLIENT_MODEL: CSQCModel_Read(bIsNewEntity); break; 
 		default:
 			//error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
 			error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname));
diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index e196396f0..33e093adc 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -162,15 +162,15 @@ void CSQCPlayer_FallbackFrame_PostUpdate(float isnew)
 #define FIX_FRAMETIME(f,ft) \
 		switch(self.f) \
 		{ \
-			case 0: // anim_die1 \
-			case 1: // anim_die2 \
+			case 0: \
+			case 1: \
 				self.ft = 0; \
 				break; \
 		}
-		FIX_FRAMETIME(frame, frame1time);
-		FIX_FRAMETIME(frame2, frame2time);
-		FIX_FRAMETIME(frame3, frame3time);
-		FIX_FRAMETIME(frame4, frame4time);
+		FIX_FRAMETIME(frame, frame1time)
+		FIX_FRAMETIME(frame2, frame2time)
+		FIX_FRAMETIME(frame3, frame3time)
+		FIX_FRAMETIME(frame4, frame4time)
 	}
 }
 float CSQCPlayer_FallbackFrame(float f)
diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh
index 2164ecae4..0f3ca3859 100644
--- a/qcsrc/common/csqcmodel_settings.qh
+++ b/qcsrc/common/csqcmodel_settings.qh
@@ -33,9 +33,9 @@
 
 // add hook function calls here
 #define CSQCMODEL_HOOK_PREUPDATE \
-	CSQCModel_Hook_PreUpdate(isplayer, islocalplayer);
+	CSQCModel_Hook_PreUpdate(isnew, isplayer, islocalplayer);
 #define CSQCMODEL_HOOK_POSTUPDATE \
-	CSQCModel_Hook_PostUpdate(isplayer, islocalplayer);
+	CSQCModel_Hook_PostUpdate(isnew, isplayer, islocalplayer);
 #define CSQCMODEL_HOOK_PREDRAW \
 	CSQCModel_Hook_PreDraw(isplayer, islocalplayer);
 #define CSQCPLAYER_HOOK_POSTCAMERASETUP
diff --git a/qcsrc/csqcmodellib/cl_model.qc b/qcsrc/csqcmodellib/cl_model.qc
index 03226613b..24f3c60e0 100644
--- a/qcsrc/csqcmodellib/cl_model.qc
+++ b/qcsrc/csqcmodellib/cl_model.qc
@@ -170,7 +170,7 @@ void CSQCModel_Draw()
 	self.csqcmodel_teleported = 0;
 }
 
-void CSQCModel_Read()
+void CSQCModel_Read(float isnew)
 {
 	float sf;
 	sf = ReadShort();
diff --git a/qcsrc/csqcmodellib/cl_model.qh b/qcsrc/csqcmodellib/cl_model.qh
index d38656533..e8ea9012c 100644
--- a/qcsrc/csqcmodellib/cl_model.qh
+++ b/qcsrc/csqcmodellib/cl_model.qh
@@ -20,7 +20,7 @@
  * IN THE SOFTWARE.
  */
 
-void CSQCModel_Read();
+void CSQCModel_Read(float isnew);
 
 #define CSQCMODEL_IF(cond)
 #define CSQCMODEL_ENDIF