X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=e46a70ae4465ed65e2281a4872623158b81ec28f;hp=ba771f56846546bb757fa246d25592c33a8ce8bd;hb=b0bb58df23b8d29d478535bbf033e8f52903f6f4;hpb=137b39dbc35e2d3f99387d4222003c7c103891a9 diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index ba771f5684..e46a70ae44 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -82,41 +82,6 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the } } -// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga -// TODO: make a default skin, and fallback to these! - -// 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)\ - 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);\ - } - -#define drawpic_aspect_skin(pos,pic,sz,color,alpha,drawflag)\ - do {drawpic_aspect(pos, strcat(hud_skin_path, "/", pic), 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; @@ -333,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; @@ -456,7 +420,7 @@ void HUD_Panel_ExportCfg(string cfgname) fh = fopen(strcat("hud_", autocvar_hud_skin, "_", cfgname, ".cfg"), FILE_WRITE); if(fh >= 0) { - fputs(fh, strcat("seta hud_skin \"", autocvar_hud_skin, "\"", "\n")); + 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")); @@ -466,13 +430,13 @@ void HUD_Panel_ExportCfg(string cfgname) fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n")); fputs(fh, "\n"); - fputs(fh, strcat("seta hud_dock \"", autocvar_hud_dock, "\"", "\n")); + fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n")); fputs(fh, strcat("seta hud_dock_color \"", cvar_string("hud_dock_color"), "\"", "\n")); fputs(fh, strcat("seta hud_dock_color_team \"", cvar_string("hud_dock_color_team"), "\"", "\n")); - fputs(fh, strcat("seta hud_dock_alpha \"", ftos(autocvar_hud_dock_alpha), "\"", "\n")); + fputs(fh, strcat("seta hud_dock_alpha \"", cvar_string("hud_dock_alpha"), "\"", "\n")); fputs(fh, "\n"); - fputs(fh, strcat("seta hud_progressbar_alpha ", ftos(autocvar_hud_progressbar_alpha), "\n")); + fputs(fh, strcat("seta hud_progressbar_alpha \"", cvar_string("hud_progressbar_alpha"), "\"", "\n")); fputs(fh, strcat("seta hud_progressbar_strength_color \"", cvar_string("hud_progressbar_strength_color"), "\"", "\n")); fputs(fh, strcat("seta hud_progressbar_shield_color \"", cvar_string("hud_progressbar_shield_color"), "\"", "\n")); fputs(fh, strcat("seta hud_progressbar_health_color \"", cvar_string("hud_progressbar_health_color"), "\"", "\n")); @@ -481,14 +445,16 @@ void HUD_Panel_ExportCfg(string cfgname) fputs(fh, strcat("seta hud_progressbar_nexball_color \"", cvar_string("hud_progressbar_nexball_color"), "\"", "\n")); fputs(fh, "\n"); + fputs(fh, strcat("seta _hud_panelorder \"", cvar_string("_hud_panelorder"), "\"", "\n")); + fputs(fh, "\n"); + // common cvars for all panels float i; for (i = 0; i < HUD_PANEL_NUM; ++i) { HUD_Panel_GetName(i) - HUD_Panel_UpdateCvarsForId(i) - fputs(fh, strcat("seta hud_", panel_name, " ", ftos(cvar(strcat("hud_", panel_name))), "\n")); + 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")); @@ -499,31 +465,34 @@ void HUD_Panel_ExportCfg(string cfgname) fputs(fh, strcat("seta hud_", panel_name, "_bg_padding \"", cvar_string(strcat("hud_", panel_name, "_bg_padding")), "\"", "\n")); switch(i) { case HUD_PANEL_WEAPONICONS: - fputs(fh, strcat("seta hud_", panel_name, "_accuracy_yellow ", ftos(cvar(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_padding \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_padding")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_ammo_color \"", cvar_string(strcat("hud_", panel_name, "_ammo_color")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_ammo_alpha \"", cvar_string(strcat("hud_", panel_name, "_ammo_alpha")), "\"", "\n")); break; case HUD_PANEL_INVENTORY: - fputs(fh, strcat("seta hud_", panel_name, "_onlycurrent ", ftos(cvar(strcat("hud_", panel_name, "_onlycurrent"))), "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_iconalign ", ftos(cvar(strcat("hud_", panel_name, "_iconalign"))), "\n")); + 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")); break; case HUD_PANEL_POWERUPS: - fputs(fh, strcat("seta hud_", panel_name, "_flip ", ftos(cvar(strcat("hud_", panel_name, "_flip"))), "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_iconalign ", ftos(cvar(strcat("hud_", panel_name, "_iconalign"))), "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_baralign ", ftos(cvar(strcat("hud_", panel_name, "_baralign"))), "\n")); + 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")); break; case HUD_PANEL_HEALTHARMOR: - fputs(fh, strcat("seta hud_", panel_name, "_flip ", ftos(cvar(strcat("hud_", panel_name, "_flip"))), "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_iconalign ", ftos(cvar(strcat("hud_", panel_name, "_iconalign"))), "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_baralign ", ftos(cvar(strcat("hud_", panel_name, "_baralign"))), "\n")); + 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")); break; case HUD_PANEL_NOTIFY: - fputs(fh, strcat("seta hud_", panel_name, "_flip ", ftos(cvar(strcat("hud_", panel_name, "_flip"))), "\n")); - fputs(fh, strcat("seta hud_", panel_name, "_info_top ", ftos(cvar(strcat("hud_", panel_name, "_info_top"))), "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_print \"", cvar_string(strcat("hud_", panel_name, "_print")), "\"", "\n")); break; case HUD_PANEL_RADAR: - fputs(fh, strcat("seta hud_", panel_name, "_foreground_alpha ", ftos(cvar(strcat("hud_", panel_name, "_foreground_alpha"))), "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_foreground_alpha \"", cvar_string(strcat("hud_", panel_name, "_foreground_alpha")), "\"", "\n")); break; case HUD_PANEL_VOTE: - fputs(fh, strcat("seta hud_", panel_name, "_alreadyvoted_alpha ", ftos(cvar(strcat("hud_", panel_name, "_alreadyvoted_alpha"))), "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_alreadyvoted_alpha \"", cvar_string(strcat("hud_", panel_name, "_alreadyvoted_alpha")), "\"", "\n")); break; } fputs(fh, "\n"); @@ -534,69 +503,24 @@ void HUD_Panel_ExportCfg(string cfgname) 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) +const float hlBorderSize = 4; +const string hlBorder = "gfx/hud/default/border_highlighted"; +const string hlBorder2 = "gfx/hud/default/border_highlighted2"; +void HUD_Panel_HlBorder(float myBorder, vector color, float alpha) { - 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; + drawfill(panel_pos - '1 1 0' * myBorder, panel_size + '2 2 0' * myBorder, '0 0.5 1', .5 * alpha, DRAWFLAG_NORMAL); + drawpic_tiled(panel_pos - '1 1 0' * myBorder, hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); + drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * (panel_size_y + 2 * myBorder - hlBorderSize), hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); + drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize, hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); + drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize + eX * (panel_size_x + 2 * myBorder - hlBorderSize), hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); } // draw the background/borders #define HUD_Panel_DrawBg(alpha)\ if(panel_bg != "0")\ - draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, strcat(hud_skin_path, "/", 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)\ - drawfill(panel_pos - '1 1 0' * panel_bg_border, panel_size + '1 1 0' * 2 * panel_bg_border, '1 1 1', .1 * (1 - autocvar__menu_alpha), DRAWFLAG_ADDITIVE); + HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha) * alpha); void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag) { @@ -604,20 +528,44 @@ void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector return; string pic; - pic = strcat(hud_skin_path, "/"); if(vertical) { - drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0 0', '1 0.25 0', color, alpha, drawflag); + pic = strcat(hud_skin_path, "/statusbar_vertical"); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/statusbar_vertical"; + } + drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, pic, '0 0 0', '1 0.25 0', color, alpha, drawflag); if(mySize_y/mySize_x > 2) - drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.25 0', '1 0.5 0', color, alpha, drawflag); - drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.75 0', '1 0.25 0', color, alpha, drawflag); + drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, pic, '0 0.25 0', '1 0.5 0', color, alpha, drawflag); + drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, pic, '0 0.75 0', '1 0.25 0', color, alpha, drawflag); } else { - drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0 0 0', '0.25 1 0', color, alpha, drawflag); + pic = strcat(hud_skin_path, "/statusbar"); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/statusbar"; + } + drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0 0 0', '0.25 1 0', color, alpha, drawflag); if(mySize_x/mySize_y > 2) - drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.25 0 0', '0.5 1 0', color, alpha, drawflag); - drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.75 0 0', '0.25 1 0', color, alpha, drawflag); + drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, pic, '0.25 0 0', '0.5 1 0', color, alpha, drawflag); + drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0.75 0 0', '0.25 1 0', color, alpha, drawflag); } } +void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float alpha, float drawflag) +{ + if(!alpha) + return; + + string pic; + pic = strcat(hud_skin_path, "/num_leading"); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/num_leading"; + } + + drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0 0 0', '0.25 1 0', color, alpha, drawflag); + if(mySize_x/mySize_y > 2) + drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, pic, '0.25 0 0', '0.5 1 0', color, alpha, drawflag); + drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0.75 0 0', '0.25 1 0', color, alpha, drawflag); +} + // check if move will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector vector HUD_Panel_CheckMove(vector myPos, vector mySize) { @@ -706,8 +654,8 @@ void HUD_Panel_SetPos(vector pos) if(autocvar_hud_configure_grid) { - pos_x = floor((pos_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_x, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth; - pos_y = floor((pos_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_y, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight; + pos_x = floor((pos_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth; + pos_y = floor((pos_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight; } if(hud_configure_checkcollisions) @@ -890,8 +838,8 @@ void HUD_Panel_SetPosSize(vector mySize) // before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken if(autocvar_hud_configure_grid) { - mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_x, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth; - mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_y, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight; + mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth; + mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight; } if(hud_configure_checkcollisions) @@ -949,16 +897,16 @@ void HUD_Panel_Arrow_Action(float nPrimary) if (nPrimary == K_UPARROW || nPrimary == K_DOWNARROW) { if (hudShiftState & S_SHIFT) - step = bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight; + step = bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight; else - step = 2 * bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight; + step = 2 * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight; } else { if (hudShiftState & S_SHIFT) - step = bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth; + step = bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth; else - step = 2 * bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth; + step = 2 * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth; } } else @@ -1101,17 +1049,20 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) float HUD_Panel_HighlightCheck() { - float i, border; + float i, j, border; vector panelPos; vector panelSize; - for(i = 0; i < HUD_PANEL_NUM; ++i) + while(j <= HUD_PANEL_NUM) { + i = panel_order[j]; + j += 1; + HUD_Panel_UpdatePosSizeForId(i) panelPos = panel_pos; panelSize = panel_size; - border = 10; // FORCED border so a small border size doesn't mean you can't resize + border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize // move if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y) @@ -1142,24 +1093,66 @@ float HUD_Panel_HighlightCheck() return 0; } +// move a panel to the beginning of the panel order array (which means it gets drawn last, on top of everything else) +void HUD_Panel_FirstInDrawQ(float id) +{ + float i; + var float place = -1; + // find out where in the array our current id is, save into place + for(i = 0; i < HUD_PANEL_NUM; ++i) + { + if(panel_order[i] == id) + { + place = i; + break; + } + } + // place last if we didn't find a place for it yet (probably new panel, or screwed up cvar) + if(place == -1) + place = HUD_PANEL_NUM - 1; + + // move all ids up by one step in the array until "place" + for(i = place; i > 0; --i) + { + panel_order[i] = panel_order[i-1]; + } + // now save the new top id + panel_order[0] = id; + + // let's save them into the cvar by some strcat trickery + string s; + for(i = 0; i < HUD_PANEL_NUM; ++i) + { + s = strcat(s, ftos(panel_order[i]), " "); + } + cvar_set("_hud_panelorder", s); + if(hud_panelorder_prev) + strunzone(hud_panelorder_prev); + hud_panelorder_prev = strzone(autocvar__hud_panelorder); // prevent HUD_Main from doing useless update, we already updated here +} + void HUD_Panel_Highlight() { - float i, border; + float i, j, border; vector panelPos; vector panelSize; - for(i = 0; i < HUD_PANEL_NUM; ++i) + while(j <= HUD_PANEL_NUM) { + i = panel_order[j]; + j += 1; + HUD_Panel_UpdatePosSizeForId(i) panelPos = panel_pos; panelSize = panel_size; - border = 10; // FORCED border so a small border size doesn't mean you can't resize + border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize // move if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y) { highlightedPanel = i; + HUD_Panel_FirstInDrawQ(i); highlightedAction = 1; panel_click_distance = mousepos - panelPos; return; @@ -1168,6 +1161,7 @@ void HUD_Panel_Highlight() else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y) { highlightedPanel = i; + HUD_Panel_FirstInDrawQ(i); highlightedAction = 2; resizeCorner = 1; panel_click_distance = mousepos - panelPos; @@ -1178,6 +1172,7 @@ void HUD_Panel_Highlight() else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y) { highlightedPanel = i; + HUD_Panel_FirstInDrawQ(i); highlightedAction = 2; resizeCorner = 2; panel_click_distance_x = panelSize_x - mousepos_x + panelPos_x; @@ -1189,6 +1184,7 @@ void HUD_Panel_Highlight() else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border) { highlightedPanel = i; + HUD_Panel_FirstInDrawQ(i); highlightedAction = 2; resizeCorner = 3; panel_click_distance_x = mousepos_x - panelPos_x; @@ -1200,12 +1196,17 @@ void HUD_Panel_Highlight() else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border) { highlightedPanel = i; + HUD_Panel_FirstInDrawQ(i); highlightedAction = 2; resizeCorner = 4; panel_click_distance = panelSize - mousepos + panelPos; panel_click_resizeorigin = panelPos; return; } + else + { + highlightedPanel_prev = -1; + } } } @@ -1225,10 +1226,11 @@ void HUD_Panel_Mouse() */ if(mouseClicked == 0 && disable_menu_alphacheck != 2 && highlightedPanel >= 0) { // don't reset these variables in disable_menu_alphacheck mode 2! - highlightedPanel_prev = highlightedPanel; highlightedPanel = -1; highlightedAction = 0; } + if(highlightedPanel != -1) + highlightedPanel_prev = highlightedPanel; mousepos = mousepos + getmousepos(); @@ -1328,8 +1330,46 @@ 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) } +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 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_WeaponIcons(void) { + if(!autocvar_hud_weaponicons && !autocvar__hud_configure) + return; + float id = HUD_PANEL_WEAPONICONS; HUD_Panel_UpdateCvarsForId(id); float alpha, stat_weapons; // "constants" @@ -1403,15 +1443,20 @@ void HUD_WeaponIcons(void) columns = ceil(WEP_COUNT/rows); float row, column; - float a; + float a, type, fullammo; float when; when = autocvar_hud_weaponicons_complainbubble_time; float fadetime; fadetime = autocvar_hud_weaponicons_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; @@ -1422,10 +1467,10 @@ void HUD_WeaponIcons(void) // 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(autocvar_hud_weaponicons_accuracy && !(gametype == GAME_RACE || gametype == GAME_CTS)) { if(weapon_damage) weapon_stats = floor(100 * weapon_hit / weapon_damage); @@ -1442,23 +1487,75 @@ void HUD_WeaponIcons(void) color_x = 1; color_y = weapon_stats/autocvar_hud_weaponicons_accuracy_yellow; // green value between 0 -> 1 } + color_z = 0; 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)) { - 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_weaponicons_number == 1) // weapon number + drawstring(wpnpos, ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + else if(autocvar_hud_weaponicons_number == 2) // bind + 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(cvar_or("hud_weaponicons_number", 1)) - 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); + // draw ammo status bar + if(autocvar_hud_weaponicons_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_weaponicons_ammo_full_shells; break; + case 1: fullammo = autocvar_hud_weaponicons_ammo_full_nails; break; + case 2: fullammo = autocvar_hud_weaponicons_ammo_full_rockets; break; + case 3: fullammo = autocvar_hud_weaponicons_ammo_full_cells; break; + case 4: fullammo = autocvar_hud_weaponicons_ammo_full_fuel; break; + default: fullammo = 60; + } + + vector barsize; + vector barpos; + if(wpnsize_x/wpnsize_y > 2) + { + barsize_x = 2 * wpnsize_y; + barsize_y = wpnsize_y; + + barpos_x = wpnpos_x + (wpnsize_x - barsize_x) / 2; + barpos_y = wpnpos_y; + } + else + { + barsize_y = 1/2 * 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); // use 2x more full ammo for uzi + drawpic_aspect_skin(wpnpos, "weapon_ammo", wpnsize, autocvar_hud_weaponicons_ammo_color, panel_fg_alpha * autocvar_hud_weaponicons_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 @@ -1479,24 +1576,21 @@ void HUD_WeaponIcons(void) a = 0; } - vector complain_bubble_size = '100 50 0' * bound(0.25, autocvar_hud_weaponicons_complainbubble_size, 2); - drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - complain_bubble_size + 0.5 * (eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows)), "weapon_complainbubble", complain_bubble_size, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - string s; if(complain_weapon_type == 0) { - s = "Out of ammo for the"; + s = "Out of ammo"; color = '1 0 0'; } else if(complain_weapon_type == 1) { - s = "You don't have the"; + s = "Don't have"; color = '1 1 0'; } else { - s = "Map doesn't have the"; + s = "Unavailable"; color = '1 1 1'; } - drawstring_aspect(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - complain_bubble_size + eX * 0.05 * complain_bubble_size_x + eY * (1/6) * complain_bubble_size_y + 0.5 * (eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows)), s, eX * 0.9 * complain_bubble_size_x + eY * 0.2 * complain_bubble_size_y, 0.2 * complain_bubble_size_y, color, panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - complain_bubble_size + eX * 0.05 * complain_bubble_size_x + eY * (11/30) * complain_bubble_size_y + 0.5 * (eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows)), complain_weapon_name, eX * 0.9 * complain_bubble_size_x + eY * 0.25 * complain_bubble_size_y, 0.25 * complain_bubble_size_y, '1 0 0', panel_fg_alpha * a, DRAWFLAG_NORMAL); + 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, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } ++row; @@ -1512,19 +1606,6 @@ void HUD_WeaponIcons(void) // Inventory (#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) @@ -1604,13 +1685,16 @@ 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) { + if(!autocvar_hud_inventory && !autocvar__hud_configure) + return; + float id = HUD_PANEL_INVENTORY; HUD_Panel_UpdateCvarsForId(id); float i, currently_selected; @@ -1641,8 +1725,10 @@ void HUD_Inventory(void) if(autocvar__hud_configure) i = 2; if (currently_selected || autocvar__hud_configure) + { DrawAmmoItem(pos, mySize, i, currently_selected); - break; + break; + } } else { DrawAmmoItem(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), i, currently_selected); ++row; @@ -1655,7 +1741,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) @@ -1704,14 +1790,25 @@ 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) + return; + float id = HUD_PANEL_POWERUPS; HUD_Panel_UpdateCvarsForId(id); float stat_items; @@ -1731,18 +1828,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; @@ -1756,7 +1853,6 @@ void HUD_Powerups(void) { string leftname, rightname; float leftcnt, rightcnt; float leftexact, rightexact; - float leftalpha, rightalpha; if (autocvar_hud_powerups_flip) { leftname = "strength"; leftcnt = ceil(strength_time); @@ -1774,9 +1870,8 @@ 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) @@ -1790,13 +1885,11 @@ void HUD_Powerups(void) { } 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); + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + if(leftcnt > 1) + DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); + if(leftcnt <= 5) + DrawNumIcon_expanding(autocvar_hud_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); } if(rightcnt) @@ -1810,8 +1903,11 @@ void HUD_Powerups(void) { } 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'); + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + if(rightcnt > 1) + DrawNumIcon(autocvar_hud_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); + if(rightcnt <= 5) + DrawNumIcon_expanding(autocvar_hud_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1)); } } else if (mySize_x/mySize_y > 1.5) @@ -1827,8 +1923,11 @@ void HUD_Powerups(void) { } 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'); + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + if(leftcnt > 1) + DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); + if(leftcnt <= 5) + DrawNumIcon_expanding(autocvar_hud_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); } if(rightcnt) @@ -1842,8 +1941,11 @@ void HUD_Powerups(void) { } 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'); + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + if(rightcnt > 1) + DrawNumIcon(autocvar_hud_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); + if(rightcnt <= 5) + DrawNumIcon_expanding(autocvar_hud_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1)); } } else @@ -1867,12 +1969,12 @@ void HUD_Powerups(void) { } 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); + 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) @@ -1894,20 +1996,24 @@ void HUD_Powerups(void) { } 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); + 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; } // Health/armor (#3) // void HUD_HealthArmor(void) { + if(!autocvar_hud_healtharmor && !autocvar__hud_configure) + return; + float id = HUD_PANEL_HEALTHARMOR; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -1942,6 +2048,7 @@ void HUD_HealthArmor(void) vector picpos; vector numpos; + drawfont = hud_bigfont; if(autocvar_hud_healtharmor == 2) // combined health and armor display { vector v; @@ -1975,7 +2082,7 @@ void HUD_HealthArmor(void) 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_healtharmor_iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200), 1); // fuel if(fuel) @@ -2035,7 +2142,7 @@ void HUD_HealthArmor(void) 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)); + DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); } if(rightactive) @@ -2050,7 +2157,7 @@ void HUD_HealthArmor(void) 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)); + DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 200), 1); } if(fuel) @@ -2080,7 +2187,7 @@ void HUD_HealthArmor(void) 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)); + DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); } if(rightactive) @@ -2095,7 +2202,7 @@ void HUD_HealthArmor(void) 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)); + DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 200), 1); } if(fuel) @@ -2134,7 +2241,7 @@ void HUD_HealthArmor(void) 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) @@ -2158,7 +2265,7 @@ void HUD_HealthArmor(void) 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) @@ -2175,9 +2282,9 @@ void HUD_HealthArmor(void) } } } + drawfont = hud_font; } -// ___TODO___ !!! // Notification area (#4) // @@ -2228,11 +2335,11 @@ 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; + float alsoprint, gentle; alsoprint = (autocvar_hud_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); @@ -2285,20 +2392,20 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) 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"); @@ -2399,47 +2506,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"); @@ -2449,7 +2556,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"); @@ -2462,7 +2569,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"); @@ -2471,7 +2578,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"); @@ -2484,7 +2591,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"); @@ -2513,7 +2620,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"); @@ -2522,14 +2629,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"); @@ -2546,6 +2653,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"); } } } @@ -2554,78 +2664,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)); @@ -2639,6 +2751,9 @@ void HUD_Centerprint(string s1, string s2, float type, float msg) void HUD_Notify (void) { + if(!autocvar_hud_notify && !autocvar__hud_configure) + return; + float id = HUD_PANEL_NOTIFY; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -2653,9 +2768,8 @@ void HUD_Notify (void) } float entries, height; - entries = bound(1, floor(14 * mySize_y/mySize_x), 12); + entries = bound(1, floor(10 * mySize_y/mySize_x), 10); height = mySize_y/entries; - entries -= 2; // top/bottom two lines reserved for info messaged, such as spec instructions vector fontsize; fontsize = '0.5 0.5 0' * height; @@ -2670,18 +2784,17 @@ void HUD_Notify (void) vector pos_attacker, pos_victim; vector weap_pos; - float width_attacker, width_victim; + float width_attacker; string attacker, victim; float i, j; for(j = 0; j < entries; ++j) { + s = ""; if(autocvar_hud_notify_flip) i = j; else // rather nasty hack for ordering items from the bottom up i = entries - j - 1; - if(autocvar_hud_notify_info_top) - i += 2; // top/bottom two lines reserved for info messaged, such as spec instructions if(fadetime) { @@ -2699,103 +2812,110 @@ void HUD_Notify (void) } // TODO: maybe print in team colors? - // TODO: maybe this could be cleaned up somehow... - // TODO: less copypaste code below // // Y [used by] X if(killnotify_actiontype[j] == 0 && !autocvar__hud_configure) { - attacker = textShortenToWidth(killnotify_attackers[j], mySize_x - 2 * height, fontsize, stringwidth_colors); - - width_attacker = stringwidth(attacker, TRUE, fontsize); - pos_attacker = pos + eX * 0.5 * (mySize_x - width_attacker + 2 * height) + eY * 0.5 * fontsize_y + eY * i * height; + attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); + pos_attacker = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height); + weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; - weap_pos = pos + eX * 0.5 * (mySize_x - width_attacker) - eX * height + eY * i * height; if(killnotify_deathtype[j] == DEATH_GENERIC) { - drawpic_aspect_skin(weap_pos, "notify_death", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_death"; } else if(killnotify_deathtype[j] == DEATH_NOAMMO) { - drawpic_aspect_skin(weap_pos, "notify_outofammo", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_outofammo"; } else if(killnotify_deathtype[j] == DEATH_KILL) { - drawpic_aspect_skin(weap_pos, "notify_selfkill", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_selfkill"; } else if(killnotify_deathtype[j] == DEATH_CAMP) { - drawpic_aspect_skin(weap_pos, "notify_camping", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_camping"; } else if(killnotify_deathtype[j] == KILL_TEAM_RED) { - drawpic_aspect_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) { - drawpic_aspect_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_teamkill_blue"; } else if(killnotify_deathtype[j] == DEATH_DROWN) { - drawpic_aspect_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_water"; } else if(killnotify_deathtype[j] == DEATH_SLIME) { - drawpic_aspect_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_slime"; } else if(killnotify_deathtype[j] == DEATH_LAVA) { - drawpic_aspect_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_lava"; } else if(killnotify_deathtype[j] == DEATH_FALL) { - drawpic_aspect_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_fall"; } else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) { - drawpic_aspect_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_shootingstar"; } else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) { - drawpic_aspect_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + s = "notify_death"; } + // TODO: ctf icons... else if(killnotify_deathtype[j] == INFO_GOTFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") - s = "red"; + { + s = "notify_red_taken"; + } else - s = "blue"; - drawpic_aspect_skin(weap_pos, strcat("flag_", s, "_carrying"), '1 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + { + s = "notify_blue_taken"; + } } else if(killnotify_deathtype[j] == INFO_RETURNFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") - s = "red"; + { + s = "notify_red_returned"; + } else - s = "blue"; - drawpic_aspect_skin(weap_pos, strcat("flag_", s, "_taken"), '1 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + { + s = "notify_blue_returned"; + } } else if(killnotify_deathtype[j] == INFO_LOSTFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") - s = "red"; + { + s = "notify_red_lost"; + } else - s = "blue"; - drawpic_aspect_skin(weap_pos, strcat("flag_", s, "_lost"), '1 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); + { + s = "notify_blue_lost"; + } + } + else if(killnotify_deathtype[j] == INFO_CAPTUREFLAG) + { + if(killnotify_victims[j] == "^1RED^7 flag") + { + s = "notify_red_captured"; + } + else + { + s = "notify_blue_captured"; + } + } + if(s != "" && a) + { + 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); } } @@ -2804,237 +2924,74 @@ void HUD_Notify (void) { if(autocvar__hud_configure) { - attacker = textShortenToWidth("Player1", 0.5 * mySize_x - height, fontsize, stringwidth_colors); - victim = textShortenToWidth("Player2", 0.5 * mySize_x - height, fontsize, stringwidth_colors); + attacker = textShortenToWidth("Player1", 0.48 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth("Player2", 0.48 * mySize_x - height, fontsize, stringwidth_colors); a = bound(0, (when - j) / 4, 1); } else { - attacker = textShortenToWidth(killnotify_attackers[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors); - victim = textShortenToWidth(killnotify_victims[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors); + attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth(killnotify_victims[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); } width_attacker = stringwidth(attacker, TRUE, fontsize); - width_victim = stringwidth(victim, TRUE, fontsize); - pos_attacker = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_attacker) + eY * 0.5 * fontsize_y + eY * i * height; - pos_victim = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_victim) + eY * 0.5 * fontsize_y + eX * 0.5 * mySize_x + eX * height + eY * i * height; + pos_attacker = pos + eX * (0.48 * mySize_x - height - width_attacker) + eY * (0.5 * fontsize_y + i * height); + pos_victim = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height); weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; if(autocvar__hud_configure) // example actions for config mode { - drawpic_aspect_skin(weap_pos, strcat("weapon", "electro"), '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); + s = "weaponelectro"; } else if(WEP_VALID(killnotify_deathtype[j])) { self = get_weaponinfo(killnotify_deathtype[j]); - drawpic_aspect_skin(weap_pos, strcat("weapon", self.netname), '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); + s = strcat("weapon", self.netname); } else if(killnotify_deathtype[j] == KILL_TEAM_RED) { - drawpic_aspect_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', 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); + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) { - drawpic_aspect_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 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); + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == DEATH_DROWN) { - drawpic_aspect_skin(weap_pos, "notify_water", '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); + s = "notify_water"; } else if(killnotify_deathtype[j] == DEATH_SLIME) { - drawpic_aspect_skin(weap_pos, "notify_slime", '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); + s = "notify_slime"; } else if(killnotify_deathtype[j] == DEATH_LAVA) { - drawpic_aspect_skin(weap_pos, "notify_lava", '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); + s = "notify_lava"; } else if(killnotify_deathtype[j] == DEATH_FALL) { - drawpic_aspect_skin(weap_pos, "notify_fall", '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); + s = "notify_fall"; } else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) { - drawpic_aspect_skin(weap_pos, "notify_shootingstar", '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); + s = "notify_shootingstar"; } else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right? { - drawpic_aspect_skin(weap_pos, "notify_void", '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); - } - } - - } - - // TODO: separate panel for these? - // Info messages - // - entity tm; - vector o; - o = pos; - if(autocvar_hud_notify_info_top) - o = pos + eY; - else - o = pos + eY * mySize_y - eY * 2 * height; - - if(spectatee_status && !intermission) - { - //drawfont = hud_bigfont; - if(spectatee_status == -1) - s = "^1Observing"; - else - s = 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; - - // 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"); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; - - if(spectatee_status == -1) - 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"); - 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"); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; - - if(gametype == GAME_ARENA) - s = "^1Wait for your turn to join"; - else if(gametype == GAME_LMS) - { - entity sk; - sk = playerslots[player_localentnum - 1]; - if(sk.(scores[ps_primary]) >= 666) - s = "^1Match has already begun"; - else if(sk.(scores[ps_primary]) > 0) - s = "^1You have no more lives left"; - else - s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); - } - else - s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; - - //show restart countdown: - if (time < getstatf(STAT_GAMESTARTTIME)) { - float countdown; - //we need to ceil, otherwise the countdown would be off by .5 when using round() - countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time); - s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds"); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } - } - if(warmup_stage && !intermission) - { - s = "^2Currently in ^1warmup^2 stage!"; - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } - - string blinkcolor; - if(mod(time, 1) >= 0.5) - blinkcolor = "^1"; - else - blinkcolor = "^3"; - - if(ready_waiting && !intermission && !spectatee_status) - { - if(ready_waiting_for_me) - { - if(warmup_stage) - s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup"); - else - s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready"); - } - else - { - if(warmup_stage) - s = strcat("^2Waiting for others to ready up to end warmup..."); - else - s = strcat("^2Waiting for others to ready up..."); - } - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } - else if(warmup_stage && !intermission && !spectatee_status) - { - s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup"); - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } - - if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger) - { - float ts_min, ts_max; - tm = teams.sort_next; - if (tm) - { - for(; tm.sort_next; tm = tm.sort_next) - { - if(!tm.team_size || tm.team == COLOR_SPECTATOR) - continue; - if(!ts_min) ts_min = tm.team_size; - else ts_min = min(ts_min, tm.team_size); - if(!ts_max) ts_max = tm.team_size; - else ts_max = max(ts_max, tm.team_size); + s = "notify_void"; } - if ((ts_max - ts_min) > 1) + if(s != "" && a) { - s = strcat(blinkcolor, "Teamnumbers are unbalanced!"); - tm = GetTeam(myteam, false); - if (tm) - if (tm.team != COLOR_SPECTATOR) - if (tm.team_size == ts_max) - s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust"); - - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; + 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); } } } - if(autocvar__hud_configure) - { - s = "^7Press ^3ESC ^7to show HUD options."; - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; - s = "^3Doubleclick a panel for panel-specific options."; - drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } } // Timer (#5) // +// TODO: macro string seconds_tostring(float sec) { float minutes; @@ -3050,6 +3007,9 @@ string seconds_tostring(float sec) void HUD_Timer(void) { + if(!autocvar_hud_timer && !autocvar__hud_configure) + return; + float id = HUD_PANEL_TIMER; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -3094,7 +3054,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; } @@ -3102,6 +3062,9 @@ void HUD_Timer(void) // void HUD_Radar(void) { + if ((autocvar_hud_radar == 0 || (autocvar_hud_radar != 2 && !teamplay)) && !autocvar__hud_configure) + return; + float id = HUD_PANEL_RADAR; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -3227,6 +3190,9 @@ void HUD_Radar(void) // void HUD_Score(void) { + if(!autocvar_hud_score && !autocvar__hud_configure) + return; + float id = HUD_PANEL_SCORE; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -3241,14 +3207,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) @@ -3256,50 +3222,30 @@ 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 = seconds_tostring(score/TIME_FACTOR); + timer = strcat(timer, ":", ftos_decimals(mod(score, TIME_FACTOR), log(TIME_FACTOR))); 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 = seconds_tostring(distribution/TIME_FACTOR); + distrtimer = strcat(timer, ":", ftos_decimals(mod(distribution, TIME_FACTOR), log(TIME_FACTOR))); 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; @@ -3328,13 +3274,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) - drawpic_aspect_skin(pos, strcat("num_leading_", ftos(score_len)), eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + 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; @@ -3349,8 +3293,6 @@ void HUD_Score(void) score = 123; leader = 0; - score_len = strlen(ftos(score)); - if (score > max_fragcount) max_fragcount = score; @@ -3358,16 +3300,16 @@ void HUD_Score(void) if (max_fragcount == score) leader = 1; if (leader) - drawpic_aspect_skin(pos, strcat("num_leading_", ftos(score_len)), eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + 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) - drawpic_aspect_skin(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, strcat("num_leading_", ftos(score_len)), 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); + 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, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); teamnum += 1; } } @@ -3377,6 +3319,9 @@ void HUD_Score(void) // Race timer (#8) // void HUD_RaceTimer (void) { + if(!autocvar_hud_racetimer && !(gametype == GAME_RACE || gametype == GAME_CTS) && !autocvar__hud_configure) + return; + float id = HUD_PANEL_RACETIMER; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -3390,18 +3335,18 @@ void HUD_RaceTimer (void) { mySize -= '2 2 0' * panel_bg_padding; } - // always force 2:1 aspect + // always force 4:1 aspect vector newSize; - if(mySize_x/mySize_y > 2) + if(mySize_x/mySize_y > 4) { - newSize_x = 2 * mySize_y; + newSize_x = 4 * mySize_y; newSize_y = mySize_y; pos_x = pos_x + (mySize_x - newSize_x) / 2; } else { - newSize_y = 1/2 * mySize_x; + newSize_y = 1/4 * mySize_x; newSize_x = mySize_x; pos_y = pos_y + (mySize_y - newSize_y) / 2; @@ -3452,8 +3397,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); } @@ -3463,8 +3406,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); } } @@ -3472,7 +3413,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 @@ -3481,7 +3421,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); } } @@ -3491,16 +3430,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); } @@ -3514,8 +3449,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); } } @@ -3538,6 +3471,9 @@ float vote_change; // "time" when vote_active changed void HUD_VoteWindow(void) { + if(!autocvar_hud_vote && !autocvar__hud_configure) + return; + float id = HUD_PANEL_VOTE; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -3568,63 +3504,64 @@ void HUD_VoteWindow(void) a = vote_alpha * bound(autocvar_hud_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1); - HUD_Panel_DrawBg(1); + HUD_Panel_DrawBg(a); if(panel_bg_padding) { pos += '1 1 0' * panel_bg_padding; mySize -= '2 2 0' * panel_bg_padding; } - // always force 2:1 aspect + // always force 3:1 aspect vector newSize; - if(mySize_x/mySize_y > 2) + if(mySize_x/mySize_y > 3) { - newSize_x = 2 * mySize_y; + newSize_x = 3 * mySize_y; newSize_y = mySize_y; pos_x = pos_x + (mySize_x - newSize_x) / 2; } else { - newSize_y = 1/2 * mySize_x; + newSize_y = 1/3 * mySize_x; newSize_x = mySize_x; pos_y = pos_y + (mySize_y - newSize_y) / 2; } mySize = newSize; - drawpic_aspect_skin(pos, "voteprogress_back", mySize, '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL); - - s = "A vote has been called for: "; - drawstring_aspect(pos + eY * (1/12) * mySize_y, s, eX * mySize_x + eY * (3/12) * mySize_y, mySize_y*(3/12), '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL); - s = textShortenToWidth(vote_called_vote, mySize_x, '1 1 0' * mySize_y * (3/12), stringwidth_colors); // TODO: broken? + s = "A vote has been called for:"; + 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 * (4/12) * mySize_y, s, eX * mySize_x + eY * (2/12) * mySize_y, mySize_y*(2/12), '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: ", ftos(vote_yescount)); - drawstring(pos + '0 0.6 0' * mySize_y + '0.02 0 0' * mySize_x, s, '1 1 0' * mySize_y*(1/6) , eY, a * panel_fg_alpha, DRAWFLAG_NORMAL); - s = strcat("No: ", ftos(vote_nocount)); - drawstring(pos + '0 0.6 0' * mySize_y + '0.98 0 0' * mySize_x - eX * stringwidth(s, FALSE, '1 1 0' * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), eX, a * panel_fg_alpha, DRAWFLAG_NORMAL); + 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, '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, '1 0 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); - // draw the progress bars - drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); - drawpic_aspect_skin(pos, "voteprogress_prog", mySize, eY, a * panel_fg_alpha, DRAWFLAG_NORMAL); - - drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y); - drawpic_aspect_skin(pos, "voteprogress_prog", mySize, eX, 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); // draw the highlights if(vote_highlighted == 1) { drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y); - drawpic_aspect_skin(pos, "voteprogress_voted", mySize, eY, a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_voted", eX * mySize_x + eY * (3/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); } else if(vote_highlighted == 2) { drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y); - drawpic_aspect_skin(pos, "voteprogress_voted", mySize, eX, a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_voted", eX * mySize_x + eY * (3/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); } + // draw the progress bars + drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); + + drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 0 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawresetcliparea(); if(!vote_active) { @@ -4024,13 +3961,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.15 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring(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); + 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(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring(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); - 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 @@ -4042,13 +3979,13 @@ void HUD_Mod_Race(vector pos, vector mySize) f = time - srecordtime_change_time; if (f > 1) { - drawstring(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring(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); + 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(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring(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); - 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) { @@ -4116,6 +4053,9 @@ float mod_change; // "time" when mod_active changed void HUD_ModIcons(void) { + if(!autocvar_hud_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; @@ -4159,6 +4099,12 @@ void HUD_ModIcons(void) // void HUD_DrawPressedKeys(void) { + if(!autocvar_hud_pressedkeys && !autocvar__hud_configure) + return; + + if(!(spectatee_status > 0 || autocvar_hud_pressedkeys >= 2 || autocvar__hud_configure)) + return; + float id = HUD_PANEL_PRESSEDKEYS; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -4172,6 +4118,27 @@ void HUD_DrawPressedKeys(void) mySize -= '2 2 0' * panel_bg_padding; } + // force custom aspect + if(autocvar_hud_pressedkeys_aspect) + { + vector newSize; + if(mySize_x/mySize_y > autocvar_hud_pressedkeys_aspect) + { + newSize_x = autocvar_hud_pressedkeys_aspect * mySize_y; + newSize_y = mySize_y; + + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else + { + newSize_y = 1/autocvar_hud_pressedkeys_aspect * mySize_x; + newSize_x = mySize_x; + + pos_y = pos_y + (mySize_y - newSize_y) / 2; + } + mySize = newSize; + } + vector keysize; keysize = eX * mySize_x * (1/3) + eY * mySize_y * 0.5; float pressedkeys; @@ -4189,6 +4156,12 @@ void HUD_DrawPressedKeys(void) // void HUD_Chat(void) { + if(!autocvar_hud_chat && !autocvar__hud_configure) + { + cvar_set("con_chatrect", "0"); + return; + } + float id = HUD_PANEL_CHAT; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -4238,6 +4211,9 @@ float frametimeavg1; // 1 frame ago float frametimeavg2; // 2 frames ago void HUD_EngineInfo(void) { + if(!autocvar_hud_engineinfo && !autocvar__hud_configure) + return; + float id = HUD_PANEL_ENGINEINFO; HUD_Panel_UpdateCvarsForId(id); vector pos, mySize; @@ -4280,9 +4256,227 @@ 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_engineinfo_framecounter_decimals"))), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_font; } + +// Info messages panel (#14) +// +void HUD_InfoMessages(void) +{ + if(!autocvar_hud_infomessages && !autocvar__hud_configure) + return; + + float id = HUD_PANEL_INFOMESSAGES; + HUD_Panel_UpdateCvarsForId(id); + vector pos, mySize; + pos = panel_pos; + mySize = panel_size; + + HUD_Panel_DrawBg(1); + if(panel_bg_padding) + { + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; + } + + // always force 6:1 aspect + vector newSize; + if(mySize_x/mySize_y > 6) + { + newSize_x = 6 * mySize_y; + newSize_y = mySize_y; + + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else + { + newSize_y = 1/6 * mySize_x; + newSize_x = mySize_x; + + pos_y = pos_y + (mySize_y - newSize_y) / 2; + } + + mySize = newSize; + entity tm; + vector o; + o = pos; + + vector fontsize; + fontsize = '0.25 0.25 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 = 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; + + // 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) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + + if(spectatee_status == -1) + 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) + 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) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + + if(gametype == GAME_ARENA) + s = "^1Wait for your turn to join"; + else if(gametype == GAME_LMS) + { + entity sk; + sk = playerslots[player_localentnum - 1]; + if(sk.(scores[ps_primary]) >= 666) + s = "^1Match has already begun"; + else if(sk.(scores[ps_primary]) > 0) + s = "^1You have no more lives left"; + else + s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); + } + else + s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); + if(autocvar_hud_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; + + //show restart countdown: + if (time < getstatf(STAT_GAMESTARTTIME)) { + float countdown; + //we need to ceil, otherwise the countdown would be off by .5 when using round() + countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time); + s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds"); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + } + } + if(warmup_stage && !intermission) + { + s = "^2Currently in ^1warmup^2 stage!"; + if(autocvar_hud_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; + } + + string blinkcolor; + if(mod(time, 1) >= 0.5) + blinkcolor = "^1"; + else + blinkcolor = "^3"; + + if(ready_waiting && !intermission && !spectatee_status) + { + if(ready_waiting_for_me) + { + if(warmup_stage) + s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup"); + else + s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready"); + } + else + { + if(warmup_stage) + s = strcat("^2Waiting for others to ready up to end warmup..."); + else + s = strcat("^2Waiting for others to ready up..."); + } + if(autocvar_hud_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; + } + else if(warmup_stage && !intermission && !spectatee_status) + { + s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup"); + if(autocvar_hud_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; + } + + if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger) + { + float ts_min, ts_max; + tm = teams.sort_next; + if (tm) + { + for(; tm.sort_next; tm = tm.sort_next) + { + if(!tm.team_size || tm.team == COLOR_SPECTATOR) + continue; + if(!ts_min) ts_min = tm.team_size; + else ts_min = min(ts_min, tm.team_size); + if(!ts_max) ts_max = tm.team_size; + else ts_max = max(ts_max, tm.team_size); + } + if ((ts_max - ts_min) > 1) + { + s = strcat(blinkcolor, "Teamnumbers are unbalanced!"); + tm = GetTeam(myteam, false); + if (tm) + if (tm.team != COLOR_SPECTATOR) + if (tm.team_size == ts_max) + s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust"); + + if(autocvar_hud_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; + } + } + } + } + else + { + s = "^7Press ^3ESC ^7to show HUD options."; + if(autocvar_hud_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) + 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) + 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) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + } +} + /* ================== Main HUD system @@ -4394,9 +4588,42 @@ void HUD_Reset (void) HUD_Mod_CTF_Reset(); } +#define HUD_DrawPanel(id)\ +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_POWERUPS):\ + HUD_Powerups(); break;\ + case (HUD_PANEL_HEALTHARMOR):\ + HUD_HealthArmor(); break;\ + case (HUD_PANEL_NOTIFY):\ + HUD_Notify(); break;\ + case (HUD_PANEL_TIMER):\ + HUD_Timer(); break;\ + case (HUD_PANEL_SCORE):\ + HUD_Score(); break;\ + case (HUD_PANEL_RACETIMER):\ + HUD_RaceTimer(); break;\ + case (HUD_PANEL_VOTE):\ + HUD_VoteWindow(); break;\ + case (HUD_PANEL_MODICONS):\ + HUD_ModIcons(); break;\ + case (HUD_PANEL_PRESSEDKEYS):\ + HUD_DrawPressedKeys(); break;\ + case (HUD_PANEL_CHAT):\ + HUD_Chat(); break;\ + case (HUD_PANEL_ENGINEINFO):\ + HUD_EngineInfo(); break;\ + case (HUD_PANEL_INFOMESSAGES):\ + HUD_InfoMessages(); break;\ +} + void HUD_Main (void) { - // TODO: render order? hud_skin_path = strcat("gfx/hud/", autocvar_hud_skin); if(disable_menu_alphacheck == 1) @@ -4419,14 +4646,14 @@ void HUD_Main (void) { float i; // x-axis - for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_x, 0.2); ++i) + for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2); ++i) { - drawfill(eX * i * vid_conwidth * bound(0.005, autocvar_hud_configure_grid_x, 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL); + drawfill(eX * i * vid_conwidth * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL); } // y-axis - for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_y, 0.2); ++i) + for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2); ++i) { - drawfill(eY * i * vid_conheight * bound(0.005, autocvar_hud_configure_grid_y, 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL); + drawfill(eY * i * vid_conheight * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL); } } @@ -4447,42 +4674,31 @@ void HUD_Main (void) else color = stov(autocvar_hud_dock_color); + // draw the dock if(autocvar_hud_dock != "" && autocvar_hud_dock != "0") - drawpic('0 0 0', strcat("gfx/hud/", autocvar_hud_skin, "/", autocvar_hud_dock), eX * vid_conwidth + eY * vid_conheight, color, autocvar_hud_dock_alpha * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock... - - if(autocvar_hud_radar || autocvar__hud_configure) - if(autocvar_hud_radar != 0 && (autocvar_hud_radar == 2 || teamplay)) - HUD_Radar(); - if(autocvar_hud_weaponicons || autocvar__hud_configure) - HUD_WeaponIcons(); - if(autocvar_hud_inventory || autocvar__hud_configure) - HUD_Inventory(); - if(autocvar_hud_powerups || autocvar__hud_configure) - HUD_Powerups(); - if(autocvar_hud_healtharmor || autocvar__hud_configure) - HUD_HealthArmor(); - if(autocvar_hud_notify || autocvar__hud_configure) - HUD_Notify(); - if(autocvar_hud_timer || autocvar__hud_configure) - HUD_Timer(); - if(autocvar_hud_score || autocvar__hud_configure) - HUD_Score(); - if(autocvar_hud_racetimer || autocvar__hud_configure) - if(gametype == GAME_RACE || gametype == GAME_CTS || autocvar__hud_configure) - HUD_RaceTimer(); - if(autocvar_hud_vote || autocvar__hud_configure) - HUD_VoteWindow(); - if(autocvar_hud_modicons || autocvar__hud_configure) - HUD_ModIcons(); - if(autocvar_hud_pressedkeys || autocvar__hud_configure) - if(spectatee_status > 0 || autocvar_hud_pressedkeys >= 2 || autocvar__hud_configure) - HUD_DrawPressedKeys(); - if(autocvar_hud_chat || autocvar__hud_configure) - HUD_Chat(); - else - cvar_set("con_chatrect", "0"); - if(autocvar_hud_engineinfo || autocvar__hud_configure) - HUD_EngineInfo(); + { + string pic; + pic = strcat(hud_skin_path, "/", autocvar_hud_dock); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/dock"; + } + drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, autocvar_hud_dock_alpha * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock... + } + + // cache the panel order into the panel_order array + if(autocvar__hud_panelorder != hud_panelorder_prev) { + if(hud_panelorder_prev) + strunzone(hud_panelorder_prev); + hud_panelorder_prev = strzone(autocvar__hud_panelorder); + tokenize_console(autocvar__hud_panelorder); + for(i = 0; i < HUD_PANEL_NUM; ++i) { + panel_order[i] = stof(argv(i)); + } + } + // draw panels in order specified by panel_order array + for(i = HUD_PANEL_NUM - 1; i >= 0; --i) { + HUD_DrawPanel(panel_order[i]); + } // TODO hud_'ify these if (cvar("cl_showspeed"))