From 44968853668a6388e8de520e317121c4c0ea2baf Mon Sep 17 00:00:00 2001
From: John Palomo Jr <palomo.john@hotmail.com>
Date: Fri, 24 Oct 2014 04:46:43 -0400
Subject: [PATCH] Added Inventory.AlwaysRespawn flag.

---
 src/g_shared/a_pickups.cpp     | 2 +-
 src/g_shared/a_pickups.h       | 1 +
 src/thingdef/thingdef_data.cpp | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp
index a16a1316f0..fc3e863a2c 100644
--- a/src/g_shared/a_pickups.cpp
+++ b/src/g_shared/a_pickups.cpp
@@ -499,7 +499,7 @@ bool AInventory::ShouldRespawn ()
 {
 	if ((ItemFlags & IF_BIGPOWERUP) && !(dmflags2 & DF2_RESPAWN_SUPER)) return false;
 	if (ItemFlags & IF_NEVERRESPAWN) return false;
-	return !!(dmflags & DF_ITEMS_RESPAWN);
+	return !!((dmflags & DF_ITEMS_RESPAWN) || (ItemFlags & IF_ALWAYSRESPAWN));
 }
 
 //===========================================================================
diff --git a/src/g_shared/a_pickups.h b/src/g_shared/a_pickups.h
index 72548776a5..8616393e71 100644
--- a/src/g_shared/a_pickups.h
+++ b/src/g_shared/a_pickups.h
@@ -135,6 +135,7 @@ enum
 	IF_NEVERRESPAWN		= 1<<20,	// Never, ever respawns
 	IF_NOSCREENFLASH	= 1<<21,	// No pickup flash on the player's screen
 	IF_TOSSED			= 1<<22,	// Was spawned by P_DropItem (i.e. as a monster drop)
+	IF_ALWAYSRESPAWN	= 1<<23,	// Always respawn, regardless of dmflag
 
 };
 
diff --git a/src/thingdef/thingdef_data.cpp b/src/thingdef/thingdef_data.cpp
index 013415cc78..5c52c45e37 100644
--- a/src/thingdef/thingdef_data.cpp
+++ b/src/thingdef/thingdef_data.cpp
@@ -311,6 +311,7 @@ static FFlagDef InventoryFlags[] =
 	DEFINE_FLAG(IF, NEVERRESPAWN, AInventory, ItemFlags),
 	DEFINE_FLAG(IF, NOSCREENFLASH, AInventory, ItemFlags),
 	DEFINE_FLAG(IF, TOSSED, AInventory, ItemFlags),
+	DEFINE_FLAG(IF, ALWAYSRESPAWN, AInventory, ItemFlags),
 
 	DEFINE_DEPRECATED_FLAG(PICKUPFLASH),
 	DEFINE_DEPRECATED_FLAG(INTERHUBSTRIP),};