o Updated scoreboard weapon icons

o Added cl_iconr, cl_icong, cl_iconb to control scoreboard icon colour for testing ( to be removed before release )
o Fixed compile issue with textmessage change.

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@394 67975925-1194-0748-b3d5-c16f83f1a3a1

releases/3.2.0/source/cl_dll/hud.cpp

@@ -210,6 +210,10 @@ void CHud :: Init( void )
 	CVAR_CREATE( kvLabelMaps, "1", FCVAR_ARCHIVE);
 	CVAR_CREATE( kvGammaRamp, "1", FCVAR_ARCHIVE);
 
+	CVAR_CREATE( "cl_iconr", "0", FCVAR_ARCHIVE);
+	CVAR_CREATE( "cl_icong", "149", FCVAR_ARCHIVE);
+	CVAR_CREATE( "cl_iconb", "221", FCVAR_ARCHIVE);
+
 	m_pSpriteList = NULL;
 
 	// Clear any old HUD list

releases/3.2.0/source/cl_dll/text_message.cpp

@@ -178,7 +178,7 @@ int CHudTextMessage::MsgFunc_TextMsg( const char *pszName, int iSize, void *pbuf
 	}
 
 	// Ensure that message[0] does not contain exessive %'s, max 4x%s, all other %'s removed.
-	int lastpos = 0; int pos; int count = 0;
+	size_t lastpos = 0; size_t pos; int count = 0;
 	while(true)
 	{
 		pos = message[0].find("%", lastpos);

releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp

@@ -1224,26 +1224,33 @@ void ScorePanel::FillGrid()
 					if(!theIsForEnemy && theExtraPlayerInfo->teamnumber != TEAM_IND && theExtraPlayerInfo->teamnumber != TEAM_SPECT )
                     {
 						if ( gHUD.GetIsMarine() && !gHUD.GetIsCombatMode() ) {
+							int r=CVAR_GET_FLOAT("cl_iconr");
+							int g=CVAR_GET_FLOAT("cl_icong");
+							int b=CVAR_GET_FLOAT("cl_iconb");
+							r=max(min(255, r), 0);
+							g=max(min(255, g), 0);
+							b=max(min(255, b), 0);
+
 							switch(theExtraPlayerInfo->extra) {
 							case AVH_WEAPON_HMG:
 								pLabel->setFgColorAsImageColor(false);
 								pLabel->setImage(m_pHMG);
-								m_pHMG->setColor(BuildColor(248, 252, 0, gHUD.GetGammaSlope()));
+								m_pHMG->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope()));
 								break;
 							case AVH_WEAPON_MG:
 								pLabel->setFgColorAsImageColor(false);
 								pLabel->setImage(m_pLMG);
-								m_pLMG->setColor(BuildColor(208, 16, 190, gHUD.GetGammaSlope()));
+								m_pLMG->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope()));
 								break;
 							case AVH_WEAPON_SONIC:
 								pLabel->setFgColorAsImageColor(false);
 								pLabel->setImage(m_pSG);
-								m_pSG->setColor(BuildColor(117, 214, 241, gHUD.GetGammaSlope()));
+								m_pSG->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope()));
 								break;
 							case AVH_WEAPON_GRENADE_GUN:
 								pLabel->setFgColorAsImageColor(false);
 								pLabel->setImage(m_pGL);
-								m_pGL->setColor(BuildColor(255, 69, 9, gHUD.GetGammaSlope()));
+								m_pGL->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope()));
 								break;
 							default:
 								break;