CSSZombieEscape/sm-zombiereloaded-3
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use damage defines from SDK Hooks directly.

Browse Source 
Removes redundant defines. DMG_CSS_HEADSHOT was never used.
This commit is contained in:
Richard Helgeby 2015-08-08 18:38:23 +02:00 committed by Oleg Tsvetkov
parent 6550dd9e02
commit daa461fee6
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/zr/damage.inc
View File

@ -25,18 +25,6 @@
* ============================================================================
*/
/**
* @section Counter Strike: Source specific damage flags.
*/
#define DMG_CSS_FALL (DMG_FALL) // Client was damaged by falling.
#define DMG_CSS_BLAST (DMG_BLAST) // Client was damaged by explosion.
#define DMG_CSS_BURN (DMG_DIRECT) // Client was damaged by fire.
#define DMG_CSS_BULLET (DMG_NEVERGIB) // Client was shot or knifed.
#define DMG_CSS_HEADSHOT (1 << 30) // Client was shot in the head.
/**
* @endsection
*/
/**
* @section Suicide intercept defines.
*/
@ -252,7 +240,7 @@ public Action:DamageOnTakeDamage(client, &attacker, &inflictor, &Float:damage, &
}
// Client was shot or knifed.
if (damagetype & DMG_CSS_BULLET)
if (damagetype & DMG_BULLET || damagetype & DMG_NEVERGIB)
{
// If attacker isn't valid, then allow damage.
if (!ZRIsClientValid(attacker))
@ -317,7 +305,7 @@ public Action:DamageOnTakeDamage(client, &attacker, &inflictor, &Float:damage, &
}
}
// Client was damaged by explosion.
else if (damagetype & DMG_CSS_BLAST)
else if (damagetype & DMG_BLAST)
{
// If blast damage is blocked, then stop.
new bool:damageblockblast = GetConVarBool(g_hCvarsList[CVAR_DAMAGE_BLOCK_BLAST]);
@ -342,7 +330,7 @@ public Action:DamageOnTakeDamage(client, &attacker, &inflictor, &Float:damage, &
return Plugin_Handled;
}
// Client was damaged by falling.
else if (damagetype & DMG_CSS_FALL)
else if (damagetype & DMG_FALL)
{
// If class has "nofalldamage" disabled, then allow damage.
new bool:blockfalldamage = ClassGetNoFallDamage(client);

3
src/zr/napalm.inc
View File

@ -72,7 +72,8 @@ NapalmOnOffsetsFound()
NapalmOnTakeDamage(client, damagetype)
{
// Client was damaged by fire.
if (damagetype & DMG_CSS_BURN)
// TODO: Is damage type different in CS:S and CS:GO (it was checking only DMG_DIRECT for some reason). Checking both.
if (damagetype & DMG_BURN || damagetype & DMG_DIRECT)
{
// Only take action if it isn't disabled, or the option is valid.
new douse = GetConVarInt(g_hCvarsList[CVAR_NAPALM_DOUSE]);