mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-24 21:21:04 +00:00
- completely removed fakePain check in case DoSpecialDamage returns -1. This signifies a special case that should bypass anything that inflicting pain implies.
This commit is contained in:
parent
c78b9235a8
commit
ac7abca6f8
1 changed files with 1 additions and 4 deletions
|
@ -1066,11 +1066,8 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
|
|||
}
|
||||
}
|
||||
damage = inflictor->DoSpecialDamage (target, damage, mod);
|
||||
|
||||
if ((damage == -1) && (target->player == NULL)) //This isn't meant for the player.
|
||||
if (damage == -1)
|
||||
{
|
||||
if (fakedPain) //Hold off ending the function before we can deal the pain chances.
|
||||
goto fakepain;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue