From b1a2f84f1bee52fff4cc77776a595d6433487e1a Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 1 Apr 2015 03:48:23 +1100 Subject: [PATCH] An actually important fix --- qcsrc/common/physics.qc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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; } } -- 2.39.2