From: terencehill <piuntn@gmail.com>
Date: Fri, 4 Aug 2017 14:24:26 +0000 (+0200)
Subject: Reset .jumppadcount underwater
X-Git-Tag: xonotic-v0.8.5~2378^2~93
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=17a67f5254fc6ecd252dc332321223d8be120be6;p=xonotic%2Fxonotic-data.pk3dir.git

Reset .jumppadcount underwater
---

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index e6c2f7ccd..ec97bb2a1 100644
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -108,6 +108,7 @@ void sys_phys_update(entity this, float dt)
 		this.com_phys_water = true;
 		sys_phys_simulate(this, dt);
 		this.com_phys_water = false;
+		this.jumppadcount = 0;
 	} else if (time < this.ladder_time) {
 		this.com_phys_friction = PHYS_FRICTION(this);
 		this.com_phys_vel_max = PHYS_MAXSPEED(this) * maxspeed_mod;