mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight;
+ if(disable_menu_alphacheck == 2 && id == highlightedPanel)
+ {
+ vector menu_enable_maxsize, menu_enable_size;
+ menu_enable_maxsize = '0 0 0'; // shut up FTEQCC
+ menu_enable_maxsize_x = 0.3 * vid_conwidth;
+ menu_enable_maxsize_y = 0.18 * vid_conheight;
+ if(mySize_x > mySize_y)
+ {
+ if(mySize_y > menu_enable_maxsize_y)
+ {
+ menu_enable_size_y = menu_enable_maxsize_y;
+ menu_enable_size_x = mySize_x * (menu_enable_maxsize_y/mySize_y);
+ mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
+ }
+ }
+ else
+ {
+ if(mySize_x > menu_enable_maxsize_x)
+ {
+ menu_enable_size_x = menu_enable_maxsize_x;
+ menu_enable_size_y = mySize_y * (menu_enable_maxsize_x/mySize_x);
+ mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
+ }
+ }
+ }
return mySize;
}
pos_x = vid_conwidth + pos_x;
if (pos_y < 0)
pos_y = vid_conheight + pos_y;
+
+ if(disable_menu_alphacheck == 2 && id == highlightedPanel)
+ {
+ vector mySize, menu_enable_panelpos;
+ mySize = HUD_Panel_GetSize(id);
+ if(mySize_x > mySize_y)
+ menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * mySize_x + eY * 0.82 * vid_conheight;
+ else
+ menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * mySize_y + eX * 0.7 * vid_conwidth;
+ pos = (1 - cvar("_menu_alpha")) * pos + (cvar("_menu_alpha")) * menu_enable_panelpos;
+ }
return pos;
}
vector panelPos;
vector panelSize;
- for(i = 0; i <= HUD_PANEL_NUM; ++i)
+ for(i = 0; i < HUD_PANEL_NUM; ++i)
{
panelPos = HUD_Panel_GetPos(i);
panelSize = HUD_Panel_GetSize(i);
return;
float len;
+ vector barpos, barsize;
+ vector picpos;
+ vector numpos;
if(cvar("hud_healtharmor") == 2) // combined health and armor display
{
float x;
x = floor(v_x + 1);
+ if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+ barpos = pos + eX * mySize_x - eX * mySize_x * min(1, x/400);
+ barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y;
+ picpos = pos;
+ numpos = picpos + eX * 1.5 * mySize_y;
+ } else {
+ barpos = pos;
+ barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y;
+ picpos = pos + eX * 3 * mySize_y;
+ numpos = pos;
+ }
+
if(v_z) // NOT fully armored
{
- drawpic_skin(pos + eX * 3 * mySize_y, "health", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+ HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+ drawpic_skin(picpos, "health", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
if(armor)
- drawpic_skin(pos + eX * 4 * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * armor / health, DRAWFLAG_NORMAL);
+ drawpic_skin(picpos + eX * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * armor / health, DRAWFLAG_NORMAL);
}
else
{
- drawpic_skin(pos + eX * 4 * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * health / armor, DRAWFLAG_NORMAL);
+ HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+ drawpic_skin(picpos + eX * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * health / armor, DRAWFLAG_NORMAL);
if(armor)
- drawpic_skin(pos + eX * 3 * mySize_y, "armor", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+ drawpic_skin(picpos, "armor", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
}
- HUD_DrawXNum_Colored(pos, 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
}
else
{
- vector barpos, barsize;
- vector picpos;
- vector numpos;
-
string leftname, rightname;
float leftcnt, rightcnt;
float leftactive, rightactive;
}
if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
- barpos = pos - eX * mySize_x * min(1, fuel/100);
+ 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;