about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-30 09:51:25 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-30 09:51:25 +0000
commite9da47d20ec8b46ebc896c5a804a01b7bdfe99c5 (patch)
tree7af2c874eb768c381b421cc7ebb2c8d55b78c749
parentfd0f68a12ce4689ed848f4e6ac22f23bef556676 (diff)
downloadzcatch-e9da47d20ec8b46ebc896c5a804a01b7bdfe99c5.tar.gz
zcatch-e9da47d20ec8b46ebc896c5a804a01b7bdfe99c5.zip
fixed loading text issue. tweaked some colors
-rw-r--r--src/game/client/gc_menu.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/game/client/gc_menu.cpp b/src/game/client/gc_menu.cpp
index 083cbcbf..b7dd8b4c 100644
--- a/src/game/client/gc_menu.cpp
+++ b/src/game/client/gc_menu.cpp
@@ -612,14 +612,19 @@ void render_loading(float percent)
 	draw_round_rect(x, y, w, h, 40.0f);
 	gfx_quads_end();
 
+
 	const char *caption = "Loading";
 
 	tw = gfx_text_width(0, 48.0f, caption, -1);
 	RECT r;
-	r.x = x+w/2;
+	r.x = x;
 	r.y = y+20;
+	r.w = w;
+	r.h = h;
 	ui_do_label(&r, caption, 48.0f, 0, -1);
 
+	DEBUG_trigger = 0;
+
 	gfx_texture_set(-1);
 	gfx_quads_begin();
 	gfx_setcolor(1,1,1,0.75f);
@@ -871,7 +876,7 @@ static void menu2_render_serverbrowser(RECT main_view)
 					if(s)
 					{
 						gfx_text_ex(&cursor, item->name, (int)(s-item->name));
-						gfx_text_color(1,0.4f,0.4f,1);
+						gfx_text_color(0.4f,0.4f,1.0f,1);
 						gfx_text_ex(&cursor, s, strlen(config.b_filter_string));
 						gfx_text_color(1,1,1,1);
 						gfx_text_ex(&cursor, s+strlen(config.b_filter_string), -1);
@@ -888,7 +893,7 @@ static void menu2_render_serverbrowser(RECT main_view)
 			{
 				str_format(temp, sizeof(temp), "%i/%i", item->num_players, item->max_players);
 				if(config.b_filter_string[0] && (item->quicksearch_hit&BROWSEQUICK_PLAYERNAME))
-					gfx_text_color(1,0.4f,0.4f,1);
+					gfx_text_color(0.4f,0.4f,1.0f,1);
 				ui_do_label(&button, temp, 12.0f, 1);
 				gfx_text_color(1,1,1,1);
 			}
@@ -1028,7 +1033,7 @@ static void menu2_render_serverbrowser(RECT main_view)
 				if(s)
 				{
 					gfx_text_ex(&cursor, name, (int)(s-name));
-					gfx_text_color(1,0.4f,0.4f,1);
+					gfx_text_color(0.4f,0.4f,1,1);
 					gfx_text_ex(&cursor, s, strlen(config.b_filter_string));
 					gfx_text_color(1,1,1,1);
 					gfx_text_ex(&cursor, s+strlen(config.b_filter_string), -1);