X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=1a6c962cac863577850fea22f8648c263c98b988;hb=6830416655b3a40dc8b46d649e6b8dbb184dcc81;hp=0d7489d83ae14049bfbf226fad5b6294b1f2d91c;hpb=3c4a44670479ada63341b2ad4dd4e9b6bf8648b9;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 0d7489d83..1a6c962ca 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -82,57 +82,6 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the } } -// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box -var float imgaspect; -var float aspect; -#define drawpic_aspect(pos,pic,mySize,color,alpha,drawflag)\ -do {\ - vector imgsize;\ - imgsize = drawgetimagesize(pic);\ - imgaspect = imgsize_x/imgsize_y;\ - vector oldsz, sz;\ - oldsz = sz = mySize;\ - aspect = sz_x/sz_y;\ - if(aspect > imgaspect) {\ - sz_x = sz_y * imgaspect;\ - drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag);\ - } else {\ - sz_y = sz_x / imgaspect;\ - drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag);\ - }\ -} while(0) - -// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga -#define drawpic_aspect_skin(pos,pic,sz,color,alpha,drawflag)\ -do{\ - picpath = strcat(hud_skin_path, "/", pic);\ - if(precache_pic(picpath) == "") {\ - picpath = strcat("gfx/hud/default/", pic);\ - }\ - drawpic_aspect(pos, picpath, sz, color, alpha, drawflag);\ -} while(0) - -// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga -#define drawpic_skin(pos,pic,sz,color,alpha,drawflag)\ -do{\ - picpath = strcat(hud_skin_path, "/", pic);\ - if(precache_pic(picpath) == "") {\ - picpath = strcat("gfx/hud/default/", pic);\ - }\ - drawpic(pos, picpath, sz, color, alpha, drawflag);\ -} while(0) - -// TODO: aspect! -void drawpic_aspect_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) { - return; - //drawpic_aspect_expanding(pos, strcat("gfx/hud/", autocvar_hud_skin, "/", pic), sz, rgb, alpha, flag, fadelerp); -} - -void drawpic_aspect_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) { - return; - //drawpic_aspect_expanding_two(pos, strcat("gfx/hud/", autocvar_hud_skin, "/", pic), sz, rgb, alpha, flag, fadelerp); -} - vector HUD_Get_Num_Color (float x, float maxvalue) { vector color; @@ -349,7 +298,6 @@ void HUD_DrawCenterPrint (void) ts = centerprint_messages[i]; if (ts != "") { - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) drawcolorcodedstring(pos, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL); // - '0 0.5 0' * (sz - 1) * centerprint_fontsize_x - '0.5 0 0' * (sz - 1) * centerprint_width[i] * centerprint_fontsize_y, centerprint_fontsize * sz pos_y = pos_y + centerprint_fontsize_y; @@ -473,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")); @@ -500,117 +448,76 @@ 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, "_accuracy_yellow \"", cvar_string(strcat("hud_", panel_name, "_accuracy_yellow")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_complainbubble \"", cvar_string(strcat("hud_", panel_name, "_complainbubble")), "\"", "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_size \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_size")), "\"", "\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, "_info_top \"", cvar_string(strcat("hud_", panel_name, "_info_top")), "\"", "\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_", 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"); } fclose(fh); } -// return smoothly faded size of given panel when a dialog is active -vector HUD_Panel_GetMenuSize(float id) -{ - vector mySize; - mySize = panel_size; - - mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight; - - if(disable_menu_alphacheck == 2 && id == highlightedPanel) - { - vector menu_enable_maxsize, menu_enable_size; - menu_enable_maxsize = '0 0 0'; // shut up FTEQCC - menu_enable_maxsize_x = 0.3 * vid_conwidth; - menu_enable_maxsize_y = 0.18 * vid_conheight; - if(mySize_x > mySize_y) - { - if(mySize_y > menu_enable_maxsize_y) - { - menu_enable_size_y = menu_enable_maxsize_y; - menu_enable_size_x = mySize_x * (menu_enable_maxsize_y/mySize_y); - mySize = (1 - autocvar__menu_alpha) * mySize + (autocvar__menu_alpha) * menu_enable_size; - } - } - else - { - if(mySize_x > menu_enable_maxsize_x) - { - menu_enable_size_x = menu_enable_maxsize_x; - menu_enable_size_y = mySize_y * (menu_enable_maxsize_x/mySize_x); - mySize = (1 - autocvar__menu_alpha) * mySize + (autocvar__menu_alpha) * menu_enable_size; - } - } - } - return mySize; -} - -// return smoothly faded pos of given panel when a dialog is active -vector HUD_Panel_GetMenuPos(float id) -{ - vector pos; - pos = panel_pos; - - pos = eX * pos_x * vid_conwidth + eY * pos_y * vid_conheight; - - if(disable_menu_alphacheck == 2 && id == highlightedPanel) - { - vector mySize, menu_enable_panelpos; - mySize = HUD_Panel_GetMenuSize(id); - if(mySize_x > mySize_y) - menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * mySize_x + eY * 0.82 * vid_conheight; - else - menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * mySize_y + eX * 0.7 * vid_conwidth; - pos = (1 - autocvar__menu_alpha) * pos + (autocvar__menu_alpha) * menu_enable_panelpos; - } - return pos; -} - const float hlBorderSize = 4; const string hlBorder = "gfx/hud/default/border_highlighted"; const string hlBorder2 = "gfx/hud/default/border_highlighted2"; @@ -626,7 +533,7 @@ void HUD_Panel_HlBorder(float myBorder, vector color, float alpha) // draw the background/borders #define HUD_Panel_DrawBg(alpha)\ if(panel_bg != "0")\ - draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\ + draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * alpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\ if(highlightedPanel_prev == active_panel && autocvar__hud_configure)\ HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha) * alpha); @@ -776,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 @@ -978,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; @@ -1340,7 +1247,7 @@ void HUD_Panel_Mouse() if(highlightedPanel != -1) highlightedPanel_prev = highlightedPanel; - mousepos = mousepos + getmousepos(); + mousepos = mousepos + getmousepos() * cvar("menu_mouse_speed"); mousepos_x = bound(0, mousepos_x, vid_conwidth); mousepos_y = bound(0, mousepos_y, vid_conheight); @@ -1414,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; @@ -1438,21 +1345,54 @@ float weaponorder_cmp(float i, float j, entity pass) return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string) } -void HUD_WeaponIcons(void) +float GetAmmoStat(float i) { - if(!autocvar_hud_weaponicons && !autocvar__hud_configure) + switch(i) + { + case 0: return STAT_SHELLS; + case 1: return STAT_NAILS; + case 2: return STAT_ROCKETS; + case 3: return STAT_CELLS; + case 4: return STAT_FUEL; + default: return -1; + } +} + +float GetAmmoTypeForWep(float i) +{ + switch(i) + { + case WEP_SHOTGUN: return 0; + case WEP_UZI: return 1; + case WEP_CAMPINGRIFLE: return 1; + case WEP_GRENADE_LAUNCHER: return 2; + case WEP_ELECTRO: return 3; + case WEP_CRYLINK: return 3; + case WEP_HLAC: return 3; + case WEP_MINSTANEX: return 3; + case WEP_NEX: return 3; + case WEP_HAGAR: return 2; + case WEP_ROCKET_LAUNCHER: return 2; + case WEP_SEEKER: return 2; + case WEP_FIREBALL: return 4; + case WEP_HOOK: return 3; + default: return -1; + } +} + +void HUD_Weapons(void) +{ + if(!autocvar_hud_panel_weapons && !autocvar__hud_configure) return; - float id = HUD_PANEL_WEAPONICONS; - HUD_Panel_UpdateCvarsForId(id); - float alpha, stat_weapons; // "constants" + active_panel = HUD_PANEL_WEAPONS; + HUD_Panel_UpdateCvars(weapons); vector pos, mySize; - float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables + float i, weapid, fade, weapon_stats, weapon_number, weapon_cnt; pos = panel_pos; mySize = panel_size; - stat_weapons = getstati(STAT_WEAPONS); weapon_cnt = 0; for(i = WEP_FIRST; i <= WEP_LAST; ++i) { @@ -1498,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); @@ -1506,79 +1446,131 @@ 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 * (2/1) * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT); - // ^^^ weapon icon aspect goes here + 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; + 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; + for(i = 0; i < weapon_cnt; ++i) { + wpnpos = pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows); + wpnsize = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows); + self = weaponorder[i]; weapid = self.impulse; - alpha = (self.weapon == activeweapon) ? 1 : 0.6; - - weapon_hit = weapon_hits[self.weapon-WEP_FIRST]; - weapon_damage = weapon_fired[self.weapon-WEP_FIRST]; - // draw background behind currently selected weapon if(self.weapon == activeweapon) - drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, "weapon_current_bg", wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL); - // draw the weapon accuracy on the HUD - if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS)) + // draw the weapon accuracy + if(acc_levels) { + float weapon_hit, weapon_damage; + weapon_damage = weapon_fired[self.weapon-WEP_FIRST]; if(weapon_damage) + { + weapon_hit = weapon_hits[self.weapon-WEP_FIRST]; weapon_stats = floor(100 * weapon_hit / weapon_damage); - - // yellow_accuracy = value at which accuracy becomes yellow - if(weapon_stats >= 100) { - color_x = 0; - color_y = 1; - } - else if(weapon_stats > autocvar_hud_weaponicons_accuracy_yellow) { - color_x = 1 - (weapon_stats-autocvar_hud_weaponicons_accuracy_yellow)/(100-autocvar_hud_weaponicons_accuracy_yellow); // red value between 1 -> 0 - color_y = 1; - } else { - color_x = 1; - color_y = weapon_stats/autocvar_hud_weaponicons_accuracy_yellow; // green value between 0 -> 1 } + // find the max level lower than weapon_stats + float j; + j = acc_levels-1; + while ( j && weapon_stats < acc_lev[j] ) + --j; + + // inject color j+1 in color j, how much depending on how much weapon_stats is higher than level j + float factor; + factor = (weapon_stats - acc_lev[j]) / (acc_lev[j+1] - acc_lev[j]); + color = acc_color(j); + color = color + factor * (acc_color(j+1) - color); + if(weapon_damage) - drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, "weapon_accuracy", wpnsize, color, panel_fg_alpha, DRAWFLAG_NORMAL); } // draw the weapon icon - if((self.impulse >= 0) && (stat_weapons & self.weapons)) + if((self.impulse >= 0) && (getstati(STAT_WEAPONS) & self.weapons)) { - drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL); + + 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_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); - if(autocvar_hud_weaponicons_number == 1) // weapon number - drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), 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 - drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), 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_panel_weapons_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO) + { + a = 0; + type = GetAmmoTypeForWep(weapid); + if(type != -1) + a = getstati(GetAmmoStat(type)); // how much ammo do we have? + + if(a > 0) + { + switch(type) { + 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_panel_weapons_aspect) + { + barsize_x = autocvar_hud_panel_weapons_aspect * wpnsize_y; + barsize_y = wpnsize_y; + + barpos_x = wpnpos_x + (wpnsize_x - barsize_x) / 2; + barpos_y = wpnpos_y; + } + else + { + barsize_y = 1/autocvar_hud_panel_weapons_aspect * wpnsize_x; + barsize_x = wpnsize_x; + + barpos_y = wpnpos_y + (wpnsize_y - barsize_y) / 2; + barpos_x = wpnpos_x; + } + + drawsetcliparea( + barpos_x, + barpos_y, + barsize_x * bound(0, a/fullammo, 1), + barsize_y); + 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(); + } + } } // draw a "ghost weapon icon" if you don't have the weapon else { - drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '0 0 0', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '0 0 0', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL); } // 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) { @@ -1598,18 +1590,18 @@ void HUD_WeaponIcons(void) string s; if(complain_weapon_type == 0) { s = "Out of ammo"; - color = '1 0 0'; + color = autocvar_hud_panel_weapons_complainbubble_color_outofammo; } else if(complain_weapon_type == 1) { s = "Don't have"; - color = '1 1 0'; + color = autocvar_hud_panel_weapons_complainbubble_color_donthave; } else { s = "Unavailable"; - color = '1 1 1'; + color = autocvar_hud_panel_weapons_complainbubble_color_unavailable; } - drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, "weapon_complainbubble", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows) - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, s, eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows) - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, mySize_y*(1/rows), '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; @@ -1622,22 +1614,9 @@ void HUD_WeaponIcons(void) } -// Inventory (#1) +// Ammo (#1) // // TODO: macro -float GetAmmoStat(float i) -{ - switch(i) - { - case 0: return STAT_SHELLS; - case 1: return STAT_NAILS; - case 2: return STAT_ROCKETS; - case 3: return STAT_CELLS; - case 4: return STAT_FUEL; - default: return -1; - } -} - float GetAmmoItemCode(float i) { switch(i) @@ -1702,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; @@ -1717,18 +1696,18 @@ void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_s drawpic_aspect_skin(newPos, "ammo_current_bg", newSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_bigfont; - drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); drawfont = hud_font; 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; - float id = HUD_PANEL_INVENTORY; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_AMMO; + HUD_Panel_UpdateCvars(ammo); float i, currently_selected; vector pos, mySize; @@ -1753,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) @@ -1773,7 +1752,7 @@ void HUD_Inventory(void) } } -void DrawNumIcon(float iconalign, vector myPos, vector mySize, float x, string icon, float left, vector color) +void DrawNumIcon(float iconalign, vector myPos, vector mySize, float x, string icon, float left, vector color, float alpha) { vector newSize, newPos; if(mySize_x/mySize_y > 3) @@ -1822,19 +1801,27 @@ void DrawNumIcon(float iconalign, vector myPos, vector mySize, float x, string i } drawfont = hud_bigfont; - drawstring_aspect(numpos, ftos(x), eX * (2/3) * newSize_x + eY * newSize_y, newSize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(x), eX * (2/3) * newSize_x + eY * newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); drawfont = hud_font; - drawpic_aspect_skin(picpos, icon, '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(picpos, icon, '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL); +} + +void DrawNumIcon_expanding(float iconalign, vector myPos, vector mySize, float x, string icon, float left, vector color, float fadelerp) +{ + float sz; + sz = expandingbox_sizefactor_from_fadelerp(fadelerp); + + DrawNumIcon(iconalign, myPos + expandingbox_resize_centered_box_offset(sz, mySize, 1), mySize * sz, x, icon, left, color, (1 - fadelerp)); } // Powerups (#2) // void HUD_Powerups(void) { - if(!autocvar_hud_powerups && !autocvar__hud_configure) + if(!autocvar_hud_panel_powerups && !autocvar__hud_configure) return; - float id = HUD_PANEL_POWERUPS; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_POWERUPS; + HUD_Panel_UpdateCvars(powerups); float stat_items; stat_items = getstati(STAT_ITEMS); @@ -1852,18 +1839,18 @@ void HUD_Powerups(void) { pos = panel_pos; mySize = panel_size; - HUD_Panel_DrawBg(1); + float strength_time, shield_time; + + strength_time = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 99); + shield_time = bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 99); + + HUD_Panel_DrawBg(bound(0, max(strength_time, shield_time), 1)); if(panel_bg_padding) { pos += '1 1 0' * panel_bg_padding; mySize -= '2 2 0' * panel_bg_padding; } - float strength_time, shield_time; - - strength_time = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 99); - shield_time = bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 99); - if(autocvar__hud_configure) { strength_time = 15; @@ -1877,8 +1864,7 @@ void HUD_Powerups(void) { string leftname, rightname; float leftcnt, rightcnt; float leftexact, rightexact; - float leftalpha, rightalpha; - if (autocvar_hud_powerups_flip) { + if (autocvar_hud_panel_powerups_flip) { leftname = "strength"; leftcnt = ceil(strength_time); leftexact = strength_time; @@ -1895,15 +1881,13 @@ void HUD_Powerups(void) { rightcnt = ceil(strength_time); rightexact = strength_time; } - leftalpha = bound(0, leftexact, 1); - rightalpha = bound(0, rightexact, 1); drawfont = hud_bigfont; if (mySize_x/mySize_y > 4) { 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 @@ -1911,19 +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, DRAWFLAG_NORMAL); - DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1'); - // TODO: expand - //if(leftcnt <= 5) - // drawpic_aspect_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); - //else - // drawpic_aspect_skin(picpos, leftname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', leftalpha * 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), DRAWFLAG_NORMAL); + } + if(leftcnt > 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_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 @@ -1931,16 +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, DRAWFLAG_NORMAL); - 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'); + 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_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_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 @@ -1948,14 +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, DRAWFLAG_NORMAL); - DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1'); + 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_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_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 @@ -1963,16 +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, DRAWFLAG_NORMAL); - 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'); + 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_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_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 @@ -1980,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 @@ -1988,18 +1991,21 @@ 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, DRAWFLAG_NORMAL); - //if(leftcnt <= 5) - //drawpic_aspect_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); - //else - 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, 0.25 * mySize_x, '1 1 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) + drawpic_aspect_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } 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 @@ -2007,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 @@ -2015,13 +2021,16 @@ 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, DRAWFLAG_NORMAL); - //if(rightcnt <= 5) - // drawpic_aspect_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * panel_fg_alpha, DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); - //else - 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, 0.25 * mySize_x, '1 1 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) + drawpic_aspect_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } } drawfont = hud_font; @@ -2031,11 +2040,11 @@ void HUD_Powerups(void) { // void HUD_HealthArmor(void) { - if(!autocvar_hud_healtharmor && !autocvar__hud_configure) + if(!autocvar_hud_panel_healtharmor && !autocvar__hud_configure) return; - float id = HUD_PANEL_HEALTHARMOR; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_HEALTHARMOR; + HUD_Panel_UpdateCvars(healtharmor); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -2069,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); @@ -2077,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 @@ -2089,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)); + 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 { @@ -2124,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) @@ -2152,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 @@ -2160,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)); + 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 @@ -2175,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)); + 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 { @@ -2197,22 +2218,25 @@ 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, rightcnt/200) + eY * 0.5 * mySize_y; + barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; } else { // left align barpos = pos; - barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + 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)); + 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 @@ -2220,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)); + 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 { @@ -2242,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 @@ -2250,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 @@ -2258,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, 0.25 * mySize_x, HUD_Get_Num_Color(leftcnt, 200), 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 @@ -2274,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 @@ -2282,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, 0.25 * mySize_x, HUD_Get_Num_Color(rightcnt, 200), 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 { @@ -2355,16 +2388,16 @@ void HUD_KillNotify_Push(string attacker, string victim, float actiontype, float void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) { float w; - float alsoprint; - alsoprint = (autocvar_hud_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled + float alsoprint, gentle; + 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) { - // TODO: cl_gentle w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); if (alsoprint) - print("^1", s1, "^1 ", Weapon_SuicideMessage(type), "\n"); + print("^1", sprintf(Weapon_SuicideMessage(type), strcat(s1, "^1")), "\n"); } else if (type == DEATH_KILL) { HUD_KillNotify_Push(s1, "", 0, DEATH_KILL); if (alsoprint) @@ -2404,28 +2437,28 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) } else if(msg == MSG_KILL) { w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { - HUD_KillNotify_Push(s2, s1, 1, w); + HUD_KillNotify_Push(s1, s2, 1, type); if (alsoprint) - print("^1", s1, "^1 ", Weapon_KillMessage(type), "\n"); + print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer } else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) { HUD_KillNotify_Push(s1, s2, 1, type); if(alsoprint) { - if(cvar("cl_gentle")) { + if(gentle) { print ("^1", s1, "^1 took action against a team mate\n"); } else { print ("^1", s1, "^1 mows down a team mate\n"); } } if (stof(s2) > 2 && type == KILL_TEAM_SPREE) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"^1 ended a ",s3," scoring spree by going against a team mate\n"); else print ("^1",s1,"^1 ended a ",s3," kill spree by killing a team mate\n"); } else if (stof(s2) > 2) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"'s ^1",s3," scoring spree was ended by a team mate!\n"); else print ("^1",s1,"'s ^1",s3," kill spree was ended by a team mate!\n"); @@ -2526,47 +2559,47 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) } } else if(msg == MSG_SPREE) { if(type == KILL_END_SPREE) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"'s ^1", s2, " scoring spree was ended by ", s3, "\n"); else print ("^1",s1,"'s ^1", s2, " kill spree was ended by ", s3, "\n"); } else if(type == KILL_SPREE) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"^1 made ",s2," scores in a row\n"); else print ("^1",s1,"^1 has ",s2," frags in a row\n"); } else if(type == KILL_SPREE_3) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made a ^1TRIPLE SCORE\n"); else print (s1,"^7 made a ^1TRIPLE FRAG\n"); } else if(type == KILL_SPREE_5) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 unleashes ^1SCORING RAGE\n"); else print (s1,"^7 unleashes ^1RAGE\n"); } else if(type == KILL_SPREE_10) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1TEN SCORES IN A ROW!\n"); else print (s1,"^7 starts the ^1MASSACRE!\n"); } else if(type == KILL_SPREE_15) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1FIFTEEN SCORES IN A ROW!\n"); else print (s1,"^7 executes ^1MAYHEM!\n"); } else if(type == KILL_SPREE_20) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1TWENTY SCORES IN A ROW!\n"); else print (s1,"^7 is a ^1BERSERKER!\n"); } else if(type == KILL_SPREE_25) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1TWENTY FIFE SCORES IN A ROW!\n"); else print (s1,"^7 inflicts ^1CARNAGE!\n"); } else if(type == KILL_SPREE_30) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1THIRTY SCORES IN A ROW!\n"); else print (s1,"^7 unleashes ^1ARMAGEDDON!\n"); @@ -2576,7 +2609,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_DROWN); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 was in the water for too long\n"); else print ("^1",s1, "^1 drowned\n"); @@ -2589,7 +2622,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_LAVA); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 found a hot place\n"); else print ("^1",s1, "^1 turned into hot slag\n"); @@ -2598,7 +2631,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 tested gravity (and it worked)\n"); else print ("^1",s1, "^1 hit the ground with a crunch\n"); @@ -2611,7 +2644,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 discovered a swamp\n"); else print ("^1",s1, "^1 is now conserved for centuries to come\n"); @@ -2640,7 +2673,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 felt a little hot\n"); else print ("^1",s1, "^1 burnt to death\n"); @@ -2649,14 +2682,14 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 needs a restart\n"); else print ("^1",s1, "^1 died\n"); } } } else if(msg == MSG_KILL_ACTION_SPREE) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"^1 needs a restart after a ",s2," scoring spree\n"); else print ("^1",s1,"^1 died with a ",s2," kill spree\n"); @@ -2673,6 +2706,9 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) } else if(type == INFO_RETURNFLAG) { HUD_KillNotify_Push(s1, s2, 0, INFO_RETURNFLAG); print(s1, "^7 returned the ", s2, "\n"); + } else if(type == INFO_CAPTUREFLAG) { + HUD_KillNotify_Push(s1, s2, 0, INFO_CAPTUREFLAG); + print(s1, "^7 captured the ", s2, s3, "\n"); } } } @@ -2681,78 +2717,80 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) void HUD_Centerprint(string s1, string s2, float type, float msg) { + float gentle; + gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages); if(msg == MSG_SUICIDE) { if (type == DEATH_TEAMCHANGE) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You are now on: ", s1)); } else if (type == DEATH_AUTOTEAMCHANGE) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You have been moved into a different team to improve team balance\nYou are now on: ", s1)); } else if (type == DEATH_CAMP) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Reconsider your tactics, camper!")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Die camper!")); } else if (type == DEATH_NOAMMO) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You are reinserted into the game for running out of ammo...")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were killed for running out of ammo...")); } else if (type == DEATH_ROT) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to preserve your health")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You grew too old without taking your medicine")); } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't go against team mates!")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't shoot your team mates!")); } else if (type == DEATH_QUIET) { // do nothing } else if (type == DEATH_KILL) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to be more careful!")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You killed your own dumb self!")); } } else if(msg == MSG_KILL) { if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against", s1, ",a team mate!")); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s1, ", a team mate!")); } } else if (type == KILL_FIRST_BLOOD) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First score")); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First blood")); } } else if (type == KILL_FIRST_VICTIM) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First casualty")); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First victim")); } } else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap... - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^1 who was typing!", s2)); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1, s2)); } } else if (type == KILL_TYPEFRAGGED) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^1 while you were typing!", s2)); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1, s2)); } } else if (type == KILL_FRAG) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s1, s2)); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You fragged ^7", s1, s2)); } } else if (type == KILL_FRAGGED) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, s2)); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were fragged by ^7", s1, s2)); @@ -2766,11 +2804,11 @@ 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; - float id = HUD_PANEL_NOTIFY; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_NOTIFY; + HUD_Panel_UpdateCvars(notify); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -2791,12 +2829,11 @@ 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; - vector color; vector pos_attacker, pos_victim; vector weap_pos; @@ -2807,7 +2844,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; @@ -2827,6 +2864,9 @@ void HUD_Notify (void) a = 0; } + float w; + w = DEATH_WEAPONOF(killnotify_deathtype[j]); + // TODO: maybe print in team colors? // // Y [used by] X @@ -2839,105 +2879,98 @@ void HUD_Notify (void) if(killnotify_deathtype[j] == DEATH_GENERIC) { s = "notify_death"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_NOAMMO) { s = "notify_outofammo"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_KILL) { s = "notify_selfkill"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_CAMP) { s = "notify_camping"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == KILL_TEAM_RED) { - s = "notify_teamkill"; - color = '1 0 0'; + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) { - s = "notify_teamkill"; - color = '0 0 1'; + s = "notify_teamkill_blue"; } else if(killnotify_deathtype[j] == DEATH_DROWN) { - s = "notify_"; - color = '1 1 1'; + s = "notify_water"; } else if(killnotify_deathtype[j] == DEATH_SLIME) { - s = "notify_"; - color = '1 1 1'; + s = "notify_slime"; } else if(killnotify_deathtype[j] == DEATH_LAVA) { - s = "notify_"; - color = '1 1 1'; + s = "notify_lava"; } else if(killnotify_deathtype[j] == DEATH_FALL) { - s = "notify_"; - color = '1 1 1'; + s = "notify_fall"; } else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) { - s = "notify_"; - color = '1 1 1'; + s = "notify_shootingstar"; } else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) { - s = "notify_"; - color = '1 1 1'; + s = "notify_death"; } else if(killnotify_deathtype[j] == INFO_GOTFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") { - s = "flag_red_carrying"; - color = '1 0 0'; + s = "notify_red_taken"; } else { - s = "flag_blue_carrying"; - color = '0 0 1'; + s = "notify_blue_taken"; } } else if(killnotify_deathtype[j] == INFO_RETURNFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") { - s = "flag_red_taken"; - color = '1 0 0'; + s = "notify_red_returned"; } else { - s = "flag_blue_taken"; - color = '0 0 1'; + s = "notify_blue_returned"; } } else if(killnotify_deathtype[j] == INFO_LOSTFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") { - s = "flag_red_lost"; - color = '1 0 0'; + s = "notify_red_lost"; + } + else + { + s = "notify_blue_lost"; + } + } + else if(killnotify_deathtype[j] == INFO_CAPTUREFLAG) + { + if(killnotify_victims[j] == "^1RED^7 flag") + { + s = "notify_red_captured"; } else { - s = "flag_blue_lost"; - color = '0 0 1'; + s = "notify_blue_captured"; } } if(s != "" && a) { - drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, color, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } @@ -2963,57 +2996,55 @@ void HUD_Notify (void) if(autocvar__hud_configure) // example actions for config mode { s = "weaponelectro"; - color = '1 1 1'; } - else if(WEP_VALID(killnotify_deathtype[j])) + else if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_LASER) { - self = get_weaponinfo(killnotify_deathtype[j]); + s = "notify_melee"; + } + else if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_SHOTGUN) + { + s = "notify_melee"; + } + else if(WEP_VALID(w)) + { + self = get_weaponinfo(w); s = strcat("weapon", self.netname); - color = '1 1 1'; } else if(killnotify_deathtype[j] == KILL_TEAM_RED) { - s = "notify_teamkill"; - color = '1 0 0'; + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) { - s = "notify_teamkill"; - color = '0 0 1'; + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == DEATH_DROWN) { s = "notify_water"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_SLIME) { s = "notify_slime"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_LAVA) { s = "notify_lava"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_FALL) { s = "notify_fall"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) { s = "notify_shootingstar"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right? { s = "notify_void"; - color = '1 1 1'; } if(s != "" && a) { - drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, color, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_victim, victim, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); } @@ -3039,11 +3070,11 @@ 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; - float id = HUD_PANEL_TIMER; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_TIMER; + HUD_Panel_UpdateCvars(timer); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -3073,7 +3104,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); @@ -3086,7 +3117,7 @@ void HUD_Timer(void) } drawfont = hud_bigfont; - drawstring_aspect(pos, timer, mySize, mySize_y, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_font; } @@ -3094,11 +3125,11 @@ 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; - float id = HUD_PANEL_RADAR; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_RADAR; + HUD_Panel_UpdateCvars(radar); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -3124,7 +3155,7 @@ void HUD_Radar(void) teamradar_loadcvars(); - switch(hud_radar_zoommode) + switch(hud_panel_radar_zoommode) { default: case 0: @@ -3141,13 +3172,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; } @@ -3157,7 +3188,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)); @@ -3180,7 +3211,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; @@ -3201,7 +3232,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); @@ -3222,11 +3253,11 @@ void HUD_Radar(void) // void HUD_Score(void) { - if(!autocvar_hud_score && !autocvar__hud_configure) + if(!autocvar_hud_panel_score && !autocvar__hud_configure) return; - float id = HUD_PANEL_SCORE; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_SCORE; + HUD_Panel_UpdateCvars(score); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -3239,14 +3270,14 @@ void HUD_Score(void) } float score, distribution, leader; - float score_len; vector distribution_color; entity tm, pl, me; me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1]; - // TODO... this (race part) still uses constant coordinates :/ if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD - /*pl = players.sort_next; + string timer, distrtimer; + + pl = players.sort_next; if(pl == me) pl = pl.sort_next; if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST) @@ -3254,50 +3285,28 @@ void HUD_Score(void) pl = world; score = me.(scores[ps_primary]); - - float racemin, racesec, racemsec; - float distsec, distmsec, minusplus; - - racemin = floor(score/(60 * TIME_FACTOR)); - racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR); - racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR; + timer = TIME_ENCODED_TOSTRING(score); if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) { // distribution display distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]); - if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR) - distmsec = fabs(distribution); - else { - distsec = floor(fabs(distribution)/TIME_FACTOR); - distmsec = fabs(distribution) - distsec*TIME_FACTOR; - if (distribution < 0) - distsec = -distsec; - } + distrtimer = ftos(distribution/pow(10, TIME_DECIMALS)); if (distribution <= 0) { - distribution_color = eY; - minusplus = 1; // minusplus 1: always prefix with minus sign + distribution_color = '0 1 0'; } else { - distribution_color = eX; - minusplus = 2; // minusplus 1: always prefix with plus sign + distribution_color = '1 0 0'; } - //HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, panel_fg_alpha, DRAWFLAG_NORMAL); - //HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, panel_fg_alpha, DRAWFLAG_ADDITIVE); + drawstring_aspect(pos + eX * 0.75 * mySize_x, distrtimer, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); } // race record display - if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead - drawpic_aspect_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "num_leading_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - - //HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, panel_fg_alpha, DRAWFLAG_NORMAL); - //HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', panel_fg_alpha, DRAWFLAG_ADDITIVE); - - //HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', panel_fg_alpha, DRAWFLAG_ADDITIVE); - */ + if (distribution <= 0) + HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_bigfont; + drawstring_aspect(pos, timer, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; } else if (!teamplay) { // non-teamgames // me vector := [team/connected frags id] pl = players.sort_next; @@ -3326,13 +3335,11 @@ void HUD_Score(void) else distribution_color = eX; - score_len = strlen(ftos(score)); - - drawstring_aspect(pos + eX * 0.75 * mySize_x, ftos(distribution), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize_x, ftos(distribution), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); if (leader) HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_bigfont; - drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_font; } else { // teamgames float max_fragcount; @@ -3347,8 +3354,6 @@ void HUD_Score(void) score = 123; leader = 0; - score_len = strlen(ftos(score)); - if (score > max_fragcount) max_fragcount = score; @@ -3358,14 +3363,14 @@ void HUD_Score(void) if (leader) HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_bigfont; - drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_font; } else { if (max_fragcount == score) leader = 1; if (leader) HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, ftos(score), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, (1/3) * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, ftos(score), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); teamnum += 1; } } @@ -3375,11 +3380,11 @@ 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; - float id = HUD_PANEL_RACETIMER; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_RACETIMER; + HUD_Panel_UpdateCvars(racetimer); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -3453,8 +3458,6 @@ void HUD_RaceTimer (void) { if(s != "" && a > 0) { - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } @@ -3464,8 +3467,6 @@ void HUD_RaceTimer (void) { if(a > 0) { s = strcat("^1PENALTY: ", ftos_decimals(race_penaltytime * 0.1, 1), " (", race_penaltyreason, ")"); - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.8 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } @@ -3473,7 +3474,6 @@ void HUD_RaceTimer (void) { if(forcetime != "") { a = bound(0, (time - race_checkpointtime) / 0.5, 1); - //drawstring_expanding(m - '16 0 0' * stringwidth(forcetime, FALSE), forcetime, '32 32 0', '1 1 1', panel_fg_alpha, 0, a); drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.6 * mySize_y), forcetime, '1 1 0' * 0.6 * mySize_y, '1 1 1', panel_fg_alpha, 0, a); } else @@ -3482,7 +3482,6 @@ void HUD_RaceTimer (void) { if(race_laptime && race_checkpoint != 255) { s = TIME_ENCODED_TOSTRING(TIME_ENCODE(time + TIME_DECODE(race_penaltyaccumulator) - race_laptime)); - //drawstring(m - '16 0 0' * stringwidth(s, FALSE), s, '32 32 0', '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.6 0.6 0' * mySize_y), s, '0.6 0.6 0' * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } } @@ -3492,16 +3491,12 @@ void HUD_RaceTimer (void) { { a = bound(0, 2 - (time - race_mycheckpointtime), 1); s = MakeRaceString(race_mycheckpoint, TIME_DECODE(race_mycheckpointdelta), -!race_mycheckpointenemy, race_mycheckpointlapsdelta, race_mycheckpointenemy); - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } if(race_othercheckpointtime && race_othercheckpointenemy != "") { a = bound(0, 2 - (time - race_othercheckpointtime), 1); s = MakeRaceString(race_othercheckpoint, -TIME_DECODE(race_othercheckpointdelta), -!race_othercheckpointenemy, race_othercheckpointlapsdelta, race_othercheckpointenemy); - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 0 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } @@ -3515,8 +3510,6 @@ void HUD_RaceTimer (void) { s = strcat("^1PENALTY: ", ftos_decimals(t - time, 1), " (", race_penaltyreason, ")"); else s = strcat("^2PENALTY: 0.0 (", race_penaltyreason, ")"); - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } @@ -3539,11 +3532,11 @@ 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; - float id = HUD_PANEL_VOTE; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_VOTE; + HUD_Panel_UpdateCvars(vote); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -3570,7 +3563,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) @@ -3598,17 +3591,17 @@ void HUD_VoteWindow(void) mySize = newSize; s = "A vote has been called for:"; - drawstring_aspect(pos, s, eX * mySize_x + eY * (2/8) * mySize_y, mySize_y*(2/8), '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos, s, eX * mySize_x + eY * (2/8) * mySize_y, '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL); s = textShortenToWidth(vote_called_vote, mySize_x, '1 1 0' * mySize_y * (1.75/8), stringwidth_colors); if(autocvar__hud_configure) - s = "Configure the HUD"; - drawstring_aspect(pos + eY * (2/8) * mySize_y, s, eX * mySize_x + eY * (1.75/8) * mySize_y, mySize_y*(1.75/8), '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL); + s = "^1Configure the HUD"; + drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize_y, s, eX * mySize_x + eY * (1.75/8) * mySize_y, a * panel_fg_alpha, DRAWFLAG_NORMAL); // print the yes/no counts s = strcat("Yes (", getcommandkey("not bound", "vyes"), "): ", ftos(vote_yescount)); - drawstring_aspect(pos + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, mySize_y*(1.5/8) , '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); s = strcat("No (", getcommandkey("not bound", "vno"), "): ", ftos(vote_nocount)); - drawstring_aspect(pos + eX * 0.5 * mySize_x + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, mySize_y*(1.5/8) , '1 0 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.5 * mySize_x + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '1 0 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); // draw the progress bar backgrounds drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_back", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL); @@ -4029,13 +4022,13 @@ void HUD_Mod_Race(vector pos, vector mySize) f = time - crecordtime_change_time; if (f > 1) { - drawstring_aspect(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } else { - drawstring_aspect(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - //drawstring_expanding(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); - //drawstring_expanding(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); + drawstring_aspect(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect_expanding(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); + drawstring_aspect_expanding(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); } // server record @@ -4047,13 +4040,13 @@ void HUD_Mod_Race(vector pos, vector mySize) f = time - srecordtime_change_time; if (f > 1) { - drawstring_aspect(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } else { - drawstring_aspect(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - //drawstring_expanding(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); - //drawstring_expanding(pos + eY * 0.5 * mySize_y + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t),'1 1 0' * 0.2 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); + drawstring_aspect(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect_expanding(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); + drawstring_aspect_expanding(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); } if (race_status != race_status_prev || race_status_name != race_status_name_prev) { @@ -4121,14 +4114,14 @@ 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) return; - float id = HUD_PANEL_MODICONS; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_MODICONS; + HUD_Panel_UpdateCvars(modicons); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -4167,14 +4160,14 @@ 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; - float id = HUD_PANEL_PRESSEDKEYS; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_PRESSEDKEYS; + HUD_Panel_UpdateCvars(pressedkeys); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -4186,23 +4179,26 @@ void HUD_DrawPressedKeys(void) mySize -= '2 2 0' * panel_bg_padding; } - // always force 2:1 aspect - vector newSize; - if(mySize_x/mySize_y > 2) + // force custom aspect + if(autocvar_hud_panel_pressedkeys_aspect) { - newSize_x = 2 * mySize_y; - newSize_y = mySize_y; + vector newSize; + if(mySize_x/mySize_y > autocvar_hud_panel_pressedkeys_aspect) + { + 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/2 * mySize_x; - newSize_x = mySize_x; + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else + { + newSize_y = 1/autocvar_hud_panel_pressedkeys_aspect * mySize_x; + newSize_x = mySize_x; - pos_y = pos_y + (mySize_y - newSize_y) / 2; + pos_y = pos_y + (mySize_y - newSize_y) / 2; + } + mySize = newSize; } - mySize = newSize; vector keysize; keysize = eX * mySize_x * (1/3) + eY * mySize_y * 0.5; @@ -4221,19 +4217,30 @@ 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; } - float id = HUD_PANEL_CHAT; - HUD_Panel_UpdateCvarsForId(id); + 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; @@ -4276,11 +4283,11 @@ 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; - float id = HUD_PANEL_ENGINEINFO; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_ENGINEINFO; + HUD_Panel_UpdateCvars(engineinfo); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -4292,17 +4299,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" } @@ -4310,9 +4317,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; } @@ -4321,7 +4328,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, mySize_y, 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; } @@ -4329,11 +4336,11 @@ void HUD_EngineInfo(void) // void HUD_InfoMessages(void) { - if(!autocvar_hud_infomessages && !autocvar__hud_configure) + if(!autocvar_hud_panel_infomessages && !autocvar__hud_configure) return; - float id = HUD_PANEL_INFOMESSAGES; - HUD_Panel_UpdateCvarsForId(id); + active_panel = HUD_PANEL_INFOMESSAGES; + HUD_Panel_UpdateCvars(infomessages); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -4345,18 +4352,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; @@ -4368,29 +4375,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; @@ -4399,13 +4405,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; @@ -4425,7 +4431,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; @@ -4443,7 +4449,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; @@ -4471,7 +4477,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; @@ -4479,7 +4485,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; @@ -4509,7 +4515,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; @@ -4520,22 +4526,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; @@ -4657,10 +4663,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):\ @@ -4699,7 +4705,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"); @@ -4724,10 +4729,13 @@ void HUD_Main (void) float f; vector color; - if(teamplay && autocvar_hud_dock_color_team) { + if((teamplay) && autocvar_hud_dock_color_team) { f = stof(getplayerkey(player_localentnum - 1, "colors")); color = colormapPaletteColor(mod(f, 16), 1) * autocvar_hud_dock_color_team; } + else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && autocvar_hud_dock_color_team) { + color = '1 0 0' * autocvar_hud_dock_color_team; + } else if(autocvar_hud_dock_color == "shirt") { f = stof(getplayerkey(player_localentnum - 1, "colors")); color = colormapPaletteColor(floor(f / 16), 0); @@ -4762,9 +4770,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();