From 93694dadc1414f53ba6b9c2e898ca9a5ebe0b169 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 15 Apr 2012 07:59:50 +0000 Subject: [PATCH] - fixed: The rail attack did not check the BLOODLESSIMPACT flag. SVN r3568 (trunk) --- src/p_map.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index 5fcc6cd3c..66c47dcda 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -3945,8 +3945,11 @@ void P_RailAttack (AActor *source, int damage, int offset, int color1, int color { spawnpuff = (puffclass != NULL && puffDefaults->flags3 & MF3_ALWAYSPUFF); puffflags |= PF_HITTHINGBLEED; // [XA] Allow for puffs to jump to XDeath state. - P_SpawnBlood (x, y, z, (source->angle + angleoffset) - ANG180, damage, RailHits[i].HitActor); - P_TraceBleed (damage, x, y, z, RailHits[i].HitActor, source->angle, pitch); + if(!(puffDefaults->flags3 & MF3_BLOODLESSIMPACT)) + { + P_SpawnBlood (x, y, z, (source->angle + angleoffset) - ANG180, damage, RailHits[i].HitActor); + P_TraceBleed (damage, x, y, z, RailHits[i].HitActor, source->angle, pitch); + } } if (spawnpuff) P_SpawnPuff (source, puffclass, x, y, z, (source->angle + angleoffset) - ANG90, 1, puffflags);