From c5205a448dd2fe4808981e364e37de05914c6aaf Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 4 Feb 2016 19:58:51 +1000 Subject: [PATCH] Fix the addition of time to pmove_waterjumptime (doesn't fix water jumping, yet) --- qcsrc/common/physics/player.qc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index 4356ba286..0da3c1df3 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -560,7 +560,7 @@ void CheckWaterJump(entity this) #ifdef SVQC PHYS_TELEPORT_TIME(this) = time + 2; // safety net #elif defined(CSQC) - pmove_waterjumptime = time + 2; + pmove_waterjumptime = 2; #endif } } @@ -1484,10 +1484,17 @@ void PM_Main(entity this) { this.velocity_x = this.movedir.x; this.velocity_y = this.movedir.y; - if (time > PHYS_TELEPORT_TIME(this) || this.waterlevel == WATERLEVEL_NONE) + if (time > PHYS_TELEPORT_TIME(this) || this.waterlevel == WATERLEVEL_NONE + #ifdef CSQC + || pmove_waterjumptime <= 0 + #endif + ) { this.flags &= ~FL_WATERJUMP; PHYS_TELEPORT_TIME(this) = 0; + #ifdef CSQC + pmove_waterjumptime = 0; + #endif } } -- 2.39.2