- added option to set item pickup color through MAPINFO's GAMEINFO block.

SVN r2539 (trunk)

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)

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")

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;
 };

wadsrc/static/mapinfo/chex.txt

@@ -42,6 +42,7 @@ gameinfo
 	endoom = "ENDOOM"
 	player5start = 4001
 	drawreadthis = true
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby

wadsrc/static/mapinfo/doomcommon.txt

@@ -40,6 +40,7 @@ gameinfo
 	defaultdropstyle = 1
 	endoom = "ENDOOM"
 	player5start = 4001
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby

wadsrc/static/mapinfo/heretic.txt

@@ -41,6 +41,7 @@ gameinfo
 	defaultdropstyle = 1
 	endoom = "ENDTEXT"
 	player5start = 4001
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby

wadsrc/static/mapinfo/hexen.txt

@@ -39,6 +39,7 @@ gameinfo
 	defaultrespawntime = 12
 	defaultdropstyle = 1
 	player5start = 9100
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby

wadsrc/static/mapinfo/strife.txt

@@ -42,6 +42,7 @@ gameinfo
 	defaultdropstyle = 2
 	endoom = "ENDSTRF"
 	player5start = 5
+	pickupcolor = "d6 ba 45"
 }
 
 skill baby