zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-16 09:11:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added DavifPH's submission for allowing THRUGHOST on puffs.

Browse source 
SVN r3232 (trunk)
This commit is contained in:
Christoph Oelckers 2011-06-13 10:27:24 +00:00
parent ab60afd0b8
commit 4a7567107f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_map.cpp
View file

@ -3374,13 +3374,14 @@ AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
shootz += 8*FRACUNIT; 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 // We need to check the defaults of the replacement here
AActor *puffDefaults = GetDefaultByType(pufftype->GetReplacement()); 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. // 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. // All other explicitly passed damage types (currenty only MDK) will be preserved.
if ((damageType == NAME_None || damageType == NAME_Melee) && puffDefaults->DamageType != NAME_None) if ((damageType == NAME_None || damageType == NAME_Melee) && puffDefaults->DamageType != NAME_None)