reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-03-04 01:35:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #60

Browse Source
This commit is contained in:
s1lentq 2016-09-13 16:20:37 +07:00
parent d9e2aee07b
commit 43753dad38
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
regamedll/dlls/player.cpp
View File

@ -2881,8 +2881,13 @@ void CBasePlayer::WaterMove()
if (pev->movetype == MOVETYPE_NOCLIP || pev->movetype == MOVETYPE_NONE) if (pev->movetype == MOVETYPE_NOCLIP || pev->movetype == MOVETYPE_NONE)
return; return;
#ifdef REGAMEDLL_FIXES
if (!IsAlive())
return;
#else
if (pev->health < 0.0f) if (pev->health < 0.0f)
return; return;
#endif
// waterlevel 0 - not in water // waterlevel 0 - not in water
// waterlevel 1 - feet in water // waterlevel 1 - feet in water
@ -4482,7 +4487,6 @@ void CBasePlayer::CheckTimeBasedDamage()
{ {
int i; int i;
byte bDuration = 0; byte bDuration = 0;
static float gtbdPrev = 0.0;
if (!(m_bitsDamageType & DMG_TIMEBASED)) if (!(m_bitsDamageType & DMG_TIMEBASED))
return; return;
@ -5180,6 +5184,11 @@ void EXT_FUNC CBasePlayer::__API_VHOOK(Spawn)()
pev->dmg_take = 0; pev->dmg_take = 0;
pev->dmg_save = 0; pev->dmg_save = 0;
#ifdef REGAMEDLL_FIXES
pev->watertype = CONTENTS_EMPTY;
pev->waterlevel = 0;
#endif
m_bitsHUDDamage = -1; m_bitsHUDDamage = -1;
m_bitsDamageType = 0; m_bitsDamageType = 0;
m_afPhysicsFlags = 0; m_afPhysicsFlags = 0;

6
regamedll/pm_shared/pm_shared.cpp
View File

@ -1351,6 +1351,12 @@ 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;