X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=334ca34b3e935daab9de8f601996535e0f454fa0;hb=df0a07022b2f24ad36892fd832b490df8351f4db;hp=fa1bc2545f77406b67cdfe7499089f4b5df7d034;hpb=7c9aa340aac9c441b0d70c65ff616d324f9d63a3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index fa1bc2545..334ca34b3 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -75,17 +75,42 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the } } +// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box +void drawpic_aspect(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) { + vector imgsize; + imgsize = drawgetimagesize(pic); + float imgaspect; + imgaspect = imgsize_x/imgsize_y; + + vector oldsz; + oldsz = sz; + float aspect; + aspect = sz_x/sz_y; + + if(aspect > imgaspect) { + sz_x = sz_y * imgaspect; + drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag); + } else { + sz_y = sz_x / imgaspect; + drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag); + } +} + // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga +// TODO: make a default skin, and fallback to these! 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); + drawpic_aspect(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, color, alpha, drawflag); } +// TODO: aspect! 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); + return; + //drawpic_aspect_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; + //drawpic_aspect_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp); } // return HUD background color @@ -124,124 +149,30 @@ vector HUD_AccuracyColor(float accuracy) return rgb; } -// draw number in the XSCALE font -void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags) -{ - float l, i; - string str, tmp, l_length; - float minus, plus; - vector vsize, num_color; - - vsize_x = vsize_y = lettersize; - vsize_z = 0; - - // showsign 1: always prefix with minus sign (useful in race distribution display) - // showsign 2: always prefix with plus sign (useful in race distribution display) - // showsign 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display) - - if((showsign == 2 && num >= 0) || (num > 0 && showsign == 3)) - { - plus = true; - pos_x -= lettersize; - } else - plus = false; - - if(num < 0 || (num < 0 && showsign == 3) || (showsign == 1 && num <= 0)) - { - minus = true; - num = -num; - pos_x -= lettersize; - } else - minus = false; - - if(digits < 0) - { - tmp = ftos(num); - digits = -digits; - str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp); - } else - str = ftos(num); - - l = strlen(str); - l_length = ftos(l); - - if(l > digits) - { - str = substring(str, l-digits, 999); - l = strlen(str); - } else if(l < digits) - pos_x += (digits-l) * lettersize; - - if (highlighted == 1) { - vector hl_size; - hl_size_x = vsize_x * l + vsize_x * 0.2; - hl_size_y = vsize_y * 1.1; - hl_size_z = 0; - if(minus) - hl_size_x = hl_size_x + vsize_x; - - vector hl_pos; - hl_pos_x = pos_x - lettersize/10; - hl_pos_y = pos_y - lettersize/20; - hl_pos_z = 0; - - drawpic_skin(hl_pos, strcat("num_leading_", l_length), hl_size, '1 1 1', alpha, dflags); - } - - if (stroke == 1) - num_color = '1 1 1'; - else - num_color = rgb; - - if(minus) - { - if (stroke == 1) - 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_skin(pos, "num_plus_stroke", vsize, rgb, alpha, dflags); - drawpic_skin(pos, "num_plus", vsize, num_color, alpha, dflags); - pos_x += lettersize; - } - - for(i = 0; i < l; ++i) - { - tmp = substring(str, i, 1); - if (stroke == 1) - 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; - } -} - -// color the number differently based on how big it is (used in the health/armor panel) -void HUD_DrawXNum_Colored (vector pos, float x, float digits, float lettersize, float alpha) +vector HUD_Get_Num_Color (float x, float maxvalue) { vector color; - if(x > 200) { + if(x > maxvalue) { color_x = 0; color_y = 1; color_z = 0; } - else if(x > 150) { + else if(x > maxvalue * 0.75) { color_x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0 color_y = 0.9 + (x-150)*0.02 * 0.1; // green value between 0.9 -> 1 color_z = 0; } - else if(x > 100) { + else if(x > maxvalue * 0.5) { color_x = 1 - (x-100)*0.02 * 0.6; //red value between 1 -> 0.4 color_y = 1 - (x-100)*0.02 * 0.1; // green value between 1 -> 0.9 color_z = 1 - (x-100)*0.02; // blue value between 1 -> 0 } - else if(x > 50) { + else if(x > maxvalue * 0.25) { color_x = 1; color_y = 1; color_z = 0.2 + (x-50)*0.02 * 0.8; // blue value between 0.2 -> 1 } - else if(x > 20) { + else if(x > maxvalue * 0.1) { color_x = 1; color_y = (x-20)*90/27/100; // green value between 0 -> 1 color_z = (x-20)*90/27/100 * 0.2; // blue value between 0 -> 0.2 @@ -251,7 +182,7 @@ void HUD_DrawXNum_Colored (vector pos, float x, float digits, float lettersize, color_y = 0; color_z = 0; } - HUD_DrawXNum(pos, x, digits, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL); + return color; } float stringwidth_colors(string s, vector theSize) @@ -564,7 +495,7 @@ void HUD_Panel_ExportCfg(string cfgname) fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n")); fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n")); fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n")); - fputs(fh, strcat("seta hud_fg_alpha) \"", cvar_string("hud_fg_alpha"), "\"", "\n")); + fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n")); fputs(fh, "\n"); fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n")); @@ -597,7 +528,6 @@ void HUD_Panel_ExportCfg(string cfgname) 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: @@ -613,7 +543,10 @@ void HUD_Panel_ExportCfg(string cfgname) break; case 4: 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), "_info_top ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_info_top"))), "\n")); break; + case 6: + fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_foreground_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_foreground_alpha"))), "\n")); 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; @@ -626,56 +559,6 @@ void HUD_Panel_ExportCfg(string cfgname) 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 = 1/10; // at least 1/10 * height - mySize_y = 1/26; // at least 1/26 * width - break; - case 1: - if(cvar("hud_inventory_onlycurrent")) - mySize_y = 2/5; // 2/5 width - else - mySize_x = 0.7; // at least 0.7 * height - break; - case 3: - if(cvar("hud_healtharmor") == 2) - { - mySize_x = 4.35; // 4.35 * height, trial and error... - mySize_y = 0.01; // "unlimited" ;) - } - break; - case 4: - mySize_x = 1.2; // 12/10 * height, as panel cant support more than 10 entries... - mySize_y = 1/12; // 1/12 * width - break; - case 5: - 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; // 1/4 * width - break; - case 10: - 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_y) - mySize_x = 1/mySize_y; - return mySize; -} - // return active status of panel float HUD_Panel_CheckActive(float id) { @@ -728,11 +611,6 @@ vector HUD_Panel_GetPos(float id) 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) - pos_y = vid_conheight + pos_y; - if(disable_menu_alphacheck == 2 && id == highlightedPanel) { vector mySize, menu_enable_panelpos; @@ -826,7 +704,9 @@ float HUD_Panel_GetBgAlpha(float id) if(alpha == "") alpha = cvar_string("hud_bg_alpha"); - if(hud_configure) + if(hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == id) // do not set a minalpha cap when showing the config dialog for this panel + alpha = ftos((1 - cvar("_menu_alpha")) * max(cvar("hud_configure_bg_minalpha"), stof(alpha)) + (cvar("_menu_alpha")) * stof(alpha)); + else if(hud_configure) alpha = ftos(max(cvar("hud_configure_bg_minalpha"), stof(alpha))); if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode @@ -900,7 +780,9 @@ void HUD_Panel_DrawBg(float id, vector pos, vector mySize, float alpha) 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; + if(!alpha) + return; + string pic; pic = strcat("gfx/hud/", cvar_string("hud_skin"), "/"); if(vertical) { @@ -1010,15 +892,10 @@ void HUD_Panel_SetPos(float id, vector pos) 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"); + pos_x = floor((pos_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth; + pos_y = floor((pos_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight; } - 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(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight)); @@ -1026,85 +903,119 @@ void HUD_Panel_SetPos(float id, vector pos) } // 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) -{ +vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) { float i; - vector myTarget; - myTarget = mySize; - + float targBorder; 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 + vector targEndPos; + vector dist; for (i = 0; i < HUD_PANEL_NUM; ++i) { if(i == id || !HUD_Panel_CheckActive(i)) continue; - targPos = HUD_Panel_GetPos(i); - targSize = HUD_Panel_GetSize(i); - - targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id); - targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id); - - if(myPos_y + mySize_y < targPos_y) - continue; - if(myPos_y > targPos_y + targSize_y) - continue; + targBorder = HUD_Panel_GetBorder(i); + targPos = HUD_Panel_GetPos(i) - '1 1 0' * targBorder; + targSize = HUD_Panel_GetSize(i) + '2 2 0' * targBorder; + targEndPos = targPos + targSize; - if(myPos_x + mySize_x < targPos_x) + // resizeorigin is WITHIN target panel, just abort any collision testing against that particular panel to produce expected behaviour! + if(resizeorigin_x > targPos_x && resizeorigin_x < targPos_x + targSize_x && resizeorigin_y > targPos_y && resizeorigin_y < targPos_y + targSize_y) continue; - if(myPos_x > targPos_x + targSize_x) - continue; - - // OK, there IS a collision. - - myCenter_x = myPos_x + 0.5 * mySize_x; - myCenter_y = myPos_y + 0.5 * mySize_y; - - targCenter_x = targPos_x + 0.5 * targSize_x; - targCenter_y = targPos_y + 0.5 * targSize_y; - if(myCenter_x < targCenter_x && myCenter_y < targCenter_y) // top left (of target panel) + if (resizeCorner == 1) { - if(myPos_x + mySize_x - targPos_x < myPos_y + mySize_y - targPos_y) // push it to the side - myTarget_x = targPos_x - myPos_x; - else // push it upwards - myTarget_y = targPos_y - myPos_y; + // check if this panel is on our way + if (resizeorigin_x <= targPos_x) + continue; + if (resizeorigin_y <= targPos_y) + continue; + if (targEndPos_x <= resizeorigin_x - mySize_x) + continue; + if (targEndPos_y <= resizeorigin_y - mySize_y) + continue; + + // there is a collision: + // detect which side of the panel we are facing is actually limiting the resizing + // (which side the resize direction finds for first) and reduce the size up to there + // + // dist is the distance between resizeorigin and the "analogous" point of the panel + // in this case resizeorigin (bottom-right point) and the bottom-right point of the panel + dist_x = resizeorigin_x - targEndPos_x; + dist_y = resizeorigin_y - targEndPos_y; + if (dist_y < 0) + mySize_x = min(mySize_x, dist_x); + else + mySize_y = min(mySize_y, dist_y); } - else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y) // top right + else if (resizeCorner == 2) { - 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; + if (resizeorigin_x >= targEndPos_x) + continue; + if (resizeorigin_y <= targPos_y) + continue; + if (targPos_x >= resizeorigin_x + mySize_x) + continue; + if (targEndPos_y <= resizeorigin_y - mySize_y) + continue; + + dist_x = targPos_x - resizeorigin_x; + dist_y = resizeorigin_y - targEndPos_y; + if (dist_y < 0) + mySize_x = min(mySize_x, dist_x); + else + mySize_y = min(mySize_y, dist_y); } - else if(myCenter_x < targCenter_x && myCenter_y > targCenter_y) // bottom left + else if (resizeCorner == 3) { - if(myPos_x + mySize_x - targPos_x < targPos_y + targSize_y - myPos_y) // push it to the side - myTarget_x = targPos_x - myPos_x; - else // push it downwards - myTarget_y = targPos_y + targSize_y; + if (resizeorigin_x <= targPos_x) + continue; + if (resizeorigin_y >= targEndPos_y) + continue; + if (targEndPos_x <= resizeorigin_x - mySize_x) + continue; + if (targPos_y >= resizeorigin_y + mySize_y) + continue; + + dist_x = resizeorigin_x - targEndPos_x; + dist_y = targPos_y - resizeorigin_y; + if (dist_y < 0) + mySize_x = min(mySize_x, dist_x); + else + mySize_y = min(mySize_y, dist_y); } - else if(myCenter_x > targCenter_x && myCenter_y > targCenter_y) // bottom right + else if (resizeCorner == 4) { - if(targPos_x + targSize_x - myPos_x < targPos_y + targSize_y - myPos_y) // push it to the side - myTarget_x = targPos_x + targSize_x; - else // push it downwards - myTarget_y = targPos_y + targSize_y; + if (resizeorigin_x >= targEndPos_x) + continue; + if (resizeorigin_y >= targEndPos_y) + continue; + if (targPos_x >= resizeorigin_x + mySize_x) + continue; + if (targPos_y >= resizeorigin_y + mySize_y) + continue; + + dist_x = targPos_x - resizeorigin_x; + dist_y = targPos_y - resizeorigin_y; + if (dist_y < 0) + mySize_x = min(mySize_x, dist_x); + else + mySize_y = min(mySize_y, dist_y); } + if(cvar("hud_configure_checkcollisions_debug")) + drawfill(targPos + '1 1 0' * targBorder, targSize - '2 2 0' * targBorder, '1 1 0', .3, DRAWFLAG_NORMAL); } - return myTarget; + return mySize; } -void HUD_Panel_SetPosSize(float id, vector resizeorigin) +void HUD_Panel_SetPosSize(float id) { + vector resizeorigin; + resizeorigin = panel_click_resizeorigin; vector mySize, myPos; - vector oldPos; if(resizeCorner == 1) { mySize_x = resizeorigin_x - (mousepos_x - panel_click_distance_x); @@ -1130,13 +1041,6 @@ void HUD_Panel_SetPosSize(float id, vector resizeorigin) mySize_y = max(2 * cvar("con_chatsize") + 2 * HUD_Panel_GetPadding(id), mySize_y); } - // cap against panel's own limits - vector minSize; - minSize = HUD_Panel_GetMinSize(id); // mySize_x at least minSize_x * mySize_y, and vice versa - - mySize_x = max(minSize_x * mySize_y, mySize_x); - mySize_y = max(minSize_y * mySize_x, mySize_y); - // collision testing| // -----------------+ @@ -1156,26 +1060,36 @@ void HUD_Panel_SetPosSize(float id, vector resizeorigin) } // left/top screen edges - mySize_x = min(myPos_x + mySize_x, mySize_x); - mySize_y = min(myPos_y + mySize_y, mySize_y); + if(myPos_x < 0) + mySize_x = mySize_x + myPos_x; + if(myPos_y < 0) + mySize_y = mySize_y + myPos_y; // bottom/right screen edges - mySize_x = min(vid_conwidth - myPos_x, mySize_x); - mySize_y = min(vid_conheight - myPos_y, mySize_y); + if(myPos_x + mySize_x > vid_conwidth) + mySize_x = vid_conwidth - myPos_x; + if(myPos_y + mySize_y > vid_conheight) + mySize_y = vid_conheight - myPos_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_checkcollisions_debug")) + drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); + // before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken 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"); + mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth; + mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight; + } + + if(cvar("hud_configure_checkcollisions")) + { + mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin); } + // minimum panel size cap, do this once more so we NEVER EVER EVER have a panel smaller than this, JUST IN CASE above code still makes the panel eg negative (impossible to resize back without changing cvars manually then) + mySize_x = max(0.025 * vid_conwidth, mySize_x); + mySize_y = max(0.025 * vid_conheight, mySize_y); + // do another pos check, as size might have changed by now if(resizeCorner == 1) { myPos_x = resizeorigin_x - mySize_x; @@ -1191,6 +1105,10 @@ void HUD_Panel_SetPosSize(float id, vector resizeorigin) myPos_y = resizeorigin_y; } + if(cvar("hud_configure_checkcollisions_debug")) + if(cvar("hud_configure_checkcollisions")) + drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL); + string s; s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight)); cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s); @@ -1349,10 +1267,13 @@ void HUD_Panel_Mouse() } } + if(cvar("hud_configure_checkcollisions_debug")) + drawfill(panelPos, panelSize, '1 0 0', .3, DRAWFLAG_NORMAL); + if(highlightedAction == 1) HUD_Panel_SetPos(i, mousepos - panel_click_distance); else if(highlightedAction == 2) - HUD_Panel_SetPosSize(i, panel_click_resizeorigin); + HUD_Panel_SetPosSize(i); } } @@ -1386,7 +1307,6 @@ void HUD_WeaponIcons_Clear() } entity weaponorder[WEP_MAXCOUNT]; - void weaponorder_swap(float i, float j, entity pass) { entity h; @@ -1395,14 +1315,14 @@ void weaponorder_swap(float i, float j, entity pass) weaponorder[j] = h; } +string weaponorder_cmp_str_save; +string weaponorder_cmp_str; 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; + float ai, aj; + ai = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[i].weapon), 0); + aj = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[j].weapon), 0); + return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string) } void HUD_WeaponIcons(void) @@ -1416,16 +1336,34 @@ void HUD_WeaponIcons(void) mySize = HUD_Panel_GetSize(id); stat_weapons = getstati(STAT_WEAPONS); + weapon_cnt = 0; for(i = WEP_FIRST; i <= WEP_LAST; ++i) { self = get_weaponinfo(i); - if(self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons) || hud_configure) - { - weaponorder[weapon_cnt] = self; + if(self.impulse >= 0) ++weapon_cnt; + } + + // TODO make this configurable + weaponorder_cmp_str = strcat(" ", weaponorder_byimpulse, " "); + + if(weaponorder_cmp_str != weaponorder_cmp_str_save) + { + if(weaponorder_cmp_str_save) + strunzone(weaponorder_cmp_str_save); + weaponorder_cmp_str_save = strzone(weaponorder_cmp_str); + weapon_cnt = 0; + for(i = WEP_FIRST; i <= WEP_LAST; ++i) + { + self = get_weaponinfo(i); + if(self.impulse >= 0) + { + weaponorder[weapon_cnt] = self; + ++weapon_cnt; + } } + heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world); } - heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world); HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; @@ -1465,36 +1403,41 @@ void HUD_WeaponIcons(void) for(i = 0; i < weapon_cnt; ++i) { self = weaponorder[i]; - if((self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons)) || hud_configure) - { - weapid = self.impulse; + weapid = self.impulse; - alpha = (self.weapon == 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]; + weapon_hit = weapon_hits[self.weapon-WEP_FIRST]; + weapon_damage = weapon_fired[self.weapon-WEP_FIRST]; - // draw background behind currently selected weapon - if(self.weapon == activeweapon) - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + // draw 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_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - // draw the weapon accuracy on the HUD - if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS)) - { - if(weapon_damage) - weapon_stats = floor(100 * weapon_hit / weapon_damage); + // draw the weapon accuracy on the HUD + if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS)) + { + if(weapon_damage) + weapon_stats = floor(100 * weapon_hit / weapon_damage); - accuracy_color = HUD_AccuracyColor(weapon_stats); - if(weapon_damage) - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - } + accuracy_color = HUD_AccuracyColor(weapon_stats); + if(weapon_damage) + drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + } - // draw the weapon icon + // draw the weapon icon + if((self.impulse >= 0) && (stat_weapons & self.weapons)) + { drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(cvar_or("hud_weaponicons_number", 1)) drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } + // draw a "ghost weapon icon" if you don't have the weapon + else + { + 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), '0 0 0', HUD_Panel_GetFgAlpha(id) * 0.5, DRAWFLAG_NORMAL); + } ++row; if(row >= rows) @@ -1547,13 +1490,68 @@ string GetAmmoPicture(float i) } } +void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_selected) +{ + float a; + a = getstati(GetAmmoStat(itemcode)); // how much ammo do we have of type itemcode? + if(hud_configure) + a = 100; + + vector color; + if(a < 10) + color = '0.7 0 0'; + else + color = '1 1 1'; + + float alpha; + if(currently_selected) + alpha = 1; + else + alpha = 0.7; + + vector newSize, newPos; + if(mySize_x/mySize_y > 3) + { + newSize_x = 3 * mySize_y; + newSize_y = mySize_y; + + newPos_x = myPos_x + (mySize_x - newSize_x) / 2; + newPos_y = myPos_y; + } + else + { + newSize_y = 1/3 * mySize_x; + newSize_x = mySize_x; + + newPos_y = myPos_y + (mySize_y - newSize_y) / 2; + newPos_x = myPos_x; + } + + vector picpos, numpos; + if(cvar("hud_inventory_iconalign")) + { + numpos = newPos; + picpos = newPos + eX * 2 * newSize_y; + } + else + { + numpos = newPos + eX * newSize_y; + picpos = newPos; + } + + if (currently_selected) + drawpic_skin(newPos, "ammo_current_bg", newSize, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_INVENTORY), DRAWFLAG_NORMAL); + + drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, newSize_y, color, HUD_Panel_GetFgAlpha(HUD_PANEL_INVENTORY) * alpha, DRAWFLAG_NORMAL); + drawpic_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_INVENTORY) * alpha, DRAWFLAG_NORMAL); +} + void HUD_Inventory(void) { float id = HUD_PANEL_INVENTORY; - float i; - float stat_items; + float i, currently_selected; - vector pos, mySize, mysize, mypos; + vector pos, mySize; pos = HUD_Panel_GetPos(id); mySize = HUD_Panel_GetSize(id); @@ -1566,77 +1564,35 @@ void HUD_Inventory(void) 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(hud_configure) - a = 100; + float rows, columns; + rows = mySize_y/mySize_x; + rows = bound(1, floor((sqrt(4 * (3/1) * rows * AMMO_COUNT + rows * rows) + rows + 0.5) / 2), AMMO_COUNT); + // ^^^ ammo item aspect goes here + columns = ceil(AMMO_COUNT/rows); + + float row, column; + // ammo + for (i = 0; i < AMMO_COUNT; ++i) { + currently_selected = getstati(STAT_ITEMS) & GetAmmoItemCode(i); if(cvar("hud_inventory_onlycurrent")) { if(hud_configure) i = 2; - if (stat_items & GetAmmoItemCode(i) || hud_configure) { - drawpic_skin(pos, GetAmmoPicture(i), '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - if(a < 10) - HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - else - HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - } - if(hud_configure) - break; + if (currently_selected || hud_configure) + DrawAmmoItem(pos, mySize, i, currently_selected); + break; } else { - if (a > 0) { - if(mySize_x/mySize_y >= 10) { // arrange horizontally - switch (i) { - case 0: mypos_x = pos_x; mypos_y = pos_y; break; // shells - case 1: mypos_x = pos_x + 0.25 * mySize_x; mypos_y = pos_y; break; // bullets - case 2: mypos_x = pos_x + 0.5 * mySize_x; mypos_y = pos_y; break; // rockets - case 3: mypos_x = pos_x + 0.75 * mySize_x; mypos_y = pos_y; break; // cells - } - mysize_x = 0.25 * mySize_x; - mysize_y = mySize_y; - } else if(mySize_x/mySize_y >= 2.5) { // arrange in a 2x2 grid - switch (i) { - case 0: mypos_x = pos_x + 0.5 * mySize_x; mypos_y = pos_y + 0.5 * mySize_y; break; // shells - case 1: mypos_x = pos_x + 0.5 * mySize_x; mypos_y = pos_y; break; // bullets - case 2: mypos_x = pos_x; mypos_y = pos_y + 0.5 * mySize_y; break; // rockets - case 3: mypos_x = pos_x; mypos_y = pos_y; break; // cells - } - mysize_x = 0.5 * mySize_x; - mysize_y = 0.5 * mySize_y; - } else { // arrange vertically - switch (i) { - case 0: mypos_x = pos_x; mypos_y = pos_y; break; // shells - case 1: mypos_x = pos_x; mypos_y = pos_y + 0.25 * mySize_y; break; // bullets - case 2: mypos_x = pos_x; mypos_y = pos_y + 0.5 * mySize_y; break; // rockets - case 3: mypos_x = pos_x; mypos_y = pos_y + 0.75 * mySize_y; break; // cells - } - mysize_x = mySize_x; - mysize_y = 0.25 * mySize_y; - } - - if (stat_items & GetAmmoItemCode(i)) - drawpic_skin(mypos, "ammo_current_bg", mysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - if (a < 10) { - if(stat_items & GetAmmoItemCode(i)) - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - else - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL); - } else { - if(stat_items & GetAmmoItemCode(i)) - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - else - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL); - } + DrawAmmoItem(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), i, currently_selected); + ++row; + if(row >= rows) + { + row = 0; + column = column + 1; } } } } - // Powerups (#2) // void HUD_Powerups(void) { @@ -1678,8 +1634,6 @@ void HUD_Powerups(void) { shield_time = 27; } - float len; - vector barpos, barsize; vector picpos; vector numpos; @@ -1708,122 +1662,136 @@ void HUD_Powerups(void) { leftalpha = bound(0, leftexact, 1); rightalpha = bound(0, rightexact, 1); + float baralign, iconalign; + baralign = cvar(strcat("hud_", HUD_Panel_GetName(id), "_baralign")); + iconalign = cvar(strcat("hud_", HUD_Panel_GetName(id), "_iconalign")); + if (mySize_x/mySize_y > 4) { if(leftcnt) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(baralign == 1 || baralign == 3) { // right align barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/30); barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; - 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 { + } else { // left align barpos = pos; barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; + } + + if(iconalign == 1 || iconalign == 3) { // right align + picpos = pos + eX * (2/6) * mySize_x; + numpos = pos; + } else { // left align picpos = pos; - numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; + numpos = pos + eX * (1/6) * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(leftcnt <= 5) drawpic_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); else - drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, leftcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, leftname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(leftcnt), eX * (2/6) * mySize_x + eY * mySize_y, mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } if(rightcnt) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(baralign == 0 || baralign == 3) { // left align 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 { + } else { // right align 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; + } + + if(iconalign == 0 || iconalign == 3) { // left align + picpos = pos + eX * (3/6) * mySize_x; + numpos = pos + eX * (4/6) * mySize_x; + } else { // right align + picpos = pos + eX * (5/6) * mySize_x; + numpos = pos + eX * (3/6) * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(rightcnt <= 5) drawpic_skin_expanding_two(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); else - drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, rightcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, rightname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(rightcnt), eX * (2/6) * mySize_x + eY * mySize_y, mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), 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"))) { + if(baralign == 1 || baralign == 3) { // right align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/30); barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y; - picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y; - numpos = picpos - eX * len * 0.5 * mySize_y; - } else { + } else { // left align barpos = pos; barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y; + } + + if(iconalign == 1 || iconalign == 3) { // right align + picpos = pos + eX * (2/3) * mySize_x; + numpos = pos; + } else { // left align picpos = pos; - numpos = picpos + eX * 0.5 * mySize_y; + numpos = pos + eX * (1/3) * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(leftcnt <= 5) drawpic_skin_expanding_two(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); else - drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, leftname, eX * (1/3) * mySize_x + eY * 0.5 * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(leftcnt), eX * (2/3) * mySize_x + eY * 0.5 * mySize_y, mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } if(rightcnt) { - 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 { + if(baralign == 0 || baralign == 3) { // left align barpos = pos + eY * 0.5 * mySize_y; barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; + } else { // right align + 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; + } + + if(iconalign == 0 || iconalign == 3) { // left align picpos = pos + eY * 0.5 * mySize_y; - numpos = picpos + eX * 0.5 * mySize_y; + numpos = pos + eX * (1/3) * mySize_x + eY * 0.5 * mySize_y; + } else { // right align + picpos = pos + eX * (2/3) * mySize_x + eY * 0.5 * mySize_y; + numpos = pos + eY * 0.5 * mySize_y; } HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if(rightcnt <= 5) drawpic_skin_expanding_two(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); else - drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(picpos, rightname, eX * (1/3) * mySize_x + eY * 0.5 * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(rightcnt), eX * (2/3) * mySize_x + eY * 0.5 * mySize_y, mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } } else { if(leftcnt) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(baralign == 1 || baralign == 3) { // down align + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30); + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30); + } else { // up align barpos = pos; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30); + } + + if(iconalign == 1 || iconalign == 3) { // down align + picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x); + numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x; + } else { // up align 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; + numpos = pos + eY * 0.4 * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); @@ -1831,23 +1799,25 @@ void HUD_Powerups(void) { drawpic_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); else drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, leftcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } if(rightcnt) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(baralign == 0 || baralign == 3) { // up align 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 { + } else { // down align 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; + } + + if(iconalign == 0 || iconalign == 3) { // up align + picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; + numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; + } else { // down align + picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x; + numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); @@ -1855,7 +1825,7 @@ void HUD_Powerups(void) { drawpic_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); else drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, rightcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } } } @@ -1895,7 +1865,6 @@ void HUD_HealthArmor(void) if(health <= 0) return; - float len; vector barpos, barsize; vector picpos; vector numpos; @@ -1934,7 +1903,7 @@ void HUD_HealthArmor(void) if(armor) drawpic_skin(picpos, "armor", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } - HUD_DrawXNum_Colored(numpos, x, 3, mySize_y, HUD_Panel_GetFgAlpha(id)); // draw the combined health and armor + //HUD_DrawXNum_Colored(numpos, x, 3, mySize_y, HUD_Panel_GetFgAlpha(id)); // draw the combined health and armor // fuel if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { @@ -1947,7 +1916,6 @@ void HUD_HealthArmor(void) if(fuel) HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); } - else { string leftname, rightname; @@ -1978,167 +1946,189 @@ void HUD_HealthArmor(void) rightalpha = min((armor+10)/55, 1); } + float baralign, iconalign; + baralign = cvar(strcat("hud_", HUD_Panel_GetName(id), "_baralign")); + iconalign = cvar(strcat("hud_", HUD_Panel_GetName(id), "_iconalign")); + if (mySize_x/mySize_y > 5) { if(leftactive) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(baralign == 1 || baralign == 3) { // right align barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/200); barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; - 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 { + } else { // left align barpos = pos; barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; + } + + if(iconalign == 1 || iconalign == 3) { // right align + picpos = pos + eX * (2/6) * mySize_x; + numpos = pos; + } else { // left align picpos = pos; - numpos = picpos + eX * mySize_y + eY * 0.25 * mySize_y; + numpos = pos + eX * (1/6) * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + drawpic_skin(picpos, leftname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(leftcnt), eX * (2/6) * mySize_x + eY * mySize_y, mySize_y, HUD_Get_Num_Color(leftcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } if(rightactive) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(baralign == 0 || baralign == 3) { // left align 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 { + } else { // right align 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; + } + + if(iconalign == 0 || iconalign == 3) { // left align + picpos = pos + eX * (3/6) * mySize_x; + numpos = pos + eX * (4/6) * mySize_x; + } else { // right align + picpos = pos + eX * (5/6) * mySize_x; + numpos = pos + eX * (3/6) * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, rightcnt, 3, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + drawpic_skin(picpos, rightname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(rightcnt), eX * (2/6) * mySize_x + eY * mySize_y, mySize_y, HUD_Get_Num_Color(rightcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; - } else { - barpos = pos; - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; - } if(fuel) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); - } - else if (mySize_x/mySize_y > 2) + { + if(baralign == 0 || baralign == 3) { // left align + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } + HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + } + } + else if (mySize_x/mySize_y > 2) { if(leftactive) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(baralign == 1 || baralign == 3) { // right align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200); - barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; - picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y; - numpos = picpos - eX * len * 0.5 * mySize_y; - } else { + barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + } else { // left align barpos = pos; - barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; + barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + } + + if(iconalign == 1 || iconalign == 3) { // right align + picpos = pos + eX * (2/3) * mySize_x; + numpos = pos; + } else { // left align picpos = pos; - numpos = picpos + eX * 0.5 * mySize_y; + numpos = pos + eX * (1/3) * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + drawpic_skin(picpos, leftname, eX * (1/3) * mySize_x + eY * 0.5 * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(leftcnt), eX * (2/3) * mySize_x + eY * 0.5 * mySize_y, mySize_y, HUD_Get_Num_Color(leftcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } if(rightactive) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; - barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; - picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y; - numpos = picpos - eX * len * 0.5 * mySize_y; - } else { + if(baralign == 0 || baralign == 3) { // left align barpos = pos + eY * 0.5 * mySize_y; barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + } else { // right align + 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; + } + + if(iconalign == 0 || iconalign == 3) { // left align picpos = pos + eY * 0.5 * mySize_y; - numpos = picpos + eX * 0.5 * mySize_y; + numpos = pos + eX * (1/3) * mySize_x + eY * 0.5 * mySize_y; + } else { // right align + picpos = pos + eX * (2/3) * mySize_x + eY * 0.5 * mySize_y; + numpos = pos + eY * 0.5 * mySize_y; } HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + drawpic_skin(picpos, rightname, eX * (1/3) * mySize_x + eY * 0.5 * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(rightcnt), eX * (2/3) * mySize_x + eY * 0.5 * mySize_y, mySize_y, HUD_Get_Num_Color(rightcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } - 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) + { + if(baralign == 0 || baralign == 3) { // left align + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; + } HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + } } else { if(leftactive) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(baralign == 1 || baralign == 3) { // down align + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200); + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); + } else { // up align barpos = pos; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); + } + + if(iconalign == 1 || iconalign == 3) { // down align + picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x); + numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x; + } else { // up align 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; + numpos = pos + eY * 0.4 * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id)); + drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, HUD_Get_Num_Color(leftcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } if(rightactive) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(baralign == 0 || baralign == 3) { // up align 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 { + } else { // down align 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; + } + + if(iconalign == 0 || iconalign == 3) { // up align + picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; + numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; + } else { // down align + picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x; + numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; } HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id)); + drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, HUD_Get_Num_Color(rightcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } - 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) + { + if(baralign == 0 || baralign == 3) { // left align + 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); + } HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + } } } } @@ -2163,14 +2153,16 @@ string Weapon_KillMessage(float deathtype) float killnotify_times[10]; float killnotify_deathtype[10]; +float killnotify_actiontype[10]; // 0 = "Y [used by] X", 1 = "X [did action to] Y" string killnotify_attackers[10]; string killnotify_victims[10]; -void HUD_KillNotify_Push(string attacker, string victim, float wpn) +void HUD_KillNotify_Push(string attacker, string victim, float actiontype, float wpn) { float i; for (i = 9; i > 0; --i) { killnotify_times[i] = killnotify_times[i-1]; killnotify_deathtype[i] = killnotify_deathtype[i-1]; + killnotify_actiontype[i] = killnotify_actiontype[i-1]; if(killnotify_attackers[i]) strunzone(killnotify_attackers[i]); killnotify_attackers[i] = strzone(killnotify_attackers[i-1]); @@ -2180,6 +2172,7 @@ void HUD_KillNotify_Push(string attacker, string victim, float wpn) } killnotify_times[0] = time; killnotify_deathtype[0] = wpn; + killnotify_actiontype[0] = actiontype; if(killnotify_attackers[0]) strunzone(killnotify_attackers[0]); killnotify_attackers[0] = strzone(attacker); @@ -2191,124 +2184,175 @@ void HUD_KillNotify_Push(string attacker, string victim, float wpn) void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) { float w; + float alsoprint; + alsoprint = (cvar("hud_notify_print") || !HUD_Panel_CheckActive(4)); // print message to console if: notify panel disabled, or cvar to do so enabled + if(msg == MSG_SUICIDE) { - HUD_KillNotify_Push(s1, "", DEATH_KILL); - // TODO: cl_gentle w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { - if (!HUD_Panel_CheckActive(4) || cvar("hud_notify_print")) + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if (alsoprint) print("^1", s1, "^1 ", Weapon_SuicideMessage(type), "\n"); - } - else if (type == DEATH_KILL) - print ("^1",s1, "^1 couldn't take it anymore\n"); - else if (type == DEATH_ROT) - print ("^1",s1, "^1 died\n"); - else if (type == DEATH_NOAMMO) - print ("^7",s1, "^7 committed suicide. What's the point of living without ammo?\n"); - else if (type == DEATH_CAMP) - print ("^1",s1, "^1 thought they found a nice camping ground\n"); - else if (type == DEATH_MIRRORDAMAGE) - print ("^1",s1, "^1 didn't become friends with the Lord of Teamplay\n"); - else if (type == DEATH_CHEAT) - print ("^1",s1, "^1 unfairly eliminated themself\n"); - else if (type == DEATH_FIRE) - print ("^1",s1, "^1 burned to death\n"); - else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET) - print ("^1",s1, "^1 couldn't resist the urge to self-destruct\n"); + } else if (type == DEATH_KILL) { + HUD_KillNotify_Push(s1, "", 0, DEATH_KILL); + if (alsoprint) + print ("^1",s1, "^1 couldn't take it anymore\n"); + } else if (type == DEATH_ROT) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if (alsoprint) + print ("^1",s1, "^1 died\n"); + } else if (type == DEATH_NOAMMO) { + HUD_KillNotify_Push(s1, "", 0, DEATH_NOAMMO); + if (alsoprint) + print ("^7",s1, "^7 committed suicide. What's the point of living without ammo?\n"); + } else if (type == DEATH_CAMP) { + HUD_KillNotify_Push(s1, "", 0, DEATH_CAMP); + if (alsoprint) + print ("^1",s1, "^1 thought they found a nice camping ground\n"); + } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { + HUD_KillNotify_Push(s1, "", 0, type); + if (alsoprint) + print ("^1",s1, "^1 didn't become friends with the Lord of Teamplay\n"); + } else if (type == DEATH_CHEAT) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if (alsoprint) + print ("^1",s1, "^1 unfairly eliminated themself\n"); + } else if (type == DEATH_FIRE) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if (alsoprint) + print ("^1",s1, "^1 burned to death\n"); + } else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if (alsoprint) + print ("^1",s1, "^1 couldn't resist the urge to self-destruct\n"); + } + if (stof(s2) > 2) // killcount > 2 print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n"); } else if(msg == MSG_KILL) { w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { - HUD_KillNotify_Push(s2, s1, w); - if (!HUD_Panel_CheckActive(4) || cvar("hud_notify_print")) + HUD_KillNotify_Push(s2, s1, 1, w); + if (alsoprint) print("^1", s1, "^1 ", Weapon_KillMessage(type), "\n"); } - else if(type == KILL_TEAM || type == KILL_TEAM_SPREE) { + else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) { + HUD_KillNotify_Push(s1, s2, 1, type); + if(alsoprint) + { if(cvar("cl_gentle")) { 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"); - } + } + if (stof(s2) > 2 && type == KILL_TEAM_SPREE) { + if(cvar("cl_gentle")) + print ("^1",s1,"^1 ended a ",s3," scoring spree by going against a team mate\n"); + else + print ("^1",s1,"^1 ended a ",s3," kill spree by killing a team mate\n"); + } + else if (stof(s2) > 2) { + if(cvar("cl_gentle")) + print ("^1",s1,"'s ^1",s3," scoring spree was ended by a team mate!\n"); + else + print ("^1",s1,"'s ^1",s3," kill spree was ended by a team mate!\n"); + } } else if(type == KILL_FIRST_BLOOD) print("^1",s1, "^1 drew first blood", "\n"); + // TODO: icon! else if (type == DEATH_TELEFRAG) print ("^1",s1, "^1 was telefragged by ", s2, "\n"); else if (type == DEATH_DROWN) { - HUD_KillNotify_Push(s2, s1, DEATH_FALL); - print ("^1",s1, "^1 was drowned by ", s2, "\n"); + HUD_KillNotify_Push(s2, s1, 1, DEATH_DROWN); + if(alsoprint) + print ("^1",s1, "^1 was drowned by ", s2, "\n"); } else if (type == DEATH_SLIME) { - HUD_KillNotify_Push(s2, s1, DEATH_FALL); - print ("^1",s1, "^1 was slimed by ", s2, "\n"); + HUD_KillNotify_Push(s2, s1, 1, DEATH_SLIME); + if(alsoprint) + print ("^1",s1, "^1 was slimed by ", s2, "\n"); } else if (type == DEATH_LAVA) { - HUD_KillNotify_Push(s2, s1, DEATH_FALL); - print ("^1",s1, "^1 was cooked by ", s2, "\n"); + HUD_KillNotify_Push(s2, s1, 1, DEATH_LAVA); + if(alsoprint) + print ("^1",s1, "^1 was cooked by ", s2, "\n"); } else if (type == DEATH_FALL) { - HUD_KillNotify_Push(s2, s1, DEATH_FALL); - print ("^1",s1, "^1 was grounded by ", s2, "\n"); + HUD_KillNotify_Push(s2, s1, 1, DEATH_FALL); + if(alsoprint) + print ("^1",s1, "^1 was grounded by ", s2, "\n"); } else if (type == DEATH_SHOOTING_STAR) { - HUD_KillNotify_Push(s2, s1, DEATH_FALL); - print ("^1",s1, "^1 was shot into space by ", s2, "\n"); + HUD_KillNotify_Push(s2, s1, 1, DEATH_SHOOTING_STAR); + if(alsoprint) + print ("^1",s1, "^1 was shot into space by ", s2, "\n"); } else if (type == DEATH_SWAMP) { - HUD_KillNotify_Push(s2, s1, DEATH_FALL); - print ("^1",s1, "^1 was conserved by ", s2, "\n"); - } - else if (type == DEATH_HURTTRIGGER && s3 != "") - { - HUD_KillNotify_Push(s2, s1, DEATH_FALL); - // p ?!?! :o - //if(p < 0) - print("^1", s1, "^1 ", s3, " ", s2, "\n"); - //else - // bprint("^1", s1, "^1 ", substring(s3, 0, p), s2, "^1", substring(s3, p+1, strlen(s3) - (p+1)), "\n"); - } - else if(type == DEATH_SBCRUSH) - print ("^1",s1, "^1 was crushed by ^1", s2, "\n"); - else if(type == DEATH_SBMINIGUN) - print ("^1",s1, "^1 got shredded by ^1", s2, "\n"); - else if(type == DEATH_SBROCKET) - print ("^1",s1, "^1 was blased to bits by ^1", s2, "\n"); - else if(type == DEATH_SBBLOWUP) - print ("^1",s1, "^1 got cought in the destruction of ^1", s2, "'s vehicle\n"); - - else if(type == DEATH_WAKIGUN) - print ("^1",s1, "^1 was bolted down by ^1", s2, "\n"); - else if(type == DEATH_WAKIROCKET) - print ("^1",s1, "^1 could find no shelter from ^1", s2, "'s rockets\n"); - else if(type == DEATH_WAKIBLOWUP) - print ("^1",s1, "^1 dies when ^1", s2, "'s wakizashi dies.\n"); - - else if(type == DEATH_TURRET) - print ("^1",s1, "^1 was pushed into the line of fire by ^1", s2, "\n"); - else if(type == DEATH_TOUCHEXPLODE) - print ("^1",s1, "^1 was pushed into an accident by ^1", s2, "\n"); - else if(type == DEATH_CHEAT) - print ("^1",s1, "^1 was unfairly eliminated by ^1", s2, "\n"); - else if (type == DEATH_FIRE) - print ("^1",s1, "^1 was burnt to death by ^1", s2, "\n"); - else if (type == DEATH_CUSTOM) - print ("^1",s1, "^1 ", s2, "\n"); - else - print ("^1",s1, "^1 was fragged by ", s2, "\n"); + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was conserved by ", s2, "\n"); + } + else if (type == DEATH_HURTTRIGGER) + { + HUD_KillNotify_Push(s2, s1, 1, DEATH_HURTTRIGGER); + if(alsoprint) + print("^1",s1, "^1 was thrown into a world of hurt by ", s2, "\n"); + } else if(type == DEATH_SBCRUSH) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was crushed by ^1", s2, "\n"); + } else if(type == DEATH_SBMINIGUN) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 got shredded by ^1", s2, "\n"); + } else if(type == DEATH_SBROCKET) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was blased to bits by ^1", s2, "\n"); + } else if(type == DEATH_SBBLOWUP) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 got caught in the destruction of ^1", s2, "'s vehicle\n"); + } else if(type == DEATH_WAKIGUN) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was bolted down by ^1", s2, "\n"); + } else if(type == DEATH_WAKIROCKET) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 could find no shelter from ^1", s2, "'s rockets\n"); + } else if(type == DEATH_WAKIBLOWUP) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 dies when ^1", s2, "'s wakizashi dies.\n"); + } else if(type == DEATH_TURRET) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was pushed into the line of fire by ^1", s2, "\n"); + } else if(type == DEATH_TOUCHEXPLODE) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was pushed into an accident by ^1", s2, "\n"); + } else if(type == DEATH_CHEAT) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was unfairly eliminated by ^1", s2, "\n"); + } else if (type == DEATH_FIRE) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was burnt to death by ^1", s2, "\n"); + } else if (type == DEATH_CUSTOM) { + HUD_KillNotify_Push(s2, s1, 1, DEATH_CUSTOM); + if(alsoprint) + print ("^1",s1, "^1 ", s2, "\n"); + } else { + HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was fragged by ", s2, "\n"); + } } else if(msg == MSG_SPREE) { if(type == KILL_END_SPREE) { if(cvar("cl_gentle")) @@ -2357,82 +2401,114 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) print (s1,"^7 unleashes ^1ARMAGEDDON!\n"); } } else if(msg == MSG_KILL_ACTION) { // wtf is this? isnt it basically the same as MSG_SUICIDE? - HUD_KillNotify_Push(s1, "", DEATH_KILL); if (type == DEATH_DROWN) { - if(cvar("cl_gentle")) - print ("^1",s1, "^1 was in the water for too long\n"); - else - print ("^1",s1, "^1 drowned\n"); - } - else if (type == DEATH_SLIME) - print ("^1",s1, "^1 was slimed\n"); - else if (type == DEATH_LAVA) { - if(cvar("cl_gentle")) - print ("^1",s1, "^1 found a hot place\n"); - else - print ("^1",s1, "^1 turned into hot slag\n"); - } - else if (type == DEATH_FALL) { - if(cvar("cl_gentle")) - print ("^1",s1, "^1 tested gravity (and it worked)\n"); - else - print ("^1",s1, "^1 hit the ground with a crunch\n"); - } - else if (type == DEATH_SHOOTING_STAR) - print ("^1",s1, "^1 became a shooting star\n"); - else if (type == DEATH_SWAMP) { - if(cvar("cl_gentle")) - print ("^1",s1, "^1 discovered a swamp\n"); - else - print ("^1",s1, "^1 is now conserved for centuries to come\n"); - } - else if(type == DEATH_TURRET) - print ("^1",s1, "^1 was mowed down by a turret \n"); - else if (type == DEATH_CUSTOM) - print ("^1",s1, "^1 ", s2, "\n"); - else if(type == DEATH_TOUCHEXPLODE) - print ("^1",s1, "^1 died in an accident\n"); - else if(type == DEATH_CHEAT) - print ("^1",s1, "^1 was unfairly eliminated\n"); - else if(type == DEATH_FIRE) { - if(cvar("cl_gentle")) - print ("^1",s1, "^1 felt a little hot\n"); - else - print ("^1",s1, "^1 burnt to death\n"); - } - else { - if(cvar("cl_gentle")) - print ("^1",s1, "^1 needs a restart\n"); - else - print ("^1",s1, "^1 died\n"); + HUD_KillNotify_Push(s1, "", 0, DEATH_DROWN); + if(alsoprint) + { + 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) { + HUD_KillNotify_Push(s1, "", 0, DEATH_SLIME); + if(alsoprint) + print ("^1",s1, "^1 was slimed\n"); + } else if (type == DEATH_LAVA) { + HUD_KillNotify_Push(s1, "", 0, DEATH_LAVA); + if(alsoprint) + { + 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) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if(alsoprint) + { + 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) { + HUD_KillNotify_Push(s1, "", 0, DEATH_SHOOTING_STAR); + if(alsoprint) + print ("^1",s1, "^1 became a shooting star\n"); + } else if (type == DEATH_SWAMP) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if(alsoprint) + { + 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) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was mowed down by a turret \n"); + } else if (type == DEATH_CUSTOM) { + HUD_KillNotify_Push(s1, "", 0, DEATH_CUSTOM); + if(alsoprint) + print ("^1",s1, "^1 ", s2, "\n"); + } else if (type == DEATH_HURTTRIGGER) { + HUD_KillNotify_Push(s1, "", 0, DEATH_HURTTRIGGER); + if(alsoprint) + print ("^1",s1, "^1 was in the wrong place\n"); + } else if(type == DEATH_TOUCHEXPLODE) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 died in an accident\n"); + } else if(type == DEATH_CHEAT) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if(alsoprint) + print ("^1",s1, "^1 was unfairly eliminated\n"); + } else if(type == DEATH_FIRE) { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if(alsoprint) + { + if(cvar("cl_gentle")) + print ("^1",s1, "^1 felt a little hot\n"); + else + print ("^1",s1, "^1 burnt to death\n"); + } + } else { + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + if(alsoprint) + { + if(cvar("cl_gentle")) + print ("^1",s1, "^1 needs a restart\n"); + else + print ("^1",s1, "^1 died\n"); + } } } else if(msg == MSG_KILL_ACTION_SPREE) { - HUD_KillNotify_Push(s1, "", DEATH_KILL); if(cvar("cl_gentle")) print ("^1",s1,"^1 needs a restart after a ",s2," scoring spree\n"); else print ("^1",s1,"^1 died with a ",s2," kill spree\n"); } else if(msg == MSG_INFO) { - if(type == INFO_GOTFLAG) { - HUD_KillNotify_Push(s1, s2, INFO_GOTFLAG); + if(type == INFO_GOTFLAG) { // here, s2 is the flag name + HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG); print(s1, "^7 got the ", s2, "\n"); } else if(type == INFO_LOSTFLAG) { - HUD_KillNotify_Push(s1, s2, INFO_LOSTFLAG); + HUD_KillNotify_Push(s1, s2, 0, INFO_LOSTFLAG); print(s1, "^7 lost the ", s2, "\n"); } else if(type == INFO_PICKUPFLAG) { - HUD_KillNotify_Push(s1, s2, INFO_GOTFLAG); + HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG); print(s1, "^7 picked up the ", s2, "\n"); } else if(type == INFO_RETURNFLAG) { - HUD_KillNotify_Push(s1, s2, INFO_RETURNFLAG); + HUD_KillNotify_Push(s1, s2, 0, INFO_RETURNFLAG); print(s1, "^7 returned the ", s2, "\n"); } } - } #define DAMAGE_CENTERPRINT_SPACER NEWLINES -void HUD_Centerprint(string s1, float type, float msg) +void HUD_Centerprint(string s1, string s2, float type, float msg) { if(msg == MSG_SUICIDE) { if (type == DEATH_TEAMCHANGE) { @@ -2454,7 +2530,7 @@ void HUD_Centerprint(string s1, float type, float msg) 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) { + } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { if(cvar("cl_gentle")) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't go against team mates!")); else @@ -2468,9 +2544,9 @@ void HUD_Centerprint(string s1, float type, float msg) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You killed your own dumb self!")); } } else if(msg == MSG_KILL) { - if (type == KILL_TEAM) { + if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { if(cvar("cl_gentle")) { - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against a team mate!")); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against", s1, ",a team mate!")); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s1, ", a team mate!")); } @@ -2486,34 +2562,34 @@ void HUD_Centerprint(string s1, float type, float msg) } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First victim")); } - } else if (type == KILL_TYPEFRAG) { + } else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap... if(cvar("cl_gentle")) { - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^7 who was typing!")); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^1 who was typing!", s2)); } else { - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1)); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1, s2)); } } else if (type == KILL_TYPEFRAGGED) { if(cvar("cl_gentle")) { - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^7 while you were typing!")); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^1 while you were typing!", s2)); } else { - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1)); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1, s2)); } } else if (type == KILL_FRAG) { if(cvar("cl_gentle")) { - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s1)); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s1, s2)); } else { - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You fragged ^7", s1)); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You fragged ^7", s1, s2)); } } else if (type == KILL_FRAGGED) { if(cvar("cl_gentle")) { - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were scored against by ^7", s1)); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, s2)); } else { - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were fragged by ^7", s1)); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were fragged by ^7", s1, s2)); } } } else if(msg == MSG_KILL_ACTION) { // TODO: invent more centerprints here? - centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Watch your step!", s1)); + centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Watch your step!")); } } @@ -2534,8 +2610,9 @@ void HUD_Notify (void) } float entries, height; - entries = bound(1, floor(12 * mySize_y/mySize_x), 10); + entries = bound(1, floor(14 * mySize_y/mySize_x), 12); height = mySize_y/entries; + entries -= 2; // top/bottom two lines reserved for info messaged, such as spec instructions vector fontsize; fontsize = '0.5 0.5 0' * height; @@ -2560,6 +2637,8 @@ void HUD_Notify (void) i = j; else // rather nasty hack for ordering items from the bottom up i = entries - j - 1; + if(cvar("hud_notify_info_top")) + i += 2; // top/bottom two lines reserved for info messaged, such as spec instructions if(fadetime) { @@ -2578,59 +2657,75 @@ void HUD_Notify (void) // TODO: maybe print in team colors? // TODO: maybe this could be cleaned up somehow... + // TODO: less copypaste code below // - // X [did action to] Y - if(hud_configure || WEP_VALID(killnotify_deathtype[j]) || killnotify_deathtype[j] == DEATH_FALL) + // Y [used by] X + if(killnotify_actiontype[j] == 0 && !hud_configure) { - if(hud_configure) + attacker = textShortenToWidth(killnotify_attackers[j], mySize_x - 2 * height, fontsize, stringwidth_colors); + + width_attacker = stringwidth(attacker, TRUE, fontsize); + pos_attacker = pos + eX * 0.5 * (mySize_x - width_attacker + 2 * height) + eY * 0.5 * fontsize_y + eY * i * height; + + weap_pos = pos + eX * 0.5 * (mySize_x - width_attacker) - eX * height + eY * i * height; + if(killnotify_deathtype[j] == DEATH_GENERIC) { - attacker = textShortenToWidth("Player1", 0.5 * mySize_x - height, fontsize, stringwidth_colors); - victim = textShortenToWidth("Player2", 0.5 * mySize_x - height, fontsize, stringwidth_colors); + drawpic_skin(weap_pos, "notify_death", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } - else + else if(killnotify_deathtype[j] == DEATH_NOAMMO) { - attacker = textShortenToWidth(killnotify_attackers[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors); - victim = textShortenToWidth(killnotify_victims[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors); + drawpic_skin(weap_pos, "notify_outofammo", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } - width_attacker = stringwidth(attacker, TRUE, fontsize); - width_victim = stringwidth(victim, TRUE, fontsize); - pos_attacker = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_attacker) + eY * 0.5 * fontsize_y + eY * i * height; - pos_victim = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_victim) + eY * 0.5 * fontsize_y + eX * 0.5 * mySize_x + eX * height + eY * i * height; - weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; - - if(hud_configure) // example actions for config mode + else if(killnotify_deathtype[j] == DEATH_KILL) { - drawpic_skin(weap_pos, strcat("weapon", "electro"), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(weap_pos, "notify_selfkill", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } - else if(WEP_VALID(killnotify_deathtype[j])) + else if(killnotify_deathtype[j] == DEATH_CAMP) { - self = get_weaponinfo(killnotify_deathtype[j]); - drawpic_skin(weap_pos, strcat("weapon", self.netname), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawpic_skin(weap_pos, "notify_camping", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == KILL_TEAM_RED) + { + drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) + { + drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_DROWN) + { + drawpic_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_SLIME) + { + drawpic_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_LAVA) + { + drawpic_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } else if(killnotify_deathtype[j] == DEATH_FALL) { - drawpic_skin(weap_pos, "notify_pushoffedge", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawpic_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } - } - - // Y [used by] X - else - { - attacker = textShortenToWidth(killnotify_attackers[j], mySize_x - 2 * height, fontsize, stringwidth_colors); - - width_attacker = stringwidth(attacker, TRUE, fontsize); - pos_attacker = pos + eX * 0.5 * (mySize_x - width_attacker + 2 * height) + eY * 0.5 * fontsize_y + eY * i * height; - - weap_pos = pos + eX * 0.5 * (mySize_x - width_attacker) - eX * height + eY * i * height; - if(killnotify_deathtype[j] == DEATH_KILL) + else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) { - drawpic_skin(weap_pos, "notify_selfkill", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawpic_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) + { + drawpic_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } else if(killnotify_deathtype[j] == INFO_GOTFLAG) @@ -2661,36 +2756,131 @@ void HUD_Notify (void) drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } } + // X [did action to] Y + else + { + if(hud_configure) + { + attacker = textShortenToWidth("Player1", 0.5 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth("Player2", 0.5 * mySize_x - height, fontsize, stringwidth_colors); + a = bound(0, (when - j) / 4, 1); + } + else + { + attacker = textShortenToWidth(killnotify_attackers[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth(killnotify_victims[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors); + } + width_attacker = stringwidth(attacker, TRUE, fontsize); + width_victim = stringwidth(victim, TRUE, fontsize); + pos_attacker = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_attacker) + eY * 0.5 * fontsize_y + eY * i * height; + pos_victim = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_victim) + eY * 0.5 * fontsize_y + eX * 0.5 * mySize_x + eX * height + eY * i * height; + weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; + + if(hud_configure) // example actions for config mode + { + drawpic_skin(weap_pos, strcat("weapon", "electro"), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(WEP_VALID(killnotify_deathtype[j])) + { + self = get_weaponinfo(killnotify_deathtype[j]); + drawpic_skin(weap_pos, strcat("weapon", self.netname), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == KILL_TEAM_RED) + { + drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) + { + drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_DROWN) + { + drawpic_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_SLIME) + { + drawpic_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_LAVA) + { + drawpic_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_FALL) + { + drawpic_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) + { + drawpic_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right? + { + drawpic_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + } + } + } - /* This will come later. - string s; + + // Info messages + // entity tm; + vector o; + o = pos; + if(cvar("hud_notify_info_top")) + o = pos + eY; + else + o = pos + eY * mySize_y - eY * 2 * height; + if(spectatee_status && !intermission) { - drawfont = hud_bigfont; + //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_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawfont = hud_font; + + //s = textShortenToWidth(s, mySize_y, 0.5 * height, stringwidth_colors); + //drawcolorcodedstring(pos + eY * 0.25 * height, s, 0.5 * height, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + //drawfont = hud_font; // spectator text in the upper right corner if(spectatee_status == -1) s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate"); else s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player"); + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; if(spectatee_status == -1) s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed"); else s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe"); + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info"); + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; if(gametype == GAME_ARENA) s = "^1Wait for your turn to join"; @@ -2707,6 +2897,8 @@ void HUD_Notify (void) } else s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; //show restart countdown: if (time < getstatf(STAT_GAMESTARTTIME)) { @@ -2714,15 +2906,17 @@ void HUD_Notify (void) //we need to ceil, otherwise the countdown would be off by .5 when using round() countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time); s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds"); + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; } } if(warmup_stage && !intermission) { s = "^2Currently in ^1warmup^2 stage!"; + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; } - // move more important stuff more to the middle so its more visible - string blinkcolor; if(mod(time, 1) >= 0.5) blinkcolor = "^1"; @@ -2745,10 +2939,14 @@ void HUD_Notify (void) else s = strcat("^2Waiting for others to ready up..."); } + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; } else if(warmup_stage && !intermission && !spectatee_status) { s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup"); + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; } if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger) @@ -2775,14 +2973,37 @@ void HUD_Notify (void) if (tm.team_size == ts_max) s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust"); + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; } } } - */ + if(hud_configure) + { + s = "^7Press ^3ESC ^7to show HUD options."; + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; + s = "^3Doubleclick a panel for panel-specific options."; + drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + o += eY * fontsize_y; + } } // Timer (#5) // +string seconds_tostring(float sec) +{ + float minutes; + minutes = floor(sec / 60); + + sec -= minutes * 60; + + string s; + s = ftos(100 + sec); + + return strcat(ftos(minutes), ":", substring(s, 1, 3)); +} + void HUD_Timer(void) { float id = HUD_PANEL_TIMER; @@ -2799,14 +3020,15 @@ void HUD_Timer(void) mySize -= '2 2 0' * padding; } - float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft; + string timer; + float timelimit, elapsedTime, timeleft, minutesLeft; timelimit = getstatf(STAT_TIMELIMIT); 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 @@ -2819,25 +3041,16 @@ void HUD_Timer(void) 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; + timer = seconds_tostring(0); } else { elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127 - minutes = floor(elapsedTime / 60); - seconds = elapsedTime - minutes*60; + timer = seconds_tostring(elapsedTime); } } else { - minutes = minutesLeft; - seconds = secondsLeft; + timer = seconds_tostring(timeleft); } - 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_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 2.57 * mySize_y, "num_colon", '1 1 0' * mySize_y, timer_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - } - HUD_DrawXNum(pos + eX * mySize_x - eX * 2 * mySize_y, seconds, -2, 0, mySize_y, timer_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(pos, timer, mySize, mySize_y, timer_color, HUD_Panel_GetFgAlpha(HUD_PANEL_TIMER), DRAWFLAG_NORMAL); } // Radar (#6) @@ -2985,7 +3198,7 @@ void HUD_Score(void) } float score, distribution, leader; - float score_len, distr_len; + float score_len; vector distribution_color; entity tm, pl, me; me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1]; @@ -3029,19 +3242,19 @@ void HUD_Score(void) 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_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + //HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + //HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); drawpic_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE); } // race record display if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "num_leading_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + //HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + //HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE); - HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + //HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE); */ } else if (!teamplay) { // non-teamgames @@ -3073,12 +3286,13 @@ void HUD_Score(void) distribution_color = eX; 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_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize_x, ftos(distribution), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, (1/3) * mySize_y, distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("num_leading_", ftos(score_len)), eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawfont = hud_bigfont; + drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, mySize_y, distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawfont = hud_font; } else { // teamgames float max_fragcount; max_fragcount = -99; @@ -3101,14 +3315,16 @@ void HUD_Score(void) if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("num_leading_", ftos(score_len)), eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawfont = hud_bigfont; + drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, mySize_y, GetTeamRGB(tm.team) * 0.8, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawfont = hud_font; } else { if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("num_leading_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, strcat("num_leading_", ftos(score_len)), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, ftos(score), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, (1/3) * mySize_y, GetTeamRGB(tm.team) * 0.8, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); teamnum += 1; } } @@ -3139,9 +3355,11 @@ void HUD_RaceTimer (void) { if(hud_configure) { s = "0:13:37"; - drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.60 0.60 0' * mySize_y), s, '0.60 0.60 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); s = "^1Intermediate 1 (+15.42)"; - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.60 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + s = strcat("^1PENALTY: ", ftos_decimals(20 * 0.1, 1), " (missing a checkpoint)"); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.80 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } else if(race_checkpointtime) { @@ -3176,10 +3394,9 @@ void HUD_RaceTimer (void) { { dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } - // ___ TODO!!!___ if(race_penaltytime) { a = bound(0, 2 - (time - race_penaltyeventtime), 1); @@ -3188,7 +3405,7 @@ void HUD_RaceTimer (void) { s = strcat("^1PENALTY: ", ftos_decimals(race_penaltytime * 0.1, 1), " (", race_penaltyreason, ")"); dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.8 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } } @@ -3196,7 +3413,7 @@ void HUD_RaceTimer (void) { { a = bound(0, (time - race_checkpointtime) / 0.5, 1); //drawstring_expanding(m - '16 0 0' * stringwidth(forcetime, FALSE), forcetime, '32 32 0', '1 1 1', HUD_Panel_GetFgAlpha(id), 0, a); - drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.75 * mySize_y), forcetime, '1 1 0' * 0.75 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), 0, a); + drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.6 * mySize_y), forcetime, '1 1 0' * 0.6 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), 0, a); } else a = 1; @@ -3205,7 +3422,7 @@ void HUD_RaceTimer (void) { { s = TIME_ENCODED_TOSTRING(TIME_ENCODE(time + TIME_DECODE(race_penaltyaccumulator) - race_laptime)); //drawstring(m - '16 0 0' * stringwidth(s, FALSE), s, '32 32 0', '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.6 0.6 0' * mySize_y), s, '0.6 0.6 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } } else @@ -3216,7 +3433,7 @@ void HUD_RaceTimer (void) { s = MakeRaceString(race_mycheckpoint, TIME_DECODE(race_mycheckpointdelta), -!race_mycheckpointenemy, race_mycheckpointlapsdelta, race_mycheckpointenemy); dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos - '0 16 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } if(race_othercheckpointtime && race_othercheckpointenemy != "") { @@ -3224,7 +3441,7 @@ void HUD_RaceTimer (void) { s = MakeRaceString(race_othercheckpoint, -TIME_DECODE(race_othercheckpointdelta), -!race_othercheckpointenemy, race_othercheckpointlapsdelta, race_othercheckpointenemy); dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) //drawcolorcodedstring(m - '0 0 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos - '0 0 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } if(race_penaltytime && !race_penaltyaccumulator) @@ -3239,7 +3456,7 @@ void HUD_RaceTimer (void) { s = strcat("^2PENALTY: 0.0 (", race_penaltyreason, ")"); dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); } } } @@ -3356,6 +3573,7 @@ void HUD_Mod_CTF_Reset(void) void HUD_Mod_CTF(vector pos, vector mySize) { vector redflag_pos, blueflag_pos; + vector flag_size; float f; // every function should have that float redflag, blueflag; // current status @@ -3460,25 +3678,37 @@ void HUD_Mod_CTF(vector pos, vector mySize) break; } - if (myteam == COLOR_TEAM1) { // always draw own flag on left - redflag_pos = pos; - blueflag_pos = pos + eX * mySize_y; + if(mySize_x > mySize_y) { + if (myteam == COLOR_TEAM1) { // always draw own flag on left + redflag_pos = pos; + blueflag_pos = pos + eX * 0.5 * mySize_x; + } else { + blueflag_pos = pos; + redflag_pos = pos + eX * 0.5 * mySize_x; + } + flag_size = eX * 0.5 * mySize_x + eY * mySize_y; } else { - blueflag_pos = pos; - redflag_pos = pos + eX * mySize_y; + if (myteam == COLOR_TEAM1) { // always draw own flag on left + redflag_pos = pos; + blueflag_pos = pos + eY * 0.5 * mySize_y; + } else { + blueflag_pos = pos; + redflag_pos = pos + eY * 0.5 * mySize_y; + } + flag_size = eY * 0.5 * mySize_y + eX * mySize_x; } 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_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f); + drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f); if(red_icon) - drawpic_skin(redflag_pos, red_icon, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL); + drawpic_skin(redflag_pos, red_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL); f = bound(0, blueflag_statuschange_elapsedtime*2, 1); if(blue_icon_prevstatus && f < 1) - drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f); + drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f); if(blue_icon) - drawpic_skin(blueflag_pos, blue_icon, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL); + drawpic_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL); } // Keyhunt HUD modicon section @@ -3497,18 +3727,29 @@ void HUD_Mod_KH(vector pos, vector mySize) float a, aa; vector p, pa, kh_size, kh_asize; - p_x = pos_x; - p_y = pos_y + 0.25 * mySize_y; - kh_keys = getstati(STAT_KH_KEYS); - kh_size_x = mySize_x * 0.25; - kh_size_y = 0.75 * mySize_y; + p_x = pos_x; + if(mySize_x > mySize_y) + { + p_y = pos_y + 0.25 * mySize_y; + pa = p - eY * 0.25 * mySize_y; - pa = p - eY * 0.25 * mySize_y; + kh_size_x = mySize_x * 0.25; + kh_size_y = 0.75 * mySize_y; + kh_asize_x = mySize_x * 0.25; + kh_asize_y = mySize_y * 0.25; + } + else + { + p_y = pos_y + 0.125 * mySize_y; + pa = p - eY * 0.125 * mySize_y; - kh_asize_x = mySize_x * 0.25; - kh_asize_y = mySize_y * 0.25; + kh_size_x = mySize_x * 0.5; + kh_size_y = 0.375 * mySize_y; + kh_asize_x = mySize_x * 0.5; + kh_asize_y = mySize_y * 0.125; + } float i, key; @@ -3592,8 +3833,26 @@ void HUD_Mod_KH(vector pos, vector mySize) break; } } - p_x += 0.25 * mySize_x; - pa_x += 0.25 * mySize_x; + if(mySize_x > mySize_y) + { + p_x += 0.25 * mySize_x; + pa_x += 0.25 * mySize_x; + } + else + { + if(i == 1) + { + p_y = pos_y + 0.625 * mySize_y; + pa_y = pos_y + 0.5 * mySize_y; + p_x = pos_x; + pa_x = pos_x; + } + else + { + p_x += 0.5 * mySize_x; + pa_x += 0.5 * mySize_x; + } + } } } @@ -3620,13 +3879,23 @@ void HUD_Mod_NexBall(vector pos, vector mySize) p = 2 - p; //Draw the filling - HUD_Panel_DrawProgressBar(pos, 0, eX * p * mySize_x + eY * mySize_y, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + vector barsize; + float vertical; + if(mySize_x > mySize_y) + { + barsize = eX * p * mySize_x + eY * mySize_y; + vertical = 0; + } + else + { + barsize = eX * mySize_x + eY * p * mySize_y; + vertical = 1; + } + HUD_Panel_DrawProgressBar(pos, vertical, barsize, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } - pos_x += 0.5 * mySize_x - 0.5 * mySize_y; //horizontal margin to the picture - if (stat_items & IT_KEY1) - drawpic_skin(pos, "nexball_carrying", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + drawpic_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } // Race/CTS HUD mod icons @@ -3677,7 +3946,7 @@ void HUD_Mod_Race(vector pos, vector mySize) f = time - crecordtime_change_time; if (f > 1) { - drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + drawstring_aspect(pos, "Personal best ", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); drawstring(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } else { drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); @@ -3718,7 +3987,7 @@ void HUD_Mod_Race(vector pos, vector mySize) a = bound(0, race_status_time - time, 1); string s; - s = textShortenToWidth(race_status_name, 120, '10 10 0', stringwidth_colors); + s = textShortenToWidth(race_status_name, mySize_y, '1 1 0' * 0.1 * mySize_y, stringwidth_colors); float rank; if(race_status > 0) @@ -3726,23 +3995,28 @@ void HUD_Mod_Race(vector pos, vector mySize) string rankname; rankname = race_PlaceName(rank); + vector namepos; + namepos = pos + '0.5 0.9 0' * mySize_y - eX * stringwidth(s, TRUE, '1 1 0' * 0.1 * mySize_y); + vector rankpos; + rankpos = pos + '0.5 0.25 0' * mySize_y - eX * stringwidth(rankname, TRUE, '1 1 0' * 0.15 * mySize_y); + if(race_status == 0) - drawpic_skin(pos, "race_newfail", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newfail", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); else if(race_status == 1) { - drawpic_skin(pos, "race_newtime", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newtime", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); } else if(race_status == 2) { if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank) - drawpic_skin(pos, "race_newrankgreen", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrankgreen", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); else - drawpic_skin(pos, "race_newrankyellow", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrankyellow", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); } else if(race_status == 3) { - drawpic_skin(pos, "race_newrecordserver", '80 80 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrecordserver", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); } if (race_status_time - time <= 0) { @@ -3822,16 +4096,17 @@ void HUD_DrawPressedKeys(void) mySize -= '2 2 0' * padding; } + vector keysize; + keysize = eX * mySize_x * (1/3) + eY * mySize_y * 0.5; float pressedkeys; pressedkeys = getstatf(STAT_PRESSED_KEYS); - drawpic_skin(pos, "key_bg.tga", mySize, '1 1 1', 0.1 * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 0.22 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.023 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.1 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 0.372 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x * (1/3), ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x * (2/3), ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (1/3), ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (2/3), ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } // Handle chat as a panel (#12) @@ -3862,15 +4137,76 @@ void HUD_Chat(void) if(hud_configure) { + float chatsize; + chatsize = cvar("con_chatsize"); cvar_set("con_chatrect_x", "9001"); // over 9000, we'll fake it instead for more control over alpha and such - float i; + float i, a; for(i = 0; i < cvar("con_chat"); ++i) { - drawcolorcodedstring(pos + eY * i * cvar("con_chatsize"), "^3Player^7: This is the chat area.", '1 1 0' * cvar("con_chatsize"), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + if(i == cvar("con_chat") - 1) + a = HUD_Panel_GetFgAlpha(id); + else + a = HUD_Panel_GetFgAlpha(id) * floor(((i + 1) * 7 + cvar("con_chattime"))/45); + drawcolorcodedstring(pos + eY * i * chatsize, textShortenToWidth("^3Player^7: This is the chat area.", mySize_x, '1 1 0' * chatsize, stringwidth_colors), '1 1 0' * chatsize, a, DRAWFLAG_NORMAL); } } } +// Engine info panel (#13) +// +float prevfps; +float prevfps_time; +float framecounter; + +float frametimeavg; +float frametimeavg1; // 1 frame ago +float frametimeavg2; // 2 frames ago +void HUD_EngineInfo(void) +{ + float id = HUD_PANEL_ENGINEINFO; + vector pos, mySize; + pos = HUD_Panel_GetPos(id); + mySize = HUD_Panel_GetSize(id); + + HUD_Panel_DrawBg(id, pos, mySize, 0); + float padding; + padding = HUD_Panel_GetPadding(id); + if(padding) + { + pos += '1 1 0' * padding; + mySize -= '2 2 0' * padding; + } + + if(cvar("hud_engineinfo_framecounter_exponentialmovingaverage")) + { + frametimeavg = (frametimeavg + frametimeavg1 + frametimeavg2 + frametime)/4; // average three frametimes into framecounter for slightly more stable fps readings :P + frametimeavg2 = frametimeavg1; + frametimeavg1 = frametimeavg; + + float weight; + weight = cvar("hud_engineinfo_framecounter_exponentialmovingaverage_new_weight"); + if(frametime > 0.0001) // filter out insane values which sometimes seem to occur and throw off the average? If you are getting 10,000 fps or more, then you don't need a framerate counter. + { + if(fabs(prevfps - (1/frametimeavg)) > prevfps * cvar("hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold")) // if there was a big jump in fps, just force prevfps at current (1/frametime) to make big updates instant + prevfps = (1/frametime); + prevfps = (1 - weight) * prevfps + weight * (1/frametimeavg); // framecounter just used so there's no need for a new variable, think of it as "frametime average" + } + } + else + { + framecounter += 1; + if(time - prevfps_time > cvar("hud_engineinfo_framecounter_time")) + { + prevfps = framecounter/cvar("hud_engineinfo_framecounter_time"); + framecounter = 0; + prevfps_time = time; + } + } + + vector color; + color = HUD_Get_Num_Color (prevfps, 100); + drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_engineinfo_framecounter_decimals"))), mySize, mySize_y, color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); +} /* ================== Main HUD system @@ -4006,20 +4342,23 @@ void HUD_Main (void) { float i; // x-axis - for(i = 0; i < vid_conwidth/max(2, cvar("hud_configure_grid_x")); ++i) + for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_x"), 0.2); ++i) { - drawfill(eX * i * max(2, cvar("hud_configure_grid_x")), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL); + drawfill(eX * i * vid_conwidth * bound(0.005, cvar("hud_configure_grid_x"), 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL); } // y-axis - for(i = 0; i < vid_conheight/max(2, cvar("hud_configure_grid_y")); ++i) + for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_y"), 0.2); ++i) { - drawfill(eY * i * max(2, cvar("hud_configure_grid_y")), eY + eX * vid_conwidth, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL); + drawfill(eY * i * vid_conheight * bound(0.005, cvar("hud_configure_grid_y"), 0.2), 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") * menu_fade_alpha, DRAWFLAG_NORMAL); + if(cvar_string("hud_dock") != "" && cvar_string("hud_dock") != "0") + drawpic('0 0 0', strcat("gfx/hud/", cvar_string("hud_skin"), "/", cvar_string("hud_dock")), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock... + if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure) + if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay)) + HUD_Radar(); if(HUD_Panel_CheckActive(HUD_PANEL_WEAPONICONS) || hud_configure) HUD_WeaponIcons(); if(HUD_Panel_CheckActive(HUD_PANEL_INVENTORY) || hud_configure) @@ -4032,10 +4371,6 @@ void HUD_Main (void) HUD_Notify(); if(HUD_Panel_CheckActive(HUD_PANEL_TIMER) || hud_configure) HUD_Timer(); - // TODO hud'ify - if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure) - if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay)) - HUD_Radar(); if(HUD_Panel_CheckActive(HUD_PANEL_SCORE) || hud_configure) HUD_Score(); if(HUD_Panel_CheckActive(HUD_PANEL_RACETIMER) || hud_configure) @@ -4052,7 +4387,9 @@ void HUD_Main (void) if(HUD_Panel_CheckActive(HUD_PANEL_CHAT) || hud_configure) HUD_Chat(); else - cvar_set("con_csqcpositioning", "0"); + cvar_set("con_chatrect", "0"); + if(HUD_Panel_CheckActive(HUD_PANEL_ENGINEINFO) || hud_configure) + HUD_EngineInfo(); // TODO hud_'ify these if (cvar("cl_showspeed"))