Fix a crash

diff --git a/qcsrc/csqcmodellib/cl_player.qc b/qcsrc/csqcmodellib/cl_player.qc
index 5b2011e8c438ace1a7f1a42c951f10812004e2f6..d3c56c813341e275eae06dfdcc08c57dbced4c6b 100644 (file)
--- 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 7c53f457aed66cf18e08152034c6501329dac467..bb60cc9bd9de080f0c7dd347f918771ea707bdc4 100644 (file)
--- 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);