X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=c5cc244f9fa3b6baad33dd29aca210641551dbc4;hb=b46fdcee5c729ccdf485d908803d06bbfdac2a8c;hp=00f687d8fd9edf487e2d9c77ac03bb63de4ec0b8;hpb=23f193f7d4f447db3cda320f704006adca177780;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 00f687d8f..c5cc244f9 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -421,13 +421,13 @@ void HUD_Panel_ExportCfg(string cfgname) if(fh >= 0) { fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n")); - fputs(fh, strcat("seta hud_bg \"", cvar_string("hud_bg"), "\"", "\n")); - fputs(fh, strcat("seta hud_bg_color \"", cvar_string("hud_bg_color"), "\"", "\n")); - fputs(fh, strcat("seta hud_bg_color_team \"", cvar_string("hud_bg_color_team"), "\"", "\n")); - fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n")); - fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n")); - fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n")); - fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_bg \"", cvar_string("hud_panel_bg"), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_bg_color \"", cvar_string("hud_panel_bg_color"), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_bg_color_team \"", cvar_string("hud_panel_bg_color_team"), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_bg_alpha \"", cvar_string("hud_panel_bg_alpha"), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_bg_border \"", cvar_string("hud_panel_bg_border"), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_bg_padding \"", cvar_string("hud_panel_bg_padding"), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_fg_alpha \"", cvar_string("hud_panel_fg_alpha"), "\"", "\n")); fputs(fh, "\n"); fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n")); @@ -448,62 +448,70 @@ void HUD_Panel_ExportCfg(string cfgname) fputs(fh, strcat("seta _hud_panelorder \"", cvar_string("_hud_panelorder"), "\"", "\n")); fputs(fh, "\n"); + fputs(fh, strcat("seta hud_configure_grid \"", cvar_string("hud_configure_grid"), "\"", "\n")); + fputs(fh, strcat("seta hud_configure_grid_xsize \"", cvar_string("hud_configure_grid_xsize"), "\"", "\n")); + fputs(fh, strcat("seta hud_configure_grid_ysize \"", cvar_string("hud_configure_grid_ysize"), "\"", "\n")); + fputs(fh, "\n"); + // common cvars for all panels float i; for (i = 0; i < HUD_PANEL_NUM; ++i) { HUD_Panel_GetName(i) - fputs(fh, strcat("seta hud_", panel_name, " ", cvar_string(strcat("hud_", panel_name)), "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_pos \"", cvar_string(strcat("hud_", panel_name, "_pos")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_size \"", cvar_string(strcat("hud_", panel_name, "_size")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_bg \"", cvar_string(strcat("hud_", panel_name, "_bg")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_bg_color \"", cvar_string(strcat("hud_", panel_name, "_bg_color")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_bg_color_team \"", cvar_string(strcat("hud_", panel_name, "_bg_color_team")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_bg_alpha \"", cvar_string(strcat("hud_", panel_name, "_bg_alpha")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_bg_border \"", cvar_string(strcat("hud_", panel_name, "_bg_border")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_bg_padding \"", cvar_string(strcat("hud_", panel_name, "_bg_padding")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, " ", cvar_string(strcat("hud_panel_", panel_name)), "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_pos \"", cvar_string(strcat("hud_panel_", panel_name, "_pos")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_size \"", cvar_string(strcat("hud_panel_", panel_name, "_size")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg \"", cvar_string(strcat("hud_panel_", panel_name, "_bg")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_color \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_color")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_color_team \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_color_team")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_alpha")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_border \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_border")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_padding \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_padding")), "\"", "\n")); switch(i) { - case HUD_PANEL_WEAPONICONS: - fputs(fh, strcat("seta hud_", panel_name, "_complainbubble \"", cvar_string(strcat("hud_", panel_name, "_complainbubble")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_padding \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_padding")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_color_outofammo \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_color_outofammo")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_color_donthave \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_color_donthave")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_color_unavailable \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_color_unavailable")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_ammo_color \"", cvar_string(strcat("hud_", panel_name, "_ammo_color")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_ammo_alpha \"", cvar_string(strcat("hud_", panel_name, "_ammo_alpha")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_aspect \"", cvar_string(strcat("hud_", panel_name, "_ammo_alpha")), "\"", "\n")); + case HUD_PANEL_WEAPONS: + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_padding \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_padding")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_outofammo \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_outofammo")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_donthave \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_donthave")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_unavailable \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_unavailable")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_color \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_color")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_alpha")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_aspect")), "\"", "\n")); break; - case HUD_PANEL_INVENTORY: - fputs(fh, strcat("seta hud_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_", panel_name, "_onlycurrent")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n")); + case HUD_PANEL_AMMO: + fputs(fh, strcat("seta hud_panel_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_panel_", panel_name, "_onlycurrent")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_iconalign \"", cvar_string(strcat("hud_panel_", panel_name, "_iconalign")), "\"", "\n")); break; case HUD_PANEL_POWERUPS: - fputs(fh, strcat("seta hud_", panel_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_baralign \"", cvar_string(strcat("hud_", panel_name, "_baralign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_iconalign \"", cvar_string(strcat("hud_panel_", panel_name, "_iconalign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_baralign \"", cvar_string(strcat("hud_panel_", panel_name, "_baralign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_progressbar \"", cvar_string(strcat("hud_panel_", panel_name, "_progressbar")), "\"", "\n")); break; case HUD_PANEL_HEALTHARMOR: - fputs(fh, strcat("seta hud_", panel_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_baralign \"", cvar_string(strcat("hud_", panel_name, "_baralign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_iconalign \"", cvar_string(strcat("hud_panel_", panel_name, "_iconalign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_baralign \"", cvar_string(strcat("hud_panel_", panel_name, "_baralign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_progressbar \"", cvar_string(strcat("hud_panel_", panel_name, "_progressbar")), "\"", "\n")); break; case HUD_PANEL_NOTIFY: - fputs(fh, strcat("seta hud_", panel_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_print \"", cvar_string(strcat("hud_", panel_name, "_print")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_print \"", cvar_string(strcat("hud_panel_", panel_name, "_print")), "\"", "\n")); break; case HUD_PANEL_RADAR: - fputs(fh, strcat("seta hud_", panel_name, "_foreground_alpha \"", cvar_string(strcat("hud_", panel_name, "_foreground_alpha")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_foreground_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_foreground_alpha")), "\"", "\n")); break; case HUD_PANEL_VOTE: - fputs(fh, strcat("seta hud_", panel_name, "_alreadyvoted_alpha \"", cvar_string(strcat("hud_", panel_name, "_alreadyvoted_alpha")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_alreadyvoted_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_alreadyvoted_alpha")), "\"", "\n")); break; case HUD_PANEL_PRESSEDKEYS: - fputs(fh, strcat("seta hud_", panel_name, "_aspect \"", cvar_string(strcat("hud_", panel_name, "_aspect")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_aspect")), "\"", "\n")); break; } fputs(fh, "\n"); } + fputs(fh, strcat("menu_restart", "\n")); // force a menu update when execing config, so that the dialogs are updated print("^2Successfully exported to hud_", autocvar_hud_skin, "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n"); } @@ -675,7 +683,7 @@ void HUD_Panel_SetPos(vector pos) s = strcat(ftos(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight)); HUD_Panel_GetName(highlightedPanel); - cvar_set(strcat("hud_", panel_name, "_pos"), s); + cvar_set(strcat("hud_panel_", panel_name, "_pos"), s); } // check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector @@ -877,10 +885,10 @@ void HUD_Panel_SetPosSize(vector mySize) HUD_Panel_GetName(highlightedPanel); string s; s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight)); - cvar_set(strcat("hud_", panel_name, "_size"), s); + cvar_set(strcat("hud_panel_", panel_name, "_size"), s); s = strcat(ftos(myPos_x/vid_conwidth), " ", ftos(myPos_y/vid_conheight)); - cvar_set(strcat("hud_", panel_name, "_pos"), s); + cvar_set(strcat("hud_panel_", panel_name, "_pos"), s); } float mouseClicked; @@ -1313,7 +1321,7 @@ void HUD_Panel_Mouse() // Weapon icons (#0) // float weaponspace[10]; -#define HUD_WeaponIcons_Clear()\ +#define HUD_Weapons_Clear()\ float idx;\ for(idx = 0; idx < 10; ++idx)\ weaponspace[idx] = 0; @@ -1372,17 +1380,13 @@ float GetAmmoTypeForWep(float i) } } -#define acc_color(i) stov(cvar_string(strcat("hud_weaponicons_accuracy_color", ftos(i)))) -#define MAX_ACCURACY_LEVELS 10 -float acc_lev[MAX_ACCURACY_LEVELS]; - -void HUD_WeaponIcons(void) +void HUD_Weapons(void) { - if(!autocvar_hud_weaponicons && !autocvar__hud_configure) + if(!autocvar_hud_panel_weapons && !autocvar__hud_configure) return; - active_panel = HUD_PANEL_WEAPONICONS; - HUD_Panel_UpdateCvars(weaponicons); + active_panel = HUD_PANEL_WEAPONS; + HUD_Panel_UpdateCvars(weapons); vector pos, mySize; float i, weapid, fade, weapon_stats, weapon_number, weapon_cnt; @@ -1434,7 +1438,7 @@ void HUD_WeaponIcons(void) weapon_number = weapon_stats & 63; weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64); - if(cvar_or("hud_weaponicons_fade", 1)) + if(cvar_or("hud_panel_weapons_fade", 1)) { fade = 3.2 - 2 * (time - weapontime); fade = bound(0.7, fade, 1); @@ -1442,36 +1446,25 @@ void HUD_WeaponIcons(void) else fade = 1; - HUD_WeaponIcons_Clear(); + HUD_Weapons_Clear(); float rows, columns; rows = mySize_y/mySize_x; - rows = bound(1, floor((sqrt(4 * autocvar_hud_weaponicons_aspect * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT); + rows = bound(1, floor((sqrt(4 * autocvar_hud_panel_weapons_aspect * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT); columns = ceil(WEP_COUNT/rows); float row, column; float a, type, fullammo; float when; - when = autocvar_hud_weaponicons_complainbubble_time; + when = autocvar_hud_panel_weapons_complainbubble_time; float fadetime; - fadetime = autocvar_hud_weaponicons_complainbubble_fadetime; + fadetime = autocvar_hud_panel_weapons_complainbubble_fadetime; vector color; vector wpnpos; vector wpnsize; - float acc_levels; - if(autocvar_hud_weaponicons_accuracy && !(gametype == GAME_RACE || gametype == GAME_CTS)) - { - acc_levels = tokenize(cvar_string("hud_weaponicons_accuracy_color_levels")); - if (acc_levels > MAX_ACCURACY_LEVELS) - acc_levels = MAX_ACCURACY_LEVELS; - - for (i = 0; i < acc_levels; ++i) - acc_lev[i] = stof(argv(i)); - } - for(i = 0; i < weapon_cnt; ++i) { wpnpos = pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows); @@ -1516,13 +1509,13 @@ void HUD_WeaponIcons(void) { drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL); - if(autocvar_hud_weaponicons_number == 1) // weapon number + if(autocvar_hud_panel_weapons_label == 1) // weapon number drawstring(wpnpos, ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - else if(autocvar_hud_weaponicons_number == 2) // bind + else if(autocvar_hud_panel_weapons_label == 2) // bind drawstring(wpnpos, getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); // draw ammo status bar - if(autocvar_hud_weaponicons_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO) + if(autocvar_hud_panel_weapons_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO) { a = 0; type = GetAmmoTypeForWep(weapid); @@ -1532,19 +1525,19 @@ void HUD_WeaponIcons(void) if(a > 0) { switch(type) { - case 0: fullammo = autocvar_hud_weaponicons_ammo_full_shells; break; - case 1: fullammo = autocvar_hud_weaponicons_ammo_full_nails; break; - case 2: fullammo = autocvar_hud_weaponicons_ammo_full_rockets; break; - case 3: fullammo = autocvar_hud_weaponicons_ammo_full_cells; break; - case 4: fullammo = autocvar_hud_weaponicons_ammo_full_fuel; break; + case 0: fullammo = autocvar_hud_panel_weapons_ammo_full_shells; break; + case 1: fullammo = autocvar_hud_panel_weapons_ammo_full_nails; break; + case 2: fullammo = autocvar_hud_panel_weapons_ammo_full_rockets; break; + case 3: fullammo = autocvar_hud_panel_weapons_ammo_full_cells; break; + case 4: fullammo = autocvar_hud_panel_weapons_ammo_full_fuel; break; default: fullammo = 60; } vector barsize; vector barpos; - if(wpnsize_x/wpnsize_y > autocvar_hud_weaponicons_aspect) + if(wpnsize_x/wpnsize_y > autocvar_hud_panel_weapons_aspect) { - barsize_x = autocvar_hud_weaponicons_aspect * wpnsize_y; + barsize_x = autocvar_hud_panel_weapons_aspect * wpnsize_y; barsize_y = wpnsize_y; barpos_x = wpnpos_x + (wpnsize_x - barsize_x) / 2; @@ -1552,7 +1545,7 @@ void HUD_WeaponIcons(void) } else { - barsize_y = 1/autocvar_hud_weaponicons_aspect * wpnsize_x; + barsize_y = 1/autocvar_hud_panel_weapons_aspect * wpnsize_x; barsize_x = wpnsize_x; barpos_y = wpnpos_y + (wpnsize_y - barsize_y) / 2; @@ -1564,7 +1557,7 @@ void HUD_WeaponIcons(void) barpos_y, barsize_x * bound(0, a/fullammo, 1), barsize_y); - drawpic_aspect_skin(wpnpos, "weapon_ammo", wpnsize, autocvar_hud_weaponicons_ammo_color, panel_fg_alpha * autocvar_hud_weaponicons_ammo_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, "weapon_ammo", wpnsize, autocvar_hud_panel_weapons_ammo_color, panel_fg_alpha * autocvar_hud_panel_weapons_ammo_alpha, DRAWFLAG_NORMAL); drawresetcliparea(); } } @@ -1577,7 +1570,7 @@ void HUD_WeaponIcons(void) } // draw the complain message - if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && autocvar_hud_weaponicons_complainbubble) + if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && autocvar_hud_panel_weapons_complainbubble) { if(fadetime) { @@ -1597,18 +1590,18 @@ void HUD_WeaponIcons(void) string s; if(complain_weapon_type == 0) { s = "Out of ammo"; - color = autocvar_hud_weaponicons_complainbubble_color_outofammo; + color = autocvar_hud_panel_weapons_complainbubble_color_outofammo; } else if(complain_weapon_type == 1) { s = "Don't have"; - color = autocvar_hud_weaponicons_complainbubble_color_donthave; + color = autocvar_hud_panel_weapons_complainbubble_color_donthave; } else { s = "Unavailable"; - color = autocvar_hud_weaponicons_complainbubble_color_unavailable; + color = autocvar_hud_panel_weapons_complainbubble_color_unavailable; } - drawpic_aspect_skin(wpnpos + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, "weapon_complainbubble", wpnsize - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(wpnpos + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, s, wpnsize - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos + '1 1 0' * autocvar_hud_panel_weapons_complainbubble_padding, "weapon_complainbubble", wpnsize - '2 2 0' * autocvar_hud_panel_weapons_complainbubble_padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(wpnpos + '1 1 0' * autocvar_hud_panel_weapons_complainbubble_padding, s, wpnsize - '2 2 0' * autocvar_hud_panel_weapons_complainbubble_padding, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } ++row; @@ -1621,7 +1614,7 @@ void HUD_WeaponIcons(void) } -// Inventory (#1) +// Ammo (#1) // // TODO: macro float GetAmmoItemCode(float i) @@ -1688,7 +1681,7 @@ void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_s } vector picpos, numpos; - if(autocvar_hud_inventory_iconalign) + if(autocvar_hud_panel_ammo_iconalign) { numpos = newPos; picpos = newPos + eX * 2 * newSize_y; @@ -1708,13 +1701,13 @@ void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_s drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL); } -void HUD_Inventory(void) +void HUD_Ammo(void) { - if(!autocvar_hud_inventory && !autocvar__hud_configure) + if(!autocvar_hud_panel_ammo && !autocvar__hud_configure) return; - active_panel = HUD_PANEL_INVENTORY; - HUD_Panel_UpdateCvars(inventory); + active_panel = HUD_PANEL_AMMO; + HUD_Panel_UpdateCvars(ammo); float i, currently_selected; vector pos, mySize; @@ -1739,7 +1732,7 @@ void HUD_Inventory(void) // ammo for (i = 0; i < AMMO_COUNT; ++i) { currently_selected = getstati(STAT_ITEMS) & GetAmmoItemCode(i); - if(autocvar_hud_inventory_onlycurrent) { + if(autocvar_hud_panel_ammo_onlycurrent) { if(autocvar__hud_configure) i = 2; if (currently_selected || autocvar__hud_configure) @@ -1824,7 +1817,7 @@ void DrawNumIcon_expanding(float iconalign, vector myPos, vector mySize, float x // Powerups (#2) // void HUD_Powerups(void) { - if(!autocvar_hud_powerups && !autocvar__hud_configure) + if(!autocvar_hud_panel_powerups && !autocvar__hud_configure) return; active_panel = HUD_PANEL_POWERUPS; @@ -1871,7 +1864,7 @@ void HUD_Powerups(void) { string leftname, rightname; float leftcnt, rightcnt; float leftexact, rightexact; - if (autocvar_hud_powerups_flip) { + if (autocvar_hud_panel_powerups_flip) { leftname = "strength"; leftcnt = ceil(strength_time); leftexact = strength_time; @@ -1894,7 +1887,7 @@ void HUD_Powerups(void) { { if(leftcnt) { - if(autocvar_hud_powerups_baralign == 1 || autocvar_hud_powerups_baralign == 3) { // right align + if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // right align barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/30); barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; } else { // left align @@ -1902,17 +1895,20 @@ void HUD_Powerups(void) { barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; } - HUD_Panel_GetProgressBarColor(leftname) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + } if(leftcnt > 1) - DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); + DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); if(leftcnt <= 5) - DrawNumIcon_expanding(autocvar_hud_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); + DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); } if(rightcnt) { - if(autocvar_hud_powerups_baralign == 0 || autocvar_hud_powerups_baralign == 3) { // left align + if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // left align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y; } else { // right align @@ -1920,19 +1916,22 @@ void HUD_Powerups(void) { barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y; } - HUD_Panel_GetProgressBarColor(rightname) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(rightcnt > 1) - DrawNumIcon(autocvar_hud_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); + DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); if(rightcnt <= 5) - DrawNumIcon_expanding(autocvar_hud_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1)); + DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1)); } } else if (mySize_x/mySize_y > 1.5) { if(leftcnt) { - if(autocvar_hud_powerups_baralign == 1 || autocvar_hud_powerups_baralign == 3) { // right align + if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // right align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/30); barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y; } else { // left align @@ -1940,17 +1939,20 @@ void HUD_Powerups(void) { barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y; } - HUD_Panel_GetProgressBarColor(leftname) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(leftcnt > 1) - DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); + DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); if(leftcnt <= 5) - DrawNumIcon_expanding(autocvar_hud_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); + DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); } if(rightcnt) { - if(autocvar_hud_powerups_baralign == 0 || autocvar_hud_powerups_baralign == 3) { // left align + if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // left align barpos = pos + eY * 0.5 * mySize_y; barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; } else { // right align @@ -1958,19 +1960,22 @@ void HUD_Powerups(void) { barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; } - HUD_Panel_GetProgressBarColor(rightname) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(rightcnt > 1) - DrawNumIcon(autocvar_hud_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); + DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); if(rightcnt <= 5) - DrawNumIcon_expanding(autocvar_hud_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1)); + DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1)); } } else { if(leftcnt) { - if(autocvar_hud_powerups_baralign == 1 || autocvar_hud_powerups_baralign == 3) { // down align + if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // down align barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30); barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30); } else { // up align @@ -1978,7 +1983,7 @@ void HUD_Powerups(void) { barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30); } - if(autocvar_hud_powerups_iconalign == 1 || autocvar_hud_powerups_iconalign == 3) { // down align + if(autocvar_hud_panel_powerups_iconalign == 1 || autocvar_hud_panel_powerups_iconalign == 3) { // down align picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x); numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x; } else { // up align @@ -1986,8 +1991,11 @@ void HUD_Powerups(void) { numpos = pos + eY * 0.4 * mySize_x; } - HUD_Panel_GetProgressBarColor(leftname) - HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(leftcnt <= 5) drawpic_aspect_skin_expanding(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, bound(0, (leftcnt - leftexact) / 0.5, 1)); if(leftcnt > 1) @@ -1997,7 +2005,7 @@ void HUD_Powerups(void) { if(rightcnt) { - if(autocvar_hud_powerups_baralign == 0 || autocvar_hud_powerups_baralign == 3) { // up align + if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // up align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30); } else { // down align @@ -2005,7 +2013,7 @@ void HUD_Powerups(void) { barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30); } - if(autocvar_hud_powerups_iconalign == 0 || autocvar_hud_powerups_iconalign == 3) { // up align + if(autocvar_hud_panel_powerups_iconalign == 0 || autocvar_hud_panel_powerups_iconalign == 3) { // up align picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; } else { // down align @@ -2013,8 +2021,11 @@ void HUD_Powerups(void) { numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; } - HUD_Panel_GetProgressBarColor(rightname) - HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(rightcnt <= 5) drawpic_aspect_skin_expanding(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, bound(0, (rightcnt - rightexact) / 0.5, 1)); if(rightcnt > 1) @@ -2029,7 +2040,7 @@ void HUD_Powerups(void) { // void HUD_HealthArmor(void) { - if(!autocvar_hud_healtharmor && !autocvar__hud_configure) + if(!autocvar_hud_panel_healtharmor && !autocvar__hud_configure) return; active_panel = HUD_PANEL_HEALTHARMOR; @@ -2067,7 +2078,7 @@ void HUD_HealthArmor(void) vector numpos; drawfont = hud_bigfont; - if(autocvar_hud_healtharmor == 2) // combined health and armor display + if(autocvar_hud_panel_healtharmor == 2) // combined health and armor display { vector v; v = healtharmor_maxdamage(health, armor, armorblockpercent); @@ -2075,7 +2086,7 @@ void HUD_HealthArmor(void) float x; x = floor(v_x + 1); - if(autocvar_hud_healtharmor_baralign == 1 || autocvar_hud_healtharmor_baralign == 3) { // right align + if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, x/400); barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y; } else { // left align @@ -2087,25 +2098,31 @@ void HUD_HealthArmor(void) if(v_z) // NOT fully armored { biggercount = "health"; - HUD_Panel_GetProgressBarColor("health") - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor("health") + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(armor) drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', panel_fg_alpha * armor / health, DRAWFLAG_NORMAL); } else { biggercount = "armor"; - HUD_Panel_GetProgressBarColor("armor") - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor("armor") + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(health) drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } - DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200), 1); + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200), 1); // fuel if(fuel) { - if(autocvar_hud_healtharmor_baralign == 0 || autocvar_hud_healtharmor_baralign == 3) { // left align + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; } else { @@ -2122,7 +2139,7 @@ void HUD_HealthArmor(void) float leftcnt, rightcnt; float leftactive, rightactive; float leftalpha, rightalpha; - if (autocvar_hud_healtharmor_flip) { // old style layout with armor left/top of health + if (autocvar_hud_panel_healtharmor_flip) { // old style layout with armor left/top of health leftname = "armor"; leftcnt = armor; if(leftcnt) @@ -2150,7 +2167,7 @@ void HUD_HealthArmor(void) { if(leftactive) { - if(autocvar_hud_healtharmor_baralign == 1 || autocvar_hud_healtharmor_baralign == 3) { // right align + if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/200); barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; } else { // left align @@ -2158,14 +2175,17 @@ void HUD_HealthArmor(void) barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; } - HUD_Panel_GetProgressBarColor(leftname) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); - DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); } if(rightactive) { - if(autocvar_hud_healtharmor_baralign == 0 || autocvar_hud_healtharmor_baralign == 3) { // left align + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; } else { // right align @@ -2173,14 +2193,17 @@ void HUD_HealthArmor(void) barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; } - HUD_Panel_GetProgressBarColor(rightname) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); - DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 200), 1); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, 200), 1); } if(fuel) { - if(autocvar_hud_healtharmor_baralign == 0 || autocvar_hud_healtharmor_baralign == 3) { // left align + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; } else { @@ -2195,7 +2218,7 @@ void HUD_HealthArmor(void) { if(leftactive) { - if(autocvar_hud_healtharmor_baralign == 1 || autocvar_hud_healtharmor_baralign == 3) { // right align + if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200); barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; } else { // left align @@ -2203,14 +2226,17 @@ void HUD_HealthArmor(void) barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; } - HUD_Panel_GetProgressBarColor(leftname) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); - DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); } if(rightactive) { - if(autocvar_hud_healtharmor_baralign == 0 || autocvar_hud_healtharmor_baralign == 3) { // left align + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align barpos = pos + eY * 0.5 * mySize_y; barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; } else { // right align @@ -2218,14 +2244,17 @@ void HUD_HealthArmor(void) barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; } - HUD_Panel_GetProgressBarColor(rightname) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); - DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 200), 1); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, 200), 1); } if(fuel) { - if(autocvar_hud_healtharmor_baralign == 0 || autocvar_hud_healtharmor_baralign == 3) { // left align + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; } else { @@ -2240,7 +2269,7 @@ void HUD_HealthArmor(void) { if(leftactive) { - if(autocvar_hud_healtharmor_baralign == 1 || autocvar_hud_healtharmor_baralign == 3) { // down align + if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // down align barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200); barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); } else { // up align @@ -2248,7 +2277,7 @@ void HUD_HealthArmor(void) barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); } - if(autocvar_hud_healtharmor_iconalign == 1 || autocvar_hud_healtharmor_iconalign == 3) { // down align + if(autocvar_hud_panel_healtharmor_iconalign == 1 || autocvar_hud_panel_healtharmor_iconalign == 3) { // down align picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x); numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x; } else { // up align @@ -2256,15 +2285,18 @@ void HUD_HealthArmor(void) numpos = pos + eY * 0.4 * mySize_x; } - HUD_Panel_GetProgressBarColor(leftname) - HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } drawpic_aspect_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_NORMAL); drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, HUD_Get_Num_Color(leftcnt, 200), panel_fg_alpha, DRAWFLAG_NORMAL); } if(rightactive) { - if(autocvar_hud_healtharmor_baralign == 0 || autocvar_hud_healtharmor_baralign == 3) { // up align + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // up align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); } else { // down align @@ -2272,7 +2304,7 @@ void HUD_HealthArmor(void) barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); } - if(autocvar_hud_healtharmor_iconalign == 0 || autocvar_hud_healtharmor_iconalign == 3) { // up align + if(autocvar_hud_panel_healtharmor_iconalign == 0 || autocvar_hud_panel_healtharmor_iconalign == 3) { // up align picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; } else { // down align @@ -2280,15 +2312,18 @@ void HUD_HealthArmor(void) numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; } - HUD_Panel_GetProgressBarColor(rightname) - HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } drawpic_aspect_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * panel_fg_alpha, DRAWFLAG_NORMAL); drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, HUD_Get_Num_Color(rightcnt, 200), panel_fg_alpha, DRAWFLAG_NORMAL); } if(fuel) { - if(autocvar_hud_healtharmor_baralign == 0 || autocvar_hud_healtharmor_baralign == 3) { // left align + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align barpos = pos; barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); } else { @@ -2354,7 +2389,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) { float w; float alsoprint, gentle; - alsoprint = (autocvar_hud_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled + alsoprint = (autocvar_hud_panel_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages); if(msg == MSG_SUICIDE) { @@ -2399,6 +2434,25 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) if (stof(s2) > 2) // killcount > 2 print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n"); + } else if(msg == MSG_KILL_MELEE) { // handle melee types separately + if(type == KILL_FRAG_GAUNTLET) { + if(alsoprint) + { + if(gentle) { + print ("^1", s1, "^1 got too close to", s2, "^1's gauntlet\n"); + } else { + print ("^1", s1, "^1 was cut in half by", s2, "^1's gauntlet\n"); + } + } + } + else if(type == KILL_FRAG_SHOTGUN_MELEE) + { + if(alsoprint) + { + print ("^7", s2, "^7 slapped ", s1, "^7 around a bit with a large ^2shotgun\n"); + } + } + HUD_KillNotify_Push(s1, s2, 1, type); } else if(msg == MSG_KILL) { w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { @@ -2769,7 +2823,7 @@ void HUD_Centerprint(string s1, string s2, float type, float msg) void HUD_Notify (void) { - if(!autocvar_hud_notify && !autocvar__hud_configure) + if(!autocvar_hud_panel_notify && !autocvar__hud_configure) return; active_panel = HUD_PANEL_NOTIFY; @@ -2794,9 +2848,9 @@ void HUD_Notify (void) float a; float when; - when = autocvar_hud_notify_time; + when = autocvar_hud_panel_notify_time; float fadetime; - fadetime = autocvar_hud_notify_fadetime; + fadetime = autocvar_hud_panel_notify_fadetime; string s; @@ -2809,7 +2863,7 @@ void HUD_Notify (void) for(j = 0; j < entries; ++j) { s = ""; - if(autocvar_hud_notify_flip) + if(autocvar_hud_panel_notify_flip) i = j; else // rather nasty hack for ordering items from the bottom up i = entries - j - 1; @@ -2964,6 +3018,14 @@ void HUD_Notify (void) self = get_weaponinfo(killnotify_deathtype[j]); s = strcat("weapon", self.netname); } + else if(killnotify_deathtype[j] == KILL_FRAG_GAUNTLET) + { + s = "notify_melee"; + } + else if(killnotify_deathtype[j] == KILL_FRAG_SHOTGUN_MELEE) + { + s = "notify_melee"; + } else if(killnotify_deathtype[j] == KILL_TEAM_RED) { s = "notify_teamkill_red"; @@ -3024,7 +3086,7 @@ string seconds_tostring(float sec) void HUD_Timer(void) { - if(!autocvar_hud_timer && !autocvar__hud_configure) + if(!autocvar_hud_panel_timer && !autocvar__hud_configure) return; active_panel = HUD_PANEL_TIMER; @@ -3058,7 +3120,7 @@ void HUD_Timer(void) else timer_color = '1 0 0'; //red - if (autocvar_hud_timer_increment || timelimit == 0 || warmup_stage) { + if (autocvar_hud_panel_timer_increment || timelimit == 0 || warmup_stage) { if (time < getstatf(STAT_GAMESTARTTIME)) { //while restart is still active, show 00:00 timer = seconds_tostring(0); @@ -3079,7 +3141,7 @@ void HUD_Timer(void) // void HUD_Radar(void) { - if ((autocvar_hud_radar == 0 || (autocvar_hud_radar != 2 && !teamplay)) && !autocvar__hud_configure) + if ((autocvar_hud_panel_radar == 0 || (autocvar_hud_panel_radar != 2 && !teamplay)) && !autocvar__hud_configure) return; active_panel = HUD_PANEL_RADAR; @@ -3109,7 +3171,7 @@ void HUD_Radar(void) teamradar_loadcvars(); - switch(hud_radar_zoommode) + switch(hud_panel_radar_zoommode) { default: case 0: @@ -3126,13 +3188,13 @@ void HUD_Radar(void) break; } - switch(hud_radar_rotation) + switch(hud_panel_radar_rotation) { case 0: teamradar_angle = view_angles_y - 90; break; default: - teamradar_angle = 90 * hud_radar_rotation; + teamradar_angle = 90 * hud_panel_radar_rotation; break; } @@ -3142,7 +3204,7 @@ void HUD_Radar(void) teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; // we always center // pixels per world qu to match the teamradar_size2d_x range in the longest dimension - if(hud_radar_rotation == 0) + if(hud_panel_radar_rotation == 0) { // max-min distance must fit the radar in any rotation bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min)); @@ -3165,7 +3227,7 @@ void HUD_Radar(void) ); } - normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / hud_radar_scale; + normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / hud_panel_radar_scale; if(bigsize > normalsize) normalsize = bigsize; @@ -3186,7 +3248,7 @@ void HUD_Radar(void) mySize_y ); - draw_teamradar_background(hud_radar_background_alpha, hud_radar_foreground_alpha); + draw_teamradar_background(hud_panel_radar_background_alpha, hud_panel_radar_foreground_alpha); for(tm = world; (tm = find(tm, classname, "radarlink")); ) draw_teamradar_link(tm.origin, tm.velocity, tm.team); @@ -3207,7 +3269,7 @@ void HUD_Radar(void) // void HUD_Score(void) { - if(!autocvar_hud_score && !autocvar__hud_configure) + if(!autocvar_hud_panel_score && !autocvar__hud_configure) return; active_panel = HUD_PANEL_SCORE; @@ -3334,7 +3396,7 @@ void HUD_Score(void) // Race timer (#8) // void HUD_RaceTimer (void) { - if(!autocvar_hud_racetimer && !(gametype == GAME_RACE || gametype == GAME_CTS) && !autocvar__hud_configure) + if(!autocvar_hud_panel_racetimer && !(gametype == GAME_RACE || gametype == GAME_CTS) && !autocvar__hud_configure) return; active_panel = HUD_PANEL_RACETIMER; @@ -3486,7 +3548,7 @@ float vote_change; // "time" when vote_active changed void HUD_VoteWindow(void) { - if(!autocvar_hud_vote && !autocvar__hud_configure) + if(!autocvar_hud_panel_vote && !autocvar__hud_configure) return; active_panel = HUD_PANEL_VOTE; @@ -3517,7 +3579,7 @@ void HUD_VoteWindow(void) if(!vote_alpha) return; - a = vote_alpha * bound(autocvar_hud_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1); + a = vote_alpha * bound(autocvar_hud_panel_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1); HUD_Panel_DrawBg(a); if(panel_bg_padding) @@ -4068,7 +4130,7 @@ float mod_change; // "time" when mod_active changed void HUD_ModIcons(void) { - if(!autocvar_hud_modicons && !autocvar__hud_configure) + if(!autocvar_hud_panel_modicons && !autocvar__hud_configure) return; if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !autocvar__hud_configure) @@ -4114,10 +4176,10 @@ void HUD_ModIcons(void) // void HUD_DrawPressedKeys(void) { - if(!autocvar_hud_pressedkeys && !autocvar__hud_configure) + if(!autocvar_hud_panel_pressedkeys && !autocvar__hud_configure) return; - if(!(spectatee_status > 0 || autocvar_hud_pressedkeys >= 2 || autocvar__hud_configure)) + if(!(spectatee_status > 0 || autocvar_hud_panel_pressedkeys >= 2 || autocvar__hud_configure)) return; active_panel = HUD_PANEL_PRESSEDKEYS; @@ -4134,19 +4196,19 @@ void HUD_DrawPressedKeys(void) } // force custom aspect - if(autocvar_hud_pressedkeys_aspect) + if(autocvar_hud_panel_pressedkeys_aspect) { vector newSize; - if(mySize_x/mySize_y > autocvar_hud_pressedkeys_aspect) + if(mySize_x/mySize_y > autocvar_hud_panel_pressedkeys_aspect) { - newSize_x = autocvar_hud_pressedkeys_aspect * mySize_y; + newSize_x = autocvar_hud_panel_pressedkeys_aspect * mySize_y; newSize_y = mySize_y; pos_x = pos_x + (mySize_x - newSize_x) / 2; } else { - newSize_y = 1/autocvar_hud_pressedkeys_aspect * mySize_x; + newSize_y = 1/autocvar_hud_panel_pressedkeys_aspect * mySize_x; newSize_x = mySize_x; pos_y = pos_y + (mySize_y - newSize_y) / 2; @@ -4171,7 +4233,7 @@ void HUD_DrawPressedKeys(void) // void HUD_Chat(void) { - if(!autocvar_hud_chat && !autocvar__hud_configure) + if(!autocvar_hud_panel_chat && !autocvar__hud_configure) { cvar_set("con_chatrect", "0"); return; @@ -4179,11 +4241,22 @@ void HUD_Chat(void) active_panel = HUD_PANEL_CHAT; HUD_Panel_UpdateCvars(chat); + + if(autocvar__con_chat_maximized && !autocvar__hud_configure) // draw at full screen height if maximized + { + panel_pos_y = panel_bg_border; + panel_size_y = vid_conheight - panel_bg_border * 2; + if(panel_bg == "0") + panel_bg = "border"; // force a border when maximized + panel_bg_alpha = max(0.75, panel_bg_alpha); // force an alpha of at least 0.75 + } + vector pos, mySize; pos = panel_pos; mySize = panel_size; HUD_Panel_DrawBg(1); + if(panel_bg_padding) { pos += '1 1 0' * panel_bg_padding; @@ -4226,7 +4299,7 @@ float frametimeavg1; // 1 frame ago float frametimeavg2; // 2 frames ago void HUD_EngineInfo(void) { - if(!autocvar_hud_engineinfo && !autocvar__hud_configure) + if(!autocvar_hud_panel_engineinfo && !autocvar__hud_configure) return; active_panel = HUD_PANEL_ENGINEINFO; @@ -4242,17 +4315,17 @@ void HUD_EngineInfo(void) mySize -= '2 2 0' * panel_bg_padding; } - if(cvar("hud_engineinfo_framecounter_exponentialmovingaverage")) + if(cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage")) { frametimeavg = (frametimeavg + frametimeavg1 + frametimeavg2 + frametime)/4; // average three frametimes into framecounter for slightly more stable fps readings :P frametimeavg2 = frametimeavg1; frametimeavg1 = frametimeavg; float weight; - weight = cvar("hud_engineinfo_framecounter_exponentialmovingaverage_new_weight"); + weight = cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight"); if(frametime > 0.0001) // filter out insane values which sometimes seem to occur and throw off the average? If you are getting 10,000 fps or more, then you don't need a framerate counter. { - if(fabs(prevfps - (1/frametimeavg)) > prevfps * cvar("hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold")) // if there was a big jump in fps, just force prevfps at current (1/frametime) to make big updates instant + if(fabs(prevfps - (1/frametimeavg)) > prevfps * cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold")) // if there was a big jump in fps, just force prevfps at current (1/frametime) to make big updates instant prevfps = (1/frametime); prevfps = (1 - weight) * prevfps + weight * (1/frametimeavg); // framecounter just used so there's no need for a new variable, think of it as "frametime average" } @@ -4260,9 +4333,9 @@ void HUD_EngineInfo(void) else { framecounter += 1; - if(time - prevfps_time > cvar("hud_engineinfo_framecounter_time")) + if(time - prevfps_time > cvar("hud_panel_engineinfo_framecounter_time")) { - prevfps = framecounter/cvar("hud_engineinfo_framecounter_time"); + prevfps = framecounter/cvar("hud_panel_engineinfo_framecounter_time"); framecounter = 0; prevfps_time = time; } @@ -4271,7 +4344,7 @@ void HUD_EngineInfo(void) vector color; color = HUD_Get_Num_Color (prevfps, 100); drawfont = hud_bigfont; - drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_engineinfo_framecounter_decimals"))), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_panel_engineinfo_framecounter_decimals"))), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_font; } @@ -4279,7 +4352,7 @@ void HUD_EngineInfo(void) // void HUD_InfoMessages(void) { - if(!autocvar_hud_infomessages && !autocvar__hud_configure) + if(!autocvar_hud_panel_infomessages && !autocvar__hud_configure) return; active_panel = HUD_PANEL_INFOMESSAGES; @@ -4295,18 +4368,18 @@ void HUD_InfoMessages(void) mySize -= '2 2 0' * panel_bg_padding; } - // always force 6:1 aspect + // always force 5:1 aspect vector newSize; - if(mySize_x/mySize_y > 6) + if(mySize_x/mySize_y > 5) { - newSize_x = 6 * mySize_y; + newSize_x = 5 * mySize_y; newSize_y = mySize_y; pos_x = pos_x + (mySize_x - newSize_x) / 2; } else { - newSize_y = 1/6 * mySize_x; + newSize_y = 1/5 * mySize_x; newSize_x = mySize_x; pos_y = pos_y + (mySize_y - newSize_y) / 2; @@ -4318,29 +4391,28 @@ void HUD_InfoMessages(void) o = pos; vector fontsize; - fontsize = '0.25 0.25 0' * mySize_y; + fontsize = '0.20 0.20 0' * mySize_y; string s; if(!autocvar__hud_configure) { if(spectatee_status && !intermission) { - //drawfont = hud_bigfont; if(spectatee_status == -1) s = "^1Observing"; else - s = GetPlayerName(spectatee_status - 1); + s = strcat("^1Spectating: ^7", GetPlayerName(spectatee_status - 1)); - //s = textShortenToWidth(s, mySize_y, 0.5 * height, stringwidth_colors); - //drawcolorcodedstring(pos + eY * 0.25 * height, s, 0.5 * height, panel_fg_alpha, DRAWFLAG_NORMAL); - //drawfont = hud_font; + 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); + o += eY * fontsize_y; - // spectator text in the upper right corner if(spectatee_status == -1) s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate"); else s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player"); - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; @@ -4349,13 +4421,13 @@ void HUD_InfoMessages(void) s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed"); else s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe"); - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info"); - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; @@ -4375,7 +4447,7 @@ void HUD_InfoMessages(void) } else s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; @@ -4393,7 +4465,7 @@ void HUD_InfoMessages(void) if(warmup_stage && !intermission) { s = "^2Currently in ^1warmup^2 stage!"; - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; @@ -4421,7 +4493,7 @@ void HUD_InfoMessages(void) else s = strcat("^2Waiting for others to ready up..."); } - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; @@ -4429,7 +4501,7 @@ void HUD_InfoMessages(void) else if(warmup_stage && !intermission && !spectatee_status) { s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup"); - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; @@ -4459,7 +4531,7 @@ void HUD_InfoMessages(void) if (tm.team_size == ts_max) s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust"); - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; @@ -4470,22 +4542,22 @@ void HUD_InfoMessages(void) else { s = "^7Press ^3ESC ^7to show HUD options."; - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; s = "^3Doubleclick ^7a panel for panel-specific options."; - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; s = "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and"; - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; s = "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments."; - if(autocvar_hud_infomessages_flip) + 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); o += eY * fontsize_y; @@ -4607,10 +4679,10 @@ void HUD_Reset (void) switch (id) {\ case (HUD_PANEL_RADAR):\ HUD_Radar(); break;\ - case (HUD_PANEL_WEAPONICONS):\ - HUD_WeaponIcons(); break;\ - case (HUD_PANEL_INVENTORY):\ - HUD_Inventory(); break;\ + case (HUD_PANEL_WEAPONS):\ + HUD_Weapons(); break;\ + case (HUD_PANEL_AMMO):\ + HUD_Ammo(); break;\ case (HUD_PANEL_POWERUPS):\ HUD_Powerups(); break;\ case (HUD_PANEL_HEALTHARMOR):\ @@ -4649,7 +4721,6 @@ void HUD_Main (void) hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5); hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5); - hud_color_bg_team = cvar("hud_color_bg_team"); hud_fontsize = HUD_GetFontsize("hud_fontsize"); hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec"); @@ -4715,9 +4786,14 @@ void HUD_Main (void) } // draw panels in order specified by panel_order array for(i = HUD_PANEL_NUM - 1; i >= 0; --i) { - HUD_DrawPanel(panel_order[i]); + if(i != HUD_PANEL_CHAT || !autocvar__con_chat_maximized) // don't draw maximized chat panel twice! + HUD_DrawPanel(panel_order[i]); } + // draw chat panel on top if it is maximized + if(autocvar__con_chat_maximized) + HUD_DrawPanel(HUD_PANEL_CHAT); + // TODO hud_'ify these if (cvar("cl_showspeed")) HUD_ShowSpeed();