mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-28 15:02:39 +00:00
- added DavifPH's submission for allowing THRUGHOST on puffs.
SVN r3232 (trunk)
This commit is contained in:
parent
ab60afd0b8
commit
4a7567107f
1 changed files with 5 additions and 4 deletions
|
@ -3374,13 +3374,14 @@ AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
|
|||
shootz += 8*FRACUNIT;
|
||||
}
|
||||
|
||||
hitGhosts = (t1->player != NULL &&
|
||||
t1->player->ReadyWeapon != NULL &&
|
||||
(t1->player->ReadyWeapon->flags2 & MF2_THRUGHOST));
|
||||
|
||||
// We need to check the defaults of the replacement here
|
||||
AActor *puffDefaults = GetDefaultByType(pufftype->GetReplacement());
|
||||
|
||||
hitGhosts = (t1->player != NULL &&
|
||||
t1->player->ReadyWeapon != NULL &&
|
||||
(t1->player->ReadyWeapon->flags2 & MF2_THRUGHOST)) ||
|
||||
(puffDefaults && (puffDefaults->flags2 & MF2_THRUGHOST));
|
||||
|
||||
// if the puff uses a non-standard damage type this will override default and melee damage type.
|
||||
// All other explicitly passed damage types (currenty only MDK) will be preserved.
|
||||
if ((damageType == NAME_None || damageType == NAME_Melee) && puffDefaults->DamageType != NAME_None)
|
||||
|
|
Loading…
Reference in a new issue