mirror of
https://github.com/s1lentq/ReGameDLL_CS.git
synced 2025-03-03 17:25:24 +03:00
Fixes #60
This commit is contained in:
parent
d9e2aee07b
commit
43753dad38
@ -2881,8 +2881,13 @@ void CBasePlayer::WaterMove()
|
||||
if (pev->movetype == MOVETYPE_NOCLIP || pev->movetype == MOVETYPE_NONE)
|
||||
return;
|
||||
|
||||
#ifdef REGAMEDLL_FIXES
|
||||
if (!IsAlive())
|
||||
return;
|
||||
#else
|
||||
if (pev->health < 0.0f)
|
||||
return;
|
||||
#endif
|
||||
|
||||
// waterlevel 0 - not in water
|
||||
// waterlevel 1 - feet in water
|
||||
@ -4482,7 +4487,6 @@ void CBasePlayer::CheckTimeBasedDamage()
|
||||
{
|
||||
int i;
|
||||
byte bDuration = 0;
|
||||
static float gtbdPrev = 0.0;
|
||||
|
||||
if (!(m_bitsDamageType & DMG_TIMEBASED))
|
||||
return;
|
||||
@ -5180,6 +5184,11 @@ void EXT_FUNC CBasePlayer::__API_VHOOK(Spawn)()
|
||||
pev->dmg_take = 0;
|
||||
pev->dmg_save = 0;
|
||||
|
||||
#ifdef REGAMEDLL_FIXES
|
||||
pev->watertype = CONTENTS_EMPTY;
|
||||
pev->waterlevel = 0;
|
||||
#endif
|
||||
|
||||
m_bitsHUDDamage = -1;
|
||||
m_bitsDamageType = 0;
|
||||
m_afPhysicsFlags = 0;
|
||||
|
@ -1351,6 +1351,12 @@ qboolean PM_InWater()
|
||||
// Sets pmove->waterlevel and pmove->watertype values.
|
||||
qboolean PM_CheckWater()
|
||||
{
|
||||
#ifdef REGAMEDLL_FIXES
|
||||
// do not check for dead
|
||||
if (pmove->dead || pmove->deadflag != DEAD_NO)
|
||||
return FALSE;
|
||||
#endif
|
||||
|
||||
vec3_t point;
|
||||
int cont;
|
||||
int truecont;
|
||||
|
Loading…
x
Reference in New Issue
Block a user