Merge branch 'maint' (early part before Transifex)

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

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index 6153d80ae7f3efb2b750979c6758741b63d5194a..0cac08bb0c0fab1c7ac93ccdb160863753907c56 100644 (file)
--- a/qcsrc/common/physics.qc
+++ b/qcsrc/common/physics.qc
@@ -553,12 +553,12 @@ bool PlayerJump (void)
        bool doublejump = false;
        float mjumpheight = PHYS_JUMPVELOCITY;
 
-       player_multijump = doublejump;
-       player_jumpheight = mjumpheight;
 #ifdef SVQC
-       if (MUTATOR_CALLHOOK(PlayerJump))
+       if (MUTATOR_CALLHOOK(PlayerJump, doublejump, mjumpheight))
 #elif defined(CSQC)
-       if(PM_multijump_checkjump())
+       player_multijump = doublejump;
+       player_jumpheight = mjumpheight;
+       if (PM_multijump_checkjump())
 #endif
                return true;