From b288a7a416375c960aa64e979776bfd8258aeb80 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 14 Aug 2010 06:25:38 +0000
Subject: [PATCH] - added option to set item pickup color through MAPINFO's
 GAMEINFO block.

SVN r2539 (trunk)
---
 src/g_shared/shared_sbar.cpp         | 4 +++-
 src/gi.cpp                           | 1 +
 src/gi.h                             | 1 +
 wadsrc/static/mapinfo/chex.txt       | 1 +
 wadsrc/static/mapinfo/doomcommon.txt | 1 +
 wadsrc/static/mapinfo/heretic.txt    | 1 +
 wadsrc/static/mapinfo/hexen.txt      | 1 +
 wadsrc/static/mapinfo/strife.txt     | 1 +
 8 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp
index ef48d211a..beb459cda 100644
--- a/src/g_shared/shared_sbar.cpp
+++ b/src/g_shared/shared_sbar.cpp
@@ -1504,7 +1504,9 @@ void DBaseStatusBar::BlendView (float blend[4])
 	if (CPlayer->bonuscount)
 	{
 		cnt = CPlayer->bonuscount << 3;
-		AddBlend (0.8431f, 0.7333f, 0.2706f, cnt > 128 ? 0.5f : cnt / 255.f, blend);
+		
+		AddBlend (RPART(gameinfo.pickupcolor)/255.f, GPART(gameinfo.pickupcolor)/255.f, 
+					BPART(gameinfo.pickupcolor)/255.f, cnt > 128 ? 0.5f : cnt / 255.f, blend);
 	}
 
 	if (CPlayer->mo->DamageFade.a != 0)
diff --git a/src/gi.cpp b/src/gi.cpp
index e0813479a..03fea70a9 100644
--- a/src/gi.cpp
+++ b/src/gi.cpp
@@ -266,6 +266,7 @@ void FMapInfoParser::ParseGameInfo()
 		GAMEINFOKEY_INT(defKickback, "defKickback")
 		GAMEINFOKEY_CSTRING(SkyFlatName, "SkyFlatName", 8)
 		GAMEINFOKEY_STRING(translator, "translator")
+		GAMEINFOKEY_COLOR(pickupcolor, "pickupcolor")
 		GAMEINFOKEY_COLOR(defaultbloodcolor, "defaultbloodcolor")
 		GAMEINFOKEY_COLOR(defaultbloodparticlecolor, "defaultbloodparticlecolor")
 		GAMEINFOKEY_STRING(backpacktype, "backpacktype")
diff --git a/src/gi.h b/src/gi.h
index a87098555..09a9d37a8 100644
--- a/src/gi.h
+++ b/src/gi.h
@@ -106,6 +106,7 @@ struct gameinfo_t
 	int defaultrespawntime;
 	int defaultdropstyle;
 	int player5start;
+	DWORD pickupcolor;
 
 	const char *GetFinalePage(unsigned int num) const;
 };
diff --git a/wadsrc/static/mapinfo/chex.txt b/wadsrc/static/mapinfo/chex.txt
index 9e313cf1e..deefea4d3 100644
--- a/wadsrc/static/mapinfo/chex.txt
+++ b/wadsrc/static/mapinfo/chex.txt
@@ -42,6 +42,7 @@ gameinfo
 	endoom = "ENDOOM"
 	player5start = 4001
 	drawreadthis = true
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby
diff --git a/wadsrc/static/mapinfo/doomcommon.txt b/wadsrc/static/mapinfo/doomcommon.txt
index 3de271756..f67783509 100644
--- a/wadsrc/static/mapinfo/doomcommon.txt
+++ b/wadsrc/static/mapinfo/doomcommon.txt
@@ -40,6 +40,7 @@ gameinfo
 	defaultdropstyle = 1
 	endoom = "ENDOOM"
 	player5start = 4001
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby
diff --git a/wadsrc/static/mapinfo/heretic.txt b/wadsrc/static/mapinfo/heretic.txt
index 0c78f1184..4ca727272 100644
--- a/wadsrc/static/mapinfo/heretic.txt
+++ b/wadsrc/static/mapinfo/heretic.txt
@@ -41,6 +41,7 @@ gameinfo
 	defaultdropstyle = 1
 	endoom = "ENDTEXT"
 	player5start = 4001
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby
diff --git a/wadsrc/static/mapinfo/hexen.txt b/wadsrc/static/mapinfo/hexen.txt
index 344f4eb41..16ebcf5b4 100644
--- a/wadsrc/static/mapinfo/hexen.txt
+++ b/wadsrc/static/mapinfo/hexen.txt
@@ -39,6 +39,7 @@ gameinfo
 	defaultrespawntime = 12
 	defaultdropstyle = 1
 	player5start = 9100
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby
diff --git a/wadsrc/static/mapinfo/strife.txt b/wadsrc/static/mapinfo/strife.txt
index 6c213d81e..e5c9043ee 100644
--- a/wadsrc/static/mapinfo/strife.txt
+++ b/wadsrc/static/mapinfo/strife.txt
@@ -42,6 +42,7 @@ gameinfo
 	defaultdropstyle = 2
 	endoom = "ENDSTRF"
 	player5start = 5
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby