From ac4074a69a685810bfba58e76c8a76effd4d2149 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 27 Feb 2017 19:51:37 +0100
Subject: [PATCH] - allow sprites and particles simultaneously for puffs.

---
 src/p_mobj.cpp            | 2 +-
 wadsrc/static/menudef.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index d218d24de..88bb1d40a 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -6009,7 +6009,7 @@ AActor *P_SpawnPuff (AActor *source, PClassActor *pufftype, const DVector3 &pos1
 		if (cl_pufftype && updown != 3 && (puff->flags4 & MF4_ALLOWPARTICLES))
 		{
 			P_DrawSplash2 (32, pos, particledir, updown, 1);
-			puff->renderflags |= RF_INVISIBLE;
+			if (cl_pufftype == 1) puff->renderflags |= RF_INVISIBLE;
 		}
 
 		if ((flags & PF_HITTHING) && puff->SeeSound)
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 954567d0f..b66b381ba 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -638,6 +638,7 @@ OptionValue PuffTypes
 {
 	0.0, "$OPTVAL_SPRITES"
 	1.0, "$OPTVAL_PARTICLES"
+	2.0, "$OPTVAL_SPRITESPARTICLES"
 }
 
 OptionValue Wipes