GitHub/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-10-16 23:37:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

PM_CheckWater: Fix for uninitialized waterlevel value for dead players (incorrect waterlevel values from another player movements persisting)

Browse Source
This commit is contained in:
s1lentq 2024-01-31 17:52:38 +07:00
parent a1af7ca426
commit b34d564e3c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
regamedll/pm_shared/pm_shared.cpp
View File

@ -1345,27 +1345,27 @@ qboolean PM_InWater()
// Sets pmove->waterlevel and pmove->watertype values. // Sets pmove->waterlevel and pmove->watertype values.
qboolean PM_CheckWater() qboolean PM_CheckWater()
{ {
#ifdef REGAMEDLL_FIXES
// do not check for dead
if (pmove->dead || pmove->deadflag != DEAD_NO)
return FALSE;
#endif
vec3_t point; vec3_t point;
int cont; int cont;
int truecont; int truecont;
float height; float height;
float heightover2; float heightover2;
// Assume that we are not in water at all.
pmove->waterlevel = 0;
pmove->watertype = CONTENTS_EMPTY;
#ifdef REGAMEDLL_FIXES
// do not check for dead
if (pmove->dead || pmove->deadflag != DEAD_NO)
return FALSE;
#endif
// Pick a spot just above the players feet. // Pick a spot just above the players feet.
point[0] = pmove->origin[0] + (pmove->player_mins[pmove->usehull][0] + pmove->player_maxs[pmove->usehull][0]) * 0.5f; point[0] = pmove->origin[0] + (pmove->player_mins[pmove->usehull][0] + pmove->player_maxs[pmove->usehull][0]) * 0.5f;
point[1] = pmove->origin[1] + (pmove->player_mins[pmove->usehull][1] + pmove->player_maxs[pmove->usehull][1]) * 0.5f; point[1] = pmove->origin[1] + (pmove->player_mins[pmove->usehull][1] + pmove->player_maxs[pmove->usehull][1]) * 0.5f;
point[2] = pmove->origin[2] + pmove->player_mins[pmove->usehull][2] + 1; point[2] = pmove->origin[2] + pmove->player_mins[pmove->usehull][2] + 1;
// Assume that we are not in water at all.
pmove->waterlevel = 0;
pmove->watertype = CONTENTS_EMPTY;
// Grab point contents. // Grab point contents.
cont = pmove->PM_PointContents(point, &truecont); cont = pmove->PM_PointContents(point, &truecont);