From: Mario <zacjardine@y7mail.com>
Date: Tue, 31 Mar 2015 16:48:23 +0000 (+1100)
Subject: An actually important fix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b1a2f84f1bee52fff4cc77776a595d6433487e1a;p=xonotic%2Fxonotic-data.pk3dir.git

An actually important fix
---

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index a6dca7e2d..1ea5f0b26 100644
--- a/qcsrc/common/physics.qc
+++ b/qcsrc/common/physics.qc
@@ -241,17 +241,21 @@ void PM_ClientMovement_UpdateStatus(bool ground)
 	origin1_z += self.mins_z + 1;
 	self.waterlevel = WATERLEVEL_NONE;
 
-	self.watertype = (pointcontents(origin1) == CONTENT_WATER);
+	int thepoint = pointcontents(origin1);
+
+	self.watertype = (thepoint == CONTENT_WATER || thepoint == CONTENT_LAVA || thepoint == CONTENT_SLIME);
 
 	if(self.watertype)
 	{
 		self.waterlevel = WATERLEVEL_WETFEET;
 		origin1_z = self.origin_z + (self.mins_z + self.maxs_z) * 0.5;
-		if(pointcontents(origin1) == CONTENT_WATER)
+		thepoint = pointcontents(origin1);
+		if(thepoint == CONTENT_WATER || thepoint == CONTENT_LAVA || thepoint == CONTENT_SLIME)
 		{
 			self.waterlevel = WATERLEVEL_SWIMMING;
 			origin1_z = self.origin_z + 22;
-			if(pointcontents(origin1) == CONTENT_WATER)
+			thepoint = pointcontents(origin1);
+			if(thepoint == CONTENT_WATER || thepoint == CONTENT_LAVA || thepoint == CONTENT_SLIME)
 				self.waterlevel = WATERLEVEL_SUBMERGED;
 		}
 	}