From: Mario <mario@smbclan.net>
Date: Thu, 4 Feb 2016 09:58:51 +0000 (+1000)
Subject: Fix the addition of time to pmove_waterjumptime (doesn't fix water jumping, yet)
X-Git-Tag: xonotic-v0.8.2~1202
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c5205a448dd2fe4808981e364e37de05914c6aaf;p=xonotic%2Fxonotic-data.pk3dir.git

Fix the addition of time to pmove_waterjumptime (doesn't fix water jumping, yet)
---

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
 		}
 	}