[nexuiz-commits] r6962 - in trunk/data: . gfx/hud qcsrc/client

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Jun 10 13:17:45 EDT 2009


Author: div0
Date: 2009-06-10 13:17:45 -0400 (Wed, 10 Jun 2009)
New Revision: 6962

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/gfx/hud/sb_timerbg.tga
   trunk/data/gfx/hud/sbar.tga
   trunk/data/qcsrc/client/sbar.qc
Log:
sbar_color_bg_team


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-06-10 17:06:52 UTC (rev 6961)
+++ trunk/data/defaultNexuiz.cfg	2009-06-10 17:17:45 UTC (rev 6962)
@@ -1257,8 +1257,9 @@
 seta sbar_alpha_bg 0.7
 seta sbar_alpha_fg 1
 seta sbar_color_bg_r 0 "red color component of the HUD background"
-seta sbar_color_bg_g 1 "green color component of the HUD background"
-seta sbar_color_bg_b 0.7 "blue color component of the HUD background"
+seta sbar_color_bg_g 0.5 "green color component of the HUD background"
+seta sbar_color_bg_b 0.175 "blue color component of the HUD background"
+seta sbar_color_bg_team 0.5 "team color multiplier of the HUD background"
 
 // for menu server list (eventually make them have engine support?)
 seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"

Modified: trunk/data/gfx/hud/sb_timerbg.tga
===================================================================
(Binary files differ)

Modified: trunk/data/gfx/hud/sbar.tga
===================================================================
(Binary files differ)

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-06-10 17:06:52 UTC (rev 6961)
+++ trunk/data/qcsrc/client/sbar.qc	2009-06-10 17:17:45 UTC (rev 6962)
@@ -1308,7 +1308,7 @@
 		
 		if (cvar("viewsize") <= 100) { // draw timer background when viewsize <= 100
 			if (teamplay)
-				drawpic(bgpos, "gfx/hud/sb_timerbg", '120 30 0', GetTeamRGB(myteam), sbar_alpha_bg, 0); // timer bg color = myteam color
+				drawpic(bgpos, "gfx/hud/sb_timerbg", '120 30 0', GetTeamRGB(myteam) * cvar("sbar_color_bg_team"), sbar_alpha_bg, 0); // timer bg color = myteam color
 			else {
 				color_x = cvar("sbar_color_bg_r");
 				color_y = cvar("sbar_color_bg_g");
@@ -2011,10 +2011,10 @@
 			
 			if (cvar("viewsize") <= 100) {
 				if (teamplay) {
-					if (myteam == 13) // 13 = blue shirt color
-						drawpic(bottomleft - '0 58 0' + bgoffset, "gfx/hud/sbar", bg_size, '0 0.3 1', sbar_alpha_bg, 0); // blue hud is too dark at '0 0 1'
-					else
-						drawpic(bottomleft - '0 58 0' + bgoffset, "gfx/hud/sbar", bg_size, GetTeamRGB(myteam), sbar_alpha_bg, 0); // hud color = myteam color
+					//if (myteam == 13) // 13 = blue shirt color
+					//	drawpic(bottomleft - '0 58 0' + bgoffset, "gfx/hud/sbar", bg_size, '0 0.3 1', sbar_alpha_bg, 0); // blue hud is too dark at '0 0 1'
+					//else
+						drawpic(bottomleft - '0 58 0' + bgoffset, "gfx/hud/sbar", bg_size, GetTeamRGB(myteam) * cvar("sbar_color_bg_team"), sbar_alpha_bg, 0); // hud color = myteam color
 					}
 				else {
 					// allow for custom HUD colors in non-teamgames



More information about the nexuiz-commits mailing list