From 9880af1b0c66324dcc058e4c07115b12d099e3e9 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Thu, 30 Apr 2015 09:18:13 +0200
Subject: [PATCH] - this line got lost during conflict resolution.

---
 src/actor.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/actor.h b/src/actor.h
index 855bc5942b..04e4d722e0 100644
--- a/src/actor.h
+++ b/src/actor.h
@@ -355,6 +355,7 @@ enum
 	MF7_HITTRACER		= 0x00010000,	// Same as HITTARGET, but for tracer.
 	MF7_FLYCHEAT		= 0x00020000,	// must be part of the actor so that it can be tracked properly
 	MF7_NODECAL			= 0x00040000,	// [ZK] Forces puff to have no impact decal
+	MF7_FORCEDECAL		= 0x00080000,	// [ZK] Forces puff's decal to override the weapon's.
 // --- mobj.renderflags ---
 
 	RF_XFLIP			= 0x0001,	// Flip sprite horizontally