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

Fixed fail tests

Browse Source
This commit is contained in:
s1lent 2019-06-06 04:33:16 +07:00
parent 05aa615a8b
commit f731fbf83c
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
regamedll/dlls/player.cpp
View File

@ -862,9 +862,11 @@ BOOL EXT_FUNC CBasePlayer::__API_HOOK(TakeDamage)(entvars_t *pevInflictor, entva
pAttack = CBasePlayer::Instance(pevAttacker); pAttack = CBasePlayer::Instance(pevAttacker);
flDamage *= clamp((pAttack == this) ? #ifdef REGAMEDLL_ADD
flDamage *= clamp(((pAttack == this) ?
ff_damage_reduction_grenade_self.value : ff_damage_reduction_grenade_self.value :
ff_damage_reduction_grenade.value, 0.0f, 1.0f); ff_damage_reduction_grenade.value), 0.0f, 1.0f);
#endif
} }
#ifdef REGAMEDLL_ADD #ifdef REGAMEDLL_ADD
else if (CSGameRules()->IsFreeForAll()) else if (CSGameRules()->IsFreeForAll())
@ -1069,9 +1071,9 @@ BOOL EXT_FUNC CBasePlayer::__API_HOOK(TakeDamage)(entvars_t *pevInflictor, entva
{ {
#ifdef REGAMEDLL_ADD #ifdef REGAMEDLL_ADD
// bullets hurt teammates less // bullets hurt teammates less
flDamage *= clamp((bitsDamageType & DMG_BULLET) ? flDamage *= clamp(((bitsDamageType & DMG_BULLET) ?
ff_damage_reduction_bullets.value : ff_damage_reduction_bullets.value :
ff_damage_reduction_other.value, 0.0f, 1.0f); ff_damage_reduction_other.value), 0.0f, 1.0f);
#else #else
flDamage *= 0.35; flDamage *= 0.35;
#endif // #ifdef REGAMEDLL_ADD #endif // #ifdef REGAMEDLL_ADD