\r
vector color;\r
\r
-vector Sbar_Edge(string str)\r
-{\r
- vector pos;\r
- switch(str)\r
- {\r
- case "bottom":\r
- pos_x = vid_conwidth / 2;\r
- pos_y = vid_conheight;\r
- default:\r
- break;\r
- }\r
- return pos;\r
-}\r
-\r
void CSQC_kh_hudreset();\r
void CSQC_kh_hud();\r
void CSQC_ctf_hudreset();\r
return rgb;\r
}\r
\r
-void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)\r
+vector Sbar_ConvertToScreen_PicScale(vector dimensions)\r
+{\r
+ vector sz;\r
+ sz_x = vid_conwidth * dimensions_x;\r
+ sz_y = vid_conheight * dimensions_y;\r
+ return sz;\r
+}\r
+vector Sbar_ConvertToScreen_PicPosition(vector position, vector dimensions)\r
+{\r
+ vector pos, sz;\r
+ sz = Sbar_ConvertToScreen_PicScale(dimensions);\r
+ pos_x = (vid_conwidth / 2) * bound(0, 1 + position_x, 2);\r
+ pos_x -= sz_x / 2;\r
+ pos_y = (vid_conheight / 2) * bound(0, 1 - position_y, 2);\r
+ pos_y -= sz_y / 2;\r
+ return pos;\r
+}\r
+vector Sbar_ConvertToScreen_TextPosition(string text, vector position, float lettersize)\r
+{\r
+ vector pos, sz;\r
+ sz_x = sz_y = lettersize;\r
+ pos_x = (vid_conwidth / 2) * bound(0, 1 + position_x, 2);\r
+ pos_x -= stringwidth(text, FALSE, sz) * 0.5;\r
+ pos_y = (vid_conheight / 2) * bound(0, 1 - position_y, 2);\r
+ pos_y -= sz_y / 2;\r
+ return pos;\r
+}\r
+\r
+void Sbar_DrawPic(string pic, vector position, vector dimensions, float background)\r
+{\r
+ vector pos, sz;\r
+ pos = Sbar_ConvertToScreen_PicPosition(position, dimensions);\r
+ sz = Sbar_ConvertToScreen_PicScale(dimensions);\r
+\r
+ if(background)\r
+ {\r
+ if(teamplay)\r
+ drawpic(pos, pic, sz, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
+ else\r
+ drawpic(pos, pic, sz, stov(cvar_string("sbar_color_bg")), sbar_alpha_bg, DRAWFLAG_NORMAL);\r
+ }\r
+ else\r
+ drawpic(pos, pic, sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+}\r
+\r
+void Sbar_DrawString(string text, vector position, float lettersize)\r
+{\r
+ vector pos, sz;\r
+ pos = Sbar_ConvertToScreen_TextPosition(text, position, lettersize);\r
+ sz_x = sz_y = lettersize;\r
+\r
+ drawstring(pos, text, sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+}\r
+\r
+void Sbar_DrawXNum (vector position, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)\r
{\r
float l;\r
string str, tmp, l_length, final_num;\r
float minus, plus;\r
- vector vsize;\r
-\r
- vsize_x = vsize_y = lettersize;\r
- vsize_z = 0;\r
\r
// showminusplus 1: always prefix with minus sign (useful in race distribution display)\r
// showminusplus 2: always prefix with plus sign (useful in race distribution display)\r
final_num = "-";\r
else if(plus)\r
final_num = "+";\r
-\r
final_num = strcat(final_num, str);\r
- drawstring(pos, final_num, vsize, rgb, alpha, dflags);\r
+\r
+ vector pos, sz;\r
+ pos = Sbar_ConvertToScreen_TextPosition(final_num, position, lettersize);\r
+ sz_x = sz_y = lettersize;\r
+\r
+ drawstring(pos, final_num, sz, rgb, alpha, dflags);\r
}\r
\r
vector Sbar_NumColor (float x)\r
//return "error";\r
}\r
\r
+vector Sbar_GetVoreColor()\r
+{\r
+ // gets color based on vore status\r
+ if(getstati(STAT_VORE_EATEN))\r
+ {\r
+ if(teamplay && (GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(spectatee_status - 1))) // same team\r
+ return stov(cvar_string("sbar_stomachboard_color2"));\r
+ else\r
+ return stov(cvar_string("sbar_stomachboard_color3"));\r
+ }\r
+ else\r
+ return stov(cvar_string("sbar_stomachboard_color1"));\r
+}\r
+\r
+vector colorfade_current;\r
+vector Sbar_ColorFade(vector target_color)\r
+{\r
+ local float step;\r
+ step = cvar("sbar_stomachboard_status_fade") * frametime;\r
+\r
+ if(colorfade_current_x >= target_color_x + step)\r
+ colorfade_current_x -= step;\r
+ else if(colorfade_current_x <= target_color_x - step)\r
+ colorfade_current_x += step;\r
+\r
+ if(colorfade_current_y >= target_color_y + step)\r
+ colorfade_current_y -= step;\r
+ else if(colorfade_current_y <= target_color_y - step)\r
+ colorfade_current_y += step;\r
+\r
+ if(colorfade_current_z >= target_color_z + step)\r
+ colorfade_current_z -= step;\r
+ else if(colorfade_current_z <= target_color_z - step)\r
+ colorfade_current_z += step;\r
+\r
+ return colorfade_current;\r
+}\r
+\r
float xmin, xmax, ymin, ymax, sbwidth;\r
float sbar_fixscoreboardcolumnwidth_len;\r
float sbar_fixscoreboardcolumnwidth_iconlen;\r
}\r
}\r
\r
-float fieldcounter;\r
-void Sbar_PrintStomachboardItem(vector pos, entity pl)\r
+void Sbar_PrintStomachboardItem(entity pl, vector position, vector dimensions)\r
{\r
// lists all players in the stomach\r
\r
string str;\r
float f, field, field_number;\r
- vector hl_color;\r
field_number = 3; // the number of components each row has\r
\r
+ position = Sbar_ConvertToScreen_PicPosition(position, dimensions);\r
+ dimensions = Sbar_ConvertToScreen_PicScale(dimensions);\r
+\r
+ // set font size to the height of each entry\r
+ vector font_sz;\r
+ font_sz_x = font_sz_y = dimensions_y;\r
+\r
+ float fieldcounter;\r
for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter)\r
{\r
+ vector pos, sz;\r
field = -fieldcounter;\r
str = Sbar_GetStomachField(pl, field);\r
\r
// row highlighting\r
if(field == ST_HIGHLIGHT)\r
{\r
- if(getstati(STAT_VORE_EATEN))\r
- {\r
- if(teamplay && (GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(spectatee_status - 1))) // same team\r
- hl_color = stov(cvar_string("sbar_stomachboard_color2"));\r
- else\r
- hl_color = stov(cvar_string("sbar_stomachboard_color3"));\r
- }\r
- else\r
- hl_color = stov(cvar_string("sbar_stomachboard_color1"));\r
- drawfill(pos - '0 0 0', '193 11 0', hl_color, cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ pos = position;\r
+ sz = dimensions;\r
+\r
+ drawfill(pos, sz, Sbar_ColorFade(Sbar_GetVoreColor()), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
if(field == ST_NAME) {\r
+ pos_x = position_x + dimensions_x * cvar("hud_item_preylist_colors_location");\r
+ sz_x = dimensions_x * cvar("hud_item_preylist_colors_length");\r
+\r
f = stof(getplayerkey(pl.sv_entnum, "colors"));\r
- drawpic(pos, "gfx/sb_playercolor_base", '22 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(pos, "gfx/sb_playercolor_shirt", '22 11 0', colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(pos, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, "gfx/sb_playercolor_base", sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, "gfx/sb_playercolor_shirt", sz, colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, "gfx/sb_playercolor_pants", sz, colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
- pos_x += 24;\r
- drawcolorcodedstring(pos, textShortenToWidth(str, 138, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ pos_x = position_x + dimensions_x * cvar("hud_item_preylist_name_location");\r
+ sz_x = dimensions_x * cvar("hud_item_preylist_name_length");\r
+ drawcolorcodedstring(pos, textShortenToWidth(str, sz_x, font_sz, stringwidth_colors), font_sz, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
if(field == ST_HEALTH) {\r
- pos_x += 138;\r
- if(pl.sv_entnum == player_localentnum - 1 || (spectatee_status && pl.sv_entnum == spectatee_status - 1))\r
- drawcolorcodedstring(pos, "self", '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- else\r
- {\r
- drawpic(pos, "gfx/hud/sb_health", '11 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ pos_x = position_x + dimensions_x * cvar("hud_item_preylist_health_icon_location");\r
+ sz_x = dimensions_x * cvar("hud_item_preylist_health_icon_length");\r
\r
- pos_x += 9;\r
- drawcolorcodedstring(pos, str, '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- }\r
+ if(pl.sv_entnum == player_localentnum - 1 || (spectatee_status && pl.sv_entnum == spectatee_status - 1))\r
+ drawcolorcodedstring(pos, textShortenToWidth("self", sz_x, font_sz, stringwidth_colors), font_sz, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ else\r
+ {\r
+ drawpic(pos, "gfx/hud/sb_health", sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+\r
+ pos_x = position_x + dimensions_x * cvar("hud_item_preylist_health_text_location");\r
+ sz_x = dimensions_x * cvar("hud_item_preylist_health_text_length");\r
+ drawcolorcodedstring(pos, textShortenToWidth(str, sz_x, font_sz, stringwidth_colors), font_sz, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ }\r
}\r
}\r
}\r
\r
-float fieldcounter2;\r
-void Sbar_PrintStomachboardItemPred(vector pos, entity pl)\r
+void Sbar_PrintStomachboardItemPred(entity pl, vector position, vector dimensions)\r
{\r
// shows the name of our predator\r
\r
string str;\r
float f, field, field_number;\r
- field_number = 1; // the number of components each row has\r
+ field_number = 2; // the number of components each row has\r
\r
- for(fieldcounter2 = 1; fieldcounter2 <= field_number; ++fieldcounter2)\r
+ position = Sbar_ConvertToScreen_PicPosition(position, dimensions);\r
+ dimensions = Sbar_ConvertToScreen_PicScale(dimensions);\r
+\r
+ // set font size to the height of each entry\r
+ vector font_sz;\r
+ font_sz_x = font_sz_y = dimensions_y;\r
+\r
+ float fieldcounter;\r
+ for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter)\r
{\r
- field = -fieldcounter2;\r
+ vector pos, sz;\r
+ field = -fieldcounter;\r
str = Sbar_GetStomachFieldPred(pl, field);\r
\r
+ // row highlighting\r
+ if(field == ST_HIGHLIGHT)\r
+ {\r
+ pos = position;\r
+ sz = dimensions;\r
+\r
+ drawfill(pos, sz, Sbar_ColorFade(Sbar_GetVoreColor()), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ }\r
+\r
if(field == STP_NAME) {\r
+ pos_x = position_x + dimensions_x * cvar("hud_item_predator_colors_location");\r
+ sz_x = dimensions_x * cvar("hud_item_predator_colors_length");\r
f = stof(getplayerkey(pl.sv_entnum, "colors"));\r
- drawpic(pos, "gfx/sb_playercolor_base", '22 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(pos, "gfx/sb_playercolor_shirt", '22 11 0', colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(pos, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, "gfx/sb_playercolor_base", sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, "gfx/sb_playercolor_shirt", sz, colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, "gfx/sb_playercolor_pants", sz, colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
- pos_x += 24;\r
- drawcolorcodedstring(pos, textShortenToWidth(str, 122, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ pos_x = position_x + dimensions_x * cvar("hud_item_predator_name_location");\r
+ sz_x = dimensions_x * cvar("hud_item_predator_name_length");\r
+ drawcolorcodedstring(pos, textShortenToWidth(str, sz_x, font_sz, stringwidth_colors), font_sz, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
}\r
}\r
pos_y += 1.2 * sbar_fontsize_y;\r
drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, sbar_fontsize)), str, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);\r
\r
+ // print information about respawn status\r
+ float respawn_time = getstatf(STAT_RESPAWN_TIME);\r
+ if(respawn_time)\r
+ {\r
+ if(respawn_time < 0)\r
+ {\r
+ // a negative number means we are awaiting respawn, time value is still the same\r
+ respawn_time *= -1; // remove mark now that we checked it\r
+ if(time >= respawn_time) // don't show a negative value while the server is respawning the player (lag)\r
+ str = strcat("^1Respawning...");\r
+ else\r
+ str = strcat("^1Respawning in ^3", ftos_decimals(respawn_time - time, 2), "^1 seconds...");\r
+ }\r
+ else if(time < respawn_time)\r
+ str = strcat("You are dead, wait ^3", ftos_decimals(respawn_time - time, 2), "^7 seconds before respawning");\r
+ else if(time >= respawn_time)\r
+ str = strcat("You are dead, press ^2", getcommandkey("primary fire", "+fire"), "^7 to respawn");\r
+\r
+ pos_y += 1.2 * sbar_fontsize_y;\r
+ drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, sbar_fontsize)), str, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);\r
+ }\r
+\r
scoreboard_bottom = pos_y + 2 * sbar_fontsize_y;\r
}\r
\r
float stat_items;\r
stat_items = getstati(STAT_ITEMS);\r
\r
- vector edge, pos, pos2;\r
- edge = Sbar_Edge(cvar_string("hud_panel_status_edge"));\r
-\r
- pos = edge - stov(cvar_string("hud_panel_status_background_position"));\r
- if (cvar("viewsize") <= 100 && sbar_hudselector) {\r
- if (teamplay)\r
- drawpic(pos, "gfx/hud/bg_status", stov(cvar_string("hud_panel_status_background_scale")), GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
- else {\r
- // allow for custom HUD colors in non-teamgames\r
- color = stov(cvar_string("sbar_color_bg"));\r
-\r
- drawpic(pos, "gfx/hud/bg_status", stov(cvar_string("hud_panel_status_background_scale")), color, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
- }\r
- }\r
+ if (cvar("viewsize") <= 100 && sbar_hudselector)\r
+ Sbar_DrawPic("gfx/hud/bg_status", stov(cvar_string("hud_panel_status_background_position")), stov(cvar_string("hud_panel_status_background_scale")), TRUE);\r
\r
// armor\r
- pos = edge - stov(cvar_string("hud_panel_status_item_armor_text_position"));\r
- pos2 = edge - stov(cvar_string("hud_panel_status_item_armor_icon_position"));\r
x = armor;\r
if (x > 0)\r
{\r
- drawpic(pos2, "gfx/hud/sb_armor", stov(cvar_string("hud_panel_status_item_armor_icon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '1 1 0' * cvar("hud_panel_status_item_armor_text_scale")) * 0.5;\r
- Sbar_DrawXNum(pos, x, 3, 0, cvar("hud_panel_status_item_armor_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic("gfx/hud/sb_armor", stov(cvar_string("hud_item_armor_icon_position")), stov(cvar_string("hud_item_armor_icon_scale")), FALSE);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_armor_text_position")), x, 3, 0, cvar("hud_item_armor_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
// health\r
- pos = edge - stov(cvar_string("hud_panel_status_item_health_text_position"));\r
- pos2 = edge - stov(cvar_string("hud_panel_status_item_health_icon_position"));\r
x = health;\r
- drawpic(pos2, "gfx/hud/sb_health", stov(cvar_string("hud_panel_status_item_health_icon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '1 1 0' * cvar("hud_panel_status_item_health_text_scale")) * 0.5;\r
- Sbar_DrawXNum(pos, x, 3, 0, cvar("hud_panel_status_item_health_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic("gfx/hud/sb_health", stov(cvar_string("hud_item_health_icon_position")), stov(cvar_string("hud_item_health_icon_scale")), FALSE);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_health_text_position")), x, 3, 0, cvar("hud_item_health_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
// if we are dead, we can skip the HUD from here\r
if(health <= 0)\r
// if we are using the jetpack, show fuel ammo. Otherwise show the ammo of our weapon\r
if(stat_items & IT_JETPACK && button_jetpack)\r
{\r
- pos = edge - stov(cvar_string("hud_panel_status_item_noload_ammo_text_position"));\r
- pos2 = edge - stov(cvar_string("hud_panel_status_item_ammo_icon_position"));\r
a = getstati(GetAmmoStat(0)); // how much fuel do we have?\r
- drawpic(pos2, GetAmmoPicture(0), stov(cvar_string("hud_panel_status_item_noload_ammo_icon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- pos -= '1 0 0' * stringwidth(ftos(a), FALSE, '1 1 0' * cvar("hud_panel_status_item_noload_ammo_text_scale")) * 0.5;\r
- Sbar_DrawXNum(pos, a, 3, 0, cvar("hud_panel_status_item_noload_ammo_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic(GetAmmoPicture(0), stov(cvar_string("hud_item_ammo_icon_position")), stov(cvar_string("hud_item_ammo_noload_icon_scale")), FALSE);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_noload_text_position")), a, 3, 0, cvar("hud_item_ammo_noload_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
else\r
{\r
// if (stat_items & GetAmmoItemCode(i))\r
{\r
a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?\r
- pos2 = edge - stov(cvar_string("hud_panel_status_item_ammo_icon_position"));\r
- drawpic(pos2, GetAmmoPicture(i), stov(cvar_string("hud_panel_status_item_ammo_icon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic(GetAmmoPicture(i), stov(cvar_string("hud_item_ammo_icon_position")), stov(cvar_string("hud_item_ammo_icon_scale")), FALSE);\r
weapon_clipsize = getstati(STAT_WEAPON_CLIPSIZE);\r
\r
// if the weapon we're holding is reloadable, show both its ammo and load\r
if(weapon_clipsize)\r
{\r
weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);\r
- pos = edge - stov(cvar_string("hud_panel_status_item_load_clip_text_position"));\r
if(weapon_clipload < 0) // we're reloading\r
- {\r
- pos -= '1 0 0' * stringwidth("- -", FALSE, '1 1 0' * cvar("hud_panel_status_item_load_clip_text_scale")) * 0.5;\r
- drawstring(pos, "- -", '1 1 0' * cvar("hud_panel_status_item_load_clip_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- }\r
+ Sbar_DrawString("- -", stov(cvar_string("hud_item_clip_load_text_position")), cvar("hud_item_clip_load_text_scale"));\r
else\r
- {\r
- pos -= '1 0 0' * stringwidth(ftos(weapon_clipload), FALSE, '1 1 0' * cvar("hud_panel_status_item_load_clip_text_scale")) * 0.5;\r
- Sbar_DrawXNum(pos, weapon_clipload, 2, 0, cvar("hud_panel_status_item_load_clip_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- }\r
- pos = edge - stov(cvar_string("hud_panel_status_item_load_ammo_text_position"));\r
- pos -= '1 0 0' * stringwidth(ftos(a), FALSE, '1 1 0' * cvar("hud_panel_status_item_load_ammo_text_scale")) * 0.5;\r
- Sbar_DrawXNum(pos, a, 3, 0, cvar("hud_panel_status_item_load_ammo_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_clip_load_text_position")), weapon_clipload, 2, 0, cvar("hud_item_clip_load_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_load_text_position")), a, 3, 0, cvar("hud_item_ammo_load_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
else\r
{\r
- pos = edge - stov(cvar_string("hud_panel_status_item_noload_ammo_text_position"));\r
- pos -= '1 0 0' * stringwidth(ftos(a), FALSE, '1 1 0' * cvar("hud_panel_status_item_noload_ammo_text_scale")) * 0.5;\r
- Sbar_DrawXNum(pos, a, 3, 0, cvar("hud_panel_status_item_noload_ammo_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_noload_text_position")), a, 3, 0, cvar("hud_item_ammo_noload_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
}\r
}\r
}\r
\r
// weapon icon\r
- pos = edge - stov(cvar_string("hud_panel_status_item_weapon_position"));\r
entity e;\r
e = get_weaponinfo(activeweapon);\r
if (e && e.netname != "" && e.netname != "N/A")\r
- drawpic(pos, strcat("gfx/hud/bg_status_activeweapon_", e.netname), stov(cvar_string("hud_panel_status_item_weapon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic(strcat("gfx/hud/bg_status_activeweapon_", e.netname), stov(cvar_string("hud_item_weapon_position")), stov(cvar_string("hud_item_weapon_scale")), FALSE);\r
}\r
\r
void Sbar_Timer()\r
float vote_alpha;\r
float vote_change; // "time" when vote_active changed\r
\r
-vector stomachstatus_colorfade_current;\r
-vector StomachStatus_ColorFade(vector target_color)\r
-{\r
- local float step;\r
- step = cvar("sbar_stomachboard_status_fade") * frametime;\r
-\r
- if(stomachstatus_colorfade_current_x >= target_color_x + step)\r
- stomachstatus_colorfade_current_x -= step;\r
- else if(stomachstatus_colorfade_current_x <= target_color_x - step)\r
- stomachstatus_colorfade_current_x += step;\r
-\r
- if(stomachstatus_colorfade_current_y >= target_color_y + step)\r
- stomachstatus_colorfade_current_y -= step;\r
- else if(stomachstatus_colorfade_current_y <= target_color_y - step)\r
- stomachstatus_colorfade_current_y += step;\r
-\r
- if(stomachstatus_colorfade_current_z >= target_color_z + step)\r
- stomachstatus_colorfade_current_z -= step;\r
- else if(stomachstatus_colorfade_current_z <= target_color_z - step)\r
- stomachstatus_colorfade_current_z += step;\r
-\r
- return stomachstatus_colorfade_current;\r
-}\r
-\r
void Sbar_Draw (void)\r
{\r
// vectors for top right, bottom right, bottom and bottom left corners\r
\r
Sbar_Reset();\r
\r
- StomachStatus_ColorFade('0 0 0');\r
+ Sbar_ColorFade('0 0 0');\r
}\r
else\r
{\r
}\r
}\r
\r
- vector hl_color;\r
- string hl_string;\r
- if(getstati(STAT_VORE_EATEN))\r
- {\r
- if(teamplay && (GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(spectatee_status - 1))) // same team\r
- hl_color = stov(cvar_string("sbar_stomachboard_color2"));\r
- else\r
- hl_color = stov(cvar_string("sbar_stomachboard_color3"));\r
- hl_string = "predator:";\r
- }\r
- else\r
- {\r
- hl_color = stov(cvar_string("sbar_stomachboard_color1"));\r
- hl_string = "self:";\r
- }\r
- drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(hl_color), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawstring(bottomleft - '-80 173 0', hl_string, '11 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Sbar_ColorFade(Sbar_GetVoreColor()), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
float stomach_load, stomach_maxload; // shows the predator's stomach load when we are eaten, and ours otherwise\r
stomach_load = getstati(STAT_VORE_LOAD);\r
entity pl, pred;\r
float f, l;\r
\r
- pos = bottomleft;\r
hud_total_prey = 0;\r
+ pos = stov(cvar_string("hud_item_preylist_position"));\r
+ vector sz = stov(cvar_string("hud_item_preylist_scale"));\r
+ vector dir = stov(cvar_string("hud_item_preylist_entry_spacing")) * 2;\r
for(pl = players.sort_next; pl; pl = pl.sort_next)\r
{\r
if(pl.team == COLOR_SPECTATOR)\r
\r
if(f)\r
{\r
- if(l <= 8) // limit the stomach board to 9 entries due to the HUD design\r
+ if(l < cvar("hud_item_preylist_entry_number")) // limit the stomach board to the given number of entries\r
{\r
- Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
- pos_y += 1.1 * sbar_fontsize_y;\r
+ Sbar_PrintStomachboardItem(pl, pos, sz);\r
+\r
+ // advance position for each entry\r
+ pos_x += sz_x * dir_x;\r
+ pos_y += sz_y * dir_y;\r
l += 1;\r
}\r
++hud_total_prey;\r
}\r
\r
// draw the predator's name\r
- Sbar_PrintStomachboardItemPred(bottomleft - '-76 150 0', pred);\r
+ Sbar_PrintStomachboardItemPred(pred, stov(cvar_string("hud_item_predator_position")), stov(cvar_string("hud_item_predator_scale")));\r
}\r
\r
// draw status, scores, timer, ring and portrait\r
projects / voretournament / voretournament.git / blobdiff