From ae6b0c621533947b965b2c3d561753e00143f2b6 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Tue, 19 Feb 2013 02:27:41 +0000
Subject: [PATCH] - Added IF_NOSCREENFLASH>

SVN r4145 (trunk)
---
 src/g_shared/a_pickups.cpp     | 5 ++++-
 src/g_shared/a_pickups.h       | 1 +
 src/thingdef/thingdef_data.cpp | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp
index 9465a1c3a..1ed5b4919 100644
--- a/src/g_shared/a_pickups.cpp
+++ b/src/g_shared/a_pickups.cpp
@@ -964,7 +964,10 @@ void AInventory::Touch (AActor *toucher)
 		if (toucher->player != NULL)
 		{
 			PlayPickupSound (toucher->player->mo);
-			toucher->player->bonuscount = BONUSADD;
+			if (!(ItemFlags & IF_NOSCREENFLASH))
+			{
+				toucher->player->bonuscount = BONUSADD;
+			}
 		}
 		else
 		{
diff --git a/src/g_shared/a_pickups.h b/src/g_shared/a_pickups.h
index 2358fbe10..631a25181 100644
--- a/src/g_shared/a_pickups.h
+++ b/src/g_shared/a_pickups.h
@@ -133,6 +133,7 @@ enum
 	IF_PERSISTENTPOWER	= 1<<18,	// Powerup is kept when travelling between levels
 	IF_RESTRICTABSOLUTELY = 1<<19,	// RestrictedTo and ForbiddenTo do not allow pickup in any form by other classes
 	IF_NEVERRESPAWN		= 1<<20,	// Never, ever respawns
+	IF_NOSCREENFLASH	= 1<<21,	// No pickup flash on the player's screen
 };
 
 
diff --git a/src/thingdef/thingdef_data.cpp b/src/thingdef/thingdef_data.cpp
index 16028d249..1d828d647 100644
--- a/src/thingdef/thingdef_data.cpp
+++ b/src/thingdef/thingdef_data.cpp
@@ -299,10 +299,10 @@ static FFlagDef InventoryFlags[] =
 	DEFINE_FLAG(IF, PERSISTENTPOWER, AInventory, ItemFlags),
 	DEFINE_FLAG(IF, RESTRICTABSOLUTELY, AInventory, ItemFlags),
 	DEFINE_FLAG(IF, NEVERRESPAWN, AInventory, ItemFlags),
+	DEFINE_FLAG(IF, NOSCREENFLASH, AInventory, ItemFlags),
 
 	DEFINE_DEPRECATED_FLAG(PICKUPFLASH),
-	DEFINE_DEPRECATED_FLAG(INTERHUBSTRIP),
-};
+	DEFINE_DEPRECATED_FLAG(INTERHUBSTRIP),};
 
 static FFlagDef WeaponFlags[] =
 {