[nexuiz-commits] r6661 - in trunk/data: . qcsrc/client

[DONOTREPLY at icculus.org]

Author: mrbougo
Date: 2009-05-04 12:24:40 -0400 (Mon, 04 May 2009)
New Revision: 6661

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/client/sbar.qc
Log:
nexball hud fixes

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-05-04 13:51:27 UTC (rev 6660)
+++ trunk/data/defaultNexuiz.cfg	2009-05-04 16:24:40 UTC (rev 6661)
@@ -1232,6 +1232,8 @@
 con_notifysize 10
 sbar_alpha_bg 0.4
 sbar_flagstatus_pos 115
+seta sbar_ballstatus_pos 123
+seta sbar_ballstatus_right 0
 
 // for menu server list (eventually make them have engine support?)
 seta menu_slist_showfull 1
@@ -1258,12 +1260,12 @@
 // useful keybind to maximize the chat area temporarily
 set _backup_con_chatvars_set 0
 alias _restore_con_chatvars_0 ""
-alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; sbar_flagstatus_right $_backup_sbar_flagstatus_right; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites"
+alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; sbar_flagstatus_right $_backup_sbar_flagstatus_right; sbar_ballstatus_right $_backup_sbar_ballstatus_right; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites"
 alias _restore_con_chatvars "_restore_con_chatvars_$_backup_con_chatvars_set"
-alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_sbar_flagstatus_right $sbar_flagstatus_right; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites"
+alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_sbar_flagstatus_right $sbar_flagstatus_right; set _backup_sbar_ballstatus_right $sbar_ballstatus_right; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites"
 alias _backup_con_chatvars_1 ""
 alias _backup_con_chatvars "_backup_con_chatvars_$_backup_con_chatvars_set"
-alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -7; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; sbar_flagstatus_right 1; scr_centertime 0; r_track_sprites 0"
+alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -7; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; sbar_flagstatus_right 1; sbar_ballstatus_right 1; scr_centertime 0; r_track_sprites 0"
 alias -con_chat_maximize "_restore_con_chatvars"
 
 // tab completion

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-05-04 13:51:27 UTC (rev 6660)
+++ trunk/data/qcsrc/client/sbar.qc	2009-05-04 16:24:40 UTC (rev 6661)
@@ -2213,17 +2213,17 @@
 	stat_items = getstati(STAT_ITEMS);
 	nb_pb_starttime = getstatf(STAT_NB_METERSTART);
 	
-	if(cvar("sbar_flagstatus_right"))
-		pos_x = vid_conwidth - 10 - sbar_x - 64;
+	if(cvar("sbar_ballstatus_right"))
+		pos_x = vid_conwidth - 66 - sbar_x - 64; // the 66 comes from trial and error, no idea about the 64 (see CTF)
 	else
 		pos_x = 10 - sbar_x;
 	
 	pos_z = 0;
 
 	if(sbar_hudselector == 1)
-		pos_y = (vid_conheight - sbar_y) - cvar("sbar_flagstatus_pos") - 64;
+		pos_y = (vid_conheight - sbar_y) - cvar("sbar_ballstatus_pos") - 64;
 	else
-		pos_y = -117;
+		pos_y = -124; // 17 more than flag icons
 
 	pos += sbar;
 	pos_y -= 1; //vertical margin to the picture