From a489d4c5ddbc5c3de5120df90eb58e453a1dc357 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Wed, 4 Aug 2010 19:01:41 +0300 Subject: [PATCH] show the infomessages panel at all times, move it a little bit in luminos --- defaultXonotic.cfg | 2 +- hud_luminos_default.cfg | 27 ++++++++++++++------------- qcsrc/client/hud.qc | 37 +++++++++++++++++++++++-------------- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index f54fdd0f1..c3dd61ef5 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1392,7 +1392,7 @@ seta scoreboard_highlight 1 "enable highlighting for rows and columns in the sco seta scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on hud_scoreboard_highlight 1)" seta scoreboard_highlight_alpha_self 0.25 "self highlight alpha value" seta scoreboard_offset_left 0.02 "how many pixels the scoreboard is offset from the left screen edge" -seta scoreboard_offset_right 0.1 "how many pixels the scoreboard is offset from the right screen edge" +seta scoreboard_offset_right 0.148 "how many pixels the scoreboard is offset from the right screen edge" // 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" diff --git a/hud_luminos_default.cfg b/hud_luminos_default.cfg index f8639c8ae..c677401d5 100644 --- a/hud_luminos_default.cfg +++ b/hud_luminos_default.cfg @@ -20,13 +20,13 @@ seta hud_progressbar_armor_color "0 0.6 0" seta hud_progressbar_fuel_color "0.6 0.6 0" seta hud_progressbar_nexball_color "0.7 0.1 0" -seta _hud_panelorder "11 0 9 2 10 14 12 6 3 13 4 8 7 1 5 " +seta _hud_panelorder "2 14 13 9 1 3 11 0 10 12 6 4 8 7 5 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.005000" seta hud_configure_grid_ysize "0.005000" -seta scr_centerpos 0.25 +seta scr_centerpos "0.25" seta hud_panel_weapons 1 seta hud_panel_weapons_pos "0.915000 0.085000" @@ -48,18 +48,18 @@ seta hud_panel_weapons_aspect "2" seta hud_panel_ammo 1 seta hud_panel_ammo_pos "0.190000 0.925000" -seta hud_panel_ammo_size "0.095000 0.060000" +seta hud_panel_ammo_size "0.110000 0.060000" seta hud_panel_ammo_bg "" seta hud_panel_ammo_bg_color "" seta hud_panel_ammo_bg_color_team "" seta hud_panel_ammo_bg_alpha "" seta hud_panel_ammo_bg_border "" seta hud_panel_ammo_bg_padding "" -seta hud_panel_ammo_onlycurrent "1" +seta hud_panel_ammo_onlycurrent "0" seta hud_panel_ammo_iconalign "0" seta hud_panel_powerups 1 -seta hud_panel_powerups_pos "0.365000 0.015000" +seta hud_panel_powerups_pos "0.365000 0.105000" seta hud_panel_powerups_size "0.262500 0.048047" seta hud_panel_powerups_bg "" seta hud_panel_powerups_bg_color "" @@ -73,8 +73,8 @@ seta hud_panel_powerups_baralign "4" seta hud_panel_powerups_progressbar "1" seta hud_panel_healtharmor 1 -seta hud_panel_healtharmor_pos "0.305000 0.925000" -seta hud_panel_healtharmor_size "0.315000 0.060000" +seta hud_panel_healtharmor_pos "0.320000 0.925000" +seta hud_panel_healtharmor_size "0.300000 0.060000" seta hud_panel_healtharmor_bg "" seta hud_panel_healtharmor_bg_color "" seta hud_panel_healtharmor_bg_color_team "1" @@ -140,7 +140,7 @@ seta hud_panel_racetimer_bg_border "" seta hud_panel_racetimer_bg_padding "" seta hud_panel_vote 1 -seta hud_panel_vote_pos "0.025000 0.660000" +seta hud_panel_vote_pos "0.025000 0.655000" seta hud_panel_vote_size "0.264218 0.102462" seta hud_panel_vote_bg "" seta hud_panel_vote_bg_color "" @@ -182,8 +182,8 @@ seta hud_panel_chat_bg_border "" seta hud_panel_chat_bg_padding "" seta hud_panel_engineinfo 1 -seta hud_panel_engineinfo_pos "0.860000 0.954667" -seta hud_panel_engineinfo_size "0.125000 0.035000" +seta hud_panel_engineinfo_pos "0.890000 0.955000" +seta hud_panel_engineinfo_size "0.110000 0.035000" seta hud_panel_engineinfo_bg "" seta hud_panel_engineinfo_bg_color "" seta hud_panel_engineinfo_bg_color_team "" @@ -192,13 +192,14 @@ seta hud_panel_engineinfo_bg_border "" seta hud_panel_engineinfo_bg_padding "" seta hud_panel_infomessages 1 -seta hud_panel_infomessages_pos "0.340000 0.350000" -seta hud_panel_infomessages_size "0.320000 0.085000" +seta hud_panel_infomessages_pos "0.515000 0" +seta hud_panel_infomessages_size "0.340000 0.090000" seta hud_panel_infomessages_bg "" seta hud_panel_infomessages_bg_color "" seta hud_panel_infomessages_bg_color_team "" seta hud_panel_infomessages_bg_alpha "0" seta hud_panel_infomessages_bg_border "" -seta hud_panel_infomessages_bg_padding "" +seta hud_panel_infomessages_bg_padding "0" +seta hud_panel_infomessages_flip "1" menu_restart diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 9360246df..c294401c7 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -511,6 +511,9 @@ void HUD_Panel_ExportCfg(string cfgname) case HUD_PANEL_PRESSEDKEYS: fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_aspect")), "\"", "\n")); break; + case HUD_PANEL_INFOMESSAGES: + fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\"", "\n")); + break; } fputs(fh, "\n"); } @@ -4395,6 +4398,12 @@ void HUD_InfoMessages(void) vector fontsize; fontsize = '0.20 0.20 0' * mySize_y; + float a; + if(spectatee_status != 0) + a = 1; + else + a = panel_fg_alpha; + string s; if(!autocvar__hud_configure) { @@ -4407,7 +4416,7 @@ void HUD_InfoMessages(void) if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; if(spectatee_status == -1) @@ -4416,7 +4425,7 @@ void HUD_InfoMessages(void) s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player"); if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; if(spectatee_status == -1) @@ -4425,13 +4434,13 @@ void HUD_InfoMessages(void) s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe"); if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info"); if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; if(gametype == GAME_ARENA) @@ -4451,7 +4460,7 @@ void HUD_InfoMessages(void) s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; //show restart countdown: @@ -4460,7 +4469,7 @@ void HUD_InfoMessages(void) //we need to ceil, otherwise the countdown would be off by .5 when using round() countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time); s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds"); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; } } @@ -4469,7 +4478,7 @@ void HUD_InfoMessages(void) s = "^2Currently in ^1warmup^2 stage!"; if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; } @@ -4497,7 +4506,7 @@ void HUD_InfoMessages(void) } if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; } else if(warmup_stage && !intermission && !spectatee_status) @@ -4505,7 +4514,7 @@ void HUD_InfoMessages(void) s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup"); if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; } @@ -4535,7 +4544,7 @@ void HUD_InfoMessages(void) if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; } } @@ -4546,22 +4555,22 @@ void HUD_InfoMessages(void) s = "^7Press ^3ESC ^7to show HUD options."; if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; s = "^3Doubleclick ^7a panel for panel-specific options."; if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; s = "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and"; if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; s = "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments."; if(autocvar_hud_panel_infomessages_flip) o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); o += eY * fontsize_y; } } -- 2.39.2