X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=9d1b6816b88425a9a51e981a080f87b765e02a7b;hp=7b04825981468337e6ae206ff70a1df7ea4d845f;hb=b002c4ebc89a519c52fe7c81863ab841ba6660c2;hpb=baa73e19a892ebe8362c8747bac991456509fcf0 diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 7b0482598..9d1b6816b 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -550,25 +550,6 @@ HUD panels ================== */ -string HUD_Panel_GetName(float id) -{ - switch(id) { - case 0: return "weaponicons"; break; - case 1: return "inventory"; break; - case 2: return "powerups"; break; - case 3: return "healtharmor"; break; - case 4: return "notify"; break; - case 5: return "timer"; break; - case 6: return "radar"; break; - case 7: return "score"; break; - case 8: return "racetimer"; break; - case 9: return "vote"; break; - case 10: return "modicons"; break; - case 11: return "pressedkeys"; break; - default: return ""; - } -} - // Save the config void HUD_Panel_ExportCfg(string cfgname) { @@ -579,14 +560,16 @@ void HUD_Panel_ExportCfg(string cfgname) fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n")); fputs(fh, strcat("seta hud_bg \"", cvar_string("hud_bg"), "\"", "\n")); fputs(fh, strcat("seta hud_bg_color \"", cvar_string("hud_bg_color"), "\"", "\n")); + fputs(fh, strcat("seta hud_bg_color_team \"", cvar_string("hud_bg_color_team"), "\"", "\n")); fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n")); fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n")); fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n")); - fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n")); + fputs(fh, strcat("seta hud_fg_alpha) \"", cvar_string("hud_fg_alpha"), "\"", "\n")); fputs(fh, "\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(cvar("hud_dock_alpha")), "\"", "\n")); fputs(fh, "\n"); @@ -601,13 +584,14 @@ void HUD_Panel_ExportCfg(string cfgname) // common cvars for all panels float i; - for (i = 0; i < panel_cnt; ++i) + for (i = 0; i < HUD_PANEL_NUM; ++i) { fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), " ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i)))), "\n")); fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_pos \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_pos")), "\"", "\n")); fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_size \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_size")), "\"", "\n")); fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg")), "\"", "\n")); fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color")), "\"", "\n")); + fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color_team \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color_team")), "\"", "\n")); fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_alpha \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_alpha")), "\"", "\n")); fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_border \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_border")), "\"", "\n")); fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_padding \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_padding")), "\"", "\n")); @@ -627,6 +611,9 @@ void HUD_Panel_ExportCfg(string cfgname) fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n")); fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_mirror ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_mirror"))), "\n")); break; + case 4: + fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n")); + break; case 9: fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha"))), "\n")); break; @@ -639,41 +626,53 @@ void HUD_Panel_ExportCfg(string cfgname) fclose(fh); } -vector HUD_Panel_CheckLimitSize(float id, vector mySize) +vector HUD_Panel_GetMinSize(float id) { + vector mySize; + // note: please only set mySize_y on aspect ratio forced panels switch(id) { case 0: - mySize_x = max(mySize_y * (1/10), mySize_x); // at least 1/10 * height - mySize_y = max(mySize_x * (1/26), mySize_y); // at least 1/26 * width + mySize_x = 1/10; // at least 1/10 * height + mySize_y = 1/26; // at least 1/26 * width break; case 1: - mySize_x = max(mySize_y * 0.7, mySize_x); // at least 0.7 * height + if(cvar("hud_inventory_onlycurrent")) + mySize_y = 2/5; // 2/5 width + else + mySize_x = 0.7; // at least 0.7 * height + break; + case 3: + if(cvar("hud_healtharmor") == 2) + { + mySize_x = 4.35; // 4.35 * height, trial and error... + mySize_y = 0.01; // "unlimited" ;) + } + break; + case 4: + mySize_x = 1.2; // 12/10 * height, as panel cant support more than 10 entries... + mySize_y = 1/12; // 1/12 * width break; - //case 2: - // mySize_x = max(mySize_y * 1.5, mySize_x); // at least 1.5 * height - // break; - //case 3: - // mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height - // break; case 5: - mySize_y = (1/4.1) * mySize_x; // 1/4.1 * width, trial and error... + mySize_y = 1/4.1; // 1/4.1 * width, trial and error... break; case 7: - mySize_y = (1/4) * mySize_x; // 1/4 * width + mySize_y = 1/4; // 1/4 * width break; case 8: - mySize_y = (1/4) * mySize_x; // 1/4 * width + mySize_y = 1/4; // 1/4 * width break; case 9: - mySize_y = (1/4) * mySize_x; // 1/4 * width + mySize_y = 1/4; // 1/4 * width break; case 10: - mySize_y = (1/2) * mySize_x; // 1/2 * width + mySize_y = 1/2; // 1/2 * width break; case 11: - mySize_y = 0.5898 * mySize_x; // 0.5898 * width, reason: bg has weird dimensions... + mySize_y = 0.5898; // 0.5898 * width, reason: bg has weird dimensions... break; } + if(!mySize_x && mySize_y) + mySize_x = 1/mySize_y; return mySize; } @@ -693,6 +692,31 @@ vector HUD_Panel_GetSize(float id) 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 - cvar("_menu_alpha")) * mySize + (cvar("_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 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size; + } + } + } return mySize; } @@ -708,6 +732,17 @@ vector HUD_Panel_GetPos(float id) pos_x = vid_conwidth + pos_x; if (pos_y < 0) pos_y = vid_conheight + pos_y; + + if(disable_menu_alphacheck == 2 && id == highlightedPanel) + { + vector mySize, menu_enable_panelpos; + mySize = HUD_Panel_GetSize(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 - cvar("_menu_alpha")) * pos + (cvar("_menu_alpha")) * menu_enable_panelpos; + } return pos; } @@ -722,21 +757,101 @@ float HUD_Panel_GetBorder(float id) vector HUD_Panel_GetColor(float id) { - // TODO: idea: let user choose colors "pants", "shirt" + float f; + vector color_vec; string color; - color = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color")); - if(color == "") + + // fetch per-panel color + if(teamplay && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")) != "") { + f = stof(getplayerkey(self.sv_entnum, "colors")); + color = vtos(colormapPaletteColor(mod(f, 16), 1) * cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team"))); + } + else + color = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color")); + color_vec = stov(color); + + if(color == "") { // fetch default color color = cvar_string("hud_bg_color"); - return stov(color); + color_vec = stov(color); + if(teamplay && cvar(strcat("hud_bg_color_team"))) { + f = stof(getplayerkey(self.sv_entnum, "colors")); + color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_bg_color_team"); + } + else if(color == "shirt") { + f = stof(getplayerkey(self.sv_entnum, "colors")); + color_vec = colormapPaletteColor(floor(f / 16), 0); + } + else if(color == "pants") { + f = stof(getplayerkey(self.sv_entnum, "colors")); + color_vec = colormapPaletteColor(mod(f, 16), 1); + } + } + else if(color == "shirt") { + f = stof(getplayerkey(self.sv_entnum, "colors")); + color_vec = colormapPaletteColor(floor(f / 16), 0); + } + else if(color == "pants") { + f = stof(getplayerkey(self.sv_entnum, "colors")); + color_vec = colormapPaletteColor(mod(f, 16), 1); + } + return color_vec; } -float HUD_Panel_GetAlpha(float id) +vector HUD_Panel_Dock_GetColor(void) +{ + float f; + vector color_vec; + string color; + color = cvar_string("hud_dock_color"); + color_vec = stov(color); + if(teamplay && cvar(strcat("hud_dock_color_team"))) { + f = stof(getplayerkey(self.sv_entnum, "colors")); + color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_dock_color_team"); + } + else if(color == "shirt") { + f = stof(getplayerkey(self.sv_entnum, "colors")); + color_vec = colormapPaletteColor(floor(f / 16), 0); + } + else if(color == "pants") { + f = stof(getplayerkey(self.sv_entnum, "colors")); + color_vec = colormapPaletteColor(mod(f, 16), 1); + } + return color_vec; +} + +float HUD_Panel_GetBgAlpha(float id) { string alpha; alpha = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_alpha")); if(alpha == "") alpha = cvar_string("hud_bg_alpha"); - return stof(alpha); + + if(hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == id) // do not set a minalpha cap when showing the config dialog for this panel + alpha = ftos((1 - cvar("_menu_alpha")) * max(cvar("hud_configure_bg_minalpha"), stof(alpha)) + (cvar("_menu_alpha")) * stof(alpha)); + else if(hud_configure) + alpha = ftos(max(cvar("hud_configure_bg_minalpha"), stof(alpha))); + + if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode + return 0.25; + + if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog + return stof(alpha); + else + return stof(alpha) * menu_fade_alpha; +} + +float HUD_Panel_GetFgAlpha(float id) +{ + float alpha; + alpha = hud_fg_alpha; + + if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode + return 0.25; + + if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog + return alpha; + else + return alpha * menu_fade_alpha; } float HUD_Panel_GetPadding(float id) @@ -745,14 +860,17 @@ float HUD_Panel_GetPadding(float id) padding = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding")); if(padding == "") padding = cvar_string("hud_bg_padding"); - return stof(padding); + + vector mySize; + mySize = HUD_Panel_GetSize(id); + float smallestsize; + smallestsize = min(mySize_x, mySize_y); + return min(smallestsize/2 - 5, stof(padding)); } // draw the background/borders -void HUD_Panel_DrawBg(float id, vector pos, vector mySize) +void HUD_Panel_DrawBg(float id, vector pos, vector mySize, float alpha) { - float alpha; - if(!hud_configure && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0") return; @@ -763,7 +881,6 @@ void HUD_Panel_DrawBg(float id, vector pos, vector mySize) if(bg == "0" && hud_configure) { bg = "border"; // we probably want to see a background in config mode at all times... - alpha = cvar("hud_configure_bg_minalpha"); } if(bg != "0") @@ -774,8 +891,10 @@ void HUD_Panel_DrawBg(float id, vector pos, vector mySize) vector color; color = HUD_Panel_GetColor(id); - if(!alpha) - alpha = HUD_Panel_GetAlpha(id); + if(alpha) + alpha = HUD_Panel_GetBgAlpha(id) * alpha; // allow panels to fade in/out by passing an alpha value + else + alpha = HUD_Panel_GetBgAlpha(id); draw_BorderPicture(pos - '1 1 0' * border, strcat("gfx/hud/", cvar_string("hud_skin"), "/", bg), mySize + '1 1 0' * 2 * border, color, alpha, '1 1 0' * (border/BORDER_MULTIPLIER)); } @@ -804,14 +923,13 @@ vector HUD_Panel_GetProgressBarColor(string item) return stov(cvar_string(strcat("hud_progressbar_", item, "_color"))); } -float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright -// check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector -vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize) +// 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(float id, vector myPos, vector mySize) { float i; vector myTarget; - myTarget = mySize; + myTarget = myPos; vector targPos; vector targSize; @@ -820,13 +938,10 @@ vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize) myCenter = '0 0 0'; // shut up fteqcc, there IS a reference targCenter = '0 0 0'; // shut up fteqcc, there IS a reference - for (i = 0; i < panel_cnt; ++i) { + for (i = 0; i < HUD_PANEL_NUM; ++i) { if(i == id || !HUD_Panel_CheckActive(i)) continue; - targPos = HUD_Panel_GetPos(i); - targSize = HUD_Panel_GetSize(i); - targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id); targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id); @@ -848,24 +963,24 @@ vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize) targCenter_x = targPos_x + 0.5 * targSize_x; targCenter_y = targPos_y + 0.5 * targSize_y; - if(myCenter_x < targCenter_x && myCenter_y < targCenter_y && resizeCorner != 1) // top left (of target panel) + if(myCenter_x < targCenter_x && myCenter_y < targCenter_y) // top left (of the target panel) { if(myPos_x + mySize_x - targPos_x < myPos_y + mySize_y - targPos_y) // push it to the side - myTarget_x = targPos_x - myPos_x; + myTarget_x = targPos_x - mySize_x; else // push it upwards - myTarget_y = targPos_y - myPos_y; + myTarget_y = targPos_y - mySize_y; } - else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y && resizeCorner != 2) // top right + else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y) // top right { if(targPos_x + targSize_x - myPos_x < myPos_y + mySize_y - targPos_y) // push it to the side myTarget_x = targPos_x + targSize_x; else // push it upwards - myTarget_y = targPos_y - myPos_y; + myTarget_y = targPos_y - mySize_y; } else if(myCenter_x < targCenter_x && myCenter_y > targCenter_y) // bottom left { if(myPos_x + mySize_x - targPos_x < targPos_y + targSize_y - myPos_y) // push it to the side - myTarget_x = targPos_x - myPos_x; + myTarget_x = targPos_x - mySize_x; else // push it downwards myTarget_y = targPos_y + targSize_y; } @@ -881,58 +996,44 @@ vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize) return myTarget; } -// TODO: checkResize -float HUD_Panel_SetSize(float id, vector mySize) +void HUD_Panel_SetPos(float id, vector pos) { - float didntresize; - - vector oldSize; - oldSize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size"))); + vector oldPos; + oldPos = HUD_Panel_GetPos(id); - vector myPos; - myPos = HUD_Panel_GetPos(id); + vector mySize; + mySize = HUD_Panel_GetSize(id); - // check for collisions if(cvar("hud_configure_checkcollisions")) - mySize = HUD_Panel_CheckResize(id, HUD_Panel_GetPos(id), mySize); - - mySize_x = bound(0.025 * vid_conwidth, mySize_x, vid_conwidth - myPos_x); - mySize_y = bound(0.025 * vid_conheight, mySize_y, vid_conheight - myPos_y); - - // cap against panel's own limits - mySize = HUD_Panel_CheckLimitSize(id, mySize); + pos = HUD_Panel_CheckMove(id, pos, mySize); - //mySize_x = bound(0.025 * vid_conwidth, mySize_x, vid_conwidth); - //mySize_y = bound(0.025 * vid_conheight, mySize_y, vid_conheight); + pos_x = bound(0, pos_x, vid_conwidth - mySize_x); + pos_y = bound(0, pos_y, vid_conheight - mySize_y); if(cvar("hud_configure_grid")) { - mySize_x = floor(mySize_x/cvar("hud_configure_grid_x") + 0.5) * cvar("hud_configure_grid_x"); - mySize_y = floor(mySize_y/cvar("hud_configure_grid_y") + 0.5) * cvar("hud_configure_grid_y"); + pos_x = floor(pos_x/cvar("hud_configure_grid_x") + 0.5) * cvar("hud_configure_grid_x"); + pos_y = floor(pos_y/cvar("hud_configure_grid_y") + 0.5) * cvar("hud_configure_grid_y"); } - // TODO: is this needed? - // this is to check if (and how) SetPos should be called - if(mySize_x == oldSize_x && mySize_y == oldSize_y) - didntresize = 3; // didnt resize either - else if(mySize_x == oldSize_x && mySize_y != oldSize_y) - didntresize = 2; // resized Y - else if(mySize_y == oldSize_y && mySize_x != oldSize_x) - didntresize = 1; // resized X + if (pos_x + 0.5 * mySize_x > 0.5 * vid_conwidth) + pos_x = pos_x - vid_conwidth; + if (pos_y + 0.5 * mySize_y > 0.5 * vid_conheight) + pos_y = pos_y - vid_conheight; string s; - s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight)); - cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s); - return didntresize; + s = strcat(ftos(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight)); + + cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s); } -// 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(float id, vector myPos, vector mySize) +// check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector +vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize) { float i; vector myTarget; - myTarget = myPos; + myTarget = mySize; vector targPos; vector targSize; @@ -941,10 +1042,13 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize) myCenter = '0 0 0'; // shut up fteqcc, there IS a reference targCenter = '0 0 0'; // shut up fteqcc, there IS a reference - for (i = 0; i < panel_cnt; ++i) { + for (i = 0; i < HUD_PANEL_NUM; ++i) { if(i == id || !HUD_Panel_CheckActive(i)) continue; + targPos = HUD_Panel_GetPos(i); + targSize = HUD_Panel_GetSize(i); + targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id); targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id); @@ -966,24 +1070,24 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize) targCenter_x = targPos_x + 0.5 * targSize_x; targCenter_y = targPos_y + 0.5 * targSize_y; - if(myCenter_x < targCenter_x && myCenter_y < targCenter_y) // top left (of the target panel) + if(myCenter_x < targCenter_x && myCenter_y < targCenter_y) // top left (of target panel) { if(myPos_x + mySize_x - targPos_x < myPos_y + mySize_y - targPos_y) // push it to the side - myTarget_x = targPos_x - mySize_x; + myTarget_x = targPos_x - myPos_x; else // push it upwards - myTarget_y = targPos_y - mySize_y; + myTarget_y = targPos_y - myPos_y; } else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y) // top right { if(targPos_x + targSize_x - myPos_x < myPos_y + mySize_y - targPos_y) // push it to the side myTarget_x = targPos_x + targSize_x; else // push it upwards - myTarget_y = targPos_y - mySize_y; + myTarget_y = targPos_y - myPos_y; } else if(myCenter_x < targCenter_x && myCenter_y > targCenter_y) // bottom left { if(myPos_x + mySize_x - targPos_x < targPos_y + targSize_y - myPos_y) // push it to the side - myTarget_x = targPos_x - mySize_x; + myTarget_x = targPos_x - myPos_x; else // push it downwards myTarget_y = targPos_y + targSize_y; } @@ -999,71 +1103,169 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize) return myTarget; } -void HUD_Panel_SetPos(float id, vector pos, float didntresize) +void HUD_Panel_SetPosSize(float id, vector resizeorigin) { + vector mySize, myPos; vector oldPos; - oldPos = HUD_Panel_GetPos(id); - if(didntresize == 2) - pos_x = oldPos_x; - else if(didntresize == 1) - pos_y = oldPos_y; - else if(didntresize == 3) - return; - vector mySize; - mySize = HUD_Panel_GetSize(id); + if(resizeCorner == 1) { + mySize_x = resizeorigin_x - (mousepos_x - panel_click_distance_x); + mySize_y = resizeorigin_y - (mousepos_y - panel_click_distance_y); + } else if(resizeCorner == 2) { + mySize_x = mousepos_x + panel_click_distance_x - resizeorigin_x; + mySize_y = panel_click_distance_y + resizeorigin_y - mousepos_y; + } else if(resizeCorner == 3) { + mySize_x = resizeorigin_x + panel_click_distance_x - mousepos_x; + mySize_y = mousepos_y + panel_click_distance_y - resizeorigin_y; + } else { // resizeCorner == 4 + mySize_x = mousepos_x - (resizeorigin_x - panel_click_distance_x); + mySize_y = mousepos_y - (resizeorigin_y - panel_click_distance_y); + } - if(cvar("hud_configure_checkcollisions")) - pos = HUD_Panel_CheckMove(id, pos, mySize); + // minimum panel size cap + mySize_x = max(0.025 * vid_conwidth, mySize_x); + mySize_y = max(0.025 * vid_conheight, mySize_y); - pos_x = bound(0, pos_x, vid_conwidth - mySize_x); - pos_y = bound(0, pos_y, vid_conheight - mySize_y); + if(id == 12) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small. + { + mySize_x = max(17 * cvar("con_chatsize"), mySize_x); + mySize_y = max(2 * cvar("con_chatsize") + 2 * HUD_Panel_GetPadding(id), mySize_y); + } + + // cap against panel's own limits + vector minSize; + minSize = HUD_Panel_GetMinSize(id); // mySize_x at least minSize_x * mySize_y, and vice versa + + mySize_x = max(minSize_x * mySize_y, mySize_x); + mySize_y = max(minSize_y * mySize_x, mySize_y); + + // collision testing| + // -----------------+ + + // we need to know pos at this stage, but it might still change later if we hit a screen edge/other panel (?) + if(resizeCorner == 1) { + myPos_x = resizeorigin_x - mySize_x; + myPos_y = resizeorigin_y - mySize_y; + } else if(resizeCorner == 2) { + myPos_x = resizeorigin_x; + myPos_y = resizeorigin_y - mySize_y; + } else if(resizeCorner == 3) { + myPos_x = resizeorigin_x - mySize_x; + myPos_y = resizeorigin_y; + } else { // resizeCorner == 4 + myPos_x = resizeorigin_x; + myPos_y = resizeorigin_y; + } + + // left/top screen edges + mySize_x = min(myPos_x + mySize_x, mySize_x); + mySize_y = min(myPos_y + mySize_y, mySize_y); + + // bottom/right screen edges + mySize_x = min(vid_conwidth - myPos_x, mySize_x); + mySize_y = min(vid_conheight - myPos_y, mySize_y); + + if(cvar("hud_configure_checkcollisions")) { + oldPos = myPos; + mySize = HUD_Panel_CheckResize(id, myPos, mySize); + myPos = HUD_Panel_CheckMove(id, myPos, mySize); // touching myPos won't do anything... unless we make it change mySize somehow, see next line + mySize = mySize - myPos + oldPos; // TODO: this is still borked in some situations :( + } if(cvar("hud_configure_grid")) { - pos_x = floor(pos_x/cvar("hud_configure_grid_x") + 0.5) * cvar("hud_configure_grid_x"); - pos_y = floor(pos_y/cvar("hud_configure_grid_y") + 0.5) * cvar("hud_configure_grid_y"); + mySize_x = floor(mySize_x/cvar("hud_configure_grid_x") + 0.5) * cvar("hud_configure_grid_x"); + mySize_y = floor(mySize_y/cvar("hud_configure_grid_y") + 0.5) * cvar("hud_configure_grid_y"); } - if (pos_x + 0.5 * mySize_x > 0.5 * vid_conwidth) - pos_x = pos_x - vid_conwidth; - if (pos_y + 0.5 * mySize_y > 0.5 * vid_conheight) - pos_y = pos_y - vid_conheight; + // do another pos check, as size might have changed by now + if(resizeCorner == 1) { + myPos_x = resizeorigin_x - mySize_x; + myPos_y = resizeorigin_y - mySize_y; + } else if(resizeCorner == 2) { + myPos_x = resizeorigin_x; + myPos_y = resizeorigin_y - mySize_y; + } else if(resizeCorner == 3) { + myPos_x = resizeorigin_x - mySize_x; + myPos_y = resizeorigin_y; + } else { // resizeCorner == 4 + myPos_x = resizeorigin_x; + myPos_y = resizeorigin_y; + } string s; - s = strcat(ftos(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight)); + s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight)); + cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s); + s = strcat(ftos(myPos_x/vid_conwidth), " ", ftos(myPos_y/vid_conheight)); cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s); } float mouseClicked; float prevMouseClicked; // previous state +float prevMouseClickedTime; // time during previous mouse click, to check for doubleclicks +vector prevMouseClickedPos; // pos during previous mouse click, to check for doubleclicks + +float menu_enabled; +float menu_enabled_time; float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) { - prevMouseClicked = mouseClicked; + if(!hud_configure) + return false; + + // allow console bind to work + string con_keys; + float keys; + con_keys = findkeysforcommand("toggleconsole"); + keys = tokenize(con_keys); + + float hit_con_bind, i; + for (i = 0; i < keys; ++i) + { + if(nPrimary == stof(argv(i))) + hit_con_bind = 1; + } + if(nPrimary == K_MOUSE1) { if(bInputType == 0) { // key pressed mouseClicked = 1; return true; } - if(bInputType == 1) {// key released + else if(bInputType == 1) {// key released mouseClicked = 0; return true; } } - return false; + else if(nPrimary == K_ESCAPE) + { + disable_menu_alphacheck = 1; + menu_enabled = 1; + menu_enabled_time = time; + localcmd("menu_showhudexit\n"); + } + + else if(hit_con_bind) + return false; + + return true; // Suppress ALL other input } -vector mousepos, mouseprevpos; -vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click) -vector panel_click_pos; // panel pos (saved only upon a click) -vector panel_click_size; // panel size (saved only upon a click) -float highlightedPanel; -float highlightedAction; // 0 = nothing, 1 = move, 2 = resize void HUD_Panel_Mouse() { - if(mouseClicked == 0) { + // TODO: needs better check... is there any float that contains the current state of the menu? _menu_alpha isn't apparently updated the frame the menu gets enabled + if (menu_enabled == 0) // menu dialog closed, enable normal alpha stuff again + disable_menu_alphacheck = 0; + if (cvar("_menu_alpha") == 0 && time - menu_enabled_time > 0.5) + menu_enabled = 0; + + /* + print("Disable menu_alphacheck: ", ftos(disable_menu_alphacheck), "\n"); + print("Highlighted: ", ftos(highlightedPanel), "\n"); + print("Menu alpha: ", cvar_string("_menu_alpha"), "\n"); + */ + + if(mouseClicked == 0 && disable_menu_alphacheck != 2) { // don't reset these variables in disable_menu_alphacheck mode 2! highlightedPanel = -1; highlightedAction = 0; } @@ -1081,7 +1283,7 @@ void HUD_Panel_Mouse() vector panelPos; vector panelSize; - for(i = 0; i <= panel_cnt; ++i) + for(i = 0; i < HUD_PANEL_NUM; ++i) { panelPos = HUD_Panel_GetPos(i); panelSize = HUD_Panel_GetSize(i); @@ -1127,48 +1329,54 @@ void HUD_Panel_Mouse() { if(prevMouseClicked == 0) { - panel_click_distance = mousepos - panelPos; - panel_click_pos = panelPos; - panel_click_size = panelSize; + if(highlightedAction == 1) + panel_click_distance = mousepos - panelPos; + else if(highlightedAction == 2) + { + if(resizeCorner == 1) { + panel_click_distance = mousepos - panelPos; + panel_click_resizeorigin = panelPos + panelSize; + } else if(resizeCorner == 2) { + panel_click_distance_x = panelSize_x - mousepos_x + panelPos_x; + panel_click_distance_y = mousepos_y - panelPos_y; + panel_click_resizeorigin = panelPos + eY * panelSize_y; + } else if(resizeCorner == 3) { + panel_click_distance_x = mousepos_x - panelPos_x; + panel_click_distance_y = panelSize_y - mousepos_y + panelPos_y; + panel_click_resizeorigin = panelPos + eX * panelSize_x; + } else if(resizeCorner == 4) { + panel_click_distance = panelSize - mousepos + panelPos; + panel_click_resizeorigin = panelPos; + } + } } if(highlightedAction == 1) - HUD_Panel_SetPos(i, mousepos - panel_click_distance, 0); + HUD_Panel_SetPos(i, mousepos - panel_click_distance); else if(highlightedAction == 2) - { - float didntresize; // panel too big/too small, dont resize (also has to affect moving) - if(resizeCorner == 1) { - didntresize = HUD_Panel_SetSize(i, panelSize + mouseprevpos - mousepos); - HUD_Panel_SetPos(i, mousepos - panel_click_distance, didntresize); - } - if(resizeCorner == 2) { - didntresize = HUD_Panel_SetSize(i, eY * panel_click_size_y + eX * (mousepos_x - panelPos_x - (panel_click_distance_x - panel_click_size_x)) - + eY * (panel_click_distance_y + (panel_click_pos_y - mousepos_y))); - HUD_Panel_SetPos(i, eX * panelPos_x + eY * (mousepos_y - panel_click_distance_y), didntresize); - } - if(resizeCorner == 3) { - didntresize = HUD_Panel_SetSize(i, panelSize + eX * (mouseprevpos_x - mousepos_x) + eY * (mousepos_y - mouseprevpos_y)); - HUD_Panel_SetPos(i, eX * (mousepos_x - panel_click_distance_x) + eY * panelPos_y, didntresize); - } - if(resizeCorner == 4) { - HUD_Panel_SetSize(i, mousepos - panelPos - (panel_click_distance - panel_click_size)); - } - } + HUD_Panel_SetPosSize(i, panel_click_resizeorigin); } } + + // doubleclick check + if(time - prevMouseClickedTime < 0.4 && prevMouseClicked == 0 && prevMouseClickedPos == mousepos && highlightedPanel >= 0) + { + mouseClicked = 0; // to prevent spam, I guess. + disable_menu_alphacheck = 2; + menu_enabled = 1; + menu_enabled_time = time; + localcmd("menu_showhudoptions ", ftos(highlightedPanel), "\n"); + return; + } + if(prevMouseClicked == 0) + { + prevMouseClickedTime = time; + prevMouseClickedPos = mousepos; + } } - mouseprevpos = mousepos; prevMouseClicked = mouseClicked; } -/*void HUD_DrawDockEdge(float id, vector p1, vector p2, float target) -{ - vector pos; - vector size; - - pos = -*/ // maybe one day, since this will be quite complicated - // Weapon icons (#0) // float weaponspace[10]; @@ -1199,9 +1407,9 @@ float weaponorder_cmp(float i, float j, entity pass) return d; } -void HUD_WeaponIcons() +void HUD_WeaponIcons(void) { - float id = 0; + float id = HUD_PANEL_WEAPONICONS; float alpha, stat_weapons; // "constants" vector pos, mySize, accuracy_color; float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables @@ -1221,7 +1429,7 @@ void HUD_WeaponIcons() } heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world); - HUD_Panel_DrawBg(id, pos, mySize); + HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -1270,7 +1478,7 @@ void HUD_WeaponIcons() // draw background behind currently selected weapon if(self.weapon == activeweapon) - drawpic_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 * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_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 * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); // draw the weapon accuracy on the HUD if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS)) @@ -1280,14 +1488,14 @@ void HUD_WeaponIcons() accuracy_color = HUD_AccuracyColor(weapon_stats); if(weapon_damage) - drawpic_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), accuracy_color, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_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), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } // draw the weapon icon - drawpic_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 * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_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 * HUD_Panel_GetFgAlpha(id), 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', hud_alpha_fg, DRAWFLAG_NORMAL); + 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', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } ++row; @@ -1341,9 +1549,9 @@ string GetAmmoPicture(float i) } } -void HUD_Inventory() +void HUD_Inventory(void) { - float id = 1; + float id = HUD_PANEL_INVENTORY; float i; float stat_items; @@ -1351,7 +1559,7 @@ void HUD_Inventory() pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); - HUD_Panel_DrawBg(id, pos, mySize); + HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -1369,13 +1577,17 @@ void HUD_Inventory() a = 100; if(cvar("hud_inventory_onlycurrent")) { - if (stat_items & GetAmmoItemCode(i)) { - drawpic_skin(pos + eY * 0.05 * mySize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + if(hud_configure) + i = 2; + if (stat_items & GetAmmoItemCode(i) || hud_configure) { + drawpic_skin(pos, GetAmmoPicture(i), '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(a < 10) - HUD_DrawXNum(pos + eX * 0.8 * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); else - HUD_DrawXNum(pos + eX * 0.8 * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } + if(hud_configure) + break; } else { if (a > 0) { if(mySize_x/mySize_y >= 10) { // arrange horizontally @@ -1408,18 +1620,18 @@ void HUD_Inventory() } if (stat_items & GetAmmoItemCode(i)) - drawpic_skin(mypos, "ammo_current_bg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(mypos, "ammo_current_bg", mysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if (a < 10) { if(stat_items & GetAmmoItemCode(i)) - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); else - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, hud_alpha_fg * 0.7, DRAWFLAG_NORMAL); + HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL); } else { if(stat_items & GetAmmoItemCode(i)) - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); else - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, hud_alpha_fg * 0.7, DRAWFLAG_NORMAL); + HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL); } } } @@ -1429,8 +1641,8 @@ void HUD_Inventory() // Powerups (#2) // -void HUD_Powerups() { - float id = 2; +void HUD_Powerups(void) { + float id = HUD_PANEL_POWERUPS; float stat_items; stat_items = getstati(STAT_ITEMS); @@ -1448,7 +1660,7 @@ void HUD_Powerups() { pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); - HUD_Panel_DrawBg(id, pos, mySize); + HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -1516,12 +1728,12 @@ void HUD_Powerups() { numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(leftcnt <= 5) - drawpic_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); + drawpic_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); else - drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, leftcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(numpos, leftcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } if(rightcnt) @@ -1540,12 +1752,12 @@ void HUD_Powerups() { numpos = picpos - eX * mySize_y + eY * 0.25 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(rightcnt <= 5) - drawpic_skin_expanding_two(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); + drawpic_skin_expanding_two(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); else - drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, rightcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(numpos, rightcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } } else if (mySize_x/mySize_y > 1.5) @@ -1566,12 +1778,12 @@ void HUD_Powerups() { numpos = picpos + eX * 0.5 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(leftcnt <= 5) - drawpic_skin_expanding_two(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); + drawpic_skin_expanding_two(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); else - drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(numpos, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } if(rightcnt) @@ -1590,12 +1802,12 @@ void HUD_Powerups() { numpos = picpos + eX * 0.5 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(rightcnt <= 5) - drawpic_skin_expanding_two(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); + drawpic_skin_expanding_two(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); else - drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(numpos, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } } else @@ -1616,12 +1828,12 @@ void HUD_Powerups() { numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x; } - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(leftcnt <= 5) - drawpic_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); + drawpic_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); else - drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, leftcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(numpos, leftcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } if(rightcnt) @@ -1634,32 +1846,687 @@ void HUD_Powerups() { picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; } else { - barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/30) + eX * 0.5 * mySize_x; - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30); - picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x + eX * 0.5 * mySize_x; - numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/30) + eX * 0.5 * mySize_x; + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30); + picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x + eX * 0.5 * mySize_x; + numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; + } + + HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + if(rightcnt <= 5) + drawpic_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); + else + drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(numpos, rightcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + } + } +} + +// Health/armor (#3) +// +void HUD_HealthArmor(void) +{ + float id = HUD_PANEL_HEALTHARMOR; + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); + + HUD_Panel_DrawBg(id, pos, mySize, 0); + float padding; + padding = HUD_Panel_GetPadding(id); + if(padding) + { + pos += '1 1 0' * padding; + mySize -= '2 2 0' * padding; + } + + float armor, health; + armor = getstati(STAT_ARMOR); + health = getstati(STAT_HEALTH); + + float fuel; + fuel = getstati(GetAmmoStat(4)); // how much fuel do we have? + + if(hud_configure) + { + armor = 150; + health = 100; + fuel = 70; + } + + if(health <= 0) + return; + + float len; + vector barpos, barsize; + vector picpos; + vector numpos; + + if(cvar("hud_healtharmor") == 2) // combined health and armor display + { + vector v; + v = healtharmor_maxdamage(health, armor, armorblockpercent); + + float x; + x = floor(v_x + 1); + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, x/400); + barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y; + picpos = pos; + numpos = picpos + eX * 1.5 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y; + picpos = pos + eX * 3 * mySize_y; + numpos = pos; + } + + if(v_z) // NOT fully armored + { + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, "health", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + if(armor) + drawpic_skin(picpos + eX * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * armor / health, DRAWFLAG_NORMAL); + } + else + { + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos + eX * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * health / armor, DRAWFLAG_NORMAL); + if(armor) + drawpic_skin(picpos, "armor", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + } + HUD_DrawXNum_Colored(numpos, x, 3, mySize_y, HUD_Panel_GetFgAlpha(id)); // draw the combined health and armor + + // fuel + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } + if(fuel) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + } + + else + { + string leftname, rightname; + float leftcnt, rightcnt; + float leftactive, rightactive; + float leftalpha, rightalpha; + if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) { // old style layout with armor left/top of health + leftname = "armor"; + leftcnt = armor; + if(leftcnt) + leftactive = 1; + leftalpha = min((armor+10)/55, 1); + + rightname = "health"; + rightcnt = health; + rightactive = 1; + rightalpha = 1; + } else { + leftname = "health"; + leftcnt = health; + leftactive = 1; + leftalpha = 1; + + rightname = "armor"; + rightcnt = armor; + if(rightcnt) + rightactive = 1; + rightalpha = min((armor+10)/55, 1); + } + + if (mySize_x/mySize_y > 5) + { + if(leftactive) + { + len = strlen(ftos(leftcnt)); + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/200); + barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; + picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y; + numpos = picpos - eX * 3 * 0.5 * mySize_y + eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; + } else { + barpos = pos; + barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; + picpos = pos; + numpos = picpos + eX * mySize_y + eY * 0.25 * mySize_y; + } + + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + } + + if(rightactive) + { + len = strlen(ftos(rightcnt)); + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * 0.5 * mySize_x; + barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; + picpos = pos + eX * 0.5 * mySize_x; + numpos = picpos + eX * mySize_y - eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; + } else { + barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200); + barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; + picpos = pos + eX * mySize_x - eX * mySize_y; + numpos = picpos - eX * 1.5 * mySize_y + eY * 0.25 * mySize_y; + } + + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(numpos, rightcnt, 3, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + } + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } + if(fuel) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + } + else if (mySize_x/mySize_y > 2) + { + if(leftactive) + { + len = strlen(ftos(leftcnt)); + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200); + barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; + picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y; + numpos = picpos - eX * len * 0.5 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; + picpos = pos; + numpos = picpos + eX * 0.5 * mySize_y; + } + + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + } + + if(rightactive) + { + len = strlen(ftos(rightcnt)); + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y; + numpos = picpos - eX * len * 0.5 * mySize_y; + } else { + barpos = pos + eY * 0.5 * mySize_y; + barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + picpos = pos + eY * 0.5 * mySize_y; + numpos = picpos + eX * 0.5 * mySize_y; + } + + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + } + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; + } + if(fuel) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + } + else + { + if(leftactive) + { + len = strlen(ftos(leftcnt)); + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos; + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); + picpos = pos + eX * 0.05 * mySize_x; + numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x; + } else { + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200); + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); + picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x; + numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x; + } + + HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id)); + } + + if(rightactive) + { + len = strlen(ftos(rightcnt)); + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * 0.5 * mySize_x; + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); + picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; + numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; + } else { + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200) + eX * 0.5 * mySize_x; + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); + picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x + eX * 0.5 * mySize_x; + numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x + eX * 0.5 * mySize_x; + } + + HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id)); + } + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos; + barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); + } else { + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100); + barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); + } + if(fuel) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + } + } +} + +// ___TODO___ !!! +// Notification area (#4) +// + +string Weapon_SuicideMessage(float deathtype) +{ + w_deathtype = deathtype; + get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_SUICIDEMESSAGE); + return w_deathtypestring; +} + +string Weapon_KillMessage(float deathtype) +{ + w_deathtype = deathtype; + get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_KILLMESSAGE); + return w_deathtypestring; +} + +float killnotify_times[10]; +float killnotify_deathtype[10]; +string killnotify_attackers[10]; +string killnotify_victims[10]; +void HUD_KillNotify_Push(string attacker, string victim, float wpn) +{ + float i; + for (i = 9; i > 0; --i) { + killnotify_times[i] = killnotify_times[i-1]; + killnotify_deathtype[i] = killnotify_deathtype[i-1]; + if(killnotify_attackers[i]) + strunzone(killnotify_attackers[i]); + killnotify_attackers[i] = strzone(killnotify_attackers[i-1]); + if(killnotify_victims[i]) + strunzone(killnotify_victims[i]); + killnotify_victims[i] = strzone(killnotify_victims[i-1]); + } + killnotify_times[0] = time; + killnotify_deathtype[0] = wpn; + if(killnotify_attackers[0]) + strunzone(killnotify_attackers[0]); + killnotify_attackers[0] = strzone(attacker); + if(killnotify_victims[0]) + strunzone(killnotify_victims[0]); + killnotify_victims[0] = strzone(victim); +} + +void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) +{ + float w; + if(msg == MSG_SUICIDE) { + HUD_KillNotify_Push(s1, "", DEATH_KILL); + + // TODO: cl_gentle + w = DEATH_WEAPONOF(type); + if(WEP_VALID(w)) { + if (!HUD_Panel_CheckActive(4) || cvar("hud_notify_print")) + print("^1", s1, "^1 ", Weapon_SuicideMessage(type), "\n"); + } + else if (type == DEATH_KILL) + print ("^1",s1, "^1 couldn't take it anymore\n"); + else if (type == DEATH_ROT) + print ("^1",s1, "^1 died\n"); + else if (type == DEATH_NOAMMO) + print ("^7",s1, "^7 committed suicide. What's the point of living without ammo?\n"); + else if (type == DEATH_CAMP) + print ("^1",s1, "^1 thought they found a nice camping ground\n"); + else if (type == DEATH_MIRRORDAMAGE) + print ("^1",s1, "^1 didn't become friends with the Lord of Teamplay\n"); + else if (type == DEATH_CHEAT) + print ("^1",s1, "^1 unfairly eliminated themself\n"); + else if (type == DEATH_FIRE) + print ("^1",s1, "^1 burned to death\n"); + else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET) + print ("^1",s1, "^1 couldn't resist the urge to self-destruct\n"); + if (stof(s2) > 2) // killcount > 2 + print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n"); + } else if(msg == MSG_KILL) { + w = DEATH_WEAPONOF(type); + if(WEP_VALID(w)) { + HUD_KillNotify_Push(s2, s1, w); + if (!HUD_Panel_CheckActive(4) || cvar("hud_notify_print")) + print("^1", s1, "^1 ", Weapon_KillMessage(type), "\n"); + } + else if(type == KILL_TEAM || type == KILL_TEAM_SPREE) { + if(cvar("cl_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")) + print ("^1",s1,"^1 ended a ",s2," scoring spree by going against a team mate\n"); + else + print ("^1",s1,"^1 ended a ",s2," kill spree by killing a team mate\n"); + } + else if (stof(s2) > 2) { + if(cvar("cl_gentle")) + print ("^1",s1,"'s ^1",s2," scoring spree was ended by a team mate!\n"); + else + print ("^1",s1,"'s ^1",s2," kill spree was ended by a team mate!\n"); + } + } + else if(type == KILL_FIRST_BLOOD) + print("^1",s1, "^1 drew first blood", "\n"); + else if (type == DEATH_TELEFRAG) + print ("^1",s1, "^1 was telefragged by ", s2, "\n"); + else if (type == DEATH_DROWN) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); + print ("^1",s1, "^1 was drowned by ", s2, "\n"); + } + else if (type == DEATH_SLIME) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); + print ("^1",s1, "^1 was slimed by ", s2, "\n"); + } + else if (type == DEATH_LAVA) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); + print ("^1",s1, "^1 was cooked by ", s2, "\n"); + } + else if (type == DEATH_FALL) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); + print ("^1",s1, "^1 was grounded by ", s2, "\n"); + } + else if (type == DEATH_SHOOTING_STAR) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); + print ("^1",s1, "^1 was shot into space by ", s2, "\n"); + } + else if (type == DEATH_SWAMP) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); + print ("^1",s1, "^1 was conserved by ", s2, "\n"); + } + else if (type == DEATH_HURTTRIGGER && s3 != "") + { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); + // p ?!?! :o + //if(p < 0) + print("^1", s1, "^1 ", s3, " ", s2, "\n"); + //else + // bprint("^1", s1, "^1 ", substring(s3, 0, p), s2, "^1", substring(s3, p+1, strlen(s3) - (p+1)), "\n"); + } + else if(type == DEATH_SBCRUSH) + print ("^1",s1, "^1 was crushed by ^1", s2, "\n"); + else if(type == DEATH_SBMINIGUN) + print ("^1",s1, "^1 got shredded by ^1", s2, "\n"); + else if(type == DEATH_SBROCKET) + print ("^1",s1, "^1 was blased to bits by ^1", s2, "\n"); + else if(type == DEATH_SBBLOWUP) + print ("^1",s1, "^1 got cought in the destruction of ^1", s2, "'s vehicle\n"); + + else if(type == DEATH_WAKIGUN) + print ("^1",s1, "^1 was bolted down by ^1", s2, "\n"); + else if(type == DEATH_WAKIROCKET) + print ("^1",s1, "^1 could find no shelter from ^1", s2, "'s rockets\n"); + else if(type == DEATH_WAKIBLOWUP) + print ("^1",s1, "^1 dies when ^1", s2, "'s wakizashi dies.\n"); + + else if(type == DEATH_TURRET) + print ("^1",s1, "^1 was pushed into the line of fire by ^1", s2, "\n"); + else if(type == DEATH_TOUCHEXPLODE) + print ("^1",s1, "^1 was pushed into an accident by ^1", s2, "\n"); + else if(type == DEATH_CHEAT) + print ("^1",s1, "^1 was unfairly eliminated by ^1", s2, "\n"); + else if (type == DEATH_FIRE) + print ("^1",s1, "^1 was burnt to death by ^1", s2, "\n"); + else if (type == DEATH_CUSTOM) + print ("^1",s1, "^1 ", s2, "\n"); + else + print ("^1",s1, "^1 was fragged by ", s2, "\n"); + } else if(msg == MSG_SPREE) { + if(type == KILL_END_SPREE) { + if(cvar("cl_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")) + 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")) + 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")) + print (s1,"^7 unleashes ^1SCORING RAGE\n"); + else + print (s1,"^7 unleashes ^1RAGE\n"); + } else if(type == KILL_SPREE_10) { + if(cvar("cl_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")) + 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")) + 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")) + 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")) + print (s1,"^7 made ^1THIRTY SCORES IN A ROW!\n"); + else + print (s1,"^7 unleashes ^1ARMAGEDDON!\n"); + } + } else if(msg == MSG_KILL_ACTION) { // wtf is this? isnt it basically the same as MSG_SUICIDE? + HUD_KillNotify_Push(s1, "", DEATH_KILL); + if (type == DEATH_DROWN) { + if(cvar("cl_gentle")) + print ("^1",s1, "^1 was in the water for too long\n"); + else + print ("^1",s1, "^1 drowned\n"); + } + else if (type == DEATH_SLIME) + print ("^1",s1, "^1 was slimed\n"); + else if (type == DEATH_LAVA) { + if(cvar("cl_gentle")) + print ("^1",s1, "^1 found a hot place\n"); + else + print ("^1",s1, "^1 turned into hot slag\n"); + } + else if (type == DEATH_FALL) { + if(cvar("cl_gentle")) + print ("^1",s1, "^1 tested gravity (and it worked)\n"); + else + print ("^1",s1, "^1 hit the ground with a crunch\n"); + } + else if (type == DEATH_SHOOTING_STAR) + print ("^1",s1, "^1 became a shooting star\n"); + else if (type == DEATH_SWAMP) { + if(cvar("cl_gentle")) + print ("^1",s1, "^1 discovered a swamp\n"); + else + print ("^1",s1, "^1 is now conserved for centuries to come\n"); + } + else if(type == DEATH_TURRET) + print ("^1",s1, "^1 was mowed down by a turret \n"); + else if (type == DEATH_CUSTOM) + print ("^1",s1, "^1 ", s2, "\n"); + else if(type == DEATH_TOUCHEXPLODE) + print ("^1",s1, "^1 died in an accident\n"); + else if(type == DEATH_CHEAT) + print ("^1",s1, "^1 was unfairly eliminated\n"); + else if(type == DEATH_FIRE) { + if(cvar("cl_gentle")) + print ("^1",s1, "^1 felt a little hot\n"); + else + print ("^1",s1, "^1 burnt to death\n"); + } + else { + if(cvar("cl_gentle")) + print ("^1",s1, "^1 needs a restart\n"); + else + print ("^1",s1, "^1 died\n"); + } + } else if(msg == MSG_KILL_ACTION_SPREE) { + HUD_KillNotify_Push(s1, "", DEATH_KILL); + if(cvar("cl_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"); + } else if(msg == MSG_INFO) { + if(type == INFO_GOTFLAG) { + HUD_KillNotify_Push(s1, s2, INFO_GOTFLAG); + print(s1, "^7 got the ", s2, "\n"); + } else if(type == INFO_LOSTFLAG) { + HUD_KillNotify_Push(s1, s2, INFO_LOSTFLAG); + print(s1, "^7 lost the ", s2, "\n"); + } else if(type == INFO_PICKUPFLAG) { + HUD_KillNotify_Push(s1, s2, INFO_GOTFLAG); + print(s1, "^7 picked up the ", s2, "\n"); + } else if(type == INFO_RETURNFLAG) { + HUD_KillNotify_Push(s1, s2, INFO_RETURNFLAG); + print(s1, "^7 returned the ", s2, "\n"); + } + } + +} + +#define DAMAGE_CENTERPRINT_SPACER NEWLINES + +void HUD_Centerprint(string s1, float type, float msg) +{ + 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")) + 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")) + 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")) + 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 == DEATH_MIRRORDAMAGE) { + if(cvar("cl_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")) + 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) { + if(cvar("cl_gentle")) { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against 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")) { + 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")) { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First casualty")); + } else { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First victim")); + } + } else if (type == KILL_TYPEFRAG) { + if(cvar("cl_gentle")) { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^7 who was typing!")); + } else { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1)); + } + } else if (type == KILL_TYPEFRAGGED) { + if(cvar("cl_gentle")) { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^7 while you were typing!")); + } else { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1)); + } + } else if (type == KILL_FRAG) { + if(cvar("cl_gentle")) { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s1)); + } else { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You fragged ^7", s1)); + } + } else if (type == KILL_FRAGGED) { + if(cvar("cl_gentle")) { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were scored against by ^7", s1)); + } else { + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were fragged by ^7", s1)); } - - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - if(rightcnt <= 5) - drawpic_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); - else - drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, rightcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } + } else if(msg == MSG_KILL_ACTION) { + // TODO: invent more centerprints here? + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Watch your step!", s1)); } } -// Health/armor (#3) -// -void HUD_HealthArmor(void) +void HUD_Notify (void) { - float id = 3; + float id = HUD_PANEL_NOTIFY; vector pos, mySize; pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); - HUD_Panel_DrawBg(id, pos, mySize); + HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -1668,270 +2535,136 @@ void HUD_HealthArmor(void) mySize -= '2 2 0' * padding; } - float armor, health; - armor = getstati(STAT_ARMOR); - health = getstati(STAT_HEALTH); - - float fuel; - fuel = getstati(GetAmmoStat(4)); // how much fuel do we have? + float entries, height; + entries = bound(1, floor(12 * mySize_y/mySize_x), 10); + height = mySize_y/entries; + + vector fontsize; + fontsize = '0.5 0.5 0' * height; - if(hud_configure) - { - armor = 150; - health = 100; - fuel = 70; - } + float a; + float when; + when = cvar("hud_notify_time"); + float fadetime; + fadetime = cvar("hud_notify_fadetime"); - if(health <= 0) - return; + string s; - float len; + vector pos_attacker, pos_victim; + vector weap_pos; + float width_attacker, width_victim; + string attacker, victim; - // TODO! - /* - if(hud_hudselector == 2) // combined health and armor display + float i, j; + for(j = 0; j < entries; ++j) { - vector v; - v = healtharmor_maxdamage(health, armor, armorblockpercent); - - vector num_pos; - num_pos = - '96 28 0'; - - x = floor(v_x + 1); + if(cvar("hud_notify_flip")) + i = j; + else // rather nasty hack for ordering items from the bottom up + i = entries - j - 1; - if(v_z) // fully armored + if(fadetime) { - // here, armorideal > armor - drawpic_skin(num_pos + '78 -4.5 0', "health", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(num_pos + '108 -4.5 0', "armor", '20 20 0', '1 1 1', hud_alpha_fg * armor / v_y, DRAWFLAG_NORMAL); + if(killnotify_times[j] + when > time) + a = 1; + else + a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1); } else { - drawpic_skin(num_pos + '108 -4.5 0', "health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL); - drawpic_skin(num_pos + '78 -4.5 0', "armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + if(killnotify_times[j] + when > time) + a = 1; + else + a = 0; } - HUD_DrawXNum_Colored(num_pos, x, 3, 24, hud_alpha_fg); // draw the combined health and armor - } - - else - { - */ - vector barpos, barsize; - vector picpos; - vector numpos; - - string leftname, rightname; - float leftcnt, rightcnt; - float leftactive, rightactive; - float leftalpha, rightalpha; - // TODO! - if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) { // old style layout with armor left/top of health - leftname = "armor"; - leftcnt = armor; - if(leftcnt) - leftactive = 1; - leftalpha = min((armor+10)/55, 1); - - rightname = "health"; - rightcnt = health; - rightactive = 1; - rightalpha = 1; - } else { - leftname = "health"; - leftcnt = health; - leftactive = 1; - leftalpha = 1; - - rightname = "armor"; - rightcnt = armor; - if(rightcnt) - rightactive = 1; - rightalpha = min((armor+10)/55, 1); - } - if (mySize_x/mySize_y > 5) - { - if(leftactive) + // TODO: maybe print in team colors? + // TODO: maybe this could be cleaned up somehow... + // + // X [did action to] Y + if(hud_configure || WEP_VALID(killnotify_deathtype[j]) || killnotify_deathtype[j] == DEATH_FALL) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/200); - barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; - picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y; - numpos = picpos - eX * 3 * 0.5 * mySize_y + eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; - } else { - barpos = pos; - barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; - picpos = pos; - numpos = picpos + eX * mySize_y + eY * 0.25 * mySize_y; + if(hud_configure) + { + attacker = textShortenToWidth("Player1", 0.5 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth("Player2", 0.5 * mySize_x - height, fontsize, stringwidth_colors); } - - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg); - } - - if(rightactive) - { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * 0.5 * mySize_x; - barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; - picpos = pos + eX * 0.5 * mySize_x; - numpos = picpos + eX * mySize_y - eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; - } else { - barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200); - barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; - picpos = pos + eX * mySize_x - eX * mySize_y; - numpos = picpos - eX * 1.5 * mySize_y + eY * 0.25 * mySize_y; + 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); } + 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; + weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, rightcnt, 3, 0.5 * mySize_y, hud_alpha_fg); - } - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos - eX * mySize_x * min(1, fuel/100); - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; - } else { - barpos = pos; - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; - } - if(fuel) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL); - } - else if (mySize_x/mySize_y > 2) - { - if(leftactive) - { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200); - barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; - picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y; - numpos = picpos - eX * len * 0.5 * mySize_y; - } else { - barpos = pos; - barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; - picpos = pos; - numpos = picpos + eX * 0.5 * mySize_y; + if(hud_configure) // example actions for config mode + { + drawpic_skin(weap_pos, strcat("weapon", "electro"), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } - - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg); - } - - if(rightactive) - { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; - barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; - picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y; - numpos = picpos - eX * len * 0.5 * mySize_y; - } else { - barpos = pos + eY * 0.5 * mySize_y; - barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; - picpos = pos + eY * 0.5 * mySize_y; - numpos = picpos + eX * 0.5 * mySize_y; + else if(WEP_VALID(killnotify_deathtype[j])) + { + self = get_weaponinfo(killnotify_deathtype[j]); + drawpic_skin(weap_pos, strcat("weapon", self.netname), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } - - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.5 * mySize_y, hud_alpha_fg); - } - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; - } else { - barpos = pos; - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; - } - if(fuel) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL); - } - else - { - if(leftactive) - { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos; - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); - picpos = pos + eX * 0.05 * mySize_x; - numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x; - } else { - barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200); - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); - picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x; - numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x; + else if(killnotify_deathtype[j] == DEATH_FALL) + { + drawpic_skin(weap_pos, "notify_pushoffedge", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } - - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.166 * mySize_x, hud_alpha_fg); } - if(rightactive) + // Y [used by] X + else { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * 0.5 * mySize_x; - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); - picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; - numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; - } else { - barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200) + eX * 0.5 * mySize_x; - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); - picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x + eX * 0.5 * mySize_x; - numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x + eX * 0.5 * mySize_x; - } + attacker = textShortenToWidth(killnotify_attackers[j], mySize_x - 2 * height, fontsize, stringwidth_colors); - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.166 * mySize_x, hud_alpha_fg); - } + 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; - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos; - barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); - } else { - barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100); - barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); + weap_pos = pos + eX * 0.5 * (mySize_x - width_attacker) - eX * height + eY * i * height; + if(killnotify_deathtype[j] == DEATH_KILL) + { + drawpic_skin(weap_pos, "notify_selfkill", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == INFO_GOTFLAG) + { + if(killnotify_victims[j] == "^1RED^7 flag") + s = "red"; + else + s = "blue"; + drawpic_skin(weap_pos, strcat("flag_", s, "_carrying"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == INFO_RETURNFLAG) + { + if(killnotify_victims[j] == "^1RED^7 flag") + s = "red"; + else + s = "blue"; + drawpic_skin(weap_pos, strcat("flag_", s, "_taken"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == INFO_LOSTFLAG) + { + if(killnotify_victims[j] == "^1RED^7 flag") + s = "red"; + else + s = "blue"; + drawpic_skin(weap_pos, strcat("flag_", s, "_lost"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } } - if(fuel) - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL); - } -} - -// ___TODO___ !!! -// Notification area (#4) -// -void HUD_Notify (void) -{ - float id = 4; - vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); - - HUD_Panel_DrawBg(id, pos, mySize); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) - { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; } - + /* This will come later. string s; entity tm; if(spectatee_status && !intermission) @@ -1945,7 +2678,7 @@ void HUD_Notify (void) pos_x = 0; pos_y = - 50 - hud_fontsize_spec_y; s = textShortenToWidth(s, vid_conwidth/2.5, hud_fontsize_spec, stringwidth_colors); - drawcolorcodedstring(pos, s, hud_fontsize_spec, hud_alpha_fg, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos, s, hud_fontsize_spec, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); drawfont = hud_font; // spectator text in the upper right corner @@ -2047,18 +2780,19 @@ void HUD_Notify (void) } } } + */ } // Timer (#5) // -void HUD_Timer() +void HUD_Timer(void) { - float id = 5; + float id = HUD_PANEL_TIMER; vector pos, mySize; pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); - HUD_Panel_DrawBg(id, pos, mySize); + HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -2102,22 +2836,22 @@ void HUD_Timer() seconds = 99; minutes = min(minutes, 999); if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { - HUD_DrawXNum(pos + eX * mySize_x - eX * 5.1 * mySize_y, minutes, 3, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 2.57 * mySize_y, "num_colon", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 5.1 * mySize_y, minutes, 3, 0, mySize_y, timer_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 2.57 * mySize_y, "num_colon", '1 1 0' * mySize_y, timer_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } - HUD_DrawXNum(pos + eX * mySize_x - eX * 2 * mySize_y, seconds, -2, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 2 * mySize_y, seconds, -2, 0, mySize_y, timer_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } // Radar (#6) // void HUD_Radar(void) { - float id = 6; + float id = HUD_PANEL_RADAR; vector pos, mySize; pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); - HUD_Panel_DrawBg(id, pos, mySize); + HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -2132,7 +2866,7 @@ void HUD_Radar(void) float scale2d, normalsize, bigsize; float f; - teamradar_origin2d = pos + 0.5 * mySize; // TODO: stupid compat, should be removed (hint: code seems to assume origin to be in center, where panelhud code uses pos as topleft pixel) + teamradar_origin2d = pos + 0.5 * mySize; teamradar_size2d = mySize; if(minimapname == "") @@ -2222,7 +2956,7 @@ void HUD_Radar(void) for(tm = world; (tm = find(tm, classname, "radarlink")); ) draw_teamradar_link(tm.origin, tm.velocity, tm.team); for(tm = world; (tm = findflags(tm, teamradar_icon, 0xFFFFFF)); ) - draw_teamradar_icon(tm.origin, tm.teamradar_icon, tm, tm.teamradar_color, hud_alpha_fg); + draw_teamradar_icon(tm.origin, tm.teamradar_icon, tm, tm.teamradar_color, HUD_Panel_GetFgAlpha(id)); for(tm = world; (tm = find(tm, classname, "entcs_receiver")); ) { color2 = GetPlayerColor(tm.sv_entnum); @@ -2236,14 +2970,14 @@ void HUD_Radar(void) // Score (#7) // -void HUD_Score() +void HUD_Score(void) { - float id = 7; + float id = HUD_PANEL_SCORE; vector pos, mySize; pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); - HUD_Panel_DrawBg(id, pos, mySize); + HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -2297,20 +3031,20 @@ void HUD_Score() distribution_color = eX; minusplus = 2; // minusplus 1: always prefix with plus sign } - HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, hud_alpha_fg, DRAWFLAG_ADDITIVE); + HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE); } // race record display if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead - drawpic_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', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_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', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, 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, hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); + HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), 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, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), 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, hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', hud_alpha_fg, 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, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE); */ } else if (!teamplay) { // non-teamgames // me vector := [team/connected frags id] @@ -2343,10 +3077,10 @@ void HUD_Score() score_len = strlen(ftos(score)); distr_len = strlen(ftos(distribution)); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } else { // teamgames float max_fragcount; max_fragcount = -99; @@ -2369,14 +3103,14 @@ void HUD_Score() if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } else { if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("num_leading_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("num_leading_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); teamnum += 1; } } @@ -2386,12 +3120,12 @@ void HUD_Score() // Race timer (#8) // void HUD_RaceTimer (void) { - float id = 8; + float id = HUD_PANEL_RACETIMER; vector pos, mySize; pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); - HUD_Panel_DrawBg(id, pos, mySize); + HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -2407,9 +3141,9 @@ void HUD_RaceTimer (void) { if(hud_configure) { s = "0:13:37"; - drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); s = "^1Intermediate 1 (+15.42)"; - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, hud_alpha_fg, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } else if(race_checkpointtime) { @@ -2443,8 +3177,8 @@ 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', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, hud_alpha_fg * a, DRAWFLAG_NORMAL); + //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } // ___ TODO!!!___ @@ -2455,16 +3189,16 @@ void HUD_RaceTimer (void) { { 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', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); + //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } } 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', hud_alpha_fg, 0, a); - drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.75 * mySize_y), forcetime, '1 1 0' * 0.75 * mySize_y, '1 1 1', hud_alpha_fg, 0, a); + //drawstring_expanding(m - '16 0 0' * stringwidth(forcetime, FALSE), forcetime, '32 32 0', '1 1 1', HUD_Panel_GetFgAlpha(id), 0, a); + drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.75 * mySize_y), forcetime, '1 1 0' * 0.75 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), 0, a); } else a = 1; @@ -2472,8 +3206,8 @@ 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', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + //drawstring(m - '16 0 0' * stringwidth(s, FALSE), s, '32 32 0', '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } } else @@ -2483,16 +3217,16 @@ 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', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos - '0 16 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); + //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos - '0 16 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * 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', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos - '0 0 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); + //drawcolorcodedstring(m - '0 0 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos - '0 0 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } if(race_penaltytime && !race_penaltyaccumulator) @@ -2506,8 +3240,8 @@ void HUD_RaceTimer (void) { 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', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); + //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } } } @@ -2529,7 +3263,7 @@ float vote_change; // "time" when vote_active changed void HUD_VoteWindow(void) { - float id = 9; + float id = HUD_PANEL_VOTE; vector pos, mySize; pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); @@ -2538,23 +3272,27 @@ void HUD_VoteWindow(void) float a; if(vote_active != vote_prev) { vote_change = time; - vote_prev = bound(0, vote_active, 1); + vote_prev = vote_active; } - if(vote_active) + if(vote_active || hud_configure) vote_alpha = bound(0, (time - vote_change) * 2, 1); else vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1); if(hud_configure) { - vote_alpha = 1; vote_yescount = 3; vote_nocount = 2; vote_needed = 4; } - HUD_Panel_DrawBg(id, pos, mySize); + if(!vote_alpha) + return; + + a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1); + + HUD_Panel_DrawBg(id, pos, mySize, a); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -2563,44 +3301,41 @@ void HUD_VoteWindow(void) mySize -= '2 2 0' * padding; } - if(vote_alpha) { - a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1); + drawpic_skin(pos, "voteprogress_back", mySize, '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos, "voteprogress_back", mySize, HUD_Panel_GetColor(id), a * hud_alpha_bg, DRAWFLAG_NORMAL); + s = "A vote has been called for: "; + drawstring(pos + '0.5 0 0' * mySize_x + '0 0.1 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/5)), s, '1 1 0' * mySize_y*(1/5), '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '1 1 0' * mySize_y*(1/5), stringwidth_colors); // TODO: broken? + if(hud_configure) + s = "Configure the HUD"; + drawcolorcodedstring(pos + '0.52 0 0' * mySize_x + '0 0.3 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - s = "A vote has been called for: "; - drawstring(pos + '0.5 0 0' * mySize_x + '0 0.1 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/5)), s, '1 1 0' * mySize_y*(1/5), '1 1 1', a * hud_alpha_fg, DRAWFLAG_NORMAL); - s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '10 0 0', stringwidth_colors); // TODO: broken? - if(hud_configure) - s = "Configure the HUD"; - drawcolorcodedstring(pos + '0.52 0 0' * mySize_x + '0 0.3 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), a * hud_alpha_fg, 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 * HUD_Panel_GetFgAlpha(id), 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 * HUD_Panel_GetFgAlpha(id), 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 * hud_alpha_fg, 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 * hud_alpha_fg, DRAWFLAG_NORMAL); + // draw the progress bars + drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); + drawpic_skin(pos, "voteprogress_prog", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - // draw the progress bars - drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); - drawpic_skin(pos, "voteprogress_prog", mySize, eY, a * hud_alpha_fg, 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, "voteprogress_prog", mySize, eX, a * HUD_Panel_GetFgAlpha(id), 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, "voteprogress_prog", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL); + // draw the highlights + if(vote_highlighted == 1) { + drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y); + drawpic_skin(pos, "voteprogress_voted", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + } + else if(vote_highlighted == 2) { + drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y); + drawpic_skin(pos, "voteprogress_voted", mySize, eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + } - // draw the highlights - if(vote_highlighted == 1) { - drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y); - drawpic_skin(pos, "voteprogress_voted", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL); - } - else if(vote_highlighted == 2) { - drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y); - drawpic_skin(pos, "voteprogress_voted", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL); - } + drawresetcliparea(); - drawresetcliparea(); - } - else if(!vote_active) { + if(!vote_active) { vote_highlighted = 0; } } @@ -2608,6 +3343,8 @@ void HUD_VoteWindow(void) // Mod icons panel (#10) // +float mod_active; // is there any active mod icon? + // CTF HUD modicon section float redflag_prevframe, blueflag_prevframe; // status during previous frame float redflag_prevstatus, blueflag_prevstatus; // last remembered status @@ -2630,6 +3367,11 @@ void HUD_Mod_CTF(vector pos, vector mySize) stat_items = getstati(STAT_ITEMS); redflag = (stat_items/IT_RED_FLAG_TAKEN) & 3; blueflag = (stat_items/IT_BLUE_FLAG_TAKEN) & 3; + + if(redflag || blueflag) + mod_active = 1; + else + mod_active = 0; if(hud_configure) { @@ -2730,15 +3472,15 @@ void HUD_Mod_CTF(vector pos, vector mySize) f = bound(0, redflag_statuschange_elapsedtime*2, 1); if(red_icon_prevstatus && f < 1) - drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg * red_alpha_prevstatus, DRAWFLAG_NORMAL, f); + drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f); if(red_icon) - drawpic_skin(redflag_pos, red_icon, '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg * red_alpha * f, DRAWFLAG_NORMAL); + drawpic_skin(redflag_pos, red_icon, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL); f = bound(0, blueflag_statuschange_elapsedtime*2, 1); if(blue_icon_prevstatus && f < 1) - drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f); + drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f); if(blue_icon) - drawpic_skin(blueflag_pos, blue_icon, '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg * blue_alpha * f, DRAWFLAG_NORMAL); + drawpic_skin(blueflag_pos, blue_icon, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL); } // Keyhunt HUD modicon section @@ -2751,6 +3493,7 @@ void HUD_Mod_KH_Reset(void) void HUD_Mod_KH(vector pos, vector mySize) { + mod_active = 1; // keyhunt should never hide the mod icons panel float kh_keys; float keyteam; float a, aa; @@ -2782,6 +3525,7 @@ void HUD_Mod_KH(vector pos, vector mySize) if(keyteam == myteam || keyteam == -1 || keyteam == 30) keycount += 1; } + // this yields 8 exactly if "RUN HERE" shows if(keycount == 8) @@ -2813,8 +3557,8 @@ void HUD_Mod_KH(vector pos, vector mySize) aa = 0.5; break; } - a = a * hud_alpha_fg; - aa = aa * hud_alpha_fg; + a = a * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS); + aa = aa * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS); if(a > 0) { switch(keyteam) @@ -2863,6 +3607,11 @@ void HUD_Mod_NexBall(vector pos, vector mySize) stat_items = getstati(STAT_ITEMS); nb_pb_starttime = getstatf(STAT_NB_METERSTART); + if (stat_items & IT_KEY1) + mod_active = 1; + else + mod_active = 0; + //Manage the progress bar if any if (nb_pb_starttime > 0) { @@ -2873,13 +3622,13 @@ void HUD_Mod_NexBall(vector pos, vector mySize) p = 2 - p; //Draw the filling - HUD_Panel_DrawProgressBar(pos, 0, eX * p * mySize_x + eY * mySize_y, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, 0, eX * p * mySize_x + eY * mySize_y, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } pos_x += 0.5 * mySize_x - 0.5 * mySize_y; //horizontal margin to the picture if (stat_items & IT_KEY1) - drawpic_skin(pos, "nexball_carrying", '1 1 0' * mySize_y, '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic_skin(pos, "nexball_carrying", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } // Race/CTS HUD mod icons @@ -2893,6 +3642,7 @@ float race_status_prev; string race_status_name_prev; void HUD_Mod_Race(vector pos, vector mySize) { + mod_active = 1; // race should never hide the mod icons panel entity me; me = playerslots[player_localentnum - 1]; float t, score; @@ -2929,13 +3679,13 @@ void HUD_Mod_Race(vector pos, vector mySize) f = time - crecordtime_change_time; if (f > 1) { - drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + drawstring(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } else { - drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring_expanding(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', hud_alpha_fg, 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', hud_alpha_fg, DRAWFLAG_NORMAL, f); + drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + drawstring(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + drawstring_expanding(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), 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', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL, f); } // server record @@ -2947,13 +3697,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', hud_alpha_fg, 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', hud_alpha_fg, DRAWFLAG_NORMAL); + drawstring(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), 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', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } else { - drawstring(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', hud_alpha_fg, 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', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring_expanding(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', hud_alpha_fg, 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', hud_alpha_fg, DRAWFLAG_NORMAL, f); + drawstring(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), 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', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + drawstring_expanding(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), 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', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL, f); } if (race_status != race_status_prev || race_status_name != race_status_name_prev) { @@ -2979,22 +3729,22 @@ void HUD_Mod_Race(vector pos, vector mySize) rankname = race_PlaceName(rank); if(race_status == 0) - drawpic_skin(pos, "race_newfail", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newfail", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); else if(race_status == 1) { - drawpic_skin(pos, "race_newtime", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newtime", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); } else if(race_status == 2) { if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank) - drawpic_skin(pos, "race_newrankgreen", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrankgreen", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); else - drawpic_skin(pos, "race_newrankyellow", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrankyellow", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); } else if(race_status == 3) { - drawpic_skin(pos, "race_newrecordserver", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); - drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrecordserver", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); } if (race_status_time - time <= 0) { @@ -3010,17 +3760,33 @@ void HUD_Mod_Race(vector pos, vector mySize) drawfont = hud_font; } -// TODO: idea: alpha fade in/out empty panels +float mod_prev; // previous state of mod_active to check for a change +float mod_alpha; +float mod_change; // "time" when mod_active changed + void HUD_ModIcons(void) { if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !hud_configure) return; - float id = 10; + + float id = HUD_PANEL_MODICONS; vector pos, mySize; pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); - HUD_Panel_DrawBg(id, pos, mySize); + if(mod_active != mod_prev) { + mod_change = time; + mod_prev = mod_active; + } + + if(mod_active || hud_configure) + mod_alpha = bound(0, (time - mod_change) * 2, 1); + else + mod_alpha = bound(0, 1 - (time - mod_change) * 2, 1); + + if(mod_alpha) + HUD_Panel_DrawBg(id, pos, mySize, mod_alpha); + float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -3029,11 +3795,11 @@ void HUD_ModIcons(void) mySize -= '2 2 0' * padding; } - // TODO... well make them work in a panel etc + // these MUST be ran in order to update mod_active if(gametype == GAME_KEYHUNT) HUD_Mod_KH(pos, mySize); else if(gametype == GAME_CTF || hud_configure) - HUD_Mod_CTF(pos, mySize); + HUD_Mod_CTF(pos, mySize); // forcealpha only needed for ctf icons, as only they are shown in config mode else if(gametype == GAME_NEXBALL) HUD_Mod_NexBall(pos, mySize); else if(gametype == GAME_CTS || gametype == GAME_RACE) @@ -3044,12 +3810,12 @@ void HUD_ModIcons(void) // void HUD_DrawPressedKeys(void) { - float id = 11; + float id = HUD_PANEL_PRESSEDKEYS; vector pos, mySize; pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); - HUD_Panel_DrawBg(id, pos, mySize); + HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; padding = HUD_Panel_GetPadding(id); if(padding) @@ -3061,13 +3827,50 @@ void HUD_DrawPressedKeys(void) float pressedkeys; pressedkeys = getstatf(STAT_PRESSED_KEYS); - drawpic_skin(pos, "key_bg.tga", mySize, '1 1 1', 0.1 * hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 0.22 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.023 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.1 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 0.372 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, "key_bg.tga", mySize, '1 1 1', 0.1 * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 0.22 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.023 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.1 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 0.372 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); +} + +// Handle chat as a panel (#12) +// +void HUD_Chat(void) +{ + float id = HUD_PANEL_CHAT; + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); + + HUD_Panel_DrawBg(id, pos, mySize, 0); + float padding; + padding = HUD_Panel_GetPadding(id); + if(padding) + { + pos += '1 1 0' * padding; + mySize -= '2 2 0' * padding; + } + + cvar_set("con_chatrect", "1"); + + cvar_set("con_chatrect_x", ftos(pos_x/vid_conwidth)); + cvar_set("con_chatrect_y", ftos(pos_y/vid_conheight)); + + cvar_set("con_chatwidth", ftos(mySize_x/vid_conwidth)); + cvar_set("con_chat", ftos(floor(mySize_y/cvar("con_chatsize") - 0.5))); + + if(hud_configure) + { + cvar_set("con_chatrect_x", "9001"); // over 9000, we'll fake it instead for more control over alpha and such + float i; + for(i = 0; i < cvar("con_chat"); ++i) + { + drawcolorcodedstring(pos + eY * i * cvar("con_chatsize"), "^3Player^7: This is the chat area.", '1 1 0' * cvar("con_chatsize"), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + } + } } /* @@ -3117,11 +3920,11 @@ void HUD_ShowSpeed(void) pos = (vid_conheight - numsize_y) * cvar("cl_showspeed_position"); drawfont = hud_bigfont; - drawstringcenter(eX + pos * eY, speed, numsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawstringcenter(eX + pos * eY, speed, numsize, '1 1 1', hud_fg_alpha, DRAWFLAG_NORMAL); if (cvar("cl_showspeed_z") == 1) { zspeed = strcat(ftos(fabs(floor( pmove_vel_z * conversion_factor + 0.5 ))), unit); - drawstringcenter(eX + pos * eY + numsize_y * eY, zspeed, numsize * 0.5, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawstringcenter(eX + pos * eY + numsize_y * eY, zspeed, numsize * 0.5, '1 1 1', hud_fg_alpha, DRAWFLAG_NORMAL); } drawfont = hud_font; @@ -3167,9 +3970,9 @@ void HUD_ShowAcceleration(void) } if (acceleration > 0) - HUD_Panel_DrawProgressBar(pos, 0, acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, 0, acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_fg_alpha, DRAWFLAG_NORMAL); else if (acceleration < 0) - HUD_Panel_DrawProgressBar(pos + acceleration * scale * '40 0 0', 0, -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos + acceleration * scale * '40 0 0', 0, -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_fg_alpha, DRAWFLAG_NORMAL); } void HUD_Reset (void) @@ -3183,7 +3986,12 @@ void HUD_Reset (void) void HUD_Main (void) { - hud_alpha_bg = cvar_or("hud_bg_alpha", 0.8) * (1 - cvar("_menu_alpha")); + if(disable_menu_alphacheck == 1) + menu_fade_alpha = 1; + else + menu_fade_alpha = (1 - cvar("_menu_alpha")); + hud_fg_alpha = cvar("hud_fg_alpha"); + hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5); hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5); hud_color_bg_team = cvar("hud_color_bg_team"); @@ -3194,42 +4002,69 @@ void HUD_Main (void) hud_configure = cvar("_hud_configure"); // Drawing stuff + + // HUD configure visible grid + if(hud_configure && cvar("hud_configure_grid") && cvar("hud_configure_grid_alpha")) + { + float i; + // x-axis + for(i = 0; i < vid_conwidth/max(2, cvar("hud_configure_grid_x")); ++i) + { + drawfill(eX * i * max(2, cvar("hud_configure_grid_x")), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL); + } + // y-axis + for(i = 0; i < vid_conheight/max(2, cvar("hud_configure_grid_y")); ++i) + { + drawfill(eY * i * max(2, cvar("hud_configure_grid_y")), eY + eX * vid_conwidth, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL); + } + } + if(cvar_string("hud_dock") != "") - drawpic_skin('0 0 0', cvar_string("hud_dock"), eX * vid_conwidth + eY * vid_conheight, stov(cvar_string("hud_dock_color")), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL); + drawpic_skin('0 0 0', cvar_string("hud_dock"), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL); - if(HUD_Panel_CheckActive(0)) + if(HUD_Panel_CheckActive(HUD_PANEL_WEAPONICONS) || hud_configure) HUD_WeaponIcons(); - if(HUD_Panel_CheckActive(1)) + if(HUD_Panel_CheckActive(HUD_PANEL_INVENTORY) || hud_configure) HUD_Inventory(); - if(HUD_Panel_CheckActive(2)) + if(HUD_Panel_CheckActive(HUD_PANEL_POWERUPS) || hud_configure) HUD_Powerups(); - if(HUD_Panel_CheckActive(3)) + if(HUD_Panel_CheckActive(HUD_PANEL_HEALTHARMOR) || hud_configure) HUD_HealthArmor(); - if(HUD_Panel_CheckActive(4)) + if(HUD_Panel_CheckActive(HUD_PANEL_NOTIFY) || hud_configure) HUD_Notify(); - if(HUD_Panel_CheckActive(5)) + if(HUD_Panel_CheckActive(HUD_PANEL_TIMER) || hud_configure) HUD_Timer(); // TODO hud'ify - if(HUD_Panel_CheckActive(6)) + if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure) if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay)) HUD_Radar(); - if(HUD_Panel_CheckActive(7)) + if(HUD_Panel_CheckActive(HUD_PANEL_SCORE) || hud_configure) HUD_Score(); - if(HUD_Panel_CheckActive(8)) + if(HUD_Panel_CheckActive(HUD_PANEL_RACETIMER) || hud_configure) if(gametype == GAME_RACE || gametype == GAME_CTS || hud_configure) HUD_RaceTimer(); - if(HUD_Panel_CheckActive(9)) + if(HUD_Panel_CheckActive(HUD_PANEL_VOTE) || hud_configure) HUD_VoteWindow(); - if(HUD_Panel_CheckActive(10)) + if(HUD_Panel_CheckActive(HUD_PANEL_MODICONS) || hud_configure) HUD_ModIcons(); // TODO hud'ify - if(HUD_Panel_CheckActive(11)) + if(HUD_Panel_CheckActive(HUD_PANEL_PRESSEDKEYS) || hud_configure) if(spectatee_status > 0 || cvar("hud_pressedkeys") >= 2 || hud_configure) HUD_DrawPressedKeys(); + if(HUD_Panel_CheckActive(HUD_PANEL_CHAT) || hud_configure) + HUD_Chat(); + else + cvar_set("con_csqcpositioning", "0"); // TODO hud_'ify these if (cvar("cl_showspeed")) HUD_ShowSpeed(); if (cvar("cl_showacceleration")) HUD_ShowAcceleration(); + + if (hud_configure && spectatee_status) // try to join if we are in hud_configure mode, but still spectating (in order to get rid of motd and such) + localcmd("cmd selectteam auto; cmd join\n"); + + if (!hud_configure) // hud config mode disabled, enable normal alpha stuff again + disable_menu_alphacheck = 0; }