Add a clientside hook for PlayerJump

diff --git a/qcsrc/client/mutators/events.qh b/qcsrc/client/mutators/events.qh
index 9516fd25e794788e8da9bc4c792c7a5ad6efd132..d6ac0c88115eaaffa841e9ce80bc67eab79fb9e7 100644 (file)
--- a/qcsrc/client/mutators/events.qh
+++ b/qcsrc/client/mutators/events.qh
@@ -112,4 +112,15 @@ MUTATOR_HOOKABLE(ClearModelParams, EV_NO_ARGS);
 string checkmodel_input, checkmodel_command;
 MUTATOR_HOOKABLE(GetModelParams, EV_GetModelParams);
 
+/** called when a player presses the jump key */
+#define EV_PlayerJump(i, o) \
+    /**/ i(float, player_multijump) \
+    /**/ i(float, player_jumpheight) \
+    /**/ o(float, player_multijump) \
+    /**/ o(float, player_jumpheight) \
+    /**/
+float player_multijump;
+float player_jumpheight;
+MUTATOR_HOOKABLE(PlayerJump, EV_PlayerJump);
+
 #endif

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index e5b83443fbcd3c28aecce9276cd006e5eead2e74..34dedf13280ad6ba0b9d2aaf75ac64918f746b24 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;

diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index d4e5fdd389b9e86dc33f8881c05403cbcff9f404..a249b238d7bf197650833c3e3d1badad89135478 100644 (file)
--- a/qcsrc/common/physics.qh
+++ b/qcsrc/common/physics.qh
@@ -43,8 +43,8 @@ bool IsFlying(entity a);
        #define IS_PLAYER(s)                                            (s).isplayermodel
        #define isPushable(s)                                           (s).isplayermodel
 
-       float player_multijump;
-       float player_jumpheight;
+       //float player_multijump;
+       //float player_jumpheight;
 
        #define PHYS_INPUT_ANGLES(s)                            input_angles
 // TODO