zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-18 15:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: P_LineAttack needs to check for 'Hitscan' damage, too, when deciding if using the damage type from the puff is appropriate.

Browse source 
SVN r3648 (trunk)
This commit is contained in:
Christoph Oelckers 2012-05-13 07:14:54 +00:00
parent a8507d58bd
commit 3e41382d63
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_map.cpp
View file

@ -3478,7 +3478,7 @@ AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
// 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 || damageType == NAME_Hitscan) && puffDefaults->DamageType != NAME_None)
{ {
damageType = puffDefaults->DamageType; damageType = puffDefaults->DamageType;
} }