From: FruitieX Date: Thu, 13 May 2010 15:23:16 +0000 (+0300) Subject: just for fun, make the HUD look like the old HUD for now :P X-Git-Tag: xonotic-v0.1.0preview~541^2~179 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e7cea568e10cdfdea03fee64c2985fd51e9a9b47;p=xonotic%2Fxonotic-data.pk3dir.git just for fun, make the HUD look like the old HUD for now :P --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 0ad1ed638..a08fe16e2 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1330,8 +1330,8 @@ con_notifyalign 0 set _hud_configure 0 "1 = configure the HUD" seta hud_accuracy_yellow 40 "percentage at which the accuracy color is yellow" seta hud_progressbar_alpha "0.5" "alpha of progressbars" -seta hud_bg "border" "sets the default background for the panels, file must exist in data/gfx/hud/. 0 = disable background by default" -seta hud_bg_color "0 0.7 0.8" "sets the default background color for the panels" +seta hud_bg 0 "sets the default background for the panels, file must exist in data/gfx/hud/. 0 = disable background by default" +seta hud_bg_color "0 0.6 0.9" "sets the default background color for the panels" seta hud_bg_alpha 0.8 "alpha of the background" seta hud_bg_border 10 "sets the default border size for the panels" seta hud_fg_alpha 1 "alpha of the foreground" @@ -1340,7 +1340,7 @@ seta hud_configure_checkcollisions 1 "check for collisions against other panels seta hud_configure_bg_minalpha 0.5 "minimum panel background alpha when in hud configure mode" seta hud_dock dock_oldhud "overlay the whole screen with this dock background, 0 = disable" -seta hud_dock_color "0 0.7 0.8" "dock color" +seta hud_dock_color "0 0.6 0.9" "dock color" seta hud_dock_alpha 0.8 "alpha of the dock" seta sbar_info_pos 50 @@ -1349,8 +1349,8 @@ seta hud_hudselector 1 "0 = health/armor positions flipped, 1 = default hud layo seta hud_showcurrentammo 0 "0 = show all ammo types, 1 = show only the ammo type of the current weapon" seta hud_weaponicons 1 "enable/disable this panel" -seta hud_weaponicons_pos "0 0" "position of this panel" -seta hud_weaponicons_size "0.1 0.1" "size of this panel" +seta hud_weaponicons_pos "-0.635295 -0.134116" "position of this panel" +seta hud_weaponicons_size "0.352942 0.064845" "size of this panel" seta hud_weaponicons_number 1 "show number of weapon" seta hud_weaponicons_accuracybar_height 3 "height of accuracy bar" seta hud_weaponicons_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" @@ -1359,8 +1359,8 @@ seta hud_weaponicons_bg_alpha 0 "if set to something else than 0 = override defa seta hud_weaponicons_bg_border 0 "if set to something else than 0 = override size of border around the background" seta hud_inventory 1 "enable/disable this panel" -seta hud_inventory_pos "0.2 0.2" "position of this panel" -seta hud_inventory_size "0.1 0.1" "size of this panel" +seta hud_inventory_pos "0.179783 -0.092189" "position of this panel" +seta hud_inventory_size "0.174227 0.092189" "size of this panel" seta hud_inventory_onlycurrent 0 "1 = show only current ammo type" seta hud_inventory_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" seta hud_inventory_bg_color "" "optional R G B string of the background color, otherwise use hud default" @@ -1368,8 +1368,8 @@ seta hud_inventory_bg_alpha 0 "if set to something else than 0 = override defaul seta hud_inventory_bg_border 0 "if set to something else than 0 = override size of border around the background" seta hud_powerups 1 "enable/disable this panel" -seta hud_powerups_pos "0.3 0.3" "position of this panel" -seta hud_powerups_size "0.1 0.1" "size of this panel" +seta hud_powerups_pos "-0.311922 -0.084896" "position of this panel" +seta hud_powerups_size "0.086719 0.077084" "size of this panel" seta hud_powerups_flip 1 "flip strength/shield positions" seta hud_powerups_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" seta hud_powerups_bg_color "" "optional R G B string of the background color, otherwise use hud default" @@ -1379,8 +1379,8 @@ seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color" seta hud_healtharmor 1 "enable/disable this panel" -seta hud_healtharmor_pos "0 0.1" "position of this panel" -seta hud_healtharmor_size "0.1 0.1" "size of this panel" +seta hud_healtharmor_pos "-0.627451 -0.066667" "position of this panel" +seta hud_healtharmor_size "0.291174 0.066667" "size of this panel" seta hud_healtharmor_flip 1 "flip health/armor positions" seta hud_healtharmor_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" seta hud_healtharmor_bg_color "" "optional R G B string of the background color, otherwise use hud default" @@ -1399,41 +1399,41 @@ seta hud_notify_bg_alpha 0 "if set to something else than 0 = override default a seta hud_notify_bg_border 0 "if set to something else than 0 = override size of border around the background" seta hud_timer 1 "enable/disable this panel" -seta hud_timer_pos "0.2 0" "position of this base of the panel" -seta hud_timer_size "0.1 0.1" "size of this panel" +seta hud_timer_pos "-0.213725 0" "position of this base of the panel" +seta hud_timer_size "0.212735 0.054427" "size of this panel" seta hud_timer_increment 0 "show elapsed time instead of remaining time" -seta hud_timer_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" +seta hud_timer_bg border_oldhud "if set to something else than \"\" = override default background, if set to 0 = disable background" seta hud_timer_bg_color "" "optional R G B string of the background color, otherwise use hud default" seta hud_timer_bg_alpha 0 "if set to something else than 0 = override default alpha" seta hud_timer_bg_border 0 "if set to something else than 0 = override size of border around the background" seta hud_radar 1 "enable/disable this panel" -seta hud_radar_pos "0.2 0.1" "position of this base of the panel" -seta hud_radar_size "0.1 0.1" "size of this panel" +seta hud_radar_pos "0 0" "position of this base of the panel" +seta hud_radar_size "0.215687 0.266667" "size of this panel" seta hud_radar_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" seta hud_radar_bg_color "" "optional R G B string of the background color, otherwise use hud default" seta hud_radar_bg_alpha 0 "if set to something else than 0 = override default alpha" seta hud_radar_bg_border 0 "if set to something else than 0 = override size of border around the background" seta hud_score 1 "enable/disable this panel" -seta hud_score_pos "0 0.3" "position of this base of the panel" -seta hud_score_size "0.1 0.1" "size of this panel" +seta hud_score_pos "-0.225469 -0.084404" "position of this base of the panel" +seta hud_score_size "0.225469 0.075156" "size of this panel" seta hud_score_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" seta hud_score_bg_color "" "optional R G B string of the background color, otherwise use hud default" seta hud_score_bg_alpha 0 "if set to something else than 0 = override default alpha" seta hud_score_bg_border 0 "if set to something else than 0 = override size of border around the background" seta hud_racetimer 1 "enable/disable this panel" -seta hud_racetimer_pos "0 0.4 0" "position of this base of the panel" -seta hud_racetimer_size "0.1 0.1" "size of this panel" +seta hud_racetimer_pos "-0.614706 0" "position of this base of the panel" +seta hud_racetimer_size "0.231373 0.077124" "size of this panel" seta hud_racetimer_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" seta hud_racetimer_bg_color "" "optional R G B string of the background color, otherwise use hud default" seta hud_racetimer_bg_alpha 0 "if set to something else than 0 = override default alpha" seta hud_racetimer_bg_border 0 "if set to something else than 0 = override size of border around the background" seta hud_vote 1 "enable/disable this panel" -seta hud_vote_pos "0 0.5" "position of this base of the panel" -seta hud_vote_size "0.1 0.1" "size of this panel" +seta hud_vote_pos "-0.321140 -0.268230" "position of this base of the panel" +seta hud_vote_size "0.320156 0.106719" "size of this panel" seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted" seta hud_vote_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" seta hud_vote_bg_color "" "optional R G B string of the background color, otherwise use hud default" @@ -1441,8 +1441,8 @@ seta hud_vote_bg_alpha 0 "if set to something else than 0 = override default alp seta hud_vote_bg_border 0 "if set to something else than 0 = override size of border around the background" seta hud_pressedkeys 1 "enable/disable this panel" -seta hud_pressedkeys_pos "0.6 0" "position of this base of the panel" -seta hud_pressedkeys_size "0.1 0.1" "size of this panel" +seta hud_pressedkeys_pos "-0.571569 -0.265625" "position of this base of the panel" +seta hud_pressedkeys_size "0.145098 0.114105" "size of this panel" seta hud_pressedkeys_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background" seta hud_pressedkeys_bg_color "" "optional R G B string of the background color, otherwise use hud default" seta hud_pressedkeys_bg_alpha 0 "if set to something else than 0 = override default alpha" diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 73e0f6106..b6b71d252 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -575,7 +575,7 @@ vector HUD_Panel_CheckLimitSize(float id, vector mySize) mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height break; case 7: - mySize_y = (17/90) * mySize_x; // 17/90 * width + mySize_y = (1/4) * mySize_x; // 1/4 * width break; case 8: mySize_y = (1/4) * mySize_x; // 1/4 * width @@ -1611,7 +1611,7 @@ void HUD_Score() score = me.(scores[ps_primary]); if(cvar("_hud_configure")) - score = 1337; + score = 123; if(distribution >= 5) { distribution_color = eY; @@ -1627,13 +1627,13 @@ void HUD_Score() score_len = strlen(ftos(score)); distr_len = strlen(ftos(distribution)); - HUD_DrawXNum(pos + eX * mySize_x - eX * 4 * 0.33 * mySize_y, distribution, 4, 3, 0.33 * mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); if (leader) - drawpic(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 4 * 0.33 * mySize_y, strcat("gfx/hud/sb_highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 4 * mySize_y - eX * 4 * 0.33 * mySize_y, score, 4, 0, mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("gfx/hud/sb_highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else { // teamgames float max_fragcount; - max_fragcount = -999; + max_fragcount = -99; float teamnum; for(tm = teams.sort_next; tm; tm = tm.sort_next) { @@ -1641,7 +1641,7 @@ void HUD_Score() continue; score = tm.(teamscores[ts_primary]); if(cvar("_hud_configure")) - score = 1337; + score = 123; leader = 0; score_len = strlen(ftos(score)); @@ -1653,14 +1653,14 @@ void HUD_Score() if (max_fragcount == score) leader = 1; if (leader) - drawpic(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 4 * 0.33 * mySize_y, strcat("gfx/hud/sb_highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 4 * mySize_y - eX * 4 * 0.33 * mySize_y, score, 4, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("gfx/hud/sb_highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else { if (max_fragcount == score) leader = 1; if (leader) drawpic(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("gfx/hud/sb_highlight_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 4 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 4, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); teamnum += 1; } }