From 3e41382d635300526eb9c706a274430d4651c86f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 13 May 2012 07:14:54 +0000 Subject: [PATCH] - fixed: P_LineAttack needs to check for 'Hitscan' damage, too, when deciding if using the damage type from the puff is appropriate. SVN r3648 (trunk) --- src/p_map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index b221736cf8..c3f697bad1 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -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. // 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; }