}
// color the number differently based on how big it is (used in the health/armor panel)
-void HUD_DrawXNum_Colored (vector pos, float x, float lettersize, float alpha)
+void HUD_DrawXNum_Colored (vector pos, float x, float digits, float lettersize, float alpha)
{
vector color;
if(x > 200) {
color_y = 0;
color_z = 0;
}
- HUD_DrawXNum(pos, x, 3, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(pos, x, digits, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
}
float stringwidth_colors(string s, vector theSize)
float i, j, n, hcount;
string s;
- centerprint_fontsize = Sbar_GetFontsize("scr_centersize");
+ centerprint_fontsize = HUD_GetFontsize("scr_centersize");
centerprint_expire = min(centerprint_expire, time); // if any of the returns happens, this message will fade out
case 6: return "radar"; break;
case 7: return "score"; break;
case 8: return "racetimer"; break;
+ case 9: return "vote"; break;
+ case 10: return "pressedkeys"; break;
default: return "";
}
}
mySize_x = max(mySize_y * (1/10), mySize_x); // at least 1/10 * height
mySize_y = max(mySize_x * (1/26), mySize_y); // at least 1/26 * width
break;
+ case 1:
+ mySize_x = max(mySize_y * 0.7, mySize_x); // at least 0.7 * height
+ break;
+ case 2:
+ mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height
+ break;
+ case 3:
+ mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height
+ break;
+ case 5:
+ mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height
+ break;
+ case 8:
+ mySize_y = (1/4) * mySize_x; // 1/4 * width
+ break;
+ case 9:
+ mySize_y = (1/4) * mySize_x; // 1/4 * width
+ break;
+ case 10:
+ mySize_y = 0.5898 * mySize_x; // 0.5898 * width, reason: bg has weird dimensions...
+ break;
}
return mySize;
}
float HUD_Panel_GetMarigin(float id)
{
- return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_marigin"), 30), 200);
+ return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_border"), 30), 200);
}
vector HUD_Panel_GetColor(float id)
return cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_bg"), 1);
}
+vector HUD_Panel_GetProgressBarColor(string item)
+{
+ return stov(cvar_string(strcat("hud_progressbar_", item, "_color")));
+}
+
float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
// check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize)
if(mouseClicked)
{
- float i, marigin;
+ float i, border;
vector panelPos;
vector panelSize;
- for(i = 0; i <= panel_cnt; i++)
+ for(i = 0; i <= panel_cnt; ++i)
{
panelPos = HUD_Panel_GetPos(i);
panelSize = HUD_Panel_GetSize(i);
- marigin = HUD_Panel_GetMarigin(i);
+ border = HUD_Panel_GetMarigin(i);
if(prevMouseClicked == 0) {
// move
if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
highlightedAction = 1;
}
// resize from topleft border
- else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y - eX * marigin && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+ else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
{
highlightedPanel = i;
highlightedAction = 2;
resizeCorner = 1;
}
// resize from topright border
- else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - eX * marigin && mousepos_x <= panelPos_x + panelSize_x + eX * marigin && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+ else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
{
highlightedPanel = i;
highlightedAction = 2;
resizeCorner = 2;
}
// resize from bottomleft border
- else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + eY * marigin)
+ else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border)
{
highlightedPanel = i;
highlightedAction = 2;
resizeCorner = 3;
}
// resize from bottomright border
- else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + eX * marigin && mousepos_y <= panelPos_y + panelSize_y + eY * marigin)
+ else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border)
{
highlightedPanel = i;
highlightedAction = 2;
weaponspace[idx] = 0;
}
+entity weaponorder[WEP_MAXCOUNT];
+
+void weaponorder_swap(float i, float j, entity pass)
+{
+ entity h;
+ h = weaponorder[i];
+ weaponorder[i] = weaponorder[j];
+ weaponorder[j] = h;
+}
+
+float weaponorder_cmp(float i, float j, entity pass)
+{
+ float d, ii, ij;
+ d = mod(weaponorder[i].impulse + 9, 10) - mod(weaponorder[j].impulse + 9, 10);
+ if(d)
+ return d;
+ d = weaponorder[i].weapon - weaponorder[j].weapon;
+ return d;
+}
+
void HUD_WeaponIcons()
{
- float alpha, height, marigin, accuracybar_height, stat_weapons; // "constants"
+ float alpha, height, border, accuracybar_height, stat_weapons; // "constants"
vector pos, mySize, mysize, mypos, color, accuracy_color;
float i, id, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
- marigin = HUD_Panel_GetMarigin(0);
+ border = HUD_Panel_GetMarigin(0);
pos = HUD_Panel_GetPos(0);
mySize = HUD_Panel_GetSize(0);
color = HUD_Panel_GetColor(0);
for(i = WEP_FIRST; i <= WEP_LAST; ++i)
{
self = get_weaponinfo(i);
- if(self.weapons && self.impulse >= 0 && stat_weapons & self.weapons)
+ if(self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons) || cvar("_hud_configure"))
+ {
+ weaponorder[weapon_cnt] = self;
++weapon_cnt;
+ }
}
+ heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
if(HUD_Panel_GetBgActive(0) && weapon_cnt)
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
// hits
weapon_stats = getstati(STAT_DAMAGE_HITS);
HUD_WeaponIcons_Clear();
float rows, columns;
- //TODO: yuck. there must be a better way :)
- //rows = ceil(4 * mySize_y/mySize_x);
- if(mySize_y/mySize_x < 0.08)
- rows = 1;
- else if(mySize_y/mySize_x < 0.25)
- rows = 2;
- else if(mySize_y/mySize_x < 0.5)
- rows = 3;
- else if(mySize_y/mySize_x < 0.7)
- rows = 4;
- else if(mySize_y/mySize_x < 0.9)
- rows = 5;
- else if(mySize_y/mySize_x < 1.25)
- rows = 6;
- else if(mySize_y/mySize_x < 1.7)
- rows = 7;
- else if(mySize_y/mySize_x < 2.5)
- rows = 8;
- else if(mySize_y/mySize_x < 4)
- rows = 12;
- else if(mySize_y/mySize_x < 6)
- rows = 14;
- else
- rows = 16;
+ rows = mySize_y/mySize_x;
+ rows = bound(1, floor((sqrt(4 * (2/1) * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT);
+ // ^^^ weapon icon aspect goes here
- columns = ceil(16/rows);
+ columns = ceil(WEP_COUNT/rows);
float row, column;
- for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+ for(i = 0; i < weapon_cnt; ++i)
{
- self = get_weaponinfo(i);
- if((self.weapons && self.impulse >= 0 && stat_weapons & self.weapons) || cvar("_hud_configure"))
+ self = weaponorder[i];
+ if((self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons)) || cvar("_hud_configure"))
{
id = self.impulse;
- alpha = (id == activeweapon) ? 1 : 0.6;
+ alpha = (self.weapon == activeweapon) ? 1 : 0.6;
weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
- if(id == 0) // porto and hook should be last
- id = 9;
- else
- id = --id;
- if(id+1 == activeweapon)
+ if(self.weapon == activeweapon)
drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "gfx/hud/sb_ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), color, fade * hud_alpha_fg, DRAWFLAG_NORMAL);
drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("gfx/hud/inv_weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL);
if(cvar_or("hud_weaponicons_number", 1))
- drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(id+1), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(id), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
// draw the weapon accuracy on the HUD
if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
{
float i;
float stat_items;
- float marigin;
+ float border;
vector pos, mySize, mysize, mypos, color;
- marigin = HUD_Panel_GetMarigin(1);
+ border = HUD_Panel_GetMarigin(1);
pos = HUD_Panel_GetPos(1);
mySize = HUD_Panel_GetSize(1);
color = HUD_Panel_GetColor(1);
if(HUD_Panel_GetBgActive(1))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
// ammo
stat_items = getstati(STAT_ITEMS);
for (i = 0; i < 4; ++i) {
float a;
a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
+ if(cvar("_hud_configure"))
+ a = 100;
- if(cvar("hud_ammo_onlycurrent")) { // force showing current ammo only with conwidths < 800
+ if(cvar("hud_ammo_onlycurrent")) {
if (stat_items & GetAmmoItemCode(i)) {
- drawpic(pos - '1 1 0' * marigin, "gfx/hud/sb_ammobg", mysize + '1 1 0' * marigin, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos - '1 1 0' * border, "gfx/hud/sb_ammobg", mysize + '1 1 0' * border, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
drawpic(pos + eX * mysize_x * 1.7, GetAmmoPicture(i), '24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
if(a < 10)
HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
if (stat_items & GetAmmoItemCode(i))
drawpic(mypos, "gfx/hud/sb_ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(mypos + eX * 0.66 * mysize_x + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
if (a < 10) {
if(stat_items & GetAmmoItemCode(i))
- HUD_DrawXNum(mypos + '6 4.5 0', a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
else
- HUD_DrawXNum(mypos + '6 4.5 0', a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg * 0.7, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, hud_alpha_fg * 0.7, DRAWFLAG_NORMAL);
} else {
if(stat_items & GetAmmoItemCode(i))
- HUD_DrawXNum(mypos + '1 1 0' * 0.26 * mysize_y, a, 3, 0, 0.5 * mysize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
else
- HUD_DrawXNum(mypos + '1 1 0' * 0.26 * mysize_y, a, 3, 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, hud_alpha_fg * 0.7, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, hud_alpha_fg * 0.7, DRAWFLAG_NORMAL);
}
}
}
a = getstati(GetAmmoStat(4)); // how much fuel do we have?
if (a > 0) { // if we have fuel, draw the amount
- float invincibility_time, dt;
- invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
- dt = invincibility_time - time;
- if (dt > 0) { // if the invincibility timer is active, draw fuel ammo elsewhere
- pos_x += 140;
- pos_y += -72;
- }
- else { // if the invincibility timer is inactive, draw the fuel ammo there (it's rare to have invincibility + fuel anyway)
- pos_x += 140;
- pos_y += -20;
- }
- drawpic(pos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ if(pos_x + 0.5 * mySize_x > 0.5 * vid_conwidth)
+ mypos_x += pos_x + mySize_x - 0; // TODO!
+
+ drawpic(mypos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
if (a > 10)
- HUD_DrawXNum(pos, a, 3, 0, 16, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(mypos, a, 3, 0, 16, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
else
- HUD_DrawXNum(pos, a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(mypos, a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
}
}
// Powerups (#2)
-// TODO!
+float shield_maxtime;
+float strength_maxtime;
void HUD_Powerups() {
- float stat_items, dt;
- float marigin;
+ float stat_items;
+ stat_items = getstati(STAT_ITEMS);
+
+ if(!cvar("_hud_configure"))
+ {
+ if not(stat_items & IT_STRENGTH)
+ if not(stat_items & IT_INVINCIBLE)
+ return;
+
+ if (getstati(STAT_HEALTH) <= 0)
+ return;
+ }
+
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(2);
+ border = HUD_Panel_GetMarigin(2);
pos = HUD_Panel_GetPos(2);
mySize = HUD_Panel_GetSize(2);
color = HUD_Panel_GetColor(2);
if(HUD_Panel_GetBgActive(2))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
- stat_items = getstati(STAT_ITEMS);
- /*
- if not(stat_items & IT_STRENGTH)
- if not(stat_items & IT_INVINCIBLE)
- return;
- */
- if (getstati(STAT_HEALTH) <= 0)
- return;
+ float strength_time, shield_time;
- float strength_time, invincibility_time, countdown_fontsize;
+ strength_time = bound(0, ceil(getstatf(STAT_STRENGTH_FINISHED) - time), 999);
+ shield_time = bound(0, ceil(getstatf(STAT_INVINCIBLE_FINISHED) - time), 999);
- //strength
- strength_time = getstatf(STAT_STRENGTH_FINISHED);
- invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
+ strength_maxtime = max(strength_maxtime, strength_time);
+ shield_maxtime = max(shield_maxtime, shield_time);
+
+ if(cvar("_hud_configure"))
+ {
+ strength_time = 15;
+ shield_time = 27;
+ strength_maxtime = 30;
+ shield_maxtime = 30;
+ }
+
+ string leftname, rightname;
+ float leftcnt, rightcnt;
+ float leftalpha, rightalpha;
+ float leftcnt_max, rightcnt_max;
+ if (cvar(strcat("hud_", HUD_Panel_GetName(2), "_flip"))) {
+ leftname = "strength";
+ leftcnt = strength_time;
+ leftcnt_max = strength_maxtime;
+
+ rightname = "shield";
+ rightcnt = shield_time;
+ rightcnt_max = shield_maxtime;
+ } else {
+ leftname = "shield";
+ leftcnt = shield_time;
+ leftcnt_max = shield_maxtime;
+
+ rightname = "strength";
+ rightcnt = strength_time;
+ rightcnt_max = strength_maxtime;
+ }
+ leftalpha = bound(0, leftcnt, 1);
+ rightalpha = bound(0, rightcnt, 1);
+ float len;
+ if (mySize_x/mySize_y > 5)
+ {
+ if(leftcnt)
+ {
+ len = strlen(ftos(leftcnt));
+
+ drawpic(pos, "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, leftcnt/leftcnt_max) + eY * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos, strcat("gfx/hud/sb_", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+
+ if(rightcnt)
+ {
+ drawpic(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/rightcnt_max), "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, rightcnt/rightcnt_max) + eY * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eX * mySize_x - eX * mySize_y, strcat("gfx/hud/sb_", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, rightcnt, 3, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+ }
+ else if (mySize_x/mySize_y > 3.2)
+ {
+ if(leftcnt)
+ {
+ len = strlen(ftos(leftcnt));
+
+ drawpic(pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/leftcnt_max), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/leftcnt_max), HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eX * 0.4 * mySize_y, strcat("gfx/hud/sb_", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(pos + eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+
+ if(rightcnt)
+ {
+ len = strlen(ftos(rightcnt));
+
+ drawpic(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, rightcnt/rightcnt_max), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/rightcnt_max), HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("gfx/hud/sb_", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(pos + eX * mySize_x - eX * len * 0.5 * mySize_y - eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+ }
+ else
+ {
+ if(leftcnt)
+ {
+ len = strlen(ftos(leftcnt));
+
+ drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, leftcnt/leftcnt_max) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos, strcat("gfx/hud/sb_", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(pos + eX * 0.5 * mySize_y, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+
+ if(rightcnt)
+ {
+ len = strlen(ftos(rightcnt));
+
+ drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/statusbar", eX * mySize_x * min(1, rightcnt/rightcnt_max) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eY * 0.5 * mySize_y, strcat("gfx/hud/sb_", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+ }
+
+ /* TODO: add expand!
+ //strength
if (strength_time) {
dt = strength_time - time;
if(dt > 0)
bound(0, -dt / 0.5, 1));
}
}
+ */
}
// Health/armor (#3)
//
void HUD_HealthArmor(void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(3);
+ border = HUD_Panel_GetMarigin(3);
pos = HUD_Panel_GetPos(3);
mySize = HUD_Panel_GetSize(3);
color = HUD_Panel_GetColor(3);
if(HUD_Panel_GetBgActive(3))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
float armor, health, x;
armor = getstati(STAT_ARMOR);
health = getstati(STAT_HEALTH);
+ if(cvar("_hud_configure"))
+ {
+ armor = 150;
+ health = 100;
+ }
+
+ if(health <= 0)
+ return;
+
+ float len;
+ // TODO!
if(hud_hudselector == 2) // combined health and armor display
{
vector v;
drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL);
drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
}
- HUD_DrawXNum_Colored(num_pos, x, 24, hud_alpha_fg); // draw the combined health and armor
+ HUD_DrawXNum_Colored(num_pos, x, 3, 24, hud_alpha_fg); // draw the combined health and armor
}
else
{
- vector health_pos, armor_pos;
-
- if (hud_hudselector == 0) { // old style layout with armor left of health
- armor_pos = pos;
- health_pos = pos + eX * 0.5 * mySize_x;
- }
- else {
- health_pos = pos;
- armor_pos = pos + eX * 0.5 * mySize_x;
+ string leftname, rightname;
+ float leftcnt, rightcnt;
+ float leftactive, rightactive;
+ float leftalpha, rightalpha;
+ // TODO!
+ if (cvar(strcat("hud_", HUD_Panel_GetName(3), "_flip"))) { // old style layout with armor left of health
+ leftname = "armor";
+ leftcnt = armor;
+ if(leftcnt)
+ leftactive = 1;
+ leftalpha = min((armor+10)/55, 1);
+
+ rightname = "health";
+ rightcnt = health;
+ rightactive = 1;
+ rightalpha = 1;
+ } else {
+ leftname = "health";
+ leftcnt = health;
+ leftactive = 1;
+ leftalpha = 1;
+
+ rightname = "armor";
+ rightcnt = armor;
+ if(rightcnt)
+ rightactive = 1;
+ rightalpha = min((armor+10)/55, 1);
}
- // armor
- x = armor;
- if (x > 0)
+
+ if (mySize_x/mySize_y > 5)
{
- if (x > 45)
- drawpic(armor_pos + eX * 0.35 * mySize_x, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- else
- drawpic(armor_pos + eX * 0.35 * mySize_x, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL);
- HUD_DrawXNum_Colored(armor_pos + eY * 0.25 * mySize_y, x, 0.5 * mySize_y, hud_alpha_fg);
+ if(leftactive)
+ {
+ len = strlen(ftos(leftcnt));
+
+ drawpic(pos, "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos, strcat("gfx/hud/sb_", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum_Colored(pos + eX * mySize_y + eY * 0.25 * mySize_y, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg);
+ }
+
+ if(rightactive)
+ {
+ drawpic(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200), "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eX * mySize_x - eX * mySize_y, strcat("gfx/hud/sb_", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, rightcnt, 3, 0.5 * mySize_y, hud_alpha_fg);
+ }
}
+ else if (mySize_x/mySize_y > 3.2)
+ {
+ if(leftactive)
+ {
+ len = strlen(ftos(leftcnt));
+
+ drawpic(pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200), HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eX * 0.4 * mySize_y, strcat("gfx/hud/sb_", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum_Colored(pos + eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg);
+ }
+
+ if(rightactive)
+ {
+ len = strlen(ftos(rightcnt));
+
+ drawpic(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200), HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("gfx/hud/sb_", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * len * 0.5 * mySize_y - eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, rightcnt, len, 0.5 * mySize_y, hud_alpha_fg);
+ }
+ }
+ else
+ {
+ if(leftactive)
+ {
+ len = strlen(ftos(leftcnt));
- // health
- x = health;
- drawpic(health_pos + eX * 0.35 * mySize_x, "gfx/hud/sb_health", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- HUD_DrawXNum_Colored(health_pos + eY * 0.25 * mySize_y, x, 0.5 * mySize_y, hud_alpha_fg);
+ drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos, strcat("gfx/hud/sb_", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg);
+ }
+
+ if(rightactive)
+ {
+ len = strlen(ftos(rightcnt));
+
+ drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/statusbar", eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eY * 0.5 * mySize_y, strcat("gfx/hud/sb_", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, rightcnt, len, 0.5 * mySize_y, hud_alpha_fg);
+ }
+ }
}
}
//
void HUD_Score()
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(7);
+ border = HUD_Panel_GetMarigin(7);
pos = HUD_Panel_GetPos(7);
mySize = HUD_Panel_GetSize(7);
color = HUD_Panel_GetColor(7);
if(HUD_Panel_GetBgActive(7))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
float score, distribution, leader;
vector score_pos, secondary_score_pos, distribution_color;
// Race timer (#8)
//
void HUD_RaceTimer (void) {
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(8);
+ border = HUD_Panel_GetMarigin(8);
pos = HUD_Panel_GetPos(8);
mySize = HUD_Panel_GetSize(8);
color = HUD_Panel_GetColor(8);
if(HUD_Panel_GetBgActive(8))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
- drawfont = sbar_bigfont;
+ drawfont = hud_bigfont;
float a, t;
string s, forcetime;
- if(race_checkpointtime)
+ if(cvar("_hud_configure"))
+ {
+ s = "0:13:37";
+ drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ s = "^1Intermediate 1 (+15.42)";
+ drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+ else if(race_checkpointtime)
{
a = bound(0, 2 - (time - race_checkpointtime), 1);
s = "";
{
dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
//drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
- drawcolorcodedstring(pos, s, '1 1 0' * mySize_y, hud_alpha_fg * a, DRAWFLAG_NORMAL);
+ drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, hud_alpha_fg * a, DRAWFLAG_NORMAL);
}
if(race_penaltytime)
{
a = bound(0, (time - race_checkpointtime) / 0.5, 1);
//drawstring_expanding(m - '16 0 0' * stringwidth(forcetime, FALSE), forcetime, '32 32 0', '1 1 1', hud_alpha_fg, 0, a);
- drawstring_expanding(pos - eX * stringwidth(forcetime, FALSE, '16 0 0'), forcetime, '32 32 0', '1 1 1', hud_alpha_fg, 0, a);
+ drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.75 * mySize_y), forcetime, '1 1 0' * 0.75 * mySize_y, '1 1 1', hud_alpha_fg, 0, a);
}
else
a = 1;
{
s = TIME_ENCODED_TOSTRING(TIME_ENCODE(time + TIME_DECODE(race_penaltyaccumulator) - race_laptime));
//drawstring(m - '16 0 0' * stringwidth(s, FALSE), s, '32 32 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
- drawstring(pos - '0.5 0 0' * stringwidth(s, FALSE, '32 32 0'), s, '32 32 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+ drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
}
}
else
}
}
- drawfont = sbar_font;
+ drawfont = hud_font;
}
-
-
-
-
-
-
// Notification area (#4)
-// OH MY GOOODDDDDD this thing is colossal :/
-// TODO
-float vote_yescount;
-float vote_nocount;
-float vote_needed;
-float vote_highlighted; // currently selected vote
+void HUD_Notify (void)
+{
+ float border;
-float vote_active; // is there an active vote?
-float vote_prev; // previous state of vote_active to check for a change
-float vote_alpha;
-float vote_change; // "time" when vote_active changed
+ vector pos, mySize, color;
+ border = HUD_Panel_GetMarigin(4);
+ pos = HUD_Panel_GetPos(4);
+ mySize = HUD_Panel_GetSize(4);
+ color = HUD_Panel_GetColor(4);
-/*
-{
+ if(HUD_Panel_GetBgActive(4))
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+
+ string s;
+ entity tm;
if(spectatee_status && !intermission)
{
- drawfont = sbar_bigfont;
+ drawfont = hud_bigfont;
if(spectatee_status == -1)
s = "^1Observing";
else
s = GetPlayerName(spectatee_status - 1);
// spectated player name between HUD and chat area, aligned to the left
pos_x = 0;
- pos_y = - 50 - sbar_fontsize_spec_y;
- s = textShortenToWidth(s, vid_conwidth/2.5, sbar_fontsize_spec, stringwidth_colors);
- drawcolorcodedstring(pos, s, sbar_fontsize_spec, hud_alpha_fg, DRAWFLAG_NORMAL);
- drawfont = sbar_font;
+ pos_y = - 50 - hud_fontsize_spec_y;
+ s = textShortenToWidth(s, vid_conwidth/2.5, hud_fontsize_spec, stringwidth_colors);
+ drawcolorcodedstring(pos, s, hud_fontsize_spec, hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawfont = hud_font;
// spectator text in the upper right corner
if(spectatee_status == -1)
}
}
}
+}
+
+// Vote window (#9)
+float vote_yescount;
+float vote_nocount;
+float vote_needed;
+float vote_highlighted; // currently selected vote
+float vote_active; // is there an active vote?
+float vote_prev; // previous state of vote_active to check for a change
+float vote_alpha;
+float vote_change; // "time" when vote_active changed
+
+void HUD_VoteWindow(void)
+{
+ float border;
+
+ vector pos, mySize, color;
+ border = HUD_Panel_GetMarigin(9);
+ pos = HUD_Panel_GetPos(9);
+ mySize = HUD_Panel_GetSize(9);
+ color = HUD_Panel_GetColor(9);
+
+ string s;
+ float a;
if(vote_active != vote_prev) {
vote_change = time;
vote_prev = bound(0, vote_active, 1);
else
vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1);
+ if(cvar("_hud_configure"))
+ {
+ vote_alpha = 1;
+ vote_yescount = 3;
+ vote_nocount = 2;
+ vote_needed = 4;
+ }
+
+ if(HUD_Panel_GetBgActive(9))
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg * vote_alpha, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+
if(vote_alpha) {
a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
- vector voteorigin = bottomright - '290 135 0';
- vector votesize = '280 70 0';
- drawpic(voteorigin, "gfx/hud/voteprogress_back", votesize, HUD_GetBgColor(), a * hud_alpha_bg, DRAWFLAG_NORMAL);
+ drawpic(pos, "gfx/hud/voteprogress_back", mySize, HUD_GetBgColor(), a * hud_alpha_bg, DRAWFLAG_NORMAL);
s = "A vote has been called for: ";
- drawstring(voteorigin + '0.5 0 0' * votesize_x + '0 0.1 0' * votesize_y - eX * stringwidth(s, FALSE, '6 0 0'), s, '12 12 0', '1 1 1', a * hud_alpha_fg, DRAWFLAG_NORMAL);
- s = textShortenToWidth(vote_called_vote, votesize_x * 0.96, '10 0 0', stringwidth_colors);
- drawcolorcodedstring(voteorigin + '0.52 0 0' * votesize_x + '0 0.3 0' * votesize_y - eX * stringwidth(s, FALSE, '5 0 0'), s, '10 10 0', a * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawstring(pos + '0.5 0 0' * mySize_x + '0 0.1 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/5)), s, '1 1 0' * mySize_y*(1/5), '1 1 1', a * hud_alpha_fg, DRAWFLAG_NORMAL);
+ s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '10 0 0', stringwidth_colors);
+ if(cvar("_hud_configure"))
+ s = "Configure the HUD";
+ drawcolorcodedstring(pos + '0.52 0 0' * mySize_x + '0 0.3 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), a * hud_alpha_fg, DRAWFLAG_NORMAL);
// print the yes/no counts
s = strcat("Yes: ", ftos(vote_yescount));
- drawstring(voteorigin + '0 0.6 0' * votesize_y + '0.02 0 0' * votesize_x, s, '12 12 0', eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawstring(pos + '0 0.6 0' * mySize_y + '0.02 0 0' * mySize_x, s, '1 1 0' * mySize_y*(1/6) , eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
s = strcat("No: ", ftos(vote_nocount));
- drawstring(voteorigin + '0 0.6 0' * votesize_y + '0.98 0 0' * votesize_x - eX * stringwidth(s, FALSE, '12 0 0'), s, '12 12 0', eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawstring(pos + '0 0.6 0' * mySize_y + '0.98 0 0' * mySize_x - eX * stringwidth(s, FALSE, '1 1 0' * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
// draw the progress bars
- drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5 * (vote_yescount/vote_needed), votesize_y);
- drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y);
+ drawpic(pos, "gfx/hud/voteprogress_prog", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
- drawsetcliparea(voteorigin_x + votesize_x - votesize_x * 0.5 * (vote_nocount/vote_needed), voteorigin_y, votesize_x * 0.5, votesize_y);
- drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y);
+ drawpic(pos, "gfx/hud/voteprogress_prog", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
// draw the highlights
if(vote_highlighted == 1) {
- drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5, votesize_y);
- drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y);
+ drawpic(pos, "gfx/hud/voteprogress_voted", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
}
else if(vote_highlighted == 2) {
- drawsetcliparea(voteorigin_x + 0.5 * votesize_x, voteorigin_y, votesize_x * 0.5, votesize_y);
- drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y);
+ drawpic(pos, "gfx/hud/voteprogress_voted", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
}
drawresetcliparea();
}
}
-*/
// Awards system
float race_status_time;
float race_status_prev;
if not((scores_flags[ps_primary] & SFL_TIME) && !teamplay) // race/cts record display on HUD
return; // no records in the actual race
- drawfont = sbar_bigfont;
+ drawfont = hud_bigfont;
vector pos;
pos_x = 2;
pos_y = vid_conheight - 48;
rr = RACE_RECORD;
t = stof(db_get(ClientProgsDB, strcat(shortmapname, rr, "time")));
- if(score && score < t || !t)
+ if(score && (score < t || !t)) {
db_put(ClientProgsDB, strcat(shortmapname, rr, "time"), ftos(score));
+ if(cvar("cl_autodemo_delete_keeprecords"))
+ {
+ f = cvar("cl_autodemo_delete");
+ f &~= 1;
+ cvar_set("cl_autodemo_delete", ftos(f)); // don't delete demo with new record!
+ }
+ }
if(t != crecordtime_prev) {
crecordtime_prev = t;
drawstring_expanding(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
}
- drawfont = sbar_font;
+ drawfont = hud_font;
}
// Timer (#5)
//
void HUD_Timer()
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(5);
+ border = HUD_Panel_GetMarigin(5);
pos = HUD_Panel_GetPos(5);
mySize = HUD_Panel_GetSize(5);
color = HUD_Panel_GetColor(5);
if(HUD_Panel_GetBgActive(5))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;
else
timer_color = '1 0 0'; //red
- if (cvar("hud_increment_maptime") || timelimit == 0 || warmup_stage) {
+ if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
if (time < getstatf(STAT_GAMESTARTTIME)) {
//while restart is still active, show 00:00
minutes = seconds = 0;
seconds = secondsLeft;
}
- if(minutesLeft >= 1 || cvar("hud_increment_maptime") || timelimit == 0 || warmup_stage) {
- HUD_DrawXNum(pos, minutes, 3, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(pos + eX * 0.5 * mySize_x, "gfx/hud/num_colon", eX * mySize_y + eY * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
+ if(mySize_x/mySize_y > 5.1)
+ {
+ if(minutes > 999)
+ seconds = 99;
+ minutes = min(minutes, 999);
+ if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
+ if(minutes < 100)
+ drawpic(pos + eX * mySize_x - eX * 5.1 * mySize_y, "gfx/hud/sb_timer", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(pos + eX * mySize_x - eX * 5.1 * mySize_y, minutes, 3, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + eX * mySize_x - eX * 2.57 * mySize_y, "gfx/hud/num_colon", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+ HUD_DrawXNum(pos + eX * mySize_x - eX * 2 * mySize_y, seconds, -2, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+ else
+ {
+ if(minutes > 99)
+ seconds = 99;
+ minutes = min(minutes, 99);
+ if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
+ if(minutes < 100)
+ drawpic(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y, "gfx/hud/sb_timer", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
+ HUD_DrawXNum(pos + eX * 0.5 * mySize_x - eX * mySize_y + eY * 0.5 * mySize_y, minutes, -2, 0, 0.5 * mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y + eY * 0.5 * mySize_y, "gfx/hud/num_colon", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+ HUD_DrawXNum(pos + eX * 0.51 * mySize_x + eY * 0.5 * mySize_y, seconds, -2, 0, 0.5 * mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
}
- HUD_DrawXNum(pos + eX * 0.6 * mySize_x, seconds, -2, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
}
// Radar (#6)
//
-void() teamradar_view =
+void HUD_Radar(void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(6);
+ border = HUD_Panel_GetMarigin(6);
pos = HUD_Panel_GetPos(6);
mySize = HUD_Panel_GetSize(6);
color = HUD_Panel_GetColor(6);
if(HUD_Panel_GetBgActive(6))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
- local float color1, color2; // color already declared as a global in sbar.qc
+ local float color1, color2; // color already declared as a global in hud.qc
local vector rgb;
local entity tm;
float scale2d, normalsize, bigsize;
void HUD_DrawPressedKeys(void)
{
- vector pos, bgsize;
- float pressedkeys;
+ float border;
- pos = stov(cvar_string("cl_showpressedkeys_position"));
+ vector pos, mySize, color;
+ border = HUD_Panel_GetMarigin(10);
+ pos = HUD_Panel_GetPos(10);
+ mySize = HUD_Panel_GetSize(10);
+ color = HUD_Panel_GetColor(10);
- bgsize = '126 75 0';
+ if(HUD_Panel_GetBgActive(10))
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
- pos = eX * (vid_conwidth - bgsize_x) * pos_x
- + eY * (vid_conheight - bgsize_y) * pos_y;
- pos -= '-15 -6 0'; // adjust to the origin of these numbers
+ float pressedkeys;
pressedkeys = getstatf(STAT_PRESSED_KEYS);
- drawpic(pos + '-15 -6 0', "gfx/hud/keys/key_bg.tga", bgsize, '1 1 1', 0.1 * hud_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(pos + ' 83.5 9 0', ((pressedkeys & KEY_CROUCH) ? "gfx/hud/keys/key_crouch_inv.tga" : "gfx/hud/keys/key_crouch.tga"), ' 24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(pos + ' 32 -1.5 0', ((pressedkeys & KEY_FORWARD) ? "gfx/hud/keys/key_forward_inv.tga" : "gfx/hud/keys/key_forward.tga"), ' 32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(pos + '-11.5 9 0', ((pressedkeys & KEY_JUMP) ? "gfx/hud/keys/key_jump_inv.tga" : "gfx/hud/keys/key_jump.tga"), ' 24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(pos + ' -1 32 0', ((pressedkeys & KEY_LEFT) ? "gfx/hud/keys/key_left_inv.tga" : "gfx/hud/keys/key_left.tga"), ' 32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(pos + ' 32 32 0', ((pressedkeys & KEY_BACKWARD) ? "gfx/hud/keys/key_backward_inv.tga" : "gfx/hud/keys/key_backward.tga"), ' 32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(pos + ' 65 32 0', ((pressedkeys & KEY_RIGHT) ? "gfx/hud/keys/key_right_inv.tga" : "gfx/hud/keys/key_right.tga"), ' 32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos, "gfx/hud/keys/key_bg.tga", mySize, '1 1 1', 0.1 * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + eX * mySize_x - eX * 0.22 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "gfx/hud/keys/key_crouch_inv.tga" : "gfx/hud/keys/key_crouch.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "gfx/hud/keys/key_forward_inv.tga" : "gfx/hud/keys/key_forward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + eX * 0.023 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "gfx/hud/keys/key_jump_inv.tga" : "gfx/hud/keys/key_jump.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + eX * 0.1 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "gfx/hud/keys/key_left_inv.tga" : "gfx/hud/keys/key_left.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "gfx/hud/keys/key_backward_inv.tga" : "gfx/hud/keys/key_backward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + eX * mySize_x - eX * 0.372 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "gfx/hud/keys/key_right_inv.tga" : "gfx/hud/keys/key_right.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
}
void HUD_ShowSpeed(void)
numsize_x = numsize_y = cvar("cl_showspeed_size");
pos = (vid_conheight - numsize_y) * cvar("cl_showspeed_position");
- drawfont = sbar_bigfont;
+ drawfont = hud_bigfont;
drawstringcenter(eX + pos * eY, speed, numsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
if (cvar("cl_showspeed_z") == 1) {
drawstringcenter(eX + pos * eY + numsize_y * eY, zspeed, numsize * 0.5, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
}
- drawfont = sbar_font;
+ drawfont = hud_font;
}
vector acc_prevspeed;
}
if (acceleration > 0)
- drawpic(pos, "gfx/hud/accelerometer_gradient", acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos, "gfx/hud/statusbar", acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
else if (acceleration < 0)
- drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/accelerometer_gradient", -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/statusbar", -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
}
void HUD_Reset (void)
hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5);
hud_color_bg_team = cvar("hud_color_bg_team");
- sbar_fontsize = Sbar_GetFontsize("sbar_fontsize");
- sbar_fontsize_spec = Sbar_GetFontsize("sbar_fontsize_spec");
+ hud_fontsize = HUD_GetFontsize("hud_fontsize");
+ hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec");
- if(cvar_or("hud_inventory", 1))
- HUD_Inventory();
- if(cvar_or("hud_weaponicons", 1))
+ if(HUD_Panel_CheckActive(0))
HUD_WeaponIcons();
- if(cvar_or("hud_timer", 1))
- HUD_Timer();
- if(cvar_or("hud_powerups", 1))
+ if(HUD_Panel_CheckActive(1))
+ HUD_Inventory();
+ if(HUD_Panel_CheckActive(2))
HUD_Powerups();
- if(cvar_or("hud_health", 1))
+ if(HUD_Panel_CheckActive(3))
HUD_HealthArmor();
- if(cvar_or("hud_notify", 1))
+ if(HUD_Panel_CheckActive(4))
+ HUD_Notify();
+ if(HUD_Panel_CheckActive(5))
+ HUD_Timer();
+ // TODO hud'ify
+ if(HUD_Panel_CheckActive(6))
+ if(ons_showmap || cvar_string("cl_teamradar") != "0" && (cvar("cl_teamradar") == 2 || teamplay))
+ HUD_Radar();
+ if(HUD_Panel_CheckActive(7))
HUD_Score();
- if((gametype == GAME_RACE || gametype == GAME_CTS) && cvar_or("hud_racetimer", 1))
- HUD_RaceTimer();
- if(cvar("hud_pressedkeys"))
- HUD_DrawPressedKeys();
- if(cvar("hud_speed"))
+ if(HUD_Panel_CheckActive(8))
+ if(gametype == GAME_RACE || gametype == GAME_CTS || cvar("_hud_configure"))
+ HUD_RaceTimer();
+ if(HUD_Panel_CheckActive(9))
+ HUD_VoteWindow();
+ // TODO hud'ify
+ if(HUD_Panel_CheckActive(10))
+ if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2 || cvar("_hud_configure"))
+ HUD_DrawPressedKeys();
+
+ // TODO hud_'ify these
+ if (cvar("cl_showspeed"))
HUD_ShowSpeed();
- if(cvar("hud_acceleration"))
+ if (cvar("cl_showacceleration"))
HUD_ShowAcceleration();
- //Sbar_UpdatePlayerTeams();
- // move this stuff to View.qc
- if (intermission == 2) // map voting screen
- {
- if(sb_showaccuracy && spectatee_status != -1) {
- //HUD_DrawAccuracyStats();
- //HUD_Score();
- //HUD_Timer();
- }
- else if(sb_showscores) {
- //HUD_DrawScoreboard();
- //HUD_Score();
- //HUD_Timer();
- }
- else
- //HUD_FinaleOverlay();
-
- HUD_Reset();
- }
- else if (sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
- {
- //if(sb_showaccuracy && spectatee_status != -1)
- //HUD_DrawAccuracyStats();
- //else
- //HUD_DrawScoreboard();
- //HUD_Score();
- //HUD_Timer();
-
- //HUD_Reset();
- }
- else
- {
- //if(sb_showaccuracy && spectatee_status != -1)
- //HUD_DrawAccuracyStats();
- //else
- // HUD_DrawScoreboard();
-
- // draw scores and timer
- //HUD_Score();
- //HUD_Timer();
-
- // draw gametype specific icons
- if(gametype == GAME_KEYHUNT)
- CSQC_kh_hud();
- else if(gametype == GAME_CTF)
- CSQC_ctf_hud();
- else if(gametype == GAME_NEXBALL)
- CSQC_nb_hud();
- else if(gametype == GAME_CTS || gametype == GAME_RACE)
- CSQC_race_hud();
- }
+ // TODO... well make them work in a panel etc
+ if(gametype == GAME_KEYHUNT)
+ CSQC_kh_hud();
+ else if(gametype == GAME_CTF)
+ CSQC_ctf_hud();
+ else if(gametype == GAME_NEXBALL)
+ CSQC_nb_hud();
+ else if(gametype == GAME_CTS || gametype == GAME_RACE)
+ CSQC_race_hud();
return;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff