X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=088424eab54984eb045f18bdc1aeb9a6e933c8a6;hp=4a118d4b778c659a574d4ae95fdd7a97528e5f53;hb=b66a5a64ce256767913d7f5d48b540e7e1faca0f;hpb=92f380c831a67868ddde14db32e0d73700ed7d09 diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 4a118d4b77..088424eab5 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -75,6 +75,19 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the } } +// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga +void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) { + drawpic(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, color, alpha, drawflag); +} + +void drawpic_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) { + drawpic_expanding(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp); +} + +void drawpic_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) { + drawpic_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp); +} + // return HUD background color vector HUD_GetBgColor() { @@ -94,7 +107,7 @@ vector HUD_GetBgColor() vector HUD_AccuracyColor(float accuracy) { vector rgb; - float yellow_accuracy = cvar("hud_accuracy_yellow"); // value at which this function returns yellow + float yellow_accuracy = cvar("hud_weaponicons_accuracy_yellow"); // value at which this function returns yellow if(accuracy >= 100) { rgb_x = 0; rgb_y = 1; @@ -172,7 +185,7 @@ void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float le hl_pos_y = pos_y - lettersize/20; hl_pos_z = 0; - drawpic(hl_pos, strcat("gfx/hud/sb_highlight_", l_length), hl_size, '1 1 1', alpha, dflags); + drawpic_skin(hl_pos, strcat("num_leading_", l_length), hl_size, '1 1 1', alpha, dflags); } if (stroke == 1) @@ -183,14 +196,14 @@ void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float le if(minus) { if (stroke == 1) - drawpic(pos, "gfx/hud/num_minus_stroke", vsize, rgb, alpha, dflags); - drawpic(pos, "gfx/hud/num_minus", vsize, num_color, alpha, dflags); + drawpic_skin(pos, "num_minus_stroke", vsize, rgb, alpha, dflags); + drawpic_skin(pos, "num_minus", vsize, num_color, alpha, dflags); pos_x += lettersize; } else if(plus) { if (stroke == 1) - drawpic(pos, "gfx/hud/num_plus_stroke", vsize, rgb, alpha, dflags); - drawpic(pos, "gfx/hud/num_plus", vsize, num_color, alpha, dflags); + drawpic_skin(pos, "num_plus_stroke", vsize, rgb, alpha, dflags); + drawpic_skin(pos, "num_plus", vsize, num_color, alpha, dflags); pos_x += lettersize; } @@ -198,8 +211,8 @@ void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float le { tmp = substring(str, i, 1); if (stroke == 1) - drawpic(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags); - drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags); + drawpic_skin(pos, strcat("num_", tmp, "_stroke"), vsize, rgb, alpha, dflags); + drawpic_skin(pos, strcat("num_", tmp), vsize, num_color, alpha, dflags); pos_x += lettersize; } } @@ -550,34 +563,125 @@ string HUD_Panel_GetName(float id) case 7: return "score"; break; case 8: return "racetimer"; break; case 9: return "vote"; break; - case 10: return "pressedkeys"; break; + case 10: return "modicons"; break; + case 11: return "pressedkeys"; break; default: return ""; } } -vector HUD_Panel_CheckLimitSize(float id, vector mySize) +// Save the config +void HUD_Panel_ExportCfg(string cfgname) +{ + float fh; + fh = fopen(strcat("hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg"), FILE_WRITE); + if(fh >= 0) + { + fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n")); + fputs(fh, strcat("seta hud_bg \"", cvar_string("hud_bg"), "\"", "\n")); + fputs(fh, strcat("seta hud_bg_color \"", cvar_string("hud_bg_color"), "\"", "\n")); + fputs(fh, strcat("seta hud_bg_color_team \"", cvar_string("hud_bg_color_team"), "\"", "\n")); + fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n")); + fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n")); + fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n")); + fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n")); + fputs(fh, "\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"); + + fputs(fh, strcat("seta hud_progressbar_alpha ", ftos(cvar("hud_progressbar_alpha")), "\n")); + fputs(fh, strcat("seta hud_progressbar_strength_color \"", cvar_string("hud_progressbar_strength_color"), "\"", "\n")); + fputs(fh, strcat("seta hud_progressbar_shield_color \"", cvar_string("hud_progressbar_shield_color"), "\"", "\n")); + fputs(fh, strcat("seta hud_progressbar_health_color \"", cvar_string("hud_progressbar_health_color"), "\"", "\n")); + fputs(fh, strcat("seta hud_progressbar_armor_color \"", cvar_string("hud_progressbar_armor_color"), "\"", "\n")); + fputs(fh, strcat("seta hud_progressbar_fuel_color \"", cvar_string("hud_progressbar_fuel_color"), "\"", "\n")); + fputs(fh, strcat("seta hud_progressbar_nexball_color \"", cvar_string("hud_progressbar_nexball_color"), "\"", "\n")); + fputs(fh, "\n"); + + // common cvars for all panels + float i; + for (i = 0; i < panel_cnt; ++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")); + switch(i) { + case 0: + fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_accuracy_height ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_accuracy_height"))), "\n")); + fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_accuracy_yellow ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_accuracy_yellow"))), "\n")); + break; + case 1: + fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_onlycurrent ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_onlycurrent"))), "\n")); + break; + case 2: + 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 3: + 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 9: + fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha"))), "\n")); + break; + } + fputs(fh, "\n"); + } + + print("^2Successfully exported to hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n"); + } + fclose(fh); +} + +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: - mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height + if(cvar("hud_healtharmor") == 2) + mySize_y = 0.23; // 0.23 * width, trial and error... break; case 5: - mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height + mySize_y = 1/4.1; // 1/4.1 * width, trial and error... + break; + case 7: + mySize_y = 1/4; // 1/4 * width + break; + case 8: + 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 = 0.5898 * mySize_x; // 0.5898 * width, reason: bg has weird dimensions... + mySize_y = 1/2; // 1/2 * width + break; + case 11: + mySize_y = 0.5898; // 0.5898 * width, reason: bg has weird dimensions... break; } + if(!mySize_x) + mySize_x = 1/mySize_y; return mySize; } @@ -592,7 +696,12 @@ float HUD_Panel_CheckActive(float id) // return size of given panel vector HUD_Panel_GetSize(float id) { - return stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size"))); + vector mySize; + mySize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size"))); + + mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight; + + return mySize; } // return pos of given panel @@ -601,6 +710,8 @@ vector HUD_Panel_GetPos(float id) vector pos; pos = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_pos"))); + pos = eX * pos_x * vid_conwidth + eY * pos_y * vid_conheight; + if (pos_x < 0) pos_x = vid_conwidth + pos_x; if (pos_y < 0) @@ -608,55 +719,174 @@ vector HUD_Panel_GetPos(float id) return pos; } -float HUD_Panel_GetMarigin(float id) +float HUD_Panel_GetBorder(float id) { - return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_marigin"), 30), 200); + string border; + border = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_border")); + if(border == "") + border = cvar_string("hud_bg_border"); + return stof(border); } vector HUD_Panel_GetColor(float id) { - if(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_color")) != "") - return stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_color"))); + float f; + vector color_vec; + string 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 - return stov(cvar_string("hud_color")); + 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"); + 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_GetBgActive(float id) +vector HUD_Panel_Dock_GetColor(void) { - if(cvar("_hud_configure")) - return 1; + 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_GetAlpha(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); +} + +float HUD_Panel_GetPadding(float id) +{ + string padding; + padding = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding")); + if(padding == "") + padding = cvar_string("hud_bg_padding"); + return stof(padding); +} + +// draw the background/borders +void HUD_Panel_DrawBg(float id, vector pos, vector mySize) +{ + float alpha; + + if(!hud_configure && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0") + return; + + string bg; + bg = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")); + if(bg == "") + bg = cvar_string("hud_bg"); + + 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") + { + float border; + border = max(0.0000001, HUD_Panel_GetBorder(id)); // draw_BorderPicture does not like border = 0 + + vector color; + color = HUD_Panel_GetColor(id); + + if(!alpha) + alpha = HUD_Panel_GetAlpha(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)); + } +} - return cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_bg"), 1); +void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag) +{ +//float drawsubpic(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) = #328; + string pic; + pic = strcat("gfx/hud/", cvar_string("hud_skin"), "/"); + if(vertical) { + drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0 0', '1 0.25 0', color, alpha, drawflag); + if(mySize_y/mySize_x > 2) + drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.25 0', '1 0.5 0', color, alpha, drawflag); + drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.75 0', '1 0.25 0', color, alpha, drawflag); + } else { + drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0 0 0', '0.25 1 0', color, alpha, drawflag); + if(mySize_x/mySize_y > 2) + drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.25 0 0', '0.5 1 0', color, alpha, drawflag); + drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.75 0 0', '0.25 1 0', color, alpha, drawflag); + } } vector HUD_Panel_GetProgressBarColor(string item) { - return stov(cvar_string(strcat("hud_progreshud_", item, "_color"))); + 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; vector myCenter; vector targCenter; + 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) { 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_GetMarigin(id); - targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetMarigin(id); + targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id); + targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id); if(myPos_y + mySize_y < targPos_y) continue; @@ -676,25 +906,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; - float k, 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; } @@ -710,63 +939,61 @@ 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 myPos; - myPos = HUD_Panel_GetPos(id); + vector oldPos; + oldPos = HUD_Panel_GetPos(id); - // check for collisions - mySize = HUD_Panel_CheckResize(id, HUD_Panel_GetPos(id), mySize); + vector mySize; + mySize = HUD_Panel_GetSize(id); - 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); + if(cvar("hud_configure_checkcollisions")) + pos = HUD_Panel_CheckMove(id, pos, mySize); - // cap against panel's own limits - mySize = HUD_Panel_CheckLimitSize(id, mySize); + pos_x = bound(0, pos_x, vid_conwidth - mySize_x); + pos_y = bound(0, pos_y, vid_conheight - mySize_y); - //mySize_x = bound(0.025 * vid_conwidth, mySize_x, vid_conwidth); - //mySize_y = bound(0.025 * vid_conheight, mySize_y, vid_conheight); + 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"); + } - // 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), " ", ftos(mySize_y)); - 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; vector myCenter; vector targCenter; + 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) { if(i == id || !HUD_Panel_CheckActive(i)) continue; - targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetMarigin(id); - targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetMarigin(id); + 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); if(myPos_y + mySize_y < targPos_y) continue; @@ -786,25 +1013,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; - float k, 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; } @@ -820,33 +1046,95 @@ 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); + } - 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); + // 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")) + { + 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), " ", ftos(pos_y)); + 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); } @@ -869,12 +1157,6 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) return false; } -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) { @@ -887,19 +1169,19 @@ void HUD_Panel_Mouse() mousepos_x = bound(0, mousepos_x, vid_conwidth); mousepos_y = bound(0, mousepos_y, vid_conheight); - drawpic(mousepos, "gfx/menu/default/cursor.tga", '32 32 0', '1 1 1', 1, hud_alpha_fg); + drawpic(mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL); if(mouseClicked) { - float i, marigin; + float i, border; vector panelPos; vector panelSize; - for(i = 0; i <= panel_cnt; i++) + for(i = 0; i <= panel_cnt; ++i) { panelPos = HUD_Panel_GetPos(i); panelSize = HUD_Panel_GetSize(i); - marigin = HUD_Panel_GetMarigin(i); + border = HUD_Panel_GetBorder(i); if(prevMouseClicked == 0) { // move if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y) @@ -908,28 +1190,28 @@ void HUD_Panel_Mouse() highlightedAction = 1; } // resize from topleft border - else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y - eX * marigin && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y) + else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y) { highlightedPanel = i; highlightedAction = 2; resizeCorner = 1; } // resize from topright border - else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - eX * marigin && mousepos_x <= panelPos_x + panelSize_x + eX * marigin && mousepos_y <= panelPos_y + 0.5 * panelSize_y) + else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y) { highlightedPanel = i; highlightedAction = 2; resizeCorner = 2; } // resize from bottomleft border - else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + eY * marigin) + else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border) { highlightedPanel = i; highlightedAction = 2; resizeCorner = 3; } // resize from bottomright border - else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + eX * marigin && mousepos_y <= panelPos_y + panelSize_y + eY * marigin) + else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border) { highlightedPanel = i; highlightedAction = 2; @@ -941,51 +1223,40 @@ 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); } } } - 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]; void HUD_WeaponIcons_Clear() { @@ -994,28 +1265,56 @@ void HUD_WeaponIcons_Clear() weaponspace[idx] = 0; } +entity weaponorder[WEP_MAXCOUNT]; + +void weaponorder_swap(float i, float j, entity pass) +{ + entity h; + h = weaponorder[i]; + weaponorder[i] = weaponorder[j]; + weaponorder[j] = h; +} + +float weaponorder_cmp(float i, float j, entity pass) +{ + float d; + d = mod(weaponorder[i].impulse + 9, 10) - mod(weaponorder[j].impulse + 9, 10); + if(d) + return d; + d = weaponorder[i].weapon - weaponorder[j].weapon; + return d; +} + void HUD_WeaponIcons() { - float alpha, height, marigin, accuracybar_height, stat_weapons; // "constants" - vector pos, mySize, mysize, mypos, color, accuracy_color; - float i, id, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables + float id = 0; + float alpha, stat_weapons; // "constants" + vector pos, mySize, accuracy_color; + float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables - marigin = HUD_Panel_GetMarigin(0); - pos = HUD_Panel_GetPos(0); - mySize = HUD_Panel_GetSize(0); - color = HUD_Panel_GetColor(0); - accuracybar_height = cvar_or("hud_weaponicons_accuracybar_height", 3); + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); stat_weapons = getstati(STAT_WEAPONS); for(i = WEP_FIRST; i <= WEP_LAST; ++i) { self = get_weaponinfo(i); - if(self.weapons && self.impulse >= 0 && stat_weapons & self.weapons) + if(self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons) || hud_configure) + { + weaponorder[weapon_cnt] = self; ++weapon_cnt; + } } + heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world); - if(HUD_Panel_GetBgActive(0) && weapon_cnt) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + 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; + } // hits weapon_stats = getstati(STAT_DAMAGE_HITS); @@ -1037,55 +1336,27 @@ void HUD_WeaponIcons() HUD_WeaponIcons_Clear(); float rows, columns; - //TODO: yuck. there must be a better way :) - //rows = ceil(4 * mySize_y/mySize_x); - if(mySize_y/mySize_x < 0.08) - rows = 1; - else if(mySize_y/mySize_x < 0.25) - rows = 2; - else if(mySize_y/mySize_x < 0.5) - rows = 3; - else if(mySize_y/mySize_x < 0.7) - rows = 4; - else if(mySize_y/mySize_x < 0.9) - rows = 5; - else if(mySize_y/mySize_x < 1.25) - rows = 6; - else if(mySize_y/mySize_x < 1.7) - rows = 7; - else if(mySize_y/mySize_x < 2.5) - rows = 8; - else if(mySize_y/mySize_x < 4) - rows = 12; - else if(mySize_y/mySize_x < 6) - rows = 14; - else - rows = 16; + rows = mySize_y/mySize_x; + rows = bound(1, floor((sqrt(4 * (2/1) * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT); + // ^^^ weapon icon aspect goes here - columns = ceil(16/rows); + columns = ceil(WEP_COUNT/rows); float row, column; - for(i = WEP_FIRST; i <= WEP_LAST; ++i) + for(i = 0; i < weapon_cnt; ++i) { - self = get_weaponinfo(i); - if((self.weapons && self.impulse >= 0 && stat_weapons & self.weapons) || cvar("_hud_configure")) + self = weaponorder[i]; + if((self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons)) || hud_configure) { - id = self.impulse; + weapid = self.impulse; - alpha = (id == activeweapon) ? 1 : 0.6; + alpha = (self.weapon == activeweapon) ? 1 : 0.6; weapon_hit = weapon_hits[self.weapon-WEP_FIRST]; weapon_damage = weapon_fired[self.weapon-WEP_FIRST]; - if(id == 0) // porto and hook should be last - id = 9; - else - id = --id; - - if(id+1 == activeweapon) - drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "gfx/hud/sb_ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), color, fade * hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("gfx/hud/inv_weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL); - if(cvar_or("hud_weaponicons_number", 1)) - drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(id+1), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + // 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); // draw the weapon accuracy on the HUD if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS)) @@ -1095,8 +1366,14 @@ void HUD_WeaponIcons() accuracy_color = HUD_AccuracyColor(weapon_stats); if(weapon_damage) - drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - '2 0 0' + eY * (mySize_y/rows - accuracybar_height), "gfx/hud/sb_accuracy_bar.tga", eX * mySize_x*(1/columns) + eY * accuracybar_height, 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_alpha_fg, 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); + + 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); } ++row; @@ -1111,7 +1388,6 @@ void HUD_WeaponIcons() // Inventory (#1) // - float GetAmmoStat(float i) { switch(i) @@ -1142,46 +1418,49 @@ string GetAmmoPicture(float i) { switch(i) { - case 0: return "gfx/hud/sb_shells"; - case 1: return "gfx/hud/sb_bullets"; - case 2: return "gfx/hud/sb_rocket"; - case 3: return "gfx/hud/sb_cells"; - case 4: return "gfx/hud/sb_fuel"; + case 0: return "ammo_shells"; + case 1: return "ammo_bullets"; + case 2: return "ammo_rockets"; + case 3: return "ammo_cells"; + case 4: return "ammo_fuel"; default: return ""; } } void HUD_Inventory() { + float id = 1; float i; float stat_items; - float marigin; - vector pos, mySize, mysize, mypos, color; - marigin = HUD_Panel_GetMarigin(1); - pos = HUD_Panel_GetPos(1); - mySize = HUD_Panel_GetSize(1); - color = HUD_Panel_GetColor(1); + vector pos, mySize, mysize, mypos; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); - if(HUD_Panel_GetBgActive(1)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + 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; + } // ammo stat_items = getstati(STAT_ITEMS); for (i = 0; i < 4; ++i) { float a; a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i? - if(cvar("_hud_configure")) + if(hud_configure) a = 100; - if(cvar("hud_ammo_onlycurrent")) { + if(cvar("hud_inventory_onlycurrent")) { if (stat_items & GetAmmoItemCode(i)) { - drawpic(pos - '1 1 0' * marigin, "gfx/hud/sb_ammobg", mysize + '1 1 0' * marigin, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * mysize_x * 1.7, GetAmmoPicture(i), '24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, GetAmmoPicture(i), '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); if(a < 10) - HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '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_alpha_fg, DRAWFLAG_NORMAL); else - HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '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_alpha_fg, DRAWFLAG_NORMAL); } } else { if (a > 0) { @@ -1215,8 +1494,8 @@ void HUD_Inventory() } if (stat_items & GetAmmoItemCode(i)) - drawpic(mypos, "gfx/hud/sb_ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(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_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); 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); @@ -1231,96 +1510,228 @@ void HUD_Inventory() } } } +} - // fuel ammo - a = getstati(GetAmmoStat(4)); // how much fuel do we have? - if (a > 0) { // if we have fuel, draw the amount - if(pos_x + 0.5 * mySize_x > 0.5 * vid_conwidth) - mypos_x += pos_x + mySize_x - 0; // TODO! +// Powerups (#2) +// +void HUD_Powerups() { + float id = 2; + float stat_items; + stat_items = getstati(STAT_ITEMS); - drawpic(mypos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - if (a > 10) - HUD_DrawXNum(mypos, a, 3, 0, 16, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); - else - HUD_DrawXNum(mypos, a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + if(!hud_configure) + { + if not(stat_items & IT_STRENGTH) + if not(stat_items & IT_INVINCIBLE) + return; + + if (getstati(STAT_HEALTH) <= 0) + return; } -} + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); -// Powerups (#2) -// TODO! -void HUD_Powerups() { - float stat_items, dt; - float marigin; + 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; + } - vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(2); - pos = HUD_Panel_GetPos(2); - mySize = HUD_Panel_GetSize(2); - color = HUD_Panel_GetColor(2); + float strength_time, shield_time; - if(HUD_Panel_GetBgActive(2)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + strength_time = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 99); + shield_time = bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 99); - stat_items = getstati(STAT_ITEMS); - /* - if not(stat_items & IT_STRENGTH) - if not(stat_items & IT_INVINCIBLE) - return; - */ + if(hud_configure) + { + strength_time = 15; + shield_time = 27; + } - if (getstati(STAT_HEALTH) <= 0) - return; + float len; + + vector barpos, barsize; + vector picpos; + vector numpos; + + string leftname, rightname; + float leftcnt, rightcnt; + float leftexact, rightexact; + float leftalpha, rightalpha; + if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) { + leftname = "strength"; + leftcnt = ceil(strength_time); + leftexact = strength_time; - float strength_time, invincibility_time, countdown_fontsize; + rightname = "shield"; + rightcnt = ceil(shield_time); + rightexact = shield_time; + } else { + leftname = "shield"; + leftcnt = ceil(shield_time); + leftexact = shield_time; - //strength - strength_time = getstatf(STAT_STRENGTH_FINISHED); - invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED); + rightname = "strength"; + rightcnt = ceil(strength_time); + rightexact = strength_time; + } + leftalpha = bound(0, leftexact, 1); + rightalpha = bound(0, rightexact, 1); - if (strength_time) { - dt = strength_time - time; - if(dt > 0) + if (mySize_x/mySize_y > 4) + { + if(leftcnt) { - if(dt < 5) - { - drawpic_expanding_two(pos, "gfx/hud/sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, - bound(0, (ceil(dt) - dt) / 0.5, 1)); + 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/30); + barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; + picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y; + numpos = picpos - eX * 2 * 0.5 * mySize_y + eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; + } else { + barpos = pos; + barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; + picpos = pos; + 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); + 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)); else - { - drawpic(pos, "gfx/hud/sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); - } - HUD_DrawXNum(pos - '40 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + 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); } - else if(dt > -1) + + if(rightcnt) { - drawpic_expanding(pos, "gfx/hud/sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, - bound(0, -dt / 0.5, 1)); + 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/30) + eY * mySize_y; + picpos = pos + eX * 0.5 * mySize_x; + numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; + } else { + barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/30); + barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y; + picpos = pos + eX * mySize_x - eX * mySize_y; + 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); + 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)); + 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); } } + else if (mySize_x/mySize_y > 1.5) + { + if(leftcnt) + { + len = strlen(ftos(leftcnt)); + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/30); + barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y; + 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/30) + eY * 0.5 * mySize_y; + picpos = pos; + numpos = picpos + eX * 0.5 * mySize_y; + } - //invincibility - if (invincibility_time) { - dt = invincibility_time - time; - if(dt > 0) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), 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)); + 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); + } + + if(rightcnt) { - if(dt < 5) - { - drawpic_expanding_two(pos - '0 -22 0', "gfx/hud/sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, - bound(0, (ceil(dt) - dt) / 0.5, 1)); + len = strlen(ftos(rightcnt)); + + if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; + barsize = eX * mySize_x * min(1, rightcnt/30) + 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/30) + 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"), 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)); else - { - drawpic(pos - '0 -22 0', "gfx/hud/sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); + 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); + } + } + else + { + if(leftcnt) + { + 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/30); + picpos = pos + eX * 0.05 * mySize_x; + numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x; + } else { + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30); + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30); + picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x; + numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x; } - HUD_DrawXNum(pos - '40 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + + HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), 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)); + 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); } - else if(dt > -1) + + if(rightcnt) { - drawpic_expanding(pos - '0 -22 0', "gfx/hud/sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, - bound(0, -dt / 0.5, 1)); + 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/30); + 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; + } + + 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); } } } @@ -1329,175 +1740,996 @@ void HUD_Powerups() { // void HUD_HealthArmor(void) { - float marigin; - - vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(3); - pos = HUD_Panel_GetPos(3); - mySize = HUD_Panel_GetSize(3); - color = HUD_Panel_GetColor(3); + float id = 3; + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); - if(HUD_Panel_GetBgActive(3)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + 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; + } - float armor, health, x; + float armor, health; armor = getstati(STAT_ARMOR); health = getstati(STAT_HEALTH); - if(cvar("_hud_configure")) + + 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 numbers; + float len; - // TODO! - if(hud_hudselector == 2) // combined health and armor display + if(cvar("hud_healtharmor") == 2) // combined health and armor display { vector v; v = healtharmor_maxdamage(health, armor, armorblockpercent); - vector num_pos; - num_pos = - '96 28 0'; - + float x; x = floor(v_x + 1); - if(v_z) // fully armored + if(v_z) // NOT fully armored { - // here, armorideal > armor - drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_armor", '20 20 0', '1 1 1', hud_alpha_fg * armor / v_y, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 3 * mySize_y, "health", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + if(armor) + drawpic_skin(pos + eX * 4 * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg * armor / health, DRAWFLAG_NORMAL); } else { - drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL); - drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 4 * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg * health / armor, DRAWFLAG_NORMAL); + if(armor) + drawpic_skin(pos + eX * 3 * mySize_y, "armor", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); } - HUD_DrawXNum_Colored(num_pos, x, 3, 24, hud_alpha_fg); // draw the combined health and armor + HUD_DrawXNum_Colored(pos, x, 3, mySize_y, hud_alpha_fg); // draw the combined health and armor } else { - vector health_pos, armor_pos; - - // TODO! - if (hud_hudselector == 0) { // old style layout with armor left of health - armor_pos = pos; - health_pos = pos + eX * 0.5 * mySize_x; + vector barpos, barsize; + vector picpos; + vector numpos; + + 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 { - health_pos = pos; - armor_pos = pos + eX * 0.5 * mySize_x; + 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) { - // armor - x = armor; - numbers = strlen(ftos(x)); - - if (x > 0) + if(leftactive) { - drawpic(pos, "gfx/hud/statuhud", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL); - if (x > 45) - drawpic(pos, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - else - drawpic(pos, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(pos + eX * mySize_y + eY * 0.25 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg); - } + len = strlen(ftos(leftcnt)); - // health - x = health; - drawpic(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL); - drawpic(pos + eX * mySize_x - eX * mySize_y, "gfx/hud/sb_health", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, x, 3, 0.5 * mySize_y, hud_alpha_fg); - } - else if (mySize_x/mySize_y > 3.2) + 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"), 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; + } + + 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) { - // armor - x = armor; - numbers = strlen(ftos(x)); + 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"), 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 (x > 0) + if(rightactive) { - drawpic(pos + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL); - if (x > 45) - drawpic(pos + eX * 0.4 * mySize_y, "gfx/hud/sb_armor", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - else - drawpic(pos + eX * 0.4 * mySize_y, "gfx/hud/sb_armor", '0.7 0.7 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(pos + eY * 0.55 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg); + 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"), 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; + } + + 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) + { + 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"), 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); } - // health - x = health; - numbers = strlen(ftos(x)); + 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_alpha_fg * 0.8, DRAWFLAG_NORMAL); + } + } +} + +// ___TODO___ !!! +// Notification area (#4) +// + +string Weapon_SuicideMessage(float id) +{ + switch (id) + { + case 1: + return "lasered himself to hell"; + case 2: + return "did the impossible"; + case 3: + return "did the impossible"; + case 4: + if(id & HITTYPE_SECONDARY) + return "tried out his own grenade"; + return "detonated"; + } + // TODO: was blasted by? + return strcat("[no kill message for weapon ", ftos(id), "!]"); +} + +string Weapon_KillMessage(float id) +{ + switch (id) + { + case 1: + return "was lasered to death by"; + case 2: + return "was gunned by"; + case 3: + if(id & HITTYPE_SECONDARY) + return "was sniped by"; + return "was riddled full of holes by"; + case 4: + if(id & HITTYPE_BOUNCE) + return "didn't see #'s grenade"; + return "almost dodged #'s grenade"; + } + return strcat("[no suicide message for weapon ", ftos(id), "!]"); +} + +float killnotify_times[10]; +float killnotify_weapons[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_weapons[i] = killnotify_weapons[i-1]; + killnotify_attackers[i] = killnotify_attackers[i-1]; + killnotify_victims[i] = killnotify_victims[i-1]; + } + killnotify_times[0] = time; + killnotify_weapons[0] = wpn; + killnotify_attackers[0] = attacker; + killnotify_victims[0] = victim; +} + +void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) +{ + if(msg == MSG_SUICIDE) { + // TODO: cl_gentle + // TODO: way of finding out secondary? + if(type == DEATH_WEAPON) { + HUD_KillNotify_Push(s1, "", stof(s3)); + if (!HUD_Panel_CheckActive(4) || cvar("hud_notify_print")) + print("^1", s1, "^1 ", Weapon_SuicideMessage(stof(s2)), "\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) { + 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_WEAPON) { + HUD_KillNotify_Push(s1, s2, stof(s3)); + if (!HUD_Panel_CheckActive(4) || cvar("hud_notify_print")) + print("^1", s1, "^1 ", Weapon_KillMessage(stof(s3)), "\n"); + } + else if (type == DEATH_TELEFRAG) + print ("^1",s1, "^1 was telefragged by ", s2, "\n"); + else if (type == DEATH_DROWN) + print ("^1",s1, "^1 was drowned by ", s2, "\n"); + else if (type == DEATH_SLIME) + print ("^1",s1, "^1 was slimed by ", s2, "\n"); + else if (type == DEATH_LAVA) + print ("^1",s1, "^1 was cooked by ", s2, "\n"); + else if (type == DEATH_FALL) + print ("^1",s1, "^1 was grounded by ", s2, "\n"); + else if (type == DEATH_SHOOTING_STAR) + print ("^1",s1, "^1 was shot into space by ", s2, "\n"); + else if (type == DEATH_SWAMP) + print ("^1",s1, "^1 was conserved by ", s2, "\n"); + // TODO + /*else if (type == DEATH_HURTTRIGGER && inflictor.msg2 != "") + { + print("^1", s1, "^1 ", s2, "^1", s3, "\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? + 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) { + 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"); + } +} + +#define DAMAGE_CENTERPRINT_SPACER NEWLINES + +void HUD_Centerprint(string s1, float type) +{ + 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 (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!")); + } + } +} + +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; + } + + float entries; + entries = 4 * mySize_y/mySize_x; + float i; + for(i = 0; i <= entries; ++i) + { + drawcolorcodedstring(pos + eY * i * (mySize_y/entries),killnotify_attackers[i], '1 1 0' * (mySize_y/entries), hud_alpha_fg, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.35 * mySize_x + eY * i * (mySize_y/entries),ftos(killnotify_weapons[i]), '1 1 0' * (mySize_y/entries), hud_alpha_fg, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.75 * mySize_x + eY * i * (mySize_y/entries),killnotify_victims[i], '1 1 0' * (mySize_y/entries), hud_alpha_fg, DRAWFLAG_NORMAL); + } + /* This will come later. + string s; + entity tm; + if(spectatee_status && !intermission) + { + drawfont = hud_bigfont; + if(spectatee_status == -1) + s = "^1Observing"; + else + s = GetPlayerName(spectatee_status - 1); + // spectated player name between HUD and chat area, aligned to the left + 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); + drawfont = hud_font; + + // spectator text in the upper right corner + if(spectatee_status == -1) + s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate"); + else + s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player"); + + if(spectatee_status == -1) + s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed"); + else + s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe"); + + s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info"); + + if(gametype == GAME_ARENA) + s = "^1Wait for your turn to join"; + else if(gametype == GAME_LMS) + { + entity sk; + sk = playerslots[player_localentnum - 1]; + if(sk.(scores[ps_primary]) >= 666) + s = "^1Match has already begun"; + else if(sk.(scores[ps_primary]) > 0) + s = "^1You have no more lives left"; + else + s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); + } + else + s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); + + //show restart countdown: + if (time < getstatf(STAT_GAMESTARTTIME)) { + float countdown; + //we need to ceil, otherwise the countdown would be off by .5 when using round() + countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time); + s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds"); + } + } + if(warmup_stage && !intermission) + { + s = "^2Currently in ^1warmup^2 stage!"; + } + + // move more important stuff more to the middle so its more visible + + string blinkcolor; + if(mod(time, 1) >= 0.5) + blinkcolor = "^1"; + else + blinkcolor = "^3"; - drawpic(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL); - drawpic(pos + eX * mySize_x - eX * 1.1 * mySize_y, "gfx/hud/sb_health", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * numbers * 0.5 * mySize_y + eY * 0.55 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg); + if(ready_waiting && !intermission && !spectatee_status) + { + if(ready_waiting_for_me) + { + if(warmup_stage) + s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup"); + else + s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready"); } else { - // armor - x = armor; - numbers = strlen(ftos(x)); + if(warmup_stage) + s = strcat("^2Waiting for others to ready up to end warmup..."); + else + s = strcat("^2Waiting for others to ready up..."); + } + } + else if(warmup_stage && !intermission && !spectatee_status) + { + s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup"); + } - if (x > 0) + if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger) + { + float ts_min, ts_max; + tm = teams.sort_next; + if (tm) + { + for(; tm.sort_next; tm = tm.sort_next) { - drawpic(pos, "gfx/hud/statuhud", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL); - if (x > 45) - drawpic(pos, "gfx/hud/sb_armor", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - else - drawpic(pos, "gfx/hud/sb_armor", '0.5 0.5 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg); + if(!tm.team_size || tm.team == COLOR_SPECTATOR) + continue; + if(!ts_min) ts_min = tm.team_size; + else ts_min = min(ts_min, tm.team_size); + if(!ts_max) ts_max = tm.team_size; + else ts_max = max(ts_max, tm.team_size); + } + if ((ts_max - ts_min) > 1) + { + s = strcat(blinkcolor, "Teamnumbers are unbalanced!"); + tm = GetTeam(myteam, false); + if (tm) + if (tm.team != COLOR_SPECTATOR) + if (tm.team_size == ts_max) + s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust"); + } + } + } + */ +} + +// Timer (#5) +// +void HUD_Timer() +{ + float id = 5; + 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; + } + + float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft; + + timelimit = getstatf(STAT_TIMELIMIT); - // health - x = health; - numbers = strlen(ftos(x)); + timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time); + timeleft = ceil(timeleft); + minutesLeft = floor(timeleft / 60); + secondsLeft = timeleft - minutesLeft*60; + + vector timer_color; + if(minutesLeft >= 5 || warmup_stage || timelimit == 0) //don't use red or yellow in warmup or when there is no timelimit + timer_color = '1 1 1'; //white + else if(minutesLeft >= 1) + timer_color = '1 1 0'; //yellow + else + timer_color = '1 0 0'; //red - drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/statuhud", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL); - drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/sb_health", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg); + if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { + if (time < getstatf(STAT_GAMESTARTTIME)) { + //while restart is still active, show 00:00 + minutes = seconds = 0; + } else { + elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127 + minutes = floor(elapsedTime / 60); + seconds = elapsedTime - minutes*60; } + } else { + minutes = minutesLeft; + seconds = secondsLeft; } + + if(minutes > 999) + 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 * 2 * mySize_y, seconds, -2, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } +// Radar (#6) +// +void HUD_Radar(void) +{ + float id = 6; + 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; + } + + local float color1, color2; // color already declared as a global in hud.qc + local vector rgb; + local entity tm; + float scale2d, normalsize, bigsize; + float f; + + teamradar_origin2d = pos + 0.5 * mySize; + teamradar_size2d = mySize; + + if(minimapname == "") + return; + + teamradar_loadcvars(); + + switch(hud_radar_zoommode) + { + default: + case 0: + f = current_zoomfraction; + break; + case 1: + f = 1 - current_zoomfraction; + break; + case 2: + f = 0; + break; + case 3: + f = 1; + break; + } + + switch(hud_radar_rotation) + { + case 0: + teamradar_angle = view_angles_y - 90; + break; + default: + teamradar_angle = 90 * hud_radar_rotation; + break; + } + + scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin); + teamradar_size2d = mySize; + + teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; // we always center + + // pixels per world qu to match the teamradar_size2d_x range in the longest dimension + if(hud_radar_rotation == 0) + { + // max-min distance must fit the radar in any rotation + bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min)); + } + else + { + vector c0, c1, c2, c3, span; + c0 = rotate(mi_min, teamradar_angle * DEG2RAD); + c1 = rotate(mi_max, teamradar_angle * DEG2RAD); + c2 = rotate('1 0 0' * mi_min_x + '0 1 0' * mi_max_y, teamradar_angle * DEG2RAD); + c3 = rotate('1 0 0' * mi_max_x + '0 1 0' * mi_min_y, teamradar_angle * DEG2RAD); + span = '0 0 0'; + span_x = max4(c0_x, c1_x, c2_x, c3_x) - min4(c0_x, c1_x, c2_x, c3_x); + span_y = max4(c0_y, c1_y, c2_y, c3_y) - min4(c0_y, c1_y, c2_y, c3_y); + + // max-min distance must fit the radar in x=x, y=y + bigsize = min( + teamradar_size2d_x * scale2d / (1.05 * span_x), + teamradar_size2d_y * scale2d / (1.05 * span_y) + ); + } + + normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / hud_radar_scale; + if(bigsize > normalsize) + normalsize = bigsize; + + teamradar_size = + f * bigsize + + (1 - f) * normalsize; + teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord( + f * (mi_min + mi_max) * 0.5 + + (1 - f) * view_origin); + + color1 = GetPlayerColor(player_localentnum-1); + rgb = GetTeamRGB(color1); + + drawsetcliparea( + pos_x, + pos_y, + mySize_x, + mySize_y + ); + + draw_teamradar_background(hud_radar_background_alpha, hud_radar_foreground_alpha); + + 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); + for(tm = world; (tm = find(tm, classname, "entcs_receiver")); ) + { + color2 = GetPlayerColor(tm.sv_entnum); + //if(color == COLOR_SPECTATOR || color == color2) + draw_teamradar_player(tm.origin, tm.angles, GetTeamRGB(color2)); + } + draw_teamradar_player(view_origin, view_angles, '1 1 1'); + + drawresetcliparea(); +}; + // Score (#7) // void HUD_Score() { - float marigin; - - vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(7); - pos = HUD_Panel_GetPos(7); - mySize = HUD_Panel_GetSize(7); - color = HUD_Panel_GetColor(7); + float id = 7; + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); - if(HUD_Panel_GetBgActive(7)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + 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; + } float score, distribution, leader; - vector score_pos, secondary_score_pos, distribution_color; + float score_len, distr_len; + vector distribution_color; entity tm, pl, me; me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1]; - if (!teamplay) { // non-teamgames + // TODO... this (race part) still uses constant coordinates :/ + if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD + /*pl = players.sort_next; + if(pl == me) + pl = pl.sort_next; + if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST) + if(pl.scores[ps_primary] == 0) + pl = world; + + score = me.(scores[ps_primary]); + + float racemin, racesec, racemsec; + float distsec, distmsec, minusplus; + + racemin = floor(score/(60 * TIME_FACTOR)); + racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR); + racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR; + + if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) { + // distribution display + distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]); + + if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR) + distmsec = fabs(distribution); + else { + distsec = floor(fabs(distribution)/TIME_FACTOR); + distmsec = fabs(distribution) - distsec*TIME_FACTOR; + if (distribution < 0) + distsec = -distsec; + } + + if (distribution <= 0) { + distribution_color = eY; + minusplus = 1; // minusplus 1: always prefix with minus sign + } + else { + 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); + } + // 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); + + 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' - '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); + */ + } else if (!teamplay) { // non-teamgames // me vector := [team/connected frags id] pl = players.sort_next; if(pl == me) pl = pl.sort_next; - if(pl) + if(hud_configure) + distribution = 42; + else if(pl) distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]); else distribution = 0; score = me.(scores[ps_primary]); + if(hud_configure) + score = 123; if(distribution >= 5) { distribution_color = eY; @@ -1510,17 +2742,27 @@ void HUD_Score() else distribution_color = eX; - HUD_DrawXNum(pos + eX * mySize_x - eX * 6 * 0.3 * mySize_y, distribution, 6, 3, 0.3 * mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 6 * 0.75 * mySize_y + eY * 0.35 * mySize_y, score, 6, 0, 0.75 * mySize_y, distribution_color, leader, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + 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); + 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); } else { // teamgames float max_fragcount; - max_fragcount = -999; + max_fragcount = -99; + float teamnum; for(tm = teams.sort_next; tm; tm = tm.sort_next) { - if(tm.team == COLOR_SPECTATOR || !tm.team_size) // no players? don't display + if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !hud_configure)) // no players? don't display continue; score = tm.(teamscores[ts_primary]); + if(hud_configure) + score = 123; leader = 0; + + score_len = strlen(ftos(score)); if (score > max_fragcount) max_fragcount = score; @@ -1528,12 +2770,16 @@ void HUD_Score() if(tm.team == myteam) { if (max_fragcount == score) leader = 1; - HUD_DrawXNum(score_pos, score, 4, 0, 34, GetTeamRGB(tm.team) * 0.8, leader, 1, hud_alpha_fg, 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, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else { if (max_fragcount == score) leader = 1; - HUD_DrawXNum(secondary_score_pos, score, 6, 0, 16, GetTeamRGB(tm.team) * 0.8, leader, 1, hud_alpha_fg, DRAWFLAG_NORMAL); - secondary_score_pos = secondary_score_pos + '0 16 0'; + 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); + teamnum += 1; } } } @@ -1542,22 +2788,32 @@ void HUD_Score() // Race timer (#8) // void HUD_RaceTimer (void) { - float marigin; - - vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(8); - pos = HUD_Panel_GetPos(8); - mySize = HUD_Panel_GetSize(8); - color = HUD_Panel_GetColor(8); + float id = 8; + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); - if(HUD_Panel_GetBgActive(8)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + 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; + } drawfont = hud_bigfont; float a, t; string s, forcetime; - if(race_checkpointtime) + 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); + 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); + } + else if(race_checkpointtime) { a = bound(0, 2 - (time - race_checkpointtime), 1); s = ""; @@ -1593,6 +2849,7 @@ void HUD_RaceTimer (void) { 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); } + // ___ TODO!!!___ if(race_penaltytime) { a = bound(0, 2 - (time - race_penaltyeventtime), 1); @@ -1660,138 +2917,8 @@ void HUD_RaceTimer (void) { drawfont = hud_font; } -// Notification area (#4) -void HUD_Notify (void) -{ - float marigin; - - vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(4); - pos = HUD_Panel_GetPos(4); - mySize = HUD_Panel_GetSize(4); - color = HUD_Panel_GetColor(4); - - if(HUD_Panel_GetBgActive(4)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); - - string s; - entity tm; - if(spectatee_status && !intermission) - { - drawfont = hud_bigfont; - if(spectatee_status == -1) - s = "^1Observing"; - else - s = GetPlayerName(spectatee_status - 1); - // spectated player name between HUD and chat area, aligned to the left - 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); - drawfont = hud_font; - - // spectator text in the upper right corner - if(spectatee_status == -1) - s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate"); - else - s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player"); - - if(spectatee_status == -1) - s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed"); - else - s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe"); - - s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info"); - - if(gametype == GAME_ARENA) - s = "^1Wait for your turn to join"; - else if(gametype == GAME_LMS) - { - entity sk; - sk = playerslots[player_localentnum - 1]; - if(sk.(scores[ps_primary]) >= 666) - s = "^1Match has already begun"; - else if(sk.(scores[ps_primary]) > 0) - s = "^1You have no more lives left"; - else - s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); - } - else - s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); - - //show restart countdown: - if (time < getstatf(STAT_GAMESTARTTIME)) { - float countdown; - //we need to ceil, otherwise the countdown would be off by .5 when using round() - countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time); - s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds"); - } - } - if(warmup_stage && !intermission) - { - s = "^2Currently in ^1warmup^2 stage!"; - } - - // move more important stuff more to the middle so its more visible - - string blinkcolor; - if(mod(time, 1) >= 0.5) - blinkcolor = "^1"; - else - blinkcolor = "^3"; - - if(ready_waiting && !intermission && !spectatee_status) - { - if(ready_waiting_for_me) - { - if(warmup_stage) - s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup"); - else - s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready"); - } - else - { - if(warmup_stage) - s = strcat("^2Waiting for others to ready up to end warmup..."); - else - s = strcat("^2Waiting for others to ready up..."); - } - } - else if(warmup_stage && !intermission && !spectatee_status) - { - s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup"); - } - - if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger) - { - float ts_min, ts_max; - tm = teams.sort_next; - if (tm) - { - for(; tm.sort_next; tm = tm.sort_next) - { - if(!tm.team_size || tm.team == COLOR_SPECTATOR) - continue; - if(!ts_min) ts_min = tm.team_size; - else ts_min = min(ts_min, tm.team_size); - if(!ts_max) ts_max = tm.team_size; - else ts_max = max(ts_max, tm.team_size); - } - if ((ts_max - ts_min) > 1) - { - s = strcat(blinkcolor, "Teamnumbers are unbalanced!"); - tm = GetTeam(myteam, false); - if (tm) - if (tm.team != COLOR_SPECTATOR) - if (tm.team_size == ts_max) - s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust"); - - } - } - } -} - // Vote window (#9) +// float vote_yescount; float vote_nocount; float vote_needed; @@ -1804,13 +2931,10 @@ float vote_change; // "time" when vote_active changed void HUD_VoteWindow(void) { - float marigin; - - vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(9); - pos = HUD_Panel_GetPos(9); - mySize = HUD_Panel_GetSize(9); - color = HUD_Panel_GetColor(9); + float id = 9; + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); string s; float a; @@ -1824,17 +2948,33 @@ void HUD_VoteWindow(void) else vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1); - if(HUD_Panel_GetBgActive(9)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg * vote_alpha, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + if(hud_configure) + { + vote_alpha = 1; + vote_yescount = 3; + vote_nocount = 2; + vote_needed = 4; + } + + 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; + } if(vote_alpha) { a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1); - drawpic(pos, "gfx/hud/voteprogress_back", mySize, HUD_GetBgColor(), a * hud_alpha_bg, 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_alpha_fg, DRAWFLAG_NORMAL); - s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '10 0 0', stringwidth_colors); + 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 @@ -1845,19 +2985,19 @@ void HUD_VoteWindow(void) // draw the progress bars drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); - drawpic(pos, "gfx/hud/voteprogress_prog", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL); + 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(pos, "gfx/hud/voteprogress_prog", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL); + 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(pos, "gfx/hud/voteprogress_voted", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL); + 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(pos, "gfx/hud/voteprogress_voted", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, "voteprogress_voted", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL); } drawresetcliparea(); @@ -1867,79 +3007,23 @@ void HUD_VoteWindow(void) } } -// Awards system -float race_status_time; -float race_status_prev; -string race_status_name_prev; -void HUD_DrawRaceStatus(vector pos) -{ - if (race_status != race_status_prev || race_status_name != race_status_name_prev) { - race_status_time = time + 5; - race_status_prev = race_status; - if (race_status_name_prev) - strunzone(race_status_name_prev); - race_status_name_prev = strzone(race_status_name); - } - - float a; - a = bound(0, race_status_time - time, 1); - - string s; - s = textShortenToWidth(race_status_name, 120, '10 10 0', stringwidth_colors); - - float rank; - if(race_status > 0) - rank = race_CheckName(race_status_name); - string rankname; - rankname = race_PlaceName(rank); - - if(race_status == 0) - drawpic(pos, "gfx/hud/race/newfail", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); - else if(race_status == 1) { - drawpic(pos, "gfx/hud/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); - } else if(race_status == 2) { - if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank) - drawpic(pos, "gfx/hud/race/newrankgreen", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); - else - drawpic(pos, "gfx/hud/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); - } else if(race_status == 3) { - drawpic(pos, "gfx/hud/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); - } - - if (race_status_time - time <= 0) { - race_status_prev = -1; - race_status = -1; - if(race_status_name) - strunzone(race_status_name); - race_status_name = string_null; - if(race_status_name_prev) - strunzone(race_status_name_prev); - race_status_name_prev = string_null; - } -} +// Mod icons panel (#10) +// // CTF HUD modicon section float redflag_prevframe, blueflag_prevframe; // status during previous frame float redflag_prevstatus, blueflag_prevstatus; // last remembered status float redflag_statuschange_time, blueflag_statuschange_time; // time when the status changed -void CSQC_ctf_hudreset(void) +void HUD_Mod_CTF_Reset(void) { redflag_prevstatus = blueflag_prevstatus = redflag_prevframe = blueflag_prevframe = redflag_statuschange_time = blueflag_statuschange_time = 0; } -void CSQC_ctf_hud(void) +void HUD_Mod_CTF(vector pos, vector mySize) { - vector bottomleft, redflag_pos, blueflag_pos, sz; + vector redflag_pos, blueflag_pos; float f; // every function should have that - bottomleft_y = vid_conheight; - bottomleft_z = 0; float redflag, blueflag; // current status float redflag_statuschange_elapsedtime, blueflag_statuschange_elapsedtime; // time since the status changed @@ -1949,6 +3033,12 @@ void CSQC_ctf_hud(void) redflag = (stat_items/IT_RED_FLAG_TAKEN) & 3; blueflag = (stat_items/IT_BLUE_FLAG_TAKEN) & 3; + if(hud_configure) + { + redflag = 1; + blueflag = 2; + } + // when status CHANGES, set old status into prevstatus and current status into status if (redflag != redflag_prevframe) { @@ -1980,25 +3070,25 @@ void CSQC_ctf_hud(void) float red_alpha, red_alpha_prevstatus; red_alpha = red_alpha_prevstatus = 1; switch(redflag) { - case 1: red_icon = "gfx/hud/sb_flag_red_taken"; break; - case 2: red_icon = "gfx/hud/sb_flag_red_lost"; break; - case 3: red_icon = "gfx/hud/sb_flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: red_icon = "flag_red_taken"; break; + case 2: red_icon = "flag_red_lost"; break; + case 3: red_icon = "flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2)) - red_icon = "gfx/hud/sb_flag_red_shielded"; + red_icon = "flag_red_shielded"; else red_icon = string_null; break; } switch(redflag_prevstatus) { - case 1: red_icon_prevstatus = "gfx/hud/sb_flag_red_taken"; break; - case 2: red_icon_prevstatus = "gfx/hud/sb_flag_red_lost"; break; - case 3: red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: red_icon_prevstatus = "flag_red_taken"; break; + case 2: red_icon_prevstatus = "flag_red_lost"; break; + case 3: red_icon_prevstatus = "flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if(redflag == 3) - red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; // make it more visible + red_icon_prevstatus = "flag_red_carrying"; // make it more visible else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2)) - red_icon_prevstatus = "gfx/hud/sb_flag_red_shielded"; + red_icon_prevstatus = "flag_red_shielded"; else red_icon_prevstatus = string_null; break; @@ -2008,133 +3098,78 @@ void CSQC_ctf_hud(void) float blue_alpha, blue_alpha_prevstatus; blue_alpha = blue_alpha_prevstatus = 1; switch(blueflag) { - case 1: blue_icon = "gfx/hud/sb_flag_blue_taken"; break; - case 2: blue_icon = "gfx/hud/sb_flag_blue_lost"; break; - case 3: blue_icon = "gfx/hud/sb_flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: blue_icon = "flag_blue_taken"; break; + case 2: blue_icon = "flag_blue_lost"; break; + case 3: blue_icon = "flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1)) - blue_icon = "gfx/hud/sb_flag_blue_shielded"; + blue_icon = "flag_blue_shielded"; else blue_icon = string_null; - break; - } - switch(blueflag_prevstatus) { - case 1: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_taken"; break; - case 2: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_lost"; break; - case 3: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; - default: - if(blueflag == 3) - blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; // make it more visible - else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1)) - blue_icon_prevstatus = "gfx/hud/sb_flag_blue_shielded"; - else - blue_icon_prevstatus = string_null; - break; - } - - if (myteam == COLOR_TEAM1) { // always draw own flag on left - redflag_pos = bottomleft - '-4 50 0'; - blueflag_pos = bottomleft - '-62 50 0'; - } else { - blueflag_pos = bottomleft - '-4 50 0'; - redflag_pos = bottomleft - '-62 50 0'; - } - - sz = '52 52 0'; - - f = bound(0, redflag_statuschange_elapsedtime*2, 1); - if(red_icon_prevstatus && f < 1) - drawpic_expanding(redflag_pos, red_icon_prevstatus, sz, '1 1 1', hud_alpha_fg * red_alpha_prevstatus, DRAWFLAG_NORMAL, f); - if(red_icon) - drawpic(redflag_pos, red_icon, sz, '1 1 1', hud_alpha_fg * red_alpha * f, DRAWFLAG_NORMAL); - - f = bound(0, blueflag_statuschange_elapsedtime*2, 1); - if(blue_icon_prevstatus && f < 1) - drawpic_expanding(blueflag_pos, blue_icon_prevstatus, sz, '1 1 1', hud_alpha_fg * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f); - if(blue_icon) - drawpic(blueflag_pos, blue_icon, sz, '1 1 1', hud_alpha_fg * blue_alpha * f, DRAWFLAG_NORMAL); -} - -/*void HUD_Mod_Race (void) { - if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD - pl = players.sort_next; - if(pl == me) - pl = pl.sort_next; - if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST) - if(pl.scores[ps_primary] == 0) - pl = world; - - score = me.(scores[ps_primary]); - - float racemin, racesec, racemsec; - float distsec, distmsec, minusplus; - - racemin = floor(score/(60 * TIME_FACTOR)); - racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR); - racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR; - - if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) { - // distribution display - distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]); - - if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR) - distmsec = fabs(distribution); - else { - distsec = floor(fabs(distribution)/TIME_FACTOR); - distmsec = fabs(distribution) - distsec*TIME_FACTOR; - if (distribution < 0) - distsec = -distsec; - } - - if (distribution <= 0) { - distribution_color = eY; - minusplus = 1; // minusplus 1: always prefix with minus sign - } - else { - 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(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "gfx/hud/num_dot", '16 16 0', distribution_color, hud_alpha_fg, DRAWFLAG_ADDITIVE); - } - // race record display - if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead - drawpic(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "gfx/hud/sb_highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', hud_alpha_fg, 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(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "gfx/hud/num_dot", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); + break; + } + switch(blueflag_prevstatus) { + case 1: blue_icon_prevstatus = "flag_blue_taken"; break; + case 2: blue_icon_prevstatus = "flag_blue_lost"; break; + case 3: blue_icon_prevstatus = "flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + default: + if(blueflag == 3) + blue_icon_prevstatus = "flag_blue_carrying"; // make it more visible + else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1)) + blue_icon_prevstatus = "flag_blue_shielded"; + else + blue_icon_prevstatus = string_null; + break; + } - 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(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "gfx/hud/num_colon", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); + if (myteam == COLOR_TEAM1) { // always draw own flag on left + redflag_pos = pos; + blueflag_pos = pos + eX * mySize_y; + } else { + blueflag_pos = pos; + redflag_pos = pos + eX * mySize_y; } -}*/ + + 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); + 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); + + 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); + 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); +} // Keyhunt HUD modicon section float kh_runheretime; -void CSQC_kh_hudreset(void) +void HUD_Mod_KH_Reset(void) { kh_runheretime = 0; } -void CSQC_kh_hud(void) +void HUD_Mod_KH(vector pos, vector mySize) { float kh_keys; float keyteam; float a, aa; vector p, pa, kh_size, kh_asize; - p_x = 6; - p_y = vid_conheight - 34 - 3; - p_z = 0; + p_x = pos_x; + p_y = pos_y + 0.25 * mySize_y; kh_keys = getstati(STAT_KH_KEYS); - kh_size = '19 34 0'; - kh_asize = '19 10 0'; - pa = p + '0 -10 0'; + kh_size_x = mySize_x * 0.25; + kh_size_y = 0.75 * mySize_y; + + pa = p - eY * 0.25 * mySize_y; + + kh_asize_x = mySize_x * 0.25; + kh_asize_y = mySize_y * 0.25; float i, key; @@ -2187,16 +3222,16 @@ void CSQC_kh_hud(void) switch(keyteam) { case COLOR_TEAM1: - drawpic (pa, "gfx/hud/sb_kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM2: - drawpic (pa, "gfx/hud/sb_kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM3: - drawpic (pa, "gfx/hud/sb_kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM4: - drawpic (pa, "gfx/hud/sb_kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; default: break; @@ -2204,81 +3239,61 @@ void CSQC_kh_hud(void) switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come! { case 0: - drawpic (p, "gfx/hud/sb_kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_skin(p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 1: - drawpic (p, "gfx/hud/sb_kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_skin(p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 2: - drawpic (p, "gfx/hud/sb_kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_skin(p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 3: - drawpic (p, "gfx/hud/sb_kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_skin(p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; } } - p_x += 24; - pa_x += 24; + p_x += 0.25 * mySize_x; + pa_x += 0.25 * mySize_x; } } -// Nexball HUD modicon section -#define NBPB_SIZE '96 38 0' -#define NBPB_BT 2 //thickness -#define NBPB_BRGB '1 1 1' -#define NBPB_BALPH 1 //alpha -#define NBPB_BFLAG DRAWFLAG_NORMAL -#define NBPB_IALPH 0.4 -#define NBPB_IFLAG DRAWFLAG_NORMAL -#define NBPB_IRGB '0.7 0.1 0' - -void CSQC_nb_hud(void) +// Nexball HUD mod icon +void HUD_Mod_NexBall(vector pos, vector mySize) { float stat_items, nb_pb_starttime, dt, p; - vector pos; stat_items = getstati(STAT_ITEMS); nb_pb_starttime = getstatf(STAT_NB_METERSTART); - pos_x = 4; - pos_y = vid_conheight - 42; - pos_z = 0; - //Manage the progress bar if any if (nb_pb_starttime > 0) { - vector s; dt = mod(time - nb_pb_starttime, nb_pb_period); // one period of positive triangle p = 2 * dt / nb_pb_period; if (p > 1) p = 2 - p; - s = NBPB_SIZE; //Draw the filling - drawfill(pos, p * s_x * eX + s_y * eY, NBPB_IRGB, NBPB_IALPH, NBPB_IFLAG); - - //Draw the box - s = NBPB_SIZE; - drawline(NBPB_BT, pos , pos + eX * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG); - drawline(NBPB_BT, pos , pos + eY * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG); - drawline(NBPB_BT, pos + s, pos + eX * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG); - drawline(NBPB_BT, pos + s, pos + eY * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG); + HUD_Panel_DrawProgressBar(pos, 0, eX * p * mySize_x + eY * mySize_y, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); } - pos_x += 12; //horizontal margin to the picture - pos_y += 2; //vertical margin to the picture + pos_x += 0.5 * mySize_x - 0.5 * mySize_y; //horizontal margin to the picture if (stat_items & IT_KEY1) - drawpic(pos, "gfx/hud/sb_nexball_carrying", '80 34 0', '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic_skin(pos, "nexball_carrying", '1 1 0' * mySize_y, '1 1 1', 1, DRAWFLAG_NORMAL); } -// Race/CTS HUD modicon section +// Race/CTS HUD mod icons float crecordtime_prev; // last remembered crecordtime float crecordtime_change_time; // time when crecordtime last changed float srecordtime_prev; // last remembered srecordtime float srecordtime_change_time; // time when srecordtime last changed -void CSQC_race_hud(void) + +float race_status_time; +float race_status_prev; +string race_status_name_prev; +void HUD_Mod_Race(vector pos, vector mySize) { entity me; me = playerslots[player_localentnum - 1]; @@ -2290,9 +3305,6 @@ void CSQC_race_hud(void) return; // no records in the actual race drawfont = hud_bigfont; - vector pos; - pos_x = 2; - pos_y = vid_conheight - 48; // clientside personal record string rr; @@ -2302,8 +3314,15 @@ void CSQC_race_hud(void) rr = RACE_RECORD; t = stof(db_get(ClientProgsDB, strcat(shortmapname, rr, "time"))); - if(score && score < t || !t) + if(score && (score < t || !t)) { db_put(ClientProgsDB, strcat(shortmapname, rr, "time"), ftos(score)); + if(cvar("cl_autodemo_delete_keeprecords")) + { + f = cvar("cl_autodemo_delete"); + f &~= 1; + cvar_set("cl_autodemo_delete", ftos(f)); // don't delete demo with new record! + } + } if(t != crecordtime_prev) { crecordtime_prev = t; @@ -2312,17 +3331,16 @@ void CSQC_race_hud(void) f = time - crecordtime_change_time; if (f > 1) { - drawstring(pos, "Personal best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + 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); } else { - drawstring(pos, "Personal best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring_expanding(pos, "Personal best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f); - drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f); + 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); } // server record - pos_y += 26; t = race_server_record; if(t != srecordtime_prev) { srecordtime_prev = t; @@ -2331,252 +3349,128 @@ void CSQC_race_hud(void) f = time - srecordtime_change_time; if (f > 1) { - drawstring(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '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_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); } else { - drawstring(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawstring_expanding(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f); - drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '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_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); } - drawfont = hud_font; -} - -// Timer (#5) -// -void HUD_Timer() -{ - float marigin; - - vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(5); - pos = HUD_Panel_GetPos(5); - mySize = HUD_Panel_GetSize(5); - color = HUD_Panel_GetColor(5); - if(HUD_Panel_GetBgActive(5)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); - - float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft; - - timelimit = getstatf(STAT_TIMELIMIT); + if (race_status != race_status_prev || race_status_name != race_status_name_prev) { + race_status_time = time + 5; + race_status_prev = race_status; + if (race_status_name_prev) + strunzone(race_status_name_prev); + race_status_name_prev = strzone(race_status_name); + } - HUD_DrawRaceStatus(pos + '0 30 0'); + pos_x += mySize_x/2; + // race "awards" + float a; + a = bound(0, race_status_time - time, 1); - timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time); - timeleft = ceil(timeleft); - minutesLeft = floor(timeleft / 60); - secondsLeft = timeleft - minutesLeft*60; + string s; + s = textShortenToWidth(race_status_name, 120, '10 10 0', stringwidth_colors); - vector timer_color; - if(minutesLeft >= 5 || warmup_stage || timelimit == 0) //don't use red or yellow in warmup or when there is no timelimit - timer_color = '1 1 1'; //white - else if(minutesLeft >= 1) - timer_color = '1 1 0'; //yellow - else - timer_color = '1 0 0'; //red + float rank; + if(race_status > 0) + rank = race_CheckName(race_status_name); + string rankname; + rankname = race_PlaceName(rank); - if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { - if (time < getstatf(STAT_GAMESTARTTIME)) { - //while restart is still active, show 00:00 - minutes = seconds = 0; - } else { - elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127 - minutes = floor(elapsedTime / 60); - seconds = elapsedTime - minutes*60; - } - } else { - minutes = minutesLeft; - seconds = secondsLeft; + if(race_status == 0) + drawpic_skin(pos, "race_newfail", '80 80 0', '1 1 1', hud_alpha_fg * 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); + } 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); + 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); + } 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); } - if(mySize_x/mySize_y > 5.1) - { - if(minutes > 999) - seconds = 99; - minutes = min(minutes, 999); - if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { - if(minutes < 100) - drawpic(pos + eX * mySize_x - eX * 5.1 * mySize_y, "gfx/hud/sb_timer", '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_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * mySize_x - eX * 2.57 * mySize_y, "gfx/hud/num_colon", '1 1 0' * mySize_y, timer_color, 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_alpha_fg, DRAWFLAG_NORMAL); - } - else - { - if(minutes > 99) - seconds = 99; - minutes = min(minutes, 99); - if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { - if(minutes < 100) - drawpic(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y, "gfx/hud/sb_timer", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * 0.5 * mySize_x - eX * mySize_y + eY * 0.5 * mySize_y, minutes, -2, 0, 0.5 * mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y + eY * 0.5 * mySize_y, "gfx/hud/num_colon", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); - } - HUD_DrawXNum(pos + eX * 0.51 * mySize_x + eY * 0.5 * mySize_y, seconds, -2, 0, 0.5 * mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); + if (race_status_time - time <= 0) { + race_status_prev = -1; + race_status = -1; + if(race_status_name) + strunzone(race_status_name); + race_status_name = string_null; + if(race_status_name_prev) + strunzone(race_status_name_prev); + race_status_name_prev = string_null; } + drawfont = hud_font; } -// Radar (#6) -// - -void HUD_Radar(void) +// TODO: idea: alpha fade in/out empty panels +void HUD_ModIcons(void) { - float marigin; - - vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(6); - pos = HUD_Panel_GetPos(6); - mySize = HUD_Panel_GetSize(6); - color = HUD_Panel_GetColor(6); - - if(HUD_Panel_GetBgActive(6)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); - - local float color1, color2; // color already declared as a global in hud.qc - local vector rgb; - local entity tm; - float scale2d, normalsize, bigsize; - float f; - - teamradar_origin2d = pos + 0.5 * mySize; // TODO: stupid compat, should be removed - teamradar_size2d = mySize; - - if(minimapname == "" && !ons_showmap) + if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !hud_configure) return; + float id = 10; + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); - teamradar_loadcvars(); - - switch(cl_teamradar_zoommode) - { - default: - case 0: - f = current_zoomfraction; - break; - case 1: - f = 1 - current_zoomfraction; - break; - case 2: - f = 0; - break; - case 3: - f = 1; - break; - } - - switch(cl_teamradar_rotation) - { - case 0: - teamradar_angle = view_angles_y - 90; - break; - default: - teamradar_angle = 90 * cl_teamradar_rotation; - break; - } - - scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin); - teamradar_size2d = mySize; - - teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; - if(pos == eX * vid_conwidth) - { - if(cl_teamradar_nohudhack < 2) - pos_y += 25; - if(cl_teamradar_nohudhack < 1) - teamradar_extraclip_mins_y -= 25; - } - else if(pos == eY * vid_conheight || pos == eX * vid_conwidth + eY * vid_conheight) - { - if(cl_teamradar_nohudhack < 2) - pos_y -= 50; - //if(cl_teamradar_nohudhack < 1) - //teamradar_extraclip_size_y += 50; // don't, the HUD looks nice - } - - // pixels per world qu to match the teamradar_size2d_x range in the longest dimension - if(cl_teamradar_rotation == 0) - { - // max-min distance must fit the radar in any rotation - bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min)); - } - else + HUD_Panel_DrawBg(id, pos, mySize); + float padding; + padding = HUD_Panel_GetPadding(id); + if(padding) { - vector c0, c1, c2, c3, span; - c0 = rotate(mi_min, teamradar_angle * DEG2RAD); - c1 = rotate(mi_max, teamradar_angle * DEG2RAD); - c2 = rotate('1 0 0' * mi_min_x + '0 1 0' * mi_max_y, teamradar_angle * DEG2RAD); - c3 = rotate('1 0 0' * mi_max_x + '0 1 0' * mi_min_y, teamradar_angle * DEG2RAD); - span = '0 0 0'; - span_x = max4(c0_x, c1_x, c2_x, c3_x) - min4(c0_x, c1_x, c2_x, c3_x); - span_y = max4(c0_y, c1_y, c2_y, c3_y) - min4(c0_y, c1_y, c2_y, c3_y); - - // max-min distance must fit the radar in x=x, y=y - bigsize = min( - teamradar_size2d_x * scale2d / (1.05 * span_x), - teamradar_size2d_y * scale2d / (1.05 * span_y) - ); + pos += '1 1 0' * padding; + mySize -= '2 2 0' * padding; } - normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / cl_teamradar_scale; - if(bigsize > normalsize) - normalsize = bigsize; - - teamradar_size = - f * bigsize - + (1 - f) * normalsize; - teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord( - f * (mi_min + mi_max) * 0.5 - + (1 - f) * view_origin); - - color1 = GetPlayerColor(player_localentnum-1); - rgb = GetTeamRGB(color1); - - drawsetcliparea( - pos_x, - pos_y, - pos_x + mySize_x, - pos_y + mySize_y - ); + // TODO... well make them work in a panel etc + if(gametype == GAME_KEYHUNT) + HUD_Mod_KH(pos, mySize); + else if(gametype == GAME_CTF || hud_configure) + HUD_Mod_CTF(pos, mySize); + else if(gametype == GAME_NEXBALL) + HUD_Mod_NexBall(pos, mySize); + else if(gametype == GAME_CTS || gametype == GAME_RACE) + HUD_Mod_Race(pos, mySize); +} - draw_teamradar_background(cl_teamradar_background_alpha, cl_teamradar_foreground_alpha); +// Draw pressed keys (#11) +// +void HUD_DrawPressedKeys(void) +{ + float id = 11; + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); - if(ons_showmap) + HUD_Panel_DrawBg(id, pos, mySize); + float padding; + padding = HUD_Panel_GetPadding(id); + if(padding) { - drawresetcliparea(); - - vector frame_origin, frame_size; - frame_origin = frame_size = '0 0 0'; - - frame_origin_x = pos_x - teamradar_size2d_x * 0.55859375; // matches the picture - frame_origin_y = pos_y - teamradar_size2d_y * 0.55859375; // matches the picture - frame_size_x = pos_x * 1.1171875; // matches the picture - frame_size_y = pos_y * 1.1171875; // matches the picture - drawpic(frame_origin, "gfx/ons-frame.tga", frame_size, '1 1 1', hud_alpha_fg, 0); - drawpic(frame_origin, "gfx/ons-frame-team.tga", frame_size, rgb, hud_alpha_fg, 0); - - drawsetcliparea( - pos_x - teamradar_size2d_x * 0.5, - pos_y - teamradar_size2d_y * 0.5, - teamradar_size2d_x, - teamradar_size2d_y - ); + pos += '1 1 0' * padding; + mySize -= '2 2 0' * padding; } - 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); - for(tm = world; (tm = find(tm, classname, "entcs_receiver")); ) - { - color2 = GetPlayerColor(tm.sv_entnum); - //if(color == COLOR_SPECTATOR || color == color2) - draw_teamradar_player(tm.origin, tm.angles, GetTeamRGB(color2)); - } - draw_teamradar_player(view_origin, view_angles, '1 1 1'); + float pressedkeys; - drawresetcliparea(); -}; + 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); +} /* ================== @@ -2584,31 +3478,6 @@ Main HUD system ================== */ -void HUD_DrawPressedKeys(void) -{ - float marigin; - - vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(10); - pos = HUD_Panel_GetPos(10); - mySize = HUD_Panel_GetSize(10); - color = HUD_Panel_GetColor(10); - - if(HUD_Panel_GetBgActive(10)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); - - float pressedkeys; - - pressedkeys = getstatf(STAT_PRESSED_KEYS); - drawpic(pos, "gfx/hud/keys/key_bg.tga", mySize, '1 1 1', 0.1 * hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * mySize_x - eX * 0.22 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "gfx/hud/keys/key_crouch_inv.tga" : "gfx/hud/keys/key_crouch.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "gfx/hud/keys/key_forward_inv.tga" : "gfx/hud/keys/key_forward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * 0.023 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "gfx/hud/keys/key_jump_inv.tga" : "gfx/hud/keys/key_jump.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * 0.1 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "gfx/hud/keys/key_left_inv.tga" : "gfx/hud/keys/key_left.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "gfx/hud/keys/key_backward_inv.tga" : "gfx/hud/keys/key_backward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic(pos + eX * mySize_x - eX * 0.372 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "gfx/hud/keys/key_right_inv.tga" : "gfx/hud/keys/key_right.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); -} - void HUD_ShowSpeed(void) { vector numsize; @@ -2700,23 +3569,23 @@ void HUD_ShowAcceleration(void) } if (acceleration > 0) - drawpic(pos, "gfx/hud/statuhud", 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_alpha_fg, DRAWFLAG_NORMAL); else if (acceleration < 0) - drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/statuhud", -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_alpha_fg, DRAWFLAG_NORMAL); } void HUD_Reset (void) { // reset gametype specific icons if(gametype == GAME_KEYHUNT) - CSQC_kh_hudreset(); + HUD_Mod_KH_Reset(); else if(gametype == GAME_CTF) - CSQC_ctf_hudreset(); + HUD_Mod_CTF_Reset(); } void HUD_Main (void) { - hud_alpha_bg = cvar_or("hud_alpha_bg", 0.8) * (1 - cvar("_menu_alpha")); + hud_alpha_bg = cvar_or("hud_bg_alpha", 0.8) * (1 - cvar("_menu_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"); @@ -2724,6 +3593,29 @@ void HUD_Main (void) hud_fontsize = HUD_GetFontsize("hud_fontsize"); hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec"); + 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/cvar("hud_configure_grid_x"); ++i) + { + drawfill(eX * i * 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/cvar("hud_configure_grid_y"); ++i) + { + drawfill(eY * i * 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, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL); + if(HUD_Panel_CheckActive(0)) HUD_WeaponIcons(); if(HUD_Panel_CheckActive(1)) @@ -2736,18 +3628,22 @@ void HUD_Main (void) HUD_Notify(); if(HUD_Panel_CheckActive(5)) HUD_Timer(); + // TODO hud'ify if(HUD_Panel_CheckActive(6)) - if(ons_showmap || cvar_string("cl_teamradar") != "0" && (cvar("cl_teamradar") == 2 || teamplay)) + if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay)) HUD_Radar(); if(HUD_Panel_CheckActive(7)) HUD_Score(); if(HUD_Panel_CheckActive(8)) - if(gametype == GAME_RACE || gametype == GAME_CTS || cvar("_hud_configure")) + if(gametype == GAME_RACE || gametype == GAME_CTS || hud_configure) HUD_RaceTimer(); if(HUD_Panel_CheckActive(9)) HUD_VoteWindow(); if(HUD_Panel_CheckActive(10)) - if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2 || cvar("_hud_configure")) + HUD_ModIcons(); + // TODO hud'ify + if(HUD_Panel_CheckActive(11)) + if(spectatee_status > 0 || cvar("hud_pressedkeys") >= 2 || hud_configure) HUD_DrawPressedKeys(); // TODO hud_'ify these @@ -2755,15 +3651,4 @@ void HUD_Main (void) HUD_ShowSpeed(); if (cvar("cl_showacceleration")) HUD_ShowAcceleration(); - - // TODO... well make them work in a panel etc - if(gametype == GAME_KEYHUNT) - CSQC_kh_hud(); - else if(gametype == GAME_CTF) - CSQC_ctf_hud(); - else if(gametype == GAME_NEXBALL) - CSQC_nb_hud(); - else if(gametype == GAME_CTS || gametype == GAME_RACE) - CSQC_race_hud(); - return; }