From: terencehill Date: Mon, 2 Feb 2015 23:37:19 +0000 (+0100) Subject: Merge branch 'master' into terencehill/weapon_panel_fix X-Git-Tag: xonotic-v0.8.1~129^2 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=bb80a6aba067167c6ef8d5f3465f03bd34142fa2;hp=-c Merge branch 'master' into terencehill/weapon_panel_fix Conflicts: qcsrc/client/hud.qc --- bb80a6aba067167c6ef8d5f3465f03bd34142fa2 diff --combined qcsrc/client/hud.qc index 89519d627c,e33b9b0203..024a0761e4 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@@ -1,3 -1,11 +1,11 @@@ + #include "scoreboard.qh" + #include "teamradar.qh" + #include "../common/buffs.qh" + #include "../common/counting.qh" + #include "../common/mapinfo.qh" + #include "../common/nades.qh" + #include "../server/t_items.qh" + /* ================== Misc HUD functions @@@ -14,12 -22,12 +22,12 @@@ // 1/4 height: bottom part void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha, vector theBorderSize) { - if (theBorderSize_x < 0 && theBorderSize_y < 0) // draw whole image as it is + if (theBorderSize.x < 0 && theBorderSize.y < 0) // draw whole image as it is { drawpic(theOrigin, pic, theSize, theColor, theAlpha, 0); return; } - if (theBorderSize_x == 0 && theBorderSize_y == 0) // no border + if (theBorderSize.x == 0 && theBorderSize.y == 0) // no border { // draw only the central part drawsubpic(theOrigin, theSize, pic, '0.25 0.25 0', '0.5 0.5 0', theColor, theAlpha, 0); @@@ -30,16 -38,16 +38,16 @@@ vector width, height; vector bW, bH; //pic = draw_UseSkinFor(pic); - width = eX * theSize_x; - height = eY * theSize_y; - if(theSize_x <= theBorderSize_x * 2) + width = eX * theSize.x; + height = eY * theSize.y; + if(theSize.x <= theBorderSize.x * 2) { // not wide enough... draw just left and right then - bW = eX * (0.25 * theSize_x / (theBorderSize_x * 2)); - if(theSize_y <= theBorderSize_y * 2) + bW = eX * (0.25 * theSize.x / (theBorderSize.x * 2)); + if(theSize.y <= theBorderSize.y * 2) { // not high enough... draw just corners - bH = eY * (0.25 * theSize_y / (theBorderSize_y * 2)); + bH = eY * (0.25 * theSize.y / (theBorderSize.y * 2)); drawsubpic(theOrigin, width * 0.5 + height * 0.5, pic, '0 0 0', bW + bH, theColor, theAlpha, 0); drawsubpic(theOrigin + width * 0.5, width * 0.5 + height * 0.5, pic, eX - bW, bW + bH, theColor, theAlpha, 0); drawsubpic(theOrigin + height * 0.5, width * 0.5 + height * 0.5, pic, eY - bH, bW + bH, theColor, theAlpha, 0); @@@ -47,7 -55,7 +55,7 @@@ } else { - dY = theBorderSize_x * eY; + dY = theBorderSize.x * eY; drawsubpic(theOrigin, width * 0.5 + dY, pic, '0 0 0', '0 0.25 0' + bW, theColor, theAlpha, 0); drawsubpic(theOrigin + width * 0.5, width * 0.5 + dY, pic, '0 0 0' + eX - bW, '0 0.25 0' + bW, theColor, theAlpha, 0); drawsubpic(theOrigin + dY, width * 0.5 + height - 2 * dY, pic, '0 0.25 0', '0 0.5 0' + bW, theColor, theAlpha, 0); @@@ -58,11 -66,11 +66,11 @@@ } else { - if(theSize_y <= theBorderSize_y * 2) + if(theSize.y <= theBorderSize.y * 2) { // not high enough... draw just top and bottom then - bH = eY * (0.25 * theSize_y / (theBorderSize_y * 2)); - dX = theBorderSize_x * eX; + bH = eY * (0.25 * theSize.y / (theBorderSize.y * 2)); + dX = theBorderSize.x * eX; drawsubpic(theOrigin, dX + height * 0.5, pic, '0 0 0', '0.25 0 0' + bH, theColor, theAlpha, 0); drawsubpic(theOrigin + dX, width - 2 * dX + height * 0.5, pic, '0.25 0 0', '0.5 0 0' + bH, theColor, theAlpha, 0); drawsubpic(theOrigin + width - dX, dX + height * 0.5, pic, '0.75 0 0', '0.25 0 0' + bH, theColor, theAlpha, 0); @@@ -72,8 -80,8 +80,8 @@@ } else { - dX = theBorderSize_x * eX; - dY = theBorderSize_x * eY; + dX = theBorderSize.x * eX; + dY = theBorderSize.x * eY; drawsubpic(theOrigin, dX + dY, pic, '0 0 0', '0.25 0.25 0', theColor, theAlpha, 0); drawsubpic(theOrigin + dX, width - 2 * dX + dY, pic, '0.25 0 0', '0.5 0.25 0', theColor, theAlpha, 0); drawsubpic(theOrigin + width - dX, dX + dY, pic, '0.75 0 0', '0.25 0.25 0', theColor, theAlpha, 0); @@@ -92,71 -100,65 +100,71 @@@ vector HUD_Get_Num_Color (float x, floa float blinkingamt; vector color; if(x >= maxvalue) { - color_x = sin(2*M_PI*time); - color_y = 1; - color_z = sin(2*M_PI*time); + color.x = sin(2*M_PI*time); + color.y = 1; + color.z = sin(2*M_PI*time); } 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; + 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 > 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 + 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 > 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 + 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 > 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 + 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 } else { - color_x = 1; - color_y = 0; - color_z = 0; + color.x = 1; + color.y = 0; + color.z = 0; } blinkingamt = (1 - x/maxvalue/0.25); if(blinkingamt > 0) { - color_x = color_x - color_x * blinkingamt * sin(2*M_PI*time); - color_y = color_y - color_y * blinkingamt * sin(2*M_PI*time); - color_z = color_z - color_z * blinkingamt * sin(2*M_PI*time); + color.x = color.x - color.x * blinkingamt * sin(2*M_PI*time); + color.y = color.y - color.y * blinkingamt * sin(2*M_PI*time); + color.z = color.z - color.z * blinkingamt * sin(2*M_PI*time); } return color; } +float HUD_GetRowCount(float item_count, vector size, float item_aspect) +{ - float aspect = size_y/size_x; ++ float aspect = size_y / size_x; + return bound(1, floor((sqrt(4 * item_aspect * aspect * item_count + aspect * aspect) + aspect + 0.5) / 2), item_count); +} + float stringwidth_colors(string s, vector theSize) { - return stringwidth(s, TRUE, theSize); + return stringwidth(s, true, theSize); } float stringwidth_nocolors(string s, vector theSize) { - return stringwidth(s, FALSE, theSize); + return stringwidth(s, false, theSize); } void drawstringright(vector position, string text, vector theScale, vector rgb, float theAlpha, float flag) { - position_x -= 2 / 3 * strlen(text) * theScale_x; + position.x -= 2 / 3 * strlen(text) * theScale.x; drawstring(position, text, theScale, rgb, theAlpha, flag); } void drawstringcenter(vector position, string text, vector theScale, vector rgb, float theAlpha, float flag) { - position_x = 0.5 * (vid_conwidth - 0.6025 * strlen(text) * theScale_x); + position.x = 0.5 * (vid_conwidth - 0.6025 * strlen(text) * theScale.x); drawstring(position, text, theScale, rgb, theAlpha, flag); } @@@ -238,7 -240,7 +246,7 @@@ float race_CheckName(string net_name) return 0; } - float GetPlayerColorForce(float i) + float GetPlayerColorForce(int i) { if(!teamplay) return 0; @@@ -246,7 -248,7 +254,7 @@@ return stof(getplayerkeyvalue(i, "colors")) & 15; } - float GetPlayerColor(float i) + float GetPlayerColor(int i) { if(!playerslots[i].gotscores) // unconnected return NUM_SPECTATOR; @@@ -256,7 -258,7 +264,7 @@@ return GetPlayerColorForce(i); } - string GetPlayerName(float i) + string GetPlayerName(int i) { return ColorTranslateRGB(getplayerkeyvalue(i, "name")); } @@@ -269,9 -271,10 +277,10 @@@ HUD panel */ // draw the background/borders - #define HUD_Panel_DrawBg(theAlpha)\ - if(panel.current_panel_bg != "0" && panel.current_panel_bg != "")\ - draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel.current_panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * theAlpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER)) + #define HUD_Panel_DrawBg(theAlpha) do { \ + if(panel.current_panel_bg != "0" && panel.current_panel_bg != "") \ + draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel.current_panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * theAlpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\ + } while(0) //basically the same code of draw_ButtonPicture and draw_VertButtonPicture for the menu void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, float vertical, float baralign, vector theColor, float theAlpha, float drawflag) @@@ -297,37 -300,37 +306,37 @@@ } if (baralign == 1) // bottom align - theOrigin_y += (1 - length_ratio) * theSize_y; + theOrigin.y += (1 - length_ratio) * theSize.y; else if (baralign == 2) // center align - theOrigin_y += 0.5 * (1 - length_ratio) * theSize_y; + theOrigin.y += 0.5 * (1 - length_ratio) * theSize.y; else if (baralign == 3) // center align, positive values down, negative up { - theSize_y *= 0.5; + theSize.y *= 0.5; if (length_ratio > 0) - theOrigin_y += theSize_y; + theOrigin.y += theSize.y; else { - theOrigin_y += (1 + length_ratio) * theSize_y; + theOrigin.y += (1 + length_ratio) * theSize.y; length_ratio = -length_ratio; } } - theSize_y *= length_ratio; + theSize.y *= length_ratio; vector bH; - width = eX * theSize_x; - height = eY * theSize_y; - if(theSize_y <= theSize_x * 2) + width = eX * theSize.x; + height = eY * theSize.y; + if(theSize.y <= theSize.x * 2) { // button not high enough // draw just upper and lower part then - square = eY * theSize_y * 0.5; - bH = eY * (0.25 * theSize_y / (theSize_x * 2)); + square = eY * theSize.y * 0.5; + bH = eY * (0.25 * theSize.y / (theSize.x * 2)); drawsubpic(theOrigin, square + width, pic, '0 0 0', eX + bH, theColor, theAlpha, drawflag); drawsubpic(theOrigin + square, square + width, pic, eY - bH, eX + bH, theColor, theAlpha, drawflag); } else { - square = eY * theSize_x; + square = eY * theSize.x; drawsubpic(theOrigin, width + square, pic, '0 0 0', '1 0.25 0', theColor, theAlpha, drawflag); drawsubpic(theOrigin + square, theSize - 2 * square, pic, '0 0.25 0', '1 0.5 0', theColor, theAlpha, drawflag); drawsubpic(theOrigin + height - square, width + square, pic, '0 0.75 0', '1 0.25 0', theColor, theAlpha, drawflag); @@@ -339,37 -342,37 +348,37 @@@ } if (baralign == 1) // right align - theOrigin_x += (1 - length_ratio) * theSize_x; + theOrigin.x += (1 - length_ratio) * theSize.x; else if (baralign == 2) // center align - theOrigin_x += 0.5 * (1 - length_ratio) * theSize_x; + theOrigin.x += 0.5 * (1 - length_ratio) * theSize.x; else if (baralign == 3) // center align, positive values on the right, negative on the left { - theSize_x *= 0.5; + theSize.x *= 0.5; if (length_ratio > 0) - theOrigin_x += theSize_x; + theOrigin.x += theSize.x; else { - theOrigin_x += (1 + length_ratio) * theSize_x; + theOrigin.x += (1 + length_ratio) * theSize.x; length_ratio = -length_ratio; } } - theSize_x *= length_ratio; + theSize.x *= length_ratio; vector bW; - width = eX * theSize_x; - height = eY * theSize_y; - if(theSize_x <= theSize_y * 2) + width = eX * theSize.x; + height = eY * theSize.y; + if(theSize.x <= theSize.y * 2) { // button not wide enough // draw just left and right part then - square = eX * theSize_x * 0.5; - bW = eX * (0.25 * theSize_x / (theSize_y * 2)); + square = eX * theSize.x * 0.5; + bW = eX * (0.25 * theSize.x / (theSize.y * 2)); drawsubpic(theOrigin, square + height, pic, '0 0 0', eY + bW, theColor, theAlpha, drawflag); drawsubpic(theOrigin + square, square + height, pic, eX - bW, eY + bW, theColor, theAlpha, drawflag); } else { - square = eX * theSize_y; + square = eX * theSize.y; drawsubpic(theOrigin, height + square, pic, '0 0 0', '0.25 1 0', theColor, theAlpha, drawflag); drawsubpic(theOrigin + square, theSize - 2 * square, pic, '0.25 0 0', '0.5 1 0', theColor, theAlpha, drawflag); drawsubpic(theOrigin + width - square, height + square, pic, '0.75 0 0', '0.25 1 0', theColor, theAlpha, drawflag); @@@ -388,19 -391,18 +397,18 @@@ void HUD_Panel_DrawHighlight(vector pos pic = "gfx/hud/default/num_leading"; } - drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0 0 0', '0.25 1 0', color, theAlpha, drawflag); - if(mySize_x/mySize_y > 2) - drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, pic, '0.25 0 0', '0.5 1 0', color, theAlpha, drawflag); - drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0.75 0 0', '0.25 1 0', color, theAlpha, drawflag); + drawsubpic(pos, eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0 0 0', '0.25 1 0', color, theAlpha, drawflag); + if(mySize.x/mySize.y > 2) + drawsubpic(pos + eX * mySize.y, eX * (mySize.x - 2 * mySize.y) + eY * mySize.y, pic, '0.25 0 0', '0.5 1 0', color, theAlpha, drawflag); + drawsubpic(pos + eX * mySize.x - eX * min(mySize.x * 0.5, mySize.y), eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0.75 0 0', '0.25 1 0', color, theAlpha, drawflag); } // Weapon icons (#0) // entity weaponorder[WEP_MAXCOUNT]; - void weaponorder_swap(float i, float j, entity pass) + void weaponorder_swap(int i, int j, entity pass) { - entity h; - h = weaponorder[i]; + entity h = weaponorder[i]; weaponorder[i] = weaponorder[j]; weaponorder[j] = h; } @@@ -419,16 -421,20 +427,17 @@@ void HUD_Weapons(void // declarations WepSet weapons_stat = WepSet_GetFromStat(); float i, f, a; - float screen_ar, center_x = 0, center_y; + float screen_ar; + vector center = '0 0 0'; float weapon_count, weapon_id; - float row, column, rows = 0, columns = 0; + float row, column, rows = 0, columns; float aspect = autocvar_hud_panel_weapons_aspect; - float panel_weapon_accuracy; - float timeout = autocvar_hud_panel_weapons_timeout; float timein_effect_length = autocvar_hud_panel_weapons_timeout_speed_in; //? 0.375 : 0); float timeout_effect_length = autocvar_hud_panel_weapons_timeout_speed_out; //? 0.75 : 0); - float barsize_x = 0, barsize_y = 0, baroffset_x = 0, baroffset_y = 0; - float ammo_full; + vector barsize = '0 0 0', baroffset = '0 0 0'; vector ammo_color = '1 0 1'; float ammo_alpha = 1; @@@ -461,7 -467,7 +470,7 @@@ // figure out weapon order (how the weapons are sorted) // TODO make this configurable if(weaponorder_bypriority != autocvar_cl_weaponpriority || !weaponorder[0]) { - float weapon_cnt; + int weapon_cnt; if(weaponorder_bypriority) strunzone(weaponorder_bypriority); if(weaponorder_byimpulse) @@@ -491,18 -497,15 +500,18 @@@ if(!autocvar_hud_panel_weapons_complainbubble || autocvar__hud_configure || time - complain_weapon_time >= when + fadetime) complain_weapon = 0; + if(autocvar__hud_configure) + { + if(!weapons_stat) + for(i = WEP_FIRST; i <= WEP_LAST; i += floor((WEP_LAST-WEP_FIRST)/5)) + weapons_stat |= WepSet_FromWeapon(i); + } + // determine which weapons are going to be shown if (autocvar_hud_panel_weapons_onlyowned) { if(autocvar__hud_configure) { - if (!weapons_stat) - for(i = WEP_FIRST; i <= WEP_LAST; i += floor((WEP_LAST-WEP_FIRST)/5)) - weapons_stat |= WepSet_FromWeapon(i); - if(menu_enabled != 2) HUD_Panel_DrawBg(1); // also draw the bg of the entire panel } @@@ -510,9 -513,13 +519,9 @@@ // do we own this weapon? weapon_count = 0; for(i = 0; i <= WEP_LAST-WEP_FIRST; ++i) - if(weapons_stat & WepSet_FromWeapon(weaponorder[i].weapon)) + if((weapons_stat & WepSet_FromWeapon(weaponorder[i].weapon)) || (weaponorder[i].weapon == complain_weapon)) ++weapon_count; - // add it anyway if weaponcomplain is shown - if(complain_weapon) - ++weapon_count; - // might as well commit suicide now, no reason to live ;) if (weapon_count == 0) { @@@ -520,36 -527,41 +529,36 @@@ return; } - vector max_panel_size = panel_size - '2 2 0' * panel_bg_padding; + vector old_panel_size = panel_size; + if(panel_bg_padding) + old_panel_size -= '2 2 0' * panel_bg_padding; - // calculate distribution and size of table cells - if(max_panel_size.x > max_panel_size.y) - { - while(weapon_count > columns * rows) - { - ++rows; - columns = ceil(max_panel_size.x / (max_panel_size.y / rows * aspect)); - } + // NOTE: the goal is to use the all-weapons layout and remove unneeded cells + // this way weapon icons always have the same size regardless of owned weapon count - weapon_size.x = max_panel_size.x / columns; - weapon_size.y = max_panel_size.y / rows; - columns = ceil(weapon_count / rows); - } - else - { - while(weapon_count > columns * rows) - { - ++columns; - rows = ceil(max_panel_size.y / (max_panel_size.x / columns / aspect)); - } + // get the all-weapons layout + rows = HUD_GetRowCount(WEP_COUNT, old_panel_size, aspect); + columns = ceil(WEP_COUNT/rows); - weapon_size_x = old_panel_size_x / columns; - weapon_size_y = old_panel_size_y / rows; ++ weapon_size.x = old_panel_size.x / columns; ++ weapon_size.y = old_panel_size.y / rows; - weapon_size.x = max_panel_size.x / columns; - weapon_size.y = max_panel_size.y / rows; - rows = ceil(weapon_count / columns); - } + // reduce rows and columns as needed + columns = ceil(weapon_count / rows); + rows = ceil(weapon_count / columns); + + // NOTE: although weapons should aways look the same even if onlyowned is disabled, + // we enlarge them a bit when possible to better match the desired aspect ratio + // as they look much better - weapon_size_x = min(old_panel_size_x / columns, aspect * weapon_size_y); - weapon_size_y = min(old_panel_size_y / rows, weapon_size_x / aspect); ++ weapon_size.x = min(old_panel_size.x / columns, aspect * weapon_size.y); ++ weapon_size.y = min(old_panel_size.y / rows, weapon_size.x / aspect); // reduce size of the panel - panel_size_x = columns * weapon_size_x; - panel_size_y = rows * weapon_size_y; - panel_pos_x += (old_panel_size_x - panel_size_x) / 2; - panel_pos_y += (old_panel_size_y - panel_size_y) / 2; + panel_size.x = columns * weapon_size.x; + panel_size.y = rows * weapon_size.y; - panel_pos.x += (max_panel_size.x - panel_size.x) / 2; - panel_pos.y += (max_panel_size.y - panel_size.y) / 2; - - panel_size += '2 2 0' * panel_bg_padding; ++ panel_pos.x += (old_panel_size.x - panel_size.x) / 2; ++ panel_pos.y += (old_panel_size.y - panel_size.y) / 2; + if(panel_bg_padding) + panel_size += '2 2 0' * panel_bg_padding; } else weapon_count = WEP_COUNT; @@@ -577,25 -589,25 +586,25 @@@ if (autocvar_hud_panel_weapons_timeout_effect == 2 || autocvar_hud_panel_weapons_timeout_effect == 3) { f *= f; // for a cooler movement - center_x = panel_pos_x + panel_size_x/2; - center_y = panel_pos_y + panel_size_y/2; + center.x = panel_pos.x + panel_size.x/2; + center.y = panel_pos.y + panel_size.y/2; screen_ar = vid_conwidth/vid_conheight; - if (center_x/center_y < screen_ar) //bottom left + if (center.x/center.y < screen_ar) //bottom left { - if ((vid_conwidth - center_x)/center_y < screen_ar) //bottom - panel_pos_y += f * (vid_conheight - panel_pos_y); + if ((vid_conwidth - center.x)/center.y < screen_ar) //bottom + panel_pos.y += f * (vid_conheight - panel_pos.y); else //left - panel_pos_x -= f * (panel_pos_x + panel_size_x); + panel_pos.x -= f * (panel_pos.x + panel_size.x); } else //top right { - if ((vid_conwidth - center_x)/center_y < screen_ar) //right - panel_pos_x += f * (vid_conwidth - panel_pos_x); + if ((vid_conwidth - center.x)/center.y < screen_ar) //right + panel_pos.x += f * (vid_conwidth - panel_pos.x); else //top - panel_pos_y -= f * (panel_pos_y + panel_size_y); + panel_pos.y -= f * (panel_pos.y + panel_size.y); } if(f == 1) - center_x = -1; // mark the panel as off screen + center.x = -1; // mark the panel as off screen } weaponprevtime = time - (1 - f) * timein_effect_length; } @@@ -620,22 -632,22 +629,22 @@@ { f *= f; // for a cooler movement f = 1 - f; - center_x = panel_pos_x + panel_size_x/2; - center_y = panel_pos_y + panel_size_y/2; + center.x = panel_pos.x + panel_size.x/2; + center.y = panel_pos.y + panel_size.y/2; screen_ar = vid_conwidth/vid_conheight; - if (center_x/center_y < screen_ar) //bottom left + if (center.x/center.y < screen_ar) //bottom left { - if ((vid_conwidth - center_x)/center_y < screen_ar) //bottom - panel_pos_y += f * (vid_conheight - panel_pos_y); + if ((vid_conwidth - center.x)/center.y < screen_ar) //bottom + panel_pos.y += f * (vid_conheight - panel_pos.y); else //left - panel_pos_x -= f * (panel_pos_x + panel_size_x); + panel_pos.x -= f * (panel_pos.x + panel_size.x); } else //top right { - if ((vid_conwidth - center_x)/center_y < screen_ar) //right - panel_pos_x += f * (vid_conwidth - panel_pos_x); + if ((vid_conwidth - center.x)/center.y < screen_ar) //right + panel_pos.x += f * (vid_conwidth - panel_pos.x); else //top - panel_pos_y -= f * (panel_pos_y + panel_size_y); + panel_pos.y -= f * (panel_pos.y + panel_size.y); } } } @@@ -644,7 -656,7 +653,7 @@@ // draw the background, then change the virtual size of it to better fit other items inside HUD_Panel_DrawBg(1); - if(center_x == -1) + if(center.x == -1) { draw_endBoldFont(); return; @@@ -660,9 -672,10 +669,9 @@@ if(!rows) // if rows is > 0 onlyowned code has already updated these vars { - rows = panel_size.y/panel_size.x; - rows = bound(1, floor((sqrt(4 * aspect * rows * weapon_count + rows * rows) + rows + 0.5) / 2), weapon_count); + rows = HUD_GetRowCount(weapon_count, panel_size, aspect); columns = ceil(weapon_count/rows); - weapon_size = eX * panel_size_x*(1/columns) + eY * panel_size_y*(1/rows); + weapon_size = eX * panel_size.x*(1/columns) + eY * panel_size.y*(1/rows); } // calculate position/size for visual bar displaying ammount of ammo status @@@ -671,17 -684,17 +680,17 @@@ ammo_color = stov(autocvar_hud_panel_weapons_ammo_color); ammo_alpha = panel_fg_alpha * autocvar_hud_panel_weapons_ammo_alpha; - if(weapon_size_x/weapon_size_y > aspect) + if(weapon_size.x/weapon_size.y > aspect) { - barsize_x = aspect * weapon_size_y; - barsize_y = weapon_size_y; - baroffset_x = (weapon_size_x - barsize_x) / 2; + barsize.x = aspect * weapon_size.y; + barsize.y = weapon_size.y; + baroffset.x = (weapon_size.x - barsize.x) / 2; } else { - barsize_y = 1/aspect * weapon_size_x; - barsize_x = weapon_size_x; - baroffset_y = (weapon_size_y - barsize_y) / 2; + barsize.y = 1/aspect * weapon_size.x; + barsize.x = weapon_size.x; + baroffset.y = (weapon_size.y - barsize.y) / 2; } } if(autocvar_hud_panel_weapons_accuracy) @@@ -689,7 -702,7 +698,7 @@@ // draw items row = column = 0; - vector label_size = '1 1 0' * min(weapon_size_x, weapon_size_y) * bound(0, autocvar_hud_panel_weapons_label_scale, 1); + vector label_size = '1 1 0' * min(weapon_size.x, weapon_size.y) * bound(0, autocvar_hud_panel_weapons_label_scale, 1); for(i = 0; i <= WEP_LAST-WEP_FIRST; ++i) { // retrieve information about the current weapon to be drawn @@@ -706,8 -719,8 +715,8 @@@ // figure out the drawing position of weapon weapon_pos = (panel_pos - + eX * column * weapon_size_x - + eY * row * weapon_size_y); + + eX * column * weapon_size.x + + eY * row * weapon_size.y); // draw background behind currently selected weapon if(self.weapon == switchweapon) @@@ -716,7 -729,7 +725,7 @@@ // draw the weapon accuracy if(autocvar_hud_panel_weapons_accuracy) { - panel_weapon_accuracy = weapon_accuracy[self.weapon-WEP_FIRST]; + float panel_weapon_accuracy = weapon_accuracy[self.weapon-WEP_FIRST]; if(panel_weapon_accuracy >= 0) { color = Accuracy_GetColor(panel_weapon_accuracy); @@@ -752,7 -765,6 +761,7 @@@ // draw ammo status bar if(autocvar_hud_panel_weapons_ammo && (self.ammo_field != ammo_none)) { + float ammo_full; a = getstati(GetAmmoStat(self.ammo_field)); // how much ammo do we have? if(a > 0) @@@ -769,10 -781,10 +778,10 @@@ } drawsetcliparea( - weapon_pos_x + baroffset_x, - weapon_pos_y + baroffset_y, - barsize_x * bound(0, a/ammo_full, 1), - barsize_y + weapon_pos.x + baroffset.x, + weapon_pos.y + baroffset.y, + barsize.x * bound(0, a/ammo_full, 1), + barsize.y ); drawpic_aspect_skin( @@@ -834,12 -846,12 +843,12 @@@ // Ammo (#1) void DrawNadeScoreBar(vector myPos, vector mySize, vector color) { - + HUD_Panel_DrawProgressBar( - myPos + eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize_x, - mySize - eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize_x, - autocvar_hud_panel_ammo_progressbar_name, - getstatf(STAT_NADE_BONUS_SCORE), 0, 0, color, + myPos + eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize.x, + mySize - eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize.x, + autocvar_hud_panel_ammo_progressbar_name, + getstatf(STAT_NADE_BONUS_SCORE), 0, 0, color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } @@@ -848,20 -860,20 +857,20 @@@ void DrawAmmoNades(vector myPos, vecto { float theAlpha = 1, a, b; vector nade_color, picpos, numpos; - + nade_color = Nade_Color(getstati(STAT_NADE_BONUS_TYPE)); - + a = getstatf(STAT_NADE_BONUS); b = getstatf(STAT_NADE_BONUS_SCORE); - + if(autocvar_hud_panel_ammo_iconalign) { numpos = myPos; - picpos = myPos + eX * 2 * mySize_y; + picpos = myPos + eX * 2 * mySize.y; } else { - numpos = myPos + eX * mySize_y; + numpos = myPos + eX * mySize.y; picpos = myPos; } @@@ -870,13 -882,13 +879,13 @@@ if(b > 0 || a > 0) { if(autocvar_hud_panel_ammo_text) - drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL); - + drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL); + if(draw_expanding) - drawpic_aspect_skin_expanding(picpos, "nade_nbg", '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, expand_time); - - drawpic_aspect_skin(picpos, "nade_bg" , '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(picpos, "nade_nbg" , '1 1 0' * mySize_y, nade_color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin_expanding(picpos, "nade_nbg", '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, expand_time); + + drawpic_aspect_skin(picpos, "nade_bg" , '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(picpos, "nade_nbg" , '1 1 0' * mySize.y, nade_color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL); } } @@@ -906,13 -918,13 +915,13 @@@ void DrawAmmoItem(vector myPos, vector vector iconPos, textPos; if(autocvar_hud_panel_ammo_iconalign) { - iconPos = myPos + eX * 2 * mySize_y; + iconPos = myPos + eX * 2 * mySize.y; textPos = myPos; } else { iconPos = myPos; - textPos = myPos + eX * mySize_y; + textPos = myPos + eX * mySize.y; } float isShadowed = (ammo <= 0 && !isCurrent && !isInfinite); @@@ -944,12 -956,12 +953,12 @@@ drawpic_aspect_skin(myPos, "ammo_current_bg", mySize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); if(ammo > 0 && autocvar_hud_panel_ammo_progressbar) - HUD_Panel_DrawProgressBar(myPos + eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize_x, mySize - eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize_x, autocvar_hud_panel_ammo_progressbar_name, ammo/autocvar_hud_panel_ammo_maxammo, 0, 0, textColor, autocvar_hud_progressbar_alpha * alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(myPos + eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize.x, mySize - eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize.x, autocvar_hud_panel_ammo_progressbar_name, ammo/autocvar_hud_panel_ammo_maxammo, 0, 0, textColor, autocvar_hud_progressbar_alpha * alpha, DRAWFLAG_NORMAL); if(autocvar_hud_panel_ammo_text) - drawstring_aspect(textPos, text, eX * (2/3) * mySize_x + eY * mySize_y, textColor, alpha, DRAWFLAG_NORMAL); + drawstring_aspect(textPos, text, eX * (2/3) * mySize.x + eY * mySize.y, textColor, alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(iconPos, GetAmmoPicture(ammoType), '1 1 0' * mySize_y, iconColor, alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(iconPos, GetAmmoPicture(ammoType), '1 1 0' * mySize.y, iconColor, alpha, DRAWFLAG_NORMAL); } float nade_prevstatus; @@@ -1003,25 -1015,30 +1012,25 @@@ void HUD_Ammo(void else nade_prevstatus = nade_prevframe = nade_statuschange_time = 0; - rows = mySize.y/mySize.x; - rows = bound(1, floor((sqrt(4 * (3/1) * rows * (total_ammo_count) + rows * rows) + rows + 0.5) / 2), (total_ammo_count)); - // ^^^ ammo item aspect goes here - + rows = HUD_GetRowCount(total_ammo_count, mySize, 3); columns = ceil((total_ammo_count)/rows); - ammo_size = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows); - + ammo_size = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows); - local vector offset = '0 0 0'; // fteqcc sucks - + vector offset = '0 0 0'; // fteqcc sucks float newSize; - if(ammo_size_x/ammo_size_y > 3) + if(ammo_size.x/ammo_size.y > 3) { - newSize = 3 * ammo_size_y; - offset_x = ammo_size_x - newSize; - pos_x += offset_x/2; - ammo_size_x = newSize; + newSize = 3 * ammo_size.y; + offset.x = ammo_size.x - newSize; + pos.x += offset.x/2; + ammo_size.x = newSize; } else { - newSize = 1/3 * ammo_size_x; - offset_y = ammo_size_y - newSize; - pos_y += offset_y/2; - ammo_size_y = newSize; + newSize = 1/3 * ammo_size.x; + offset.y = ammo_size.y - newSize; + pos.y += offset.y/2; + ammo_size.y = newSize; } float i; @@@ -1031,7 -1048,7 +1040,7 @@@ { if(autocvar__hud_configure) { - DrawAmmoItem(pos, ammo_size, ammo_rockets, TRUE, FALSE); + DrawAmmoItem(pos, ammo_size, ammo_rockets, true, false); } else { @@@ -1039,7 -1056,7 +1048,7 @@@ pos, ammo_size, (get_weaponinfo(switchweapon)).ammo_field, - TRUE, + true, infinite_ammo ); } @@@ -1059,7 -1076,7 +1068,7 @@@ { ammotype = GetAmmoFieldFromNum(i); DrawAmmoItem( - pos + eX * column * (ammo_size_x + offset_x) + eY * row * (ammo_size_y + offset_y), + pos + eX * column * (ammo_size.x + offset.x) + eY * row * (ammo_size.y + offset.y), ammo_size, ammotype, ((get_weaponinfo(switchweapon)).ammo_field == ammotype), @@@ -1081,7 -1098,7 +1090,7 @@@ float f = bound(0, nade_statuschange_elapsedtime*2, 1); - DrawAmmoNades(pos + eX * column * (ammo_size_x + offset_x) + eY * row * (ammo_size_y + offset_y), ammo_size, nade_prevstatus < nade_cnt && nade_cnt != 0 && f < 1, f); + DrawAmmoNades(pos + eX * column * (ammo_size.x + offset.x) + eY * row * (ammo_size.y + offset.y), ammo_size, nade_prevstatus < nade_cnt && nade_cnt != 0 && f < 1, f); } draw_endBoldFont(); @@@ -1094,76 -1111,76 +1103,76 @@@ void DrawNumIcon_expanding(vector myPos if (vertical) { - if(mySize_y/mySize_x > 2) + if(mySize.y/mySize.x > 2) { - newSize_y = 2 * mySize_x; - newSize_x = mySize_x; + newSize.y = 2 * mySize.x; + newSize.x = mySize.x; - newPos_y = myPos_y + (mySize_y - newSize_y) / 2; - newPos_x = myPos_x; + newPos.y = myPos.y + (mySize.y - newSize.y) / 2; + newPos.x = myPos.x; } else { - newSize_x = 1/2 * mySize_y; - newSize_y = mySize_y; + newSize.x = 1/2 * mySize.y; + newSize.y = mySize.y; - newPos_x = myPos_x + (mySize_x - newSize_x) / 2; - newPos_y = myPos_y; + newPos.x = myPos.x + (mySize.x - newSize.x) / 2; + newPos.y = myPos.y; } if(icon_right_align) { numpos = newPos; - picpos = newPos + eY * newSize_x; + picpos = newPos + eY * newSize.x; } else { picpos = newPos; - numpos = newPos + eY * newSize_x; + numpos = newPos + eY * newSize.x; } - newSize_y /= 2; + newSize.y /= 2; drawpic_aspect_skin(picpos, icon, newSize, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL); // make number smaller than icon, it looks better // reduce only y to draw numbers with different number of digits with the same y size - numpos_y += newSize_y * ((1 - 0.7) / 2); - newSize_y *= 0.7; + numpos.y += newSize.y * ((1 - 0.7) / 2); + newSize.y *= 0.7; drawstring_aspect(numpos, ftos(x), newSize, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL); return; } - if(mySize_x/mySize_y > 3) + if(mySize.x/mySize.y > 3) { - newSize_x = 3 * mySize_y; - newSize_y = mySize_y; + newSize.x = 3 * mySize.y; + newSize.y = mySize.y; - newPos_x = myPos_x + (mySize_x - newSize_x) / 2; - newPos_y = myPos_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; + newSize.y = 1/3 * mySize.x; + newSize.x = mySize.x; - newPos_y = myPos_y + (mySize_y - newSize_y) / 2; - newPos_x = myPos_x; + newPos.y = myPos.y + (mySize.y - newSize.y) / 2; + newPos.x = myPos.x; } if(icon_right_align) // right align { numpos = newPos; - picpos = newPos + eX * 2 * newSize_y; + picpos = newPos + eX * 2 * newSize.y; } else // left align { - numpos = newPos + eX * newSize_y; + numpos = newPos + eX * newSize.y; picpos = newPos; } // NOTE: newSize_x is always equal to 3 * mySize_y so we can use // '2 1 0' * newSize_y instead of eX * (2/3) * newSize_x + eY * newSize_y - drawstring_aspect_expanding(numpos, ftos(x), '2 1 0' * newSize_y, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp); - drawpic_aspect_skin_expanding(picpos, icon, '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp); + drawstring_aspect_expanding(numpos, ftos(x), '2 1 0' * newSize.y, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp); + drawpic_aspect_skin_expanding(picpos, icon, '1 1 0' * newSize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp); } void DrawNumIcon(vector myPos, vector mySize, float x, string icon, float vertical, float icon_right_align, vector color, float theAlpha) @@@ -1216,7 -1233,7 +1225,7 @@@ void HUD_Powerups(void mySize -= '2 2 0' * panel_bg_padding; } - float panel_ar = mySize_x/mySize_y; + float panel_ar = mySize.x/mySize.y; float is_vertical = (panel_ar < 1); vector shield_offset = '0 0 0', strength_offset = '0 0 0', superweapons_offset = '0 0 0'; @@@ -1245,40 -1262,40 +1254,40 @@@ { if (panel_ar >= 4 || (panel_ar >= 1/4 && panel_ar < 1)) { - mySize_x *= (1.0 / 3.0); - superweapons_offset_x = mySize_x; + mySize.x *= (1.0 / 3.0); + superweapons_offset.x = mySize.x; if (autocvar_hud_panel_powerups_flip) - shield_offset_x = 2*mySize_x; + shield_offset.x = 2*mySize.x; else - strength_offset_x = 2*mySize_x; + strength_offset.x = 2*mySize.x; } else { - mySize_y *= (1.0 / 3.0); - superweapons_offset_y = mySize_y; + mySize.y *= (1.0 / 3.0); + superweapons_offset.y = mySize.y; if (autocvar_hud_panel_powerups_flip) - shield_offset_y = 2*mySize_y; + shield_offset.y = 2*mySize.y; else - strength_offset_y = 2*mySize_y; + strength_offset.y = 2*mySize.y; } } else { if (panel_ar >= 4 || (panel_ar >= 1/4 && panel_ar < 1)) { - mySize_x *= 0.5; + mySize.x *= 0.5; if (autocvar_hud_panel_powerups_flip) - shield_offset_x = mySize_x; + shield_offset.x = mySize.x; else - strength_offset_x = mySize_x; + strength_offset.x = mySize.x; } else { - mySize_y *= 0.5; + mySize.y *= 0.5; if (autocvar_hud_panel_powerups_flip) - shield_offset_y = mySize_y; + shield_offset.y = mySize.y; else - strength_offset_y = mySize_y; + strength_offset.y = mySize.y; } } @@@ -1455,18 -1472,18 +1464,18 @@@ void HUD_HealthArmor(void v = healtharmor_maxdamage(health, armor, armorblockpercent, DEATH_WEAPON); float x; - x = floor(v_x + 1); + x = floor(v.x + 1); float maxtotal = maxhealth + maxarmor; string biggercount; - if(v_z) // NOT fully armored + if(v.z) // NOT fully armored { biggercount = "health"; if(autocvar_hud_panel_healtharmor_progressbar) HUD_Panel_DrawProgressBar(pos, mySize, autocvar_hud_panel_healtharmor_progressbar_health, x/maxtotal, 0, (baralign == 1 || baralign == 2), autocvar_hud_progressbar_health_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); if(armor) if(autocvar_hud_panel_healtharmor_text) - drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', panel_fg_alpha * armor / health, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * mySize.x - eX * 0.5 * mySize.y, "armor", '0.5 0.5 0' * mySize.y, '1 1 1', panel_fg_alpha * armor / health, DRAWFLAG_NORMAL); } else { @@@ -1475,34 -1492,34 +1484,34 @@@ HUD_Panel_DrawProgressBar(pos, mySize, autocvar_hud_panel_healtharmor_progressbar_armor, x/maxtotal, 0, (baralign == 1 || baralign == 2), autocvar_hud_progressbar_armor_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); if(health) if(autocvar_hud_panel_healtharmor_text) - drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * mySize.x - eX * 0.5 * mySize.y, "health", '0.5 0.5 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } if(autocvar_hud_panel_healtharmor_text) DrawNumIcon(pos, mySize, x, biggercount, 0, iconalign, HUD_Get_Num_Color(x, maxtotal), 1); if(fuel) - HUD_Panel_DrawProgressBar(pos, eX * mySize_x + eY * 0.2 * mySize_y, "progressbar", fuel/100, 0, (baralign == 1 || baralign == 3), autocvar_hud_progressbar_fuel_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, eX * mySize.x + eY * 0.2 * mySize.y, "progressbar", fuel/100, 0, (baralign == 1 || baralign == 3), autocvar_hud_progressbar_fuel_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } else { - float panel_ar = mySize_x/mySize_y; + float panel_ar = mySize.x/mySize.y; float is_vertical = (panel_ar < 1); vector health_offset = '0 0 0', armor_offset = '0 0 0'; if (panel_ar >= 4 || (panel_ar >= 1/4 && panel_ar < 1)) { - mySize_x *= 0.5; + mySize.x *= 0.5; if (autocvar_hud_panel_healtharmor_flip) - health_offset_x = mySize_x; + health_offset.x = mySize.x; else - armor_offset_x = mySize_x; + armor_offset.x = mySize.x; } else { - mySize_y *= 0.5; + mySize.y *= 0.5; if (autocvar_hud_panel_healtharmor_flip) - health_offset_y = mySize_y; + health_offset.y = mySize.y; else - armor_offset_y = mySize_y; + armor_offset.y = mySize.y; } float health_baralign, armor_baralign, fuel_baralign; @@@ -1628,13 -1645,13 +1637,13 @@@ if(fuel) { if (is_vertical) - mySize_x *= 0.2 / 2; //if vertical always halve x to not cover too much numbers with 3 digits + mySize.x *= 0.2 / 2; //if vertical always halve x to not cover too much numbers with 3 digits else - mySize_y *= 0.2; + mySize.y *= 0.2; if (panel_ar >= 4) - mySize_x *= 2; //restore full panel size + mySize.x *= 2; //restore full panel size else if (panel_ar < 1/4) - mySize_y *= 2; //restore full panel size + mySize.y *= 2; //restore full panel size HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", fuel/100, is_vertical, fuel_baralign, autocvar_hud_progressbar_fuel_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } @@@ -1710,18 -1727,18 +1719,18 @@@ void HUD_Notify(void float fade_time = max(0, autocvar_hud_panel_notify_fadetime); float icon_aspect = max(1, autocvar_hud_panel_notify_icon_aspect); - float entry_count = bound(1, floor(NOTIFY_MAX_ENTRIES * size_y / size_x), NOTIFY_MAX_ENTRIES); - float entry_height = size_y / entry_count; + float entry_count = bound(1, floor(NOTIFY_MAX_ENTRIES * size.y / size.x), NOTIFY_MAX_ENTRIES); + float entry_height = size.y / entry_count; - float panel_width_half = size_x * 0.5; + float panel_width_half = size.x * 0.5; float icon_width_half = entry_height * icon_aspect / 2; - float name_maxwidth = panel_width_half - icon_width_half - size_x * NOTIFY_ICON_MARGIN; + float name_maxwidth = panel_width_half - icon_width_half - size.x * NOTIFY_ICON_MARGIN; vector font_size = '0.5 0.5 0' * entry_height * autocvar_hud_panel_notify_fontsize; vector icon_size = (eX * icon_aspect + eY) * entry_height; vector icon_left = eX * (panel_width_half - icon_width_half); vector attacker_right = eX * name_maxwidth; - vector victim_left = eX * (size_x - name_maxwidth); + vector victim_left = eX * (size.x - name_maxwidth); vector attacker_pos, victim_pos, icon_pos; string attacker, victim, icon; @@@ -1774,7 -1791,7 +1783,7 @@@ if (icon != "" && victim != "") { - vector name_top = eY * (i * entry_height + 0.5 * (entry_height - font_size_y)); + vector name_top = eY * (i * entry_height + 0.5 * (entry_height - font_size.y)); icon_pos = pos + icon_left + eY * i * entry_height; drawpic_aspect_skin(icon_pos, icon, icon_size, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL); @@@ -1786,7 -1803,7 +1795,7 @@@ if (attacker != "") { attacker = textShortenToWidth(attacker, name_maxwidth, font_size, stringwidth_colors); - attacker_pos = pos + attacker_right - eX * stringwidth(attacker, TRUE, font_size) + name_top; + attacker_pos = pos + attacker_right - eX * stringwidth(attacker, true, font_size) + name_top; drawcolorcodedstring(attacker_pos, attacker, font_size, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); } } @@@ -1893,10 -1910,10 +1902,10 @@@ void HUD_Radar(void if (hud_panel_radar_maximized && !autocvar__hud_configure) { panel_size = autocvar_hud_panel_radar_maximized_size; - panel_size_x = bound(0.2, panel_size_x, 1) * vid_conwidth; - panel_size_y = bound(0.2, panel_size_y, 1) * vid_conheight; - panel_pos_x = (vid_conwidth - panel_size_x) / 2; - panel_pos_y = (vid_conheight - panel_size_y) / 2; + panel_size.x = bound(0.2, panel_size.x, 1) * vid_conwidth; + panel_size.y = bound(0.2, panel_size.y, 1) * vid_conheight; + panel_pos.x = (vid_conwidth - panel_size.x) / 2; + panel_pos.y = (vid_conheight - panel_size.y) / 2; string panel_bg; panel_bg = strcat(hud_skin_path, "/border_default"); // always use the default border when maximized @@@ -1928,7 -1945,7 +1937,7 @@@ switch(hud_panel_radar_maximized_rotation) { case 0: - teamradar_angle = view_angles_y - 90; + teamradar_angle = view_angles.y - 90; break; default: teamradar_angle = 90 * hud_panel_radar_maximized_rotation; @@@ -1957,7 -1974,7 +1966,7 @@@ switch(hud_panel_radar_rotation) { case 0: - teamradar_angle = view_angles_y - 90; + teamradar_angle = view_angles.y - 90; break; default: teamradar_angle = 90 * hud_panel_radar_rotation; @@@ -2004,16 -2021,16 +2013,16 @@@ vector c0, c1, c2, c3, span; c0 = rotate(mi_min, teamradar_angle * DEG2RAD); c1 = rotate(mi_max, teamradar_angle * DEG2RAD); - c2 = rotate('1 0 0' * mi_min_x + '0 1 0' * mi_max_y, teamradar_angle * DEG2RAD); - c3 = rotate('1 0 0' * mi_max_x + '0 1 0' * mi_min_y, teamradar_angle * DEG2RAD); + c2 = rotate('1 0 0' * mi_min.x + '0 1 0' * mi_max.y, teamradar_angle * DEG2RAD); + c3 = rotate('1 0 0' * mi_max.x + '0 1 0' * mi_min.y, teamradar_angle * DEG2RAD); span = '0 0 0'; - span_x = max(c0_x, c1_x, c2_x, c3_x) - min(c0_x, c1_x, c2_x, c3_x); - span_y = max(c0_y, c1_y, c2_y, c3_y) - min(c0_y, c1_y, c2_y, c3_y); + span.x = max(c0_x, c1_x, c2_x, c3_x) - min(c0_x, c1_x, c2_x, c3_x); + span.y = max(c0_y, c1_y, c2_y, c3_y) - min(c0_y, c1_y, c2_y, c3_y); // max-min distance must fit the radar in x=x, y=y bigsize = min( - teamradar_size2d_x * scale2d / (1.05 * span_x), - teamradar_size2d_y * scale2d / (1.05 * span_y) + teamradar_size2d.x * scale2d / (1.05 * span.x), + teamradar_size2d.y * scale2d / (1.05 * span.y) ); } @@@ -2029,10 -2046,10 +2038,10 @@@ + (1 - f) * view_origin); drawsetcliparea( - pos_x, - pos_y, - mySize_x, - mySize_y + pos.x, + pos.y, + mySize.x, + mySize.y ); draw_teamradar_background(hud_panel_radar_foreground_alpha); @@@ -2059,17 -2076,17 +2068,17 @@@ void HUD_Score_Rankings(vector pos, vec { float score; entity tm = world, pl; - #define SCOREPANEL_MAX_ENTRIES 6 - #define SCOREPANEL_ASPECTRATIO 2 - float entries = bound(1, floor(SCOREPANEL_MAX_ENTRIES * mySize_y/mySize_x * SCOREPANEL_ASPECTRATIO), SCOREPANEL_MAX_ENTRIES); - vector fontsize = '1 1 0' * (mySize_y/entries); + float SCOREPANEL_MAX_ENTRIES = 6; + float SCOREPANEL_ASPECTRATIO = 2; + float entries = bound(1, floor(SCOREPANEL_MAX_ENTRIES * mySize.y/mySize.x * SCOREPANEL_ASPECTRATIO), SCOREPANEL_MAX_ENTRIES); + vector fontsize = '1 1 0' * (mySize.y/entries); vector rgb, score_color; rgb = '1 1 1'; score_color = '1 1 1'; - float name_size = mySize_x*0.75; - float spacing_size = mySize_x*0.04; + float name_size = mySize.x*0.75; + float spacing_size = mySize.x*0.04; const float highlight_alpha = 0.2; float i = 0, me_printed = 0, first_pl = 0; string s; @@@ -2079,15 -2096,15 +2088,15 @@@ if (team_count) { // show team scores in the first line - float score_size = mySize_x / team_count; + float score_size = mySize.x / team_count; players_per_team = max(2, ceil((entries - 1) / team_count)); for(i=0; i 0) distribution_str = strcat("+", distribution_str); - HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } - drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eX * 0.75 * mySize_x, distribution_str, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize.x + eY * mySize.y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize.x, distribution_str, eX * 0.25 * mySize.x + eY * (1/3) * mySize.y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); draw_endBoldFont(); } else { // teamgames float row, column, rows = 0, columns = 0; - local noref vector offset = '0 0 0'; + vector offset = '0 0 0'; vector score_pos, score_size; //for scores other than myteam if(autocvar_hud_panel_score_rankings) { @@@ -2292,28 -2309,32 +2301,28 @@@ } if(spectatee_status == -1) { - rows = mySize.y/mySize.x; - rows = bound(1, floor((sqrt(4 * (3/1) * rows * team_count + rows * rows) + rows + 0.5) / 2), team_count); - // ^^^ ammo item aspect goes here - + rows = HUD_GetRowCount(team_count, mySize, 3); columns = ceil(team_count/rows); - score_size = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows); - + score_size = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows); float newSize; - if(score_size_x/score_size_y > 3) + if(score_size.x/score_size.y > 3) { - newSize = 3 * score_size_y; - offset_x = score_size_x - newSize; - pos_x += offset_x/2; - score_size_x = newSize; + newSize = 3 * score_size.y; + offset.x = score_size.x - newSize; + pos.x += offset.x/2; + score_size.x = newSize; } else { - newSize = 1/3 * score_size_x; - offset_y = score_size_y - newSize; - pos_y += offset_y/2; - score_size_y = newSize; + newSize = 1/3 * score_size.x; + offset.y = score_size.y - newSize; + pos.y += offset.y/2; + score_size.y = newSize; } } else - score_size = eX * mySize_x*(1/4) + eY * mySize_y*(1/3); + score_size = eX * mySize.x*(1/4) + eY * mySize.y*(1/3); float max_fragcount; max_fragcount = -99; @@@ -2331,7 -2352,7 +2340,7 @@@ if (spectatee_status == -1) { - score_pos = pos + eX * column * (score_size_x + offset_x) + eY * row * (score_size_y + offset_y); + score_pos = pos + eX * column * (score_size.x + offset.x) + eY * row * (score_size.y + offset.y); if (max_fragcount == score) HUD_Panel_DrawHighlight(score_pos, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawstring_aspect(score_pos, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); @@@ -2344,12 -2365,12 +2353,12 @@@ } else if(tm.team == myteam) { if (max_fragcount == score) - HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize.x + eY * mySize.y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); } else { if (max_fragcount == score) - HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize_x + eY * (1/3) * rows * mySize_y, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * rows * mySize_y, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize.x + eY * (1/3) * rows * mySize.y, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize.x + eY * (1/3) * rows * mySize.y, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); ++rows; } } @@@ -2385,19 -2406,19 +2394,19 @@@ void HUD_RaceTimer (void // always force 4:1 aspect vector newSize = '0 0 0'; - if(mySize_x/mySize_y > 4) + if(mySize.x/mySize.y > 4) { - newSize_x = 4 * mySize_y; - newSize_y = mySize_y; + newSize.x = 4 * mySize.y; + newSize.y = mySize.y; - pos_x = pos_x + (mySize_x - newSize_x) / 2; + pos.x = pos.x + (mySize.x - newSize.x) / 2; } else { - newSize_y = 1/4 * mySize_x; - newSize_x = mySize_x; + newSize.y = 1/4 * mySize.x; + newSize.x = mySize.x; - pos_y = pos_y + (mySize_y - newSize_y) / 2; + pos.y = pos.y + (mySize.y - newSize.y) / 2; } mySize = newSize; @@@ -2407,11 -2428,11 +2416,11 @@@ if(autocvar__hud_configure) { s = "0:13:37"; - 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', panel_fg_alpha, 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', panel_fg_alpha, 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.20 * mySize_y) + eY * 0.60 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, panel_fg_alpha, 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, panel_fg_alpha, DRAWFLAG_NORMAL); s = sprintf(_("^1PENALTY: %.1f (%s)"), 2, "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, panel_fg_alpha, 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.80 * mySize.y, s, '1 1 0' * 0.20 * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL); } else if(race_checkpointtime) { @@@ -2444,7 -2465,7 +2453,7 @@@ if(s != "" && a > 0) { - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } if(race_penaltytime) @@@ -2453,14 -2474,14 +2462,14 @@@ if(a > 0) { s = sprintf(_("^1PENALTY: %.1f (%s)"), race_penaltytime * 0.1, race_penaltyreason); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.8 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.8 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } if(forcetime != "") { a = bound(0, (time - race_checkpointtime) / 0.5, 1); - drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.6 * mySize_y), forcetime, '1 1 0' * 0.6 * mySize_y, '1 1 1', panel_fg_alpha, 0, a); + drawstring_expanding(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(forcetime, false, '1 1 0' * 0.6 * mySize.y), forcetime, '1 1 0' * 0.6 * mySize.y, '1 1 1', panel_fg_alpha, 0, a); } else a = 1; @@@ -2468,7 -2489,7 +2477,7 @@@ if(race_laptime && race_checkpoint != 255) { s = TIME_ENCODED_TOSTRING(TIME_ENCODE(time + TIME_DECODE(race_penaltyaccumulator) - race_laptime)); - drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.6 0.6 0' * mySize_y), s, '0.6 0.6 0' * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, false, '0.6 0.6 0' * mySize.y), s, '0.6 0.6 0' * mySize.y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } } else @@@ -2477,13 -2498,13 +2486,13 @@@ { a = bound(0, 2 - (time - race_mycheckpointtime), 1); s = MakeRaceString(race_mycheckpoint, TIME_DECODE(race_mycheckpointdelta), -(race_mycheckpointenemy == ""), race_mycheckpointlapsdelta, race_mycheckpointenemy); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } if(race_othercheckpointtime && race_othercheckpointenemy != "") { a = bound(0, 2 - (time - race_othercheckpointtime), 1); s = MakeRaceString(race_othercheckpoint, -TIME_DECODE(race_othercheckpointdelta), -(race_othercheckpointenemy == ""), race_othercheckpointlapsdelta, race_othercheckpointenemy); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } if(race_penaltytime && !race_penaltyaccumulator) @@@ -2496,7 -2517,7 +2505,7 @@@ s = sprintf(_("^1PENALTY: %.1f (%s)"), (t - time) * 0.1, race_penaltyreason); else s = sprintf(_("^2PENALTY: %.1f (%s)"), 0, race_penaltyreason); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } } @@@ -2593,61 -2614,61 +2602,61 @@@ void HUD_Vote(void // always force 3:1 aspect vector newSize = '0 0 0'; - if(mySize_x/mySize_y > 3) + if(mySize.x/mySize.y > 3) { - newSize_x = 3 * mySize_y; - newSize_y = mySize_y; + newSize.x = 3 * mySize.y; + newSize.y = mySize.y; - pos_x = pos_x + (mySize_x - newSize_x) / 2; + pos.x = pos.x + (mySize.x - newSize.x) / 2; } else { - newSize_y = 1/3 * mySize_x; - newSize_x = mySize_x; + newSize.y = 1/3 * mySize.x; + newSize.x = mySize.x; - pos_y = pos_y + (mySize_y - newSize_y) / 2; + pos.y = pos.y + (mySize.y - newSize.y) / 2; } mySize = newSize; s = _("A vote has been called for:"); if(uid2name_dialog) s = _("Allow servers to store and display your name?"); - drawstring_aspect(pos, s, eX * mySize_x + eY * (2/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); - s = textShortenToWidth(vote_called_vote, mySize_x, '1 1 0' * mySize_y * (1/8), stringwidth_colors); + drawstring_aspect(pos, s, eX * mySize.x + eY * (2/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL); + s = textShortenToWidth(vote_called_vote, mySize.x, '1 1 0' * mySize.y * (1/8), stringwidth_colors); if(autocvar__hud_configure) s = _("^1Configure the HUD"); - drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize_y, s, eX * mySize_x + eY * (1.75/8) * mySize_y, a, DRAWFLAG_NORMAL); + drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize.y, s, eX * mySize.x + eY * (1.75/8) * mySize.y, a, DRAWFLAG_NORMAL); // print the yes/no counts s = sprintf(_("Yes (%s): %d"), getcommandkey("vyes", "vyes"), vote_yescount); - drawstring_aspect(pos + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '0 1 0', a, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * (4/8) * mySize.y, s, eX * 0.5 * mySize.x + eY * (1.5/8) * mySize.y, '0 1 0', a, DRAWFLAG_NORMAL); s = sprintf(_("No (%s): %d"), getcommandkey("vno", "vno"), vote_nocount); - drawstring_aspect(pos + eX * 0.5 * mySize_x + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '1 0 0', a, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.5 * mySize.x + eY * (4/8) * mySize.y, s, eX * 0.5 * mySize.x + eY * (1.5/8) * mySize.y, '1 0 0', a, DRAWFLAG_NORMAL); // draw the progress bar backgrounds - drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_back", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_back", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL); // draw the highlights if(vote_highlighted == 1) { - drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y); - drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_voted", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); + drawsetcliparea(pos.x, pos.y, mySize.x * 0.5, mySize.y); + drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_voted", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL); } else if(vote_highlighted == -1) { - drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y); - drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_voted", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); + drawsetcliparea(pos.x + 0.5 * mySize.x, pos.y, mySize.x * 0.5, mySize.y); + drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_voted", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL); } // draw the progress bars if(vote_yescount && vote_needed) { - drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); - drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); + drawsetcliparea(pos.x, pos.y, mySize.x * 0.5 * (vote_yescount/vote_needed), mySize.y); + drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_prog", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL); } if(vote_nocount && vote_needed) { - drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y); - drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); + drawsetcliparea(pos.x + mySize.x - mySize.x * 0.5 * (vote_nocount/vote_needed), pos.y, mySize.x * 0.5, mySize.y); + drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_prog", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL); } drawresetcliparea(); @@@ -2658,16 -2679,11 +2667,11 @@@ float mod_active; // is there any active mod icon? - void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, float layout, float i) + void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, float i) { - float stat; - string pic; - vector color; - #ifdef GMQCC - stat = -1; - pic = ""; - color = '0 0 0'; - #endif + float stat = -1; + string pic = ""; + vector color = '0 0 0'; switch(i) { case 0: @@@ -2693,23 -2709,23 +2697,23 @@@ break; } - if(mySize_x/mySize_y > aspect_ratio) + if(mySize.x/mySize.y > aspect_ratio) { - i = aspect_ratio * mySize_y; - myPos_x = myPos_x + (mySize_x - i) / 2; - mySize_x = i; + i = aspect_ratio * mySize.y; + myPos.x = myPos.x + (mySize.x - i) / 2; + mySize.x = i; } else { - i = 1/aspect_ratio * mySize_x; - myPos_y = myPos_y + (mySize_y - i) / 2; - mySize_y = i; + i = 1/aspect_ratio * mySize.x; + myPos.y = myPos.y + (mySize.y - i) / 2; + mySize.y = i; } if(layout) { - drawpic_aspect_skin(myPos, pic, eX * 0.7 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(myPos + eX * 0.7 * mySize_x, ftos(stat), eX * 0.3 * mySize_x + eY * mySize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(myPos, pic, eX * 0.7 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(myPos + eX * 0.7 * mySize.x, ftos(stat), eX * 0.3 * mySize.x + eY * mySize.y, color, panel_fg_alpha, DRAWFLAG_NORMAL); } else drawstring_aspect(myPos, ftos(stat), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL); @@@ -2720,23 -2736,24 +2724,23 @@@ void HUD_Mod_CA(vector myPos, vector my { mod_active = 1; // required in each mod function that always shows something - float layout; + int layout; if(gametype == MAPINFO_TYPE_CA) layout = autocvar_hud_panel_modicons_ca_layout; else //if(gametype == MAPINFO_TYPE_FREEZETAG) layout = autocvar_hud_panel_modicons_freezetag_layout; float rows, columns, aspect_ratio; - rows = mySize.y/mySize.x; aspect_ratio = (layout) ? 2 : 1; - rows = bound(1, floor((sqrt((4 * aspect_ratio * team_count + rows) * rows) + rows + 0.5) / 2), team_count); + rows = HUD_GetRowCount(team_count, mySize, aspect_ratio); columns = ceil(team_count/rows); int i; float row = 0, column = 0; vector pos, itemSize; - itemSize = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows); + itemSize = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows); for(i=0; i mySize_y) { + if(mySize.x > mySize.y) { if (myteam == NUM_TEAM_1) { // always draw own flag on left redflag_pos = pos; - blueflag_pos = pos + eX * 0.5 * mySize_x; + blueflag_pos = pos + eX * 0.5 * mySize.x; } else { blueflag_pos = pos; - redflag_pos = pos + eX * 0.5 * mySize_x; + redflag_pos = pos + eX * 0.5 * mySize.x; } - flag_size = eX * 0.5 * mySize_x + eY * mySize_y; + flag_size = eX * 0.5 * mySize.x + eY * mySize.y; } else { if (myteam == NUM_TEAM_1) { // always draw own flag on left redflag_pos = pos; - blueflag_pos = pos + eY * 0.5 * mySize_y; + blueflag_pos = pos + eY * 0.5 * mySize.y; } else { blueflag_pos = pos; - redflag_pos = pos + eY * 0.5 * mySize_y; + redflag_pos = pos + eY * 0.5 * mySize.y; } - flag_size = eY * 0.5 * mySize_y + eX * mySize_x; + flag_size = eY * 0.5 * mySize.y + eX * mySize.x; } f = bound(0, redflag_statuschange_elapsedtime*2, 1); @@@ -2943,30 -2960,30 +2947,30 @@@ void HUD_Mod_KH(vector pos, vector mySi vector slot_size; - if(all_keys == 4 && mySize_x * 0.5 < mySize_y && mySize_y * 0.5 < mySize_x) + if(all_keys == 4 && mySize.x * 0.5 < mySize.y && mySize.y * 0.5 < mySize.x) { // Quadratic arrangement - slot_size = eX * mySize_x * 0.5 + eY * mySize_y * 0.5; + slot_size = eX * mySize.x * 0.5 + eY * mySize.y * 0.5; KH_SLOTS[0] = pos; - KH_SLOTS[1] = pos + eX * slot_size_x; - KH_SLOTS[2] = pos + eY * slot_size_y; - KH_SLOTS[3] = pos + eX * slot_size_x + eY * slot_size_y; + KH_SLOTS[1] = pos + eX * slot_size.x; + KH_SLOTS[2] = pos + eY * slot_size.y; + KH_SLOTS[3] = pos + eX * slot_size.x + eY * slot_size.y; } else { - if(mySize_x > mySize_y) + if(mySize.x > mySize.y) { // Horizontal arrangement - slot_size = eX * mySize_x / all_keys + eY * mySize_y; + slot_size = eX * mySize.x / all_keys + eY * mySize.y; for(i = 0; i < all_keys; ++i) - KH_SLOTS[i] = pos + eX * slot_size_x * i; + KH_SLOTS[i] = pos + eX * slot_size.x * i; } else { // Vertical arrangement - slot_size = eX * mySize_x + eY * mySize_y / all_keys; + slot_size = eX * mySize.x + eY * mySize.y / all_keys; for(i = 0; i < all_keys; ++i) - KH_SLOTS[i] = pos + eY * slot_size_y * i; + KH_SLOTS[i] = pos + eY * slot_size.y * i; } } @@@ -3056,12 -3073,12 +3060,12 @@@ void HUD_Mod_Keepaway(vector pos, vecto vector kaball_pos, kaball_size; - if(mySize_x > mySize_y) { - kaball_pos = pos + eX * 0.25 * mySize_x; - kaball_size = eX * 0.5 * mySize_x + eY * mySize_y; + if(mySize.x > mySize.y) { + kaball_pos = pos + eX * 0.25 * mySize.x; + kaball_size = eX * 0.5 * mySize.x + eY * mySize.y; } else { - kaball_pos = pos + eY * 0.25 * mySize_y; - kaball_size = eY * 0.5 * mySize_y + eX * mySize_x; + kaball_pos = pos + eY * 0.25 * mySize.y; + kaball_size = eY * 0.5 * mySize.y + eX * mySize.x; } float kaball_statuschange_elapsedtime = time - kaball_statuschange_time; @@@ -3071,7 -3088,7 +3075,7 @@@ drawpic_aspect_skin_expanding(kaball_pos, "keepawayball_carrying", kaball_size, '1 1 1', panel_fg_alpha * kaball_alpha, DRAWFLAG_NORMAL, f); if(kaball) - drawpic_aspect_skin(pos, "keepawayball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha * kaball_alpha * f, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos, "keepawayball_carrying", eX * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha * kaball_alpha * f, DRAWFLAG_NORMAL); } @@@ -3097,11 -3114,11 +3101,11 @@@ void HUD_Mod_NexBall(vector pos, vecto if (p > 1) p = 2 - p; - HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", p, (mySize_x <= mySize_y), 0, autocvar_hud_progressbar_nexball_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", p, (mySize.x <= mySize.y), 0, autocvar_hud_progressbar_nexball_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if (stat_items & IT_KEY1) - drawpic_aspect_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos, "nexball_carrying", eX * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } // Race/CTS HUD mod icons @@@ -3150,16 -3167,16 +3154,16 @@@ void HUD_Mod_Race(vector pos, vector my vector textPos, medalPos; float squareSize; - if(mySize_x > mySize_y) { + if(mySize.x > mySize.y) { // text on left side - squareSize = min(mySize_y, mySize_x/2); - textPos = pos + eX * 0.5 * max(0, mySize_x/2 - squareSize) + eY * 0.5 * (mySize_y - squareSize); - medalPos = pos + eX * 0.5 * max(0, mySize_x/2 - squareSize) + eX * 0.5 * mySize_x + eY * 0.5 * (mySize_y - squareSize); + squareSize = min(mySize.y, mySize.x/2); + textPos = pos + eX * 0.5 * max(0, mySize.x/2 - squareSize) + eY * 0.5 * (mySize.y - squareSize); + medalPos = pos + eX * 0.5 * max(0, mySize.x/2 - squareSize) + eX * 0.5 * mySize.x + eY * 0.5 * (mySize.y - squareSize); } else { // text on top - squareSize = min(mySize_x, mySize_y/2); - textPos = pos + eY * 0.5 * max(0, mySize_y/2 - squareSize) + eX * 0.5 * (mySize_x - squareSize); - medalPos = pos + eY * 0.5 * max(0, mySize_y/2 - squareSize) + eY * 0.5 * mySize_y + eX * 0.5 * (mySize_x - squareSize); + squareSize = min(mySize.x, mySize.y/2); + textPos = pos + eY * 0.5 * max(0, mySize.y/2 - squareSize) + eX * 0.5 * (mySize.x - squareSize); + medalPos = pos + eY * 0.5 * max(0, mySize.y/2 - squareSize) + eY * 0.5 * mySize.y + eX * 0.5 * (mySize.x - squareSize); } f = time - crecordtime_change_time; @@@ -3251,16 -3268,11 +3255,11 @@@ } } - void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, float layout, float i) + void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, float i) { - float stat, pps_ratio; - string pic; - vector color; - #ifdef GMQCC - stat = -1; - pic = ""; - color = '0 0 0'; - #endif + float stat = -1; + string pic = ""; + vector color = '0 0 0'; switch(i) { case 0: @@@ -3285,19 -3297,19 +3284,19 @@@ color = '1 0 1'; break; } - pps_ratio = stat / getstatf(STAT_DOM_TOTAL_PPS); + float pps_ratio = stat / getstatf(STAT_DOM_TOTAL_PPS); - if(mySize_x/mySize_y > aspect_ratio) + if(mySize.x/mySize.y > aspect_ratio) { - i = aspect_ratio * mySize_y; - myPos_x = myPos_x + (mySize_x - i) / 2; - mySize_x = i; + i = aspect_ratio * mySize.y; + myPos.x = myPos.x + (mySize.x - i) / 2; + mySize.x = i; } else { - i = 1/aspect_ratio * mySize_x; - myPos_y = myPos_y + (mySize_y - i) / 2; - mySize_y = i; + i = 1/aspect_ratio * mySize.x; + myPos.y = myPos.y + (mySize.y - i) / 2; + mySize.y = i; } if (layout) // show text too @@@ -3305,17 -3317,17 +3304,17 @@@ //draw the text color *= 0.5 + pps_ratio * (1 - 0.5); // half saturated color at min, full saturated at max if (layout == 2) // average pps - drawstring_aspect(myPos + eX * mySize_y, ftos_decimals(stat, 2), eX * (2/3) * mySize_x + eY * mySize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(myPos + eX * mySize.y, ftos_decimals(stat, 2), eX * (2/3) * mySize.x + eY * mySize.y, color, panel_fg_alpha, DRAWFLAG_NORMAL); else // percentage of average pps - drawstring_aspect(myPos + eX * mySize_y, strcat( ftos(floor(pps_ratio*100 + 0.5)), "%" ), eX * (2/3) * mySize_x + eY * mySize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(myPos + eX * mySize.y, strcat( ftos(floor(pps_ratio*100 + 0.5)), "%" ), eX * (2/3) * mySize.x + eY * mySize.y, color, panel_fg_alpha, DRAWFLAG_NORMAL); } //draw the icon - drawpic_aspect_skin(myPos, pic, '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(myPos, pic, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); if (stat > 0) { - drawsetcliparea(myPos_x, myPos_y + mySize_y * (1 - pps_ratio), mySize_y, mySize_y * pps_ratio); - drawpic_aspect_skin(myPos, strcat(pic, "-highlighted"), '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawsetcliparea(myPos.x, myPos.y + mySize.y * (1 - pps_ratio), mySize.y, mySize.y * pps_ratio); + drawpic_aspect_skin(myPos, strcat(pic, "-highlighted"), '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawresetcliparea(); } } @@@ -3324,19 -3336,20 +3323,19 @@@ void HUD_Mod_Dom(vector myPos, vector m { mod_active = 1; // required in each mod function that always shows something - float layout = autocvar_hud_panel_modicons_dom_layout; + int layout = autocvar_hud_panel_modicons_dom_layout; float rows, columns, aspect_ratio; - rows = mySize.y/mySize.x; aspect_ratio = (layout) ? 3 : 1; - rows = bound(1, floor((sqrt((4 * aspect_ratio * team_count + rows) * rows) + rows + 0.5) / 2), team_count); + rows = HUD_GetRowCount(team_count, mySize, aspect_ratio); columns = ceil(team_count/rows); int i; float row = 0, column = 0; vector pos, itemSize; - itemSize = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows); + itemSize = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows); for(i=0; i aspect) + if(mySize.x/mySize.y > aspect) { - newSize_x = aspect * mySize_y; - newSize_y = mySize_y; + newSize.x = aspect * mySize.y; + newSize.y = mySize.y; - pos_x = pos_x + (mySize_x - newSize_x) / 2; + pos.x = pos.x + (mySize.x - newSize.x) / 2; } else { - newSize_y = 1/aspect * mySize_x; - newSize_x = mySize_x; + newSize.y = 1/aspect * mySize.x; + newSize.x = mySize.x; - pos_y = pos_y + (mySize_y - newSize_y) / 2; + pos.y = pos.y + (mySize.y - newSize.y) / 2; } mySize = newSize; } vector keysize; - keysize = eX * mySize_x * (1/3.0) + eY * mySize_y * (1/(3.0 - !autocvar_hud_panel_pressedkeys_attack)); + keysize = eX * mySize.x * (1/3.0) + eY * mySize.y * (1/(3.0 - !autocvar_hud_panel_pressedkeys_attack)); float pressedkeys; pressedkeys = getstatf(STAT_PRESSED_KEYS); if(autocvar_hud_panel_pressedkeys_attack) { - drawpic_aspect_skin(pos + eX * keysize_x * 0.5, ((pressedkeys & KEY_ATCK) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize_x * 1.5, ((pressedkeys & KEY_ATCK2) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - pos_y += keysize_y; + drawpic_aspect_skin(pos + eX * keysize.x * 0.5, ((pressedkeys & KEY_ATCK) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * keysize.x * 1.5, ((pressedkeys & KEY_ATCK2) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + pos.y += keysize.y; } drawpic_aspect_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize_x, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize_x * 2, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - pos_y += keysize_y; + drawpic_aspect_skin(pos + eX * keysize.x, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * keysize.x * 2, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + pos.y += keysize.y; drawpic_aspect_skin(pos, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize_x, ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize_x * 2, ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * keysize.x, ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * keysize.x * 2, ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } // Handle chat as a panel (#12) @@@ -3500,8 -3513,8 +3499,8 @@@ void HUD_Chat(void if(autocvar__con_chat_maximized && !autocvar__hud_configure) // draw at full screen height if maximized { - panel_pos_y = panel_bg_border; - panel_size_y = vid_conheight - panel_bg_border * 2; + panel_pos.y = panel_bg_border; + panel_size.y = vid_conheight - panel_bg_border * 2; if(panel.current_panel_bg == "0") // force a border when maximized { string panel_bg; @@@ -3531,11 -3544,11 +3530,11 @@@ if (!autocvar_con_chatrect) cvar_set("con_chatrect", "1"); - cvar_set("con_chatrect_x", ftos(pos_x/vid_conwidth)); - cvar_set("con_chatrect_y", ftos(pos_y/vid_conheight)); + cvar_set("con_chatrect_x", ftos(pos.x/vid_conwidth)); + cvar_set("con_chatrect_y", ftos(pos.y/vid_conheight)); - cvar_set("con_chatwidth", ftos(mySize_x/vid_conwidth)); - cvar_set("con_chat", ftos(floor(mySize_y/autocvar_con_chatsize - 0.5))); + cvar_set("con_chatwidth", ftos(mySize.x/vid_conwidth)); + cvar_set("con_chat", ftos(floor(mySize.y/autocvar_con_chatsize - 0.5))); if(autocvar__hud_configure) { @@@ -3549,8 -3562,8 +3548,8 @@@ a = panel_fg_alpha; else a = panel_fg_alpha * floor(((i + 1) * 7 + autocvar_con_chattime)/45); - drawcolorcodedstring(pos, textShortenToWidth(_("^3Player^7: This is the chat area."), mySize_x, chatsize, stringwidth_colors), chatsize, a, DRAWFLAG_NORMAL); - pos_y += chatsize_y; + drawcolorcodedstring(pos, textShortenToWidth(_("^3Player^7: This is the chat area."), mySize.x, chatsize, stringwidth_colors), chatsize, a, DRAWFLAG_NORMAL); + pos.y += chatsize.y; } } } @@@ -3619,11 -3632,12 +3618,12 @@@ void HUD_EngineInfo(void // Info messages panel (#14) // - #define drawInfoMessage(s)\ - if(autocvar_hud_panel_infomessages_flip)\ - o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize);\ - drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL);\ - o_y += fontsize_y; + #define drawInfoMessage(s) do { \ + if(autocvar_hud_panel_infomessages_flip) \ + o.x = pos.x + mySize.x - stringwidth(s, true, fontsize); \ + drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); \ + o.y += fontsize.y; \ + } while(0) void HUD_InfoMessages(void) { if(!autocvar__hud_configure) @@@ -3645,19 -3659,19 +3645,19 @@@ // always force 5:1 aspect vector newSize = '0 0 0'; - if(mySize_x/mySize_y > 5) + if(mySize.x/mySize.y > 5) { - newSize_x = 5 * mySize_y; - newSize_y = mySize_y; + newSize.x = 5 * mySize.y; + newSize.y = mySize.y; - pos_x = pos_x + (mySize_x - newSize_x) / 2; + pos.x = pos.x + (mySize.x - newSize.x) / 2; } else { - newSize_y = 1/5 * mySize_x; - newSize_x = mySize_x; + newSize.y = 1/5 * mySize.x; + newSize.x = mySize.x; - pos_y = pos_y + (mySize_y - newSize_y) / 2; + pos.y = pos.y + (mySize.y - newSize.y) / 2; } mySize = newSize; @@@ -3666,7 -3680,7 +3666,7 @@@ o = pos; vector fontsize; - fontsize = '0.20 0.20 0' * mySize_y; + fontsize = '0.20 0.20 0' * mySize.y; float a; a = panel_fg_alpha; @@@ -3681,22 -3695,22 +3681,22 @@@ s = _("^1Observing"); else s = sprintf(_("^1Spectating: ^7%s"), GetPlayerName(player_localentnum - 1)); - drawInfoMessage(s) + drawInfoMessage(s); if(spectatee_status == -1) s = sprintf(_("^1Press ^3%s^1 to spectate"), getcommandkey("primary fire", "+fire")); else s = sprintf(_("^1Press ^3%s^1 or ^3%s^1 for next or previous player"), getcommandkey("next weapon", "weapnext"), getcommandkey("previous weapon", "weapprev")); - drawInfoMessage(s) + drawInfoMessage(s); if(spectatee_status == -1) s = sprintf(_("^1Use ^3%s^1 or ^3%s^1 to change the speed"), getcommandkey("next weapon", "weapnext"), getcommandkey("previous weapon", "weapprev")); else s = sprintf(_("^1Press ^3%s^1 to observe"), getcommandkey("secondary fire", "+fire2")); - drawInfoMessage(s) + drawInfoMessage(s); s = sprintf(_("^1Press ^3%s^1 for gamemode info"), getcommandkey("server info", "+show_info")); - drawInfoMessage(s) + drawInfoMessage(s); if(gametype == MAPINFO_TYPE_LMS) { @@@ -3711,7 -3725,7 +3711,7 @@@ } else s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey("jump", "+jump")); - drawInfoMessage(s) + drawInfoMessage(s); //show restart countdown: if (time < getstatf(STAT_GAMESTARTTIME)) { @@@ -3720,13 -3734,13 +3720,13 @@@ countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time); s = sprintf(_("^1Game starts in ^3%d^1 seconds"), countdown); drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL); - o_y += fontsize_y; + o.y += fontsize.y; } } if(warmup_stage && !intermission) { s = _("^2Currently in ^1warmup^2 stage!"); - drawInfoMessage(s) + drawInfoMessage(s); } string blinkcolor; @@@ -3751,12 -3765,12 +3751,12 @@@ else s = _("^2Waiting for others to ready up..."); } - drawInfoMessage(s) + drawInfoMessage(s); } else if(warmup_stage && !intermission && !spectatee_status) { s = sprintf(_("^2Press ^3%s^2 to end warmup"), getcommandkey("ready", "ready")); - drawInfoMessage(s) + drawInfoMessage(s); } if(teamplay && !intermission && !spectatee_status && gametype != MAPINFO_TYPE_CA && teamnagger) @@@ -3765,7 -3779,7 +3765,7 @@@ tm = teams.sort_next; if (tm) { - for(; tm.sort_next; tm = tm.sort_next) + for (; tm.sort_next; tm = tm.sort_next) { if(!tm.team_size || tm.team == NUM_SPECTATOR) continue; @@@ -3782,7 -3796,7 +3782,7 @@@ if (tm.team != NUM_SPECTATOR) if (tm.team_size == ts_max) s = strcat(s, sprintf(_(" Press ^3%s%s to adjust"), getcommandkey("team menu", "menu_showteamselect"), blinkcolor)); - drawInfoMessage(s) + drawInfoMessage(s); } } } @@@ -3790,13 -3804,13 +3790,13 @@@ else { s = _("^7Press ^3ESC ^7to show HUD options."); - drawInfoMessage(s) + drawInfoMessage(s); s = _("^3Doubleclick ^7a panel for panel-specific options."); - drawInfoMessage(s) + drawInfoMessage(s); s = _("^3CTRL ^7to disable collision testing, ^3SHIFT ^7and"); - drawInfoMessage(s) + drawInfoMessage(s); s = _("^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments."); - drawInfoMessage(s) + drawInfoMessage(s); } } @@@ -3871,7 -3885,7 +3871,7 @@@ void HUD_Physics(void else if(autocvar_hud_panel_physics_speed_vertical) speed = floor( vlen(vel) * conversion_factor + 0.5 ); else - speed = floor( vlen(vel - vel_z * '0 0 1') * conversion_factor + 0.5 ); + speed = floor( vlen(vel - vel.z * '0 0 1') * conversion_factor + 0.5 ); //compute acceleration float acceleration, f; @@@ -3884,7 -3898,7 +3884,7 @@@ if(autocvar_hud_panel_physics_acceleration_vertical) acceleration = (vlen(vel) - vlen(acc_prevspeed)); else - acceleration = (vlen(vel - '0 0 1' * vel_z) - vlen(acc_prevspeed - '0 0 1' * acc_prevspeed_z)); + acceleration = (vlen(vel - '0 0 1' * vel.z) - vlen(acc_prevspeed - '0 0 1' * acc_prevspeed.z)); acceleration = acceleration * (1 / max(0.0001, f)) * (0.0254 / 9.80665); @@@ -3896,23 -3910,23 +3896,23 @@@ } //compute layout - float panel_ar = panel_size_x/panel_size_y; + float panel_ar = panel_size.x/panel_size.y; vector speed_offset = '0 0 0', acceleration_offset = '0 0 0'; if (panel_ar >= 5 && !acceleration_progressbar_scale) { - panel_size_x *= 0.5; + panel_size.x *= 0.5; if (autocvar_hud_panel_physics_flip) - speed_offset_x = panel_size_x; + speed_offset.x = panel_size.x; else - acceleration_offset_x = panel_size_x; + acceleration_offset.x = panel_size.x; } else { - panel_size_y *= 0.5; + panel_size.y *= 0.5; if (autocvar_hud_panel_physics_flip) - speed_offset_y = panel_size_y; + speed_offset.y = panel_size.y; else - acceleration_offset_y = panel_size_y; + acceleration_offset.y = panel_size.y; } float speed_baralign, acceleration_baralign; if (autocvar_hud_panel_physics_baralign == 1) @@@ -3939,26 -3953,26 +3939,26 @@@ vector tmp_offset = '0 0 0', tmp_size = '0 0 0'; if (autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 2) { - tmp_size_x = panel_size_x * 0.75; - tmp_size_y = panel_size_y * text_scale; + tmp_size.x = panel_size.x * 0.75; + tmp_size.y = panel_size.y * text_scale; if (speed_baralign) - tmp_offset_x = panel_size_x - tmp_size_x; + tmp_offset.x = panel_size.x - tmp_size.x; //else //tmp_offset_x = 0; - tmp_offset_y = (panel_size_y - tmp_size_y) / 2; + tmp_offset.y = (panel_size.y - tmp_size.y) / 2; drawstring_aspect(panel_pos + speed_offset + tmp_offset, ftos(speed), tmp_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); //draw speed unit if (speed_baralign) - tmp_offset_x = 0; + tmp_offset.x = 0; else - tmp_offset_x = tmp_size_x; + tmp_offset.x = tmp_size.x; if (autocvar_hud_panel_physics_speed_unit_show) { //tmp_offset_y = 0; - tmp_size_x = panel_size_x * (1 - 0.75); - tmp_size_y = panel_size_y * 0.4 * text_scale; - tmp_offset_y = (panel_size_y * 0.4 - tmp_size_y) / 2; + tmp_size.x = panel_size.x * (1 - 0.75); + tmp_size.y = panel_size.y * 0.4 * text_scale; + tmp_offset.y = (panel_size.y * 0.4 - tmp_size.y) / 2; drawstring_aspect(panel_pos + speed_offset + tmp_offset, unit, tmp_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } } @@@ -3994,30 -4008,30 +3994,30 @@@ if(speed < top_speed) if(autocvar_hud_panel_physics_progressbar == 1 || autocvar_hud_panel_physics_progressbar == 2) { - float peak_offset_x; + float peak_offsetX; vector peak_size = '0 0 0'; if (speed_baralign == 0) - peak_offset_x = min(top_speed, max_speed)/max_speed * panel_size_x; + peak_offsetX = min(top_speed, max_speed)/max_speed * panel_size.x; else if (speed_baralign == 1) - peak_offset_x = (1 - min(top_speed, max_speed)/max_speed) * panel_size_x; + peak_offsetX = (1 - min(top_speed, max_speed)/max_speed) * panel_size.x; else // if (speed_baralign == 2) - peak_offset_x = min(top_speed, max_speed)/max_speed * panel_size_x * 0.5; - peak_size_x = floor(panel_size_x * 0.01 + 1.5); - peak_size_y = panel_size_y; + peak_offsetX = min(top_speed, max_speed)/max_speed * panel_size.x * 0.5; + peak_size.x = floor(panel_size.x * 0.01 + 1.5); + peak_size.y = panel_size.y; if (speed_baralign == 2) // draw two peaks, on both sides { - drawfill(panel_pos + speed_offset + eX * (0.5 * panel_size_x + peak_offset_x - peak_size_x), peak_size, autocvar_hud_progressbar_speed_color, f * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); - drawfill(panel_pos + speed_offset + eX * (0.5 * panel_size_x - peak_offset_x + peak_size_x), peak_size, autocvar_hud_progressbar_speed_color, f * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + drawfill(panel_pos + speed_offset + eX * (0.5 * panel_size.x + peak_offsetX - peak_size.x), peak_size, autocvar_hud_progressbar_speed_color, f * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + drawfill(panel_pos + speed_offset + eX * (0.5 * panel_size.x - peak_offsetX + peak_size.x), peak_size, autocvar_hud_progressbar_speed_color, f * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } else - drawfill(panel_pos + speed_offset + eX * (peak_offset_x - peak_size_x), peak_size, autocvar_hud_progressbar_speed_color, f * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + drawfill(panel_pos + speed_offset + eX * (peak_offsetX - peak_size.x), peak_size, autocvar_hud_progressbar_speed_color, f * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } //top speed - tmp_offset_y = panel_size_y * 0.4; - tmp_size_x = panel_size_x * (1 - 0.75); - tmp_size_y = (panel_size_y - tmp_offset_y) * text_scale; - tmp_offset_y += (panel_size_y - tmp_offset_y - tmp_size_y) / 2; + tmp_offset.y = panel_size.y * 0.4; + tmp_size.x = panel_size.x * (1 - 0.75); + tmp_size.y = (panel_size.y - tmp_offset.y) * text_scale; + tmp_offset.y += (panel_size.y - tmp_offset.y - tmp_size.y) / 2; drawstring_aspect(panel_pos + speed_offset + tmp_offset, ftos(top_speed), tmp_size, '1 0 0', f * panel_fg_alpha, DRAWFLAG_NORMAL); } else @@@ -4040,15 -4054,15 +4040,15 @@@ if (acceleration_progressbar_scale) // allow progressbar to go out of panel bounds { - tmp_size = acceleration_progressbar_scale * panel_size_x * eX + panel_size_y * eY; + tmp_size = acceleration_progressbar_scale * panel_size.x * eX + panel_size.y * eY; if (acceleration_baralign == 1) - tmp_offset_x = panel_size_x - tmp_size_x; + tmp_offset.x = panel_size.x - tmp_size.x; else if (acceleration_baralign == 2 || acceleration_baralign == 3) - tmp_offset_x = (panel_size_x - tmp_size_x) / 2; + tmp_offset.x = (panel_size.x - tmp_size.x) / 2; else - tmp_offset_x = 0; - tmp_offset_y = 0; + tmp_offset.x = 0; + tmp_offset.y = 0; } else { @@@ -4058,10 -4072,10 +4058,10 @@@ HUD_Panel_DrawProgressBar(panel_pos + acceleration_offset + tmp_offset, tmp_size, "accelbar", f, 0, acceleration_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - tmp_size_x = panel_size_x; - tmp_size_y = panel_size_y * text_scale; - tmp_offset_x = 0; - tmp_offset_y = (panel_size_y - tmp_size_y) / 2; + tmp_size.x = panel_size.x; + tmp_size.y = panel_size.y * text_scale; + tmp_offset.x = 0; + tmp_offset.y = (panel_size.y - tmp_size.y) / 2; if (autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 3) drawstring_aspect(panel_pos + acceleration_offset + tmp_offset, strcat(ftos_decimals(acceleration, 2), "g"), tmp_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); @@@ -4070,9 -4084,9 +4070,9 @@@ // CenterPrint (#16) // - #define CENTERPRINT_MAX_MSGS 10 - #define CENTERPRINT_MAX_ENTRIES 50 - #define CENTERPRINT_SPACING 0.7 + const float CENTERPRINT_MAX_MSGS = 10; + const float CENTERPRINT_MAX_ENTRIES = 50; + const float CENTERPRINT_SPACING = 0.7; float cpm_index; string centerprint_messages[CENTERPRINT_MAX_MSGS]; float centerprint_msgID[CENTERPRINT_MAX_MSGS]; @@@ -4110,7 -4124,7 +4110,7 @@@ void centerprint_generic(float new_id, return; if (!centerprint_showing) - centerprint_showing = TRUE; + centerprint_showing = true; for (i=0, j=cpm_index; i panel_pos_y) + if(target_pos.y > panel_pos.y) { panel_pos = panel_pos + (target_pos - panel_pos) * sqrt(scoreboard_fade_alpha); - panel_size_y = min(panel_size_y, vid_conheight - scoreboard_bottom); + panel_size.y = min(panel_size.y, vid_conheight - scoreboard_bottom); } } @@@ -4248,17 -4262,17 +4248,17 @@@ // fontsize = '1 1 0' * height; height = vid_conheight/50 * autocvar_hud_panel_centerprint_fontscale; fontsize = '1 1 0' * height; - entries = bound(1, floor(panel_size_y/height), CENTERPRINT_MAX_ENTRIES); + entries = bound(1, floor(panel_size.y/height), CENTERPRINT_MAX_ENTRIES); float i, j, k, n, g; - float a, sz, align, current_msg_pos_y = 0, msg_size; + float a, sz, align, current_msg_posY = 0, msg_size; vector pos; string ts; - float all_messages_expired = TRUE; + float all_messages_expired = true; pos = panel_pos; if (autocvar_hud_panel_centerprint_flip) - pos_y += panel_size_y; + pos.y += panel_size.y; align = bound(0, autocvar_hud_panel_centerprint_align, 1); for (g=0, i=0, j=cpm_index; i 0.5/255.0) // Otherwise guaranteed invisible - don't show. This is checked a second time after some multiplications with other factors were done so temporary changes of these cannot cause flicker. - drawcolorcodedstring(pos + eY * 0.5 * (1 - sz) * fontsize_y, ts, fontsize, a, DRAWFLAG_NORMAL); - pos_y += fontsize_y; + drawcolorcodedstring(pos + eY * 0.5 * (1 - sz) * fontsize.y, ts, fontsize, a, DRAWFLAG_NORMAL); + pos.y += fontsize.y; } else - pos_y += fontsize_y * CENTERPRINT_SPACING/2; + pos.y += fontsize.y * CENTERPRINT_SPACING/2; } } ++g; // move next position number up - msg_size = pos_y - msg_size; + msg_size = pos.y - msg_size; if (autocvar_hud_panel_centerprint_flip) { - pos_y = current_msg_pos_y - CENTERPRINT_SPACING * fontsize_y; + pos.y = current_msg_posY - CENTERPRINT_SPACING * fontsize.y; if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages - pos_y += (msg_size + CENTERPRINT_SPACING * fontsize_y) * (1 - sqrt(sz)); + pos.y += (msg_size + CENTERPRINT_SPACING * fontsize.y) * (1 - sqrt(sz)); - if (pos_y < panel_pos_y) // check if the next message can be shown + if (pos.y < panel_pos.y) // check if the next message can be shown { drawfontscale = '1 1 0'; return; @@@ -4368,11 -4382,11 +4368,11 @@@ } else { - pos_y += CENTERPRINT_SPACING * fontsize_y; + pos.y += CENTERPRINT_SPACING * fontsize.y; if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages - pos_y -= (msg_size + CENTERPRINT_SPACING * fontsize_y) * (1 - sqrt(sz)); + pos.y -= (msg_size + CENTERPRINT_SPACING * fontsize.y) * (1 - sqrt(sz)); - if(pos_y > panel_pos_y + panel_size_y - fontsize_y) // check if the next message can be shown + if(pos.y > panel_pos.y + panel_size.y - fontsize.y) // check if the next message can be shown { drawfontscale = '1 1 0'; return; @@@ -4382,7 -4396,7 +4382,7 @@@ drawfontscale = '1 1 0'; if (all_messages_expired) { - centerprint_showing = FALSE; + centerprint_showing = false; reset_centerprint_messages(); } } @@@ -4403,7 -4417,7 +4403,7 @@@ void HUD_Buffs(void { buffs = Buff_Type_first.items; // force first buff } - + float b = 0; // counter to tell other functions that we have buffs entity e; string s = ""; @@@ -4436,7 -4450,7 +4436,7 @@@ //float is_vertical = (panel_ar < 1); //float buff_iconalign = autocvar_hud_panel_buffs_iconalign; vector buff_offset = '0 0 0'; - + for(e = Buff_Type_first; e; e = e.enemy) if(buffs & e.items) { //DrawNumIcon(pos + buff_offset, mySize, shield, "shield", is_vertical, buff_iconalign, '1 1 1', 1); @@@ -4462,7 -4476,7 +4462,7 @@@ void HUD_Reset (void void HUD_Main (void) { - float i; + int i; // global hud theAlpha fade if(menu_enabled == 1) hud_fade_alpha = 1;