From: Mario <zacjardine@y7mail.com>
Date: Mon, 5 Jan 2015 11:02:31 +0000 (+1100)
Subject: Fix a crash
X-Git-Tag: xonotic-v0.8.1~38^2~53
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=37fe73b6bc67d2687937314ae819bc80e50749b6;p=xonotic%2Fxonotic-data.pk3dir.git

Fix a crash
---

diff --git a/qcsrc/csqcmodellib/cl_player.qc b/qcsrc/csqcmodellib/cl_player.qc
index 5b2011e8c..d3c56c813 100644
--- a/qcsrc/csqcmodellib/cl_player.qc
+++ b/qcsrc/csqcmodellib/cl_player.qc
@@ -120,14 +120,14 @@ void CSQCPlayer_SavePrediction()
 	csqcplayer_status = CSQCPLAYERSTATUS_PREDICTED;
 }
 
-void PM_Main();
+void CSQC_ClientMovement_PlayerMove_Frame();
 
 void CSQCPlayer_Physics(void)
 {
 	switch(autocvar_cl_movement)
 	{
 		case 1: runstandardplayerphysics(self); break;
-		case 2: PM_Main(); break;
+		case 2: CSQC_ClientMovement_PlayerMove_Frame(); break;
 	}
 }
 
diff --git a/qcsrc/server/mutators/mutator_multijump.qc b/qcsrc/server/mutators/mutator_multijump.qc
index 7c53f457a..bb60cc9bd 100644
--- a/qcsrc/server/mutators/mutator_multijump.qc
+++ b/qcsrc/server/mutators/mutator_multijump.qc
@@ -75,12 +75,15 @@ float PM_multijump_checkjump()
 					float curspeed;
 					vector wishvel, wishdir;
 
-					curspeed = max(
-						vlen(vec2(self.velocity)) // current xy speed
 #ifdef SVQC
-						,vlen(vec2(antilag_takebackavgvelocity(self, max(self.lastteleporttime + sys_frametime, time - 0.25), time))) // average xy topspeed over the last 0.25 secs
-#endif
+					curspeed = max(
+						vlen(vec2(self.velocity)), // current xy speed
+						vlen(vec2(antilag_takebackavgvelocity(self, max(self.lastteleporttime + sys_frametime, time - 0.25), time))) // average xy topspeed over the last 0.25 secs
 					);
+#elif defined(CSQC)
+					curspeed = vlen(vec2(self.velocity));
+#endif
+
 					makevectors(PHYS_INPUT_ANGLES(self)_y * '0 1 0');
 					wishvel = v_forward * PHYS_INPUT_MOVEVALUES(self)_x + v_right * PHYS_INPUT_MOVEVALUES(self)_y;
 					wishdir = normalize(wishvel);