From: Mario <mario@smbclan.net>
Date: Wed, 29 Jun 2016 00:47:30 +0000 (+1000)
Subject: Don't do any drown checks if player is in a vehicle
X-Git-Tag: xonotic-v0.8.2~700^2~117
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=53a332d1f6d8533fee87d5962eea8160ab0f7f13;p=xonotic%2Fxonotic-data.pk3dir.git

Don't do any drown checks if player is in a vehicle
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index f2f0f4a35..f23cb8b5c 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2387,7 +2387,7 @@ void DrownPlayer(entity this)
 	if(IS_DEAD(this))
 		return;
 
-	if (this.waterlevel != WATERLEVEL_SUBMERGED)
+	if (this.waterlevel != WATERLEVEL_SUBMERGED || this.vehicle)
 	{
 		if(this.air_finished < time)
 			PlayerSound(this, playersound_gasp, CH_PLAYER, VOICETYPE_PLAYERSOUND);