Merge branch 'TimePath/logging' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics.qc

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index 71e2aa2bafaa8b5d524bfd0ef6fa8443cc6d9f88..33aaeb58b0456845e255761a6731b40e3df74021 100644 (file)
--- a/qcsrc/common/physics.qc
+++ b/qcsrc/common/physics.qc
@@ -552,15 +552,16 @@ bool PlayerJump (void)
 
        bool doublejump = false;
        float mjumpheight = PHYS_JUMPVELOCITY;
-
-#ifdef SVQC
-       if (MUTATOR_CALLHOOK(PlayerJump, doublejump, mjumpheight))
-#elif defined(CSQC)
+#ifdef CSQC
        player_multijump = doublejump;
        player_jumpheight = mjumpheight;
-       if (PM_multijump_checkjump())
 #endif
-               return true;
+
+       if (MUTATOR_CALLHOOK(PlayerJump, doublejump, mjumpheight)
+#ifdef CSQC
+               || PM_multijump_checkjump()
+#endif
+               ) { return true; }
 
        doublejump = player_multijump;
        mjumpheight = player_jumpheight;