]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Mon, 26 Dec 2011 21:04:35 +0000 (16:04 -0500)
committerSamual <samual@xonotic.org>
Mon, 26 Dec 2011 21:04:35 +0000 (16:04 -0500)
qcsrc/csqcmodellib/cl_player.qc

index 3f31e9604087e48dc26f1385597077b8d50ec993..d1cfa4060093f25eac80c0e17c45766f98530166 100644 (file)
@@ -112,27 +112,8 @@ void CSQCPlayer_PredictTo(float endframe)
                {
                        break;
                }
-               if(input_timelength <= 0.0005) // too short move
-               {
-                       dprint("CSQC physics hack: too short frame skipped\n");
-                       // even if not running physics, handle releasing the jump key
-                       if(!(input_buttons & 4))
-                               self.pmove_flags &~= PMF_JUMP_HELD;
-               }
-               else if(input_timelength > 0.05) // too long move
-               {
-                       dprint("CSQC physics hack: too long frame split in two\n");
-                       input_timelength *= 0.5;
-                       runstandardplayerphysics(self);
-                       CSQCPlayer_SetMinsMaxs();
-                       runstandardplayerphysics(self);
-                       CSQCPlayer_SetMinsMaxs();
-               }
-               else
-               {
-                       runstandardplayerphysics(self);
-                       CSQCPlayer_SetMinsMaxs();
-               }
+               runstandardplayerphysics(self);
+               CSQCPlayer_SetMinsMaxs();
                csqcplayer_moveframe++;
        }