From 8729e973ad40cd12d1f2503df7be31fb3af42f64 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Fri, 5 Aug 2022 14:44:42 -0700 Subject: [PATCH] PMove: Define waterlevels more appropriately. Add WATERLEVEL_{OUTSIDE,KNEE,CHEST,SUBMERGED} types. --- src/shared/pmove.h | 8 ++++++++ src/shared/pmove_custom.qc | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/shared/pmove.h b/src/shared/pmove.h index 5be8f395..51c90f02 100644 --- a/src/shared/pmove.h +++ b/src/shared/pmove.h @@ -22,6 +22,14 @@ int trace_endcontentsi; .vector basevelocity; .entity groundentity; +typedef enum +{ + WATERLEVEL_OUTSIDE, + WATERLEVEL_KNEE, + WATERLEVEL_CHEST, + WATERLEVEL_SUBMERGED +} waterlevel_e; + #ifdef SERVER void PMove_StartFrame(void); #endif diff --git a/src/shared/pmove_custom.qc b/src/shared/pmove_custom.qc index bc10f562..418dc51d 100644 --- a/src/shared/pmove_custom.qc +++ b/src/shared/pmove_custom.qc @@ -131,16 +131,16 @@ PMoveCustom_Categorize(void) if (PMoveCustom_Contents(self.origin + self.maxs - [0,0,1]) & CONTENTBITS_FLUID) { - self.waterlevel = 3; + self.waterlevel = WATERLEVEL_SUBMERGED; } else { - self.waterlevel = 2; + self.waterlevel = WATERLEVEL_CHEST; } } else { - self.waterlevel = 1; + self.waterlevel = WATERLEVEL_KNEE; } } else { self.watertype = CONTENT_EMPTY; - self.waterlevel = 0; + self.waterlevel = WATERLEVEL_OUTSIDE; } }