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;
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)
vector HUD_Panel_GetProgressBarColor(string item)
{
- return stov(cvar_string(strcat("hud_progreshud_", item, "_color")));
+ return stov(cvar_string(strcat("hud_progressbar_", item, "_color")));
}
float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
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);
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);
// 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);
if(health <= 0)
return;
- float numbers;
+ float len;
// TODO!
if(hud_hudselector == 2) // combined health and armor display
else
{
- vector health_pos, armor_pos;
-
+ string leftname, rightname;
+ float leftcnt, rightcnt;
+ float leftactive, rightactive;
+ float leftalpha, rightalpha;
// TODO!
- if (hud_hudselector == 0) { // old style layout with armor left of health
- armor_pos = pos;
- health_pos = pos + eX * 0.5 * mySize_x;
+ 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 {
- health_pos = pos;
- armor_pos = pos + eX * 0.5 * mySize_x;
+ leftname = "health";
+ leftcnt = health;
+ leftactive = 1;
+ leftalpha = 1;
+
+ rightname = "armor";
+ rightcnt = armor;
+ if(rightcnt)
+ rightactive = 1;
+ rightalpha = min((armor+10)/55, 1);
}
if (mySize_x/mySize_y > 5)
{
- // armor
- x = armor;
- numbers = strlen(ftos(x));
-
- if (x > 0)
+ if(leftactive)
{
- drawpic(pos, "gfx/hud/statuhud", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
- if (x > 45)
- drawpic(pos, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- else
- drawpic(pos, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL);
- HUD_DrawXNum_Colored(pos + eX * mySize_y + eY * 0.25 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
+ len = strlen(ftos(leftcnt));
+
+ 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);
}
- // health
- x = health;
- drawpic(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
- drawpic(pos + eX * mySize_x - eX * mySize_y, "gfx/hud/sb_health", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, x, 3, 0.5 * mySize_y, hud_alpha_fg);
+ 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)
{
- // armor
- x = armor;
- numbers = strlen(ftos(x));
-
- if (x > 0)
+ if(leftactive)
{
- drawpic(pos + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
- if (x > 45)
- drawpic(pos + eX * 0.4 * mySize_y, "gfx/hud/sb_armor", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- else
- drawpic(pos + eX * 0.4 * mySize_y, "gfx/hud/sb_armor", '0.7 0.7 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL);
- HUD_DrawXNum_Colored(pos + eY * 0.55 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
- }
+ len = strlen(ftos(leftcnt));
- // health
- x = health;
- numbers = strlen(ftos(x));
+ 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);
+ }
- drawpic(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
- drawpic(pos + eX * mySize_x - eX * 1.1 * mySize_y, "gfx/hud/sb_health", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * numbers * 0.5 * mySize_y + eY * 0.55 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
+ if(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
{
- // armor
- x = armor;
- numbers = strlen(ftos(x));
-
- if (x > 0)
+ if(leftactive)
{
- drawpic(pos, "gfx/hud/statuhud", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
- if (x > 45)
- drawpic(pos, "gfx/hud/sb_armor", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- else
- drawpic(pos, "gfx/hud/sb_armor", '0.5 0.5 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL);
- HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
+ len = strlen(ftos(leftcnt));
+
+ 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);
}
- // health
- x = health;
- numbers = strlen(ftos(x));
+ if(rightactive)
+ {
+ len = strlen(ftos(rightcnt));
- drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/statuhud", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
- drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/sb_health", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
- HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
+ 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 = 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 = "";
// Notification area (#4)
void HUD_Notify (void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(4);
+ 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' * 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));
string s;
entity tm;
void HUD_VoteWindow(void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(9);
+ border = HUD_Panel_GetMarigin(9);
pos = HUD_Panel_GetPos(9);
mySize = HUD_Panel_GetSize(9);
color = HUD_Panel_GetColor(9);
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' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg * vote_alpha, '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 * 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);
s = "A vote has been called for: ";
drawstring(pos + '0.5 0 0' * mySize_x + '0 0.1 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/5)), s, '1 1 0' * mySize_y*(1/5), '1 1 1', a * hud_alpha_fg, DRAWFLAG_NORMAL);
s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '10 0 0', stringwidth_colors);
+ 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
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;
//
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;
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 hud.qc
local vector rgb;
void HUD_DrawPressedKeys(void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(10);
+ border = HUD_Panel_GetMarigin(10);
pos = HUD_Panel_GetPos(10);
mySize = HUD_Panel_GetSize(10);
color = HUD_Panel_GetColor(10);
if(HUD_Panel_GetBgActive(10))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ 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 pressedkeys;
}
if (acceleration > 0)
- drawpic(pos, "gfx/hud/statuhud", 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/statuhud", -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_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();
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();
projects / xonotic / xonotic-data.pk3dir.git / blobdiff