float sbar_scoreboard_alpha_name;\r
float sbar_scoreboard_alpha_name_self;\r
\r
+string portrait_image, portrait_name;\r
+float portrait_time;\r
+\r
float ps_primary, ps_secondary;\r
float ts_primary, ts_secondary;\r
\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, TRUE, 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
+ drawcolorcodedstring(pos, text, sz, 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
sbar_field[sbar_num_fields] = SP_END;\r
}\r
\r
+string Sbar_GetTexture(string img)\r
+{\r
+ string path = cvar_string("hud_style");\r
+ return strcat("gfx/hud/", path, "/", img);\r
+}\r
+\r
// MOVEUP::\r
vector sbar_field_rgb;\r
string sbar_field_icon0;\r
{\r
f = stof(getplayerkey(pl.sv_entnum, "colors"));\r
{\r
- sbar_field_icon0 = "gfx/sb_playercolor_base";\r
- sbar_field_icon1 = "gfx/sb_playercolor_shirt";\r
+ sbar_field_icon0 = Sbar_GetTexture("sb_playercolor_base");\r
+ sbar_field_icon1 = Sbar_GetTexture("sb_playercolor_shirt");\r
sbar_field_icon1_rgb = colormapPaletteColor(floor(f / 16), 0);\r
- sbar_field_icon2 = "gfx/sb_playercolor_pants";\r
+ sbar_field_icon2 = Sbar_GetTexture("sb_playercolor_pants");\r
sbar_field_icon2_rgb = colormapPaletteColor(mod(f, 16), 1);\r
}\r
}\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, Sbar_GetTexture("sb_playercolor_base"), sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("sb_playercolor_shirt"), sz, colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("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 not(pl.sv_entnum == player_localentnum - 1 || (spectatee_status && pl.sv_entnum == spectatee_status - 1))\r
+ {\r
+ drawpic(pos, Sbar_GetTexture("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, Sbar_GetTexture("sb_playercolor_base"), sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("sb_playercolor_shirt"), sz, colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("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
tmp_y = 1.25 * sbar_fontsize_y;\r
\r
// rounded header\r
- drawpic(pos, "gfx/hud/sb_scoreboard_tableheader", tmp, (rgb * sbar_color_bg_team) + '0.5 0.5 0.5', sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("sb_scoreboard_tableheader"), tmp, (rgb * sbar_color_bg_team) + '0.5 0.5 0.5', sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);\r
\r
// table border\r
tmp_y += sbar_border_thickness;\r
\r
// table background\r
tmp_y = body_table_height;\r
- drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);\r
+ drawpic_tiled(pos, Sbar_GetTexture("sb_scoreboard_bg"), bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);\r
\r
// anyway, apply some color\r
//drawfill(pos, tmp + '2 0 0', rgb, 0.1, DRAWFLAG_NORMAL);\r
tmp_x = sbwidth;\r
tmp_y = height * rows;\r
\r
- drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);\r
+ drawpic_tiled(pos, Sbar_GetTexture("sb_scoreboard_bg"), bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);\r
drawborderlines(sbar_accuracy_border_thickness, pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);\r
\r
// column highlighting\r
weapon_alpha = 0.2 * sbar_scoreboard_alpha_fg;\r
\r
// weapon icon\r
- drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture(strcat("inv_weapon", self.netname)), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);\r
// the accuracy\r
if(weapon_damage) {\r
weapons_with_stats += 1;\r
tmp_x = sbwidth;\r
tmp_y = sbar_fontsize_y * RANKINGS_RECEIVED_CNT;\r
\r
- drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);\r
+ drawpic_tiled(pos, Sbar_GetTexture("sb_scoreboard_bg"), bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);\r
drawborderlines(sbar_border_thickness, pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);\r
\r
// row highlighting\r
\r
// Draw the scoreboard\r
vector bg_size;\r
- bg_size = drawgetimagesize("gfx/hud/sb_scoreboard_bg");\r
+ bg_size = drawgetimagesize(Sbar_GetTexture("sb_scoreboard_bg"));\r
\r
if(teamplay)\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(getstati(STAT_VORE_EATEN))\r
+ str = strcat("^1Will respawn after leaving the stomach");\r
+ else 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
{\r
case 0:\r
if(getstati(STAT_ITEMS) & IT_FUEL_REGEN)\r
- return "gfx/hud/sb_fuel_regen";\r
+ return Sbar_GetTexture("sb_fuel_regen");\r
else\r
- return "gfx/hud/sb_fuel";\r
+ return Sbar_GetTexture("sb_fuel");\r
default:\r
return "";\r
}\r
}\r
\r
+void Sbar_DrawBackgrounds()\r
+{\r
+ // Draw all backgrounds defined by our HUD setup\r
+ if (cvar("viewsize") > 100 || !sbar_hudselector)\r
+ return;\r
+\r
+ float total = cvar("hud_backgrounds");\r
+ float i;\r
+ for(i = 1; i <= total; i++)\r
+ {\r
+ string img = Sbar_GetTexture(cvar_string(strcat("hud_background_", ftos(i), "_texture")));\r
+ vector pos = stov(cvar_string(strcat("hud_background_", ftos(i), "_position")));\r
+ vector sz = stov(cvar_string(strcat("hud_background_", ftos(i), "_scale")));\r
+\r
+ pos = Sbar_ConvertToScreen_PicPosition(pos, sz);\r
+ sz = Sbar_ConvertToScreen_PicScale(sz);\r
+\r
+ vector col;\r
+ switch(cvar(strcat("hud_background_", ftos(i), "_colortype")))\r
+ {\r
+ case 1:\r
+ if(teamplay)\r
+ col = GetTeamRGB(myteam) * sbar_color_bg_team;\r
+ else\r
+ col = stov(cvar_string("sbar_color_bg"));\r
+ break;\r
+ case 2:\r
+ col = Sbar_ColorFade(Sbar_GetVoreColor());\r
+ break;\r
+ default:\r
+ col = '1 1 1';\r
+ break;\r
+ }\r
+\r
+ drawpic(pos, img, sz, col, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
+ }\r
+}\r
+\r
float race_status_time;\r
float race_status_prev;\r
string race_status_name_prev;\r
rankname = race_PlaceName(rank);\r
\r
if(race_status == 0)\r
- drawpic(pos, "gfx/hud/race/newfail", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("race/newfail"), '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
else if(race_status == 1) {\r
- drawpic(pos, "gfx/hud/race/newtime", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL); \r
+ drawpic(pos, Sbar_GetTexture("race/newtime"), '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL); \r
drawcolorcodedstring(pos + '40 80 0' - '1 0 0' * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
drawstring(pos + '40 20 0' - '1 0 0' * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
} else if(race_status == 2) {\r
if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank)\r
- drawpic(pos, "gfx/hud/race/newrankgreen", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("race/newrankgreen"), '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
else\r
- drawpic(pos, "gfx/hud/race/newrankyellow", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("race/newrankyellow"), '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
drawcolorcodedstring(pos + '40 80 0' - '1 0 0' * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
drawstring(pos + '40 20 0' - '1 0 0' * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
} else if(race_status == 3) {\r
- drawpic(pos, "gfx/hud/race/newrecordserver", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("race/newrecordserver"), '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
drawcolorcodedstring(pos + '40 80 0' - '1 0 0' * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
drawstring(pos + '40 20 0' - '1 0 0' * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);\r
}\r
}\r
}\r
\r
+void Sbar_Portrait()\r
+{\r
+ // draws the portrait, using the values set in Ent_ReadPortrait\r
+\r
+ // make the portrait slide in and out of the left edge\r
+ float fade_time;\r
+ float fade1_start, fade1_end, fade2_start, fade2_end;\r
+ float fade_in, fade_out;\r
+\r
+ fade_time = cvar("sbar_portrait_time") * bound(0, cvar("sbar_portrait_fade"), 0.5);\r
+\r
+ fade1_start = portrait_time + cvar("sbar_portrait_time") - fade_time;\r
+ fade1_end = portrait_time + cvar("sbar_portrait_time");\r
+ fade2_start = portrait_time;\r
+ fade2_end = portrait_time + fade_time;\r
+\r
+ fade_in = bound(0, (time / fade1_end - 1) / (fade1_start / fade1_end - 1), 1);\r
+ fade_out = 1 - bound(0, (time / fade2_end - 1) / (fade2_start / fade2_end - 1), 1);\r
+\r
+ vector left, fade_pos;\r
+ left_x = 0;\r
+ left_y = vid_conheight / 2;\r
+ fade_pos_x = -130 * fade_in * fade_out;\r
+\r
+ if(!cvar("sbar_portrait"))\r
+ return;\r
+\r
+ if(portrait_time + cvar("sbar_portrait_time") >= time)\r
+ {\r
+ if(portrait_image && portrait_name) // prevent using bad strings\r
+ {\r
+ drawpic(left - '120 80 0' - fade_pos, portrait_image, '120 160 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawcolorcodedstring(left - '120 -80 0' - fade_pos, textShortenToWidth(portrait_name, 120, '12 12 0', stringwidth_colors), '12 12 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ }\r
+ }\r
+ else\r
+ {\r
+ // free unused strings from memory\r
+ if(portrait_image)\r
+ {\r
+ strunzone(portrait_image);\r
+ portrait_image = string_null;\r
+ }\r
+ if(portrait_name)\r
+ {\r
+ strunzone(portrait_name);\r
+ portrait_name = string_null;\r
+ }\r
+ }\r
+}\r
+\r
void Sbar_Score()\r
{\r
float score, distribution, leader;\r
- vector score_pos, secondary_score_pos, race_score_pos, distribution_color;\r
+ vector distribution_color;\r
string racetime, secondary_racetime;\r
entity tm, pl, me;\r
me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];\r
\r
- vector top;\r
- top_x = vid_conwidth / 2;\r
- top_y = 0;\r
- top_z = 0;\r
-\r
if(gametype == GAME_RPG)\r
return;\r
\r
- score_pos = top + '-80 8 0';\r
- secondary_score_pos = score_pos + '80 -6 0';\r
-\r
if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD\r
pl = players.sort_next;\r
if(pl == me)\r
distribution_color = '1 1 1';\r
\r
secondary_racetime = strcat(secondary_racetime, ftos(distsec), ".", ftos(distmsec));\r
- drawstring(score_pos + '222 0 0' - '14 0 0', secondary_racetime, '14 14 0', distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawstring(Sbar_ConvertToScreen_TextPosition(secondary_racetime, stov(cvar_string("hud_item_score_race_secondary_text_position")), cvar("hud_item_score_race_secondary_text_scale")), secondary_racetime, '1 1 0' * cvar("hud_item_score_race_secondary_text_scale"), distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
racetime = strcat(s_racemin, " : ", s_racesec, " . ", s_racemsec);\r
- race_score_pos = top + '0 0 0';\r
- race_score_pos -= '1 0 0' * stringwidth(racetime, FALSE, '30 30 0') * 0.5;\r
- drawstring(race_score_pos, racetime, '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawString(racetime, stov(cvar_string("hud_item_score_race_primary_text_position")), cvar("hud_item_score_race_primary_text_scale"));\r
\r
} else if (!teamplay) { // non-teamgames, except race/cts\r
// me vector := [team/connected frags id]\r
else\r
distribution_color = '1 0 0';\r
\r
- Sbar_DrawXNum(secondary_score_pos, distribution, 6, 3, 16, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- Sbar_DrawXNum(score_pos, score, 6, 0, 34, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_score_nonteam_secondary_text_position")), distribution, 6, 3, cvar("hud_item_score_nonteam_secondary_text_scale"), distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_score_nonteam_primary_text_position")), score, 6, 0, cvar("hud_item_score_nonteam_primary_text_scale"), distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
} else { // teamgames\r
float max_fragcount;\r
max_fragcount = -999;\r
\r
+ vector pos = stov(cvar_string("hud_item_score_team_secondary_text_position"));\r
+ vector sz = '1 1 0' * cvar("hud_item_score_team_secondary_text_scale");\r
+ sz_x = sz_x / vid_conwidth;\r
+ sz_y = sz_y / vid_height * 2;\r
+ vector dir = stov(cvar_string("hud_item_score_team_secondary_entry_spacing"));\r
for(tm = teams.sort_next; tm; tm = tm.sort_next) {\r
if(tm.team == COLOR_SPECTATOR || !tm.team_size) // no players? don't display\r
continue;\r
\r
if (score > max_fragcount)\r
max_fragcount = score;\r
- \r
+\r
if(tm.team == myteam) {\r
if (max_fragcount == score)\r
leader = 1;\r
- Sbar_DrawXNum(score_pos, score, 6, 0, 34, GetTeamRGB(tm.team), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_score_team_primary_text_position")), score, 6, 0, cvar("hud_item_score_team_primary_text_scale"), GetTeamRGB(tm.team), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
} else {\r
if (max_fragcount == score)\r
leader = 1;\r
- Sbar_DrawXNum(secondary_score_pos, score, 6, 3, 16, GetTeamRGB(tm.team), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- secondary_score_pos = secondary_score_pos + '0 16 0';\r
+ Sbar_DrawXNum(pos, score, 6, 3, cvar("hud_item_score_team_secondary_text_scale"), GetTeamRGB(tm.team), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ pos_x += sz_x * dir_x;\r
+ pos_y += sz_y * dir_y;\r
}\r
}\r
}\r
\r
void Sbar_Status()\r
{\r
- vector bottom;\r
- bottom_x = vid_conwidth/2;\r
- bottom_y = vid_conheight;\r
- bottom_z = 0;\r
-\r
float armor, health, x, a;\r
armor = getstati(STAT_ARMOR);\r
health = getstati(STAT_HEALTH);\r
float stat_items;\r
stat_items = getstati(STAT_ITEMS);\r
\r
- vector health_pos, armor_pos, pos;\r
- health_pos = bottom - '43 58 0';\r
- armor_pos = bottom - '43 68 0';\r
-\r
- if (cvar("viewsize") <= 100) {\r
- if (teamplay)\r
- drawpic(bottom - '96 96 0', "gfx/hud/bg_status", '192 96 0', 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(bottom - '96 96 0', "gfx/hud/bg_status", '192 96 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
- }\r
- }\r
-\r
// armor\r
x = armor;\r
if (x > 0)\r
{\r
- drawpic(armor_pos + '-8 -13.5 0', "gfx/hud/sb_armor", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- armor_pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '12 12 0') * 0.5;\r
- Sbar_DrawXNum(armor_pos, x, 3, 0, 12, Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic(Sbar_GetTexture("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
x = health;\r
- drawpic(health_pos + '-11 16 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- health_pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '22 22 0') * 0.5;\r
- Sbar_DrawXNum(health_pos, x, 3, 0, 22, Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic(Sbar_GetTexture("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
- // ammo\r
- pos_x = bottom_x + 140;\r
- pos_y = bottom_y - 20;\r
+ // if we are dead, we can skip the HUD from here\r
+ if(health <= 0)\r
+ return;\r
\r
+ // ammo\r
float weapon_clipload, weapon_clipsize;\r
- vector ammo_pos_offset;\r
\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
a = getstati(GetAmmoStat(0)); // how much fuel do we have?\r
- drawpic(pos - '98 18 0', GetAmmoPicture(0), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '16 16 0') * 0.5;\r
- Sbar_DrawXNum(pos - '118 16 0' - ammo_pos_offset, a, 3, 0, 16, '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
- drawpic(pos - '98 18 0', GetAmmoPicture(i), '20 20 0', '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
{\r
weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);\r
if(weapon_clipload < 0) // we're reloading\r
- {\r
- ammo_pos_offset = '1 0 0' * stringwidth("- -", FALSE, '16 16 0') * 0.5;\r
- drawstring(pos - '118 23 0' - ammo_pos_offset, "- -", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- }\r
+ Sbar_DrawString("- -", stov(cvar_string("hud_item_ammo_load_clip_text_position")), cvar("hud_item_ammo_load_clip_text_scale"));\r
else\r
- {\r
- ammo_pos_offset = '1 0 0' * stringwidth(ftos(weapon_clipload), FALSE, '16 16 0') * 0.5;\r
- Sbar_DrawXNum(pos - '118 23 0' - ammo_pos_offset, weapon_clipload, 2, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- }\r
- ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '12 12 0') * 0.5;\r
- Sbar_DrawXNum(pos - '118 7 0' - ammo_pos_offset, a, 3, 0, 12, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_load_clip_text_position")), weapon_clipload, 2, 0, cvar("hud_item_ammo_load_clip_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
- ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '16 16 0') * 0.5;\r
- Sbar_DrawXNum(pos - '118 16 0' - ammo_pos_offset, a, 3, 0, 16, '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
entity e;\r
e = get_weaponinfo(activeweapon);\r
if (e && e.netname != "" && e.netname != "N/A")\r
- drawpic(bottom - '96 96 0', strcat("gfx/hud/bg_status_activeweapon_", e.netname), '192 96 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic(Sbar_GetTexture(strcat("sb_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
{\r
float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;\r
- vector pos, bgpos, timer_color;\r
+ vector timer_color;\r
string finaltime;\r
- bgpos = '0 0 0';\r
- \r
- vector topright;\r
- topright = '0 0 0';\r
- topright_x = vid_conwidth;\r
- \r
- float scale;\r
- scale = cvar_or("sbar_timer_scale", 1);\r
+\r
timelimit = getstatf(STAT_TIMELIMIT);\r
\r
if(gametype == GAME_RPG && !timelimit) // don't draw the timer in rpg if there's no time limit\r
return;\r
\r
- Sbar_DrawRaceStatus((topright_x - 100) * '1 0 0' + '0 30 0' * scale);\r
+ Sbar_DrawRaceStatus('0 20 0');\r
\r
timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);\r
timeleft = ceil(timeleft);\r
minutes = floor(elapsedTime / 60);\r
seconds = elapsedTime - minutes*60;\r
}\r
- if (minutes < 10)\r
- bgpos_x = topright_x - (54 + 17 + 12) * scale;\r
- else if (minutes < 100) // nudge the timer background left if more digits are drawn\r
- bgpos_x = topright_x - (62 + 17 + 12) * scale;\r
- else\r
- bgpos_x = topright_x - (70 + 17 + 12) * scale;\r
- bgpos_y = 0;\r
- bgpos_z = 0;\r
} else {\r
minutes = minutesLeft;\r
seconds = secondsLeft;\r
- if (minutes < 10) // nudge the timer background left if more digits are drawn\r
- bgpos_x = topright_x - (54 + 17 + 12) * scale;\r
- else if (minutes < 100)\r
- bgpos_x = topright_x - (62 + 17 + 12) * scale;\r
- else\r
- bgpos_x = topright_x - (70 + 17 + 12) * scale;\r
- bgpos_y = 0;\r
- bgpos_z = 0;\r
}\r
\r
- if (cvar("viewsize") <= 100) { // draw timer background when viewsize <= 100\r
- if (teamplay)\r
- drawpic(bgpos, "gfx/hud/bg_timer", '120 30 0' * scale, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // timer bg color = myteam color\r
- else {\r
- color = stov(cvar_string("sbar_color_bg"));\r
-\r
- drawpic(bgpos, "gfx/hud/bg_timer", '120 30 0' * scale, color, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
- }\r
- }\r
+ Sbar_DrawPic(Sbar_GetTexture("sb_time"), stov(cvar_string("hud_item_timer_icon_position")), stov(cvar_string("hud_item_timer_icon_scale")), FALSE);\r
\r
- drawpic(topright - ('19 0 0' + '3 0 0' - '0 2 0'), "gfx/hud/sb_time", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
finaltime = strcat(ftos(minutes), ":");\r
if(seconds < 10)\r
finaltime = strcat(finaltime, "0", ftos(seconds));\r
else\r
finaltime = strcat(finaltime, ftos(seconds));\r
\r
- pos = topright - ('24 -2 0' + '3 0 0' - '0 2 0');\r
- pos -= '1 0 0' * stringwidth(finaltime, FALSE, 18 * scale * '1 1 0');\r
- drawstring(pos, finaltime, 18 * scale * '1 1 0', timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawstring(Sbar_ConvertToScreen_TextPosition(finaltime, stov(cvar_string("hud_item_timer_text_position")), cvar("hud_item_timer_text_scale")), finaltime, '1 1 0' * cvar("hud_item_timer_text_scale"), timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
void Sbar_Ring()\r
\r
if(text1_msg != "" && cvar("sbar_ring1"))\r
{\r
- DrawCircleClippedPic(ring_pos, ring1_size, "gfx/hud/sb_ring.tga", ring1_clip, ring1_color, ring1_alpha, DRAWFLAG_ADDITIVE);\r
+ DrawCircleClippedPic(ring_pos, ring1_size, Sbar_GetTexture("sb_ring.tga"), ring1_clip, ring1_color, ring1_alpha, DRAWFLAG_ADDITIVE);\r
text_pos_x = ring_pos_x - stringwidth(text1_msg, FALSE, text1_size) / 2;\r
text_pos_y = ring_pos_y - ring1_size / 2;\r
drawstring(text_pos, text1_msg, text1_size, ring1_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
if(text2_msg != "" && cvar("sbar_ring2"))\r
{\r
- DrawCircleClippedPic(ring_pos, ring2_size, "gfx/hud/sb_ring.tga", ring2_clip, ring2_color, ring2_alpha, DRAWFLAG_ADDITIVE);\r
+ DrawCircleClippedPic(ring_pos, ring2_size, Sbar_GetTexture("sb_ring.tga"), ring2_clip, ring2_color, ring2_alpha, DRAWFLAG_ADDITIVE);\r
text_pos_x = ring_pos_x - stringwidth(text2_msg, FALSE, text2_size) / 2;\r
text_pos_y = ring_pos_y + ring1_size / 2;\r
drawstring(text_pos, text2_msg, text2_size, ring2_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
void CSQC_Strength_Timer() {\r
- vector pos;\r
- vector bottomright;\r
-\r
- bottomright_x = vid_conwidth;\r
- bottomright_y = vid_conheight;\r
- bottomright_z = 0;\r
-\r
float stat_items, dt;\r
stat_items = getstati(STAT_ITEMS);\r
/*\r
if (getstati(STAT_HEALTH) <= 0)\r
return;\r
\r
- vector picsize;\r
- float strength_time, invincibility_time, countdown_fontsize;\r
-\r
- picsize = '22 22 0';\r
- countdown_fontsize = 18;\r
-\r
- pos = bottomright - '34 48 0';\r
+ vector pos, sz;\r
+ float strength_time, invincibility_time;\r
\r
//strength\r
strength_time = getstatf(STAT_STRENGTH_FINISHED);\r
- invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);\r
-\r
if (strength_time) {\r
dt = strength_time - time;\r
+ pos = Sbar_ConvertToScreen_PicPosition(stov(cvar_string("hud_item_strength_icon_position")), stov(cvar_string("hud_item_strength_icon_scale")));\r
+ sz = Sbar_ConvertToScreen_PicScale(stov(cvar_string("hud_item_strength_icon_scale")));\r
if(dt > 0)\r
{\r
if(dt < 5)\r
{\r
- drawpic_expanding_two(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,\r
+ drawpic_expanding_two(pos, Sbar_GetTexture("sb_str"), sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,\r
bound(0, (ceil(dt) - dt) / 0.5, 1));\r
}\r
else\r
{\r
- drawpic(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
+ drawpic(pos, Sbar_GetTexture("sb_str"), sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
}\r
- Sbar_DrawXNum(pos - '30 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_strength_text_position")), ceil(dt), 2, 0, cvar("hud_item_strength_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
else if(dt > -1)\r
{\r
- drawpic_expanding(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,\r
+ drawpic_expanding(pos, Sbar_GetTexture("sb_str"), sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,\r
bound(0, -dt / 0.5, 1));\r
}\r
}\r
\r
//invincibility\r
+ invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);\r
if (invincibility_time) {\r
dt = invincibility_time - time;\r
+ pos = Sbar_ConvertToScreen_PicPosition(stov(cvar_string("hud_item_invincible_icon_position")), stov(cvar_string("hud_item_invincible_icon_scale")));\r
+ sz = Sbar_ConvertToScreen_PicScale(stov(cvar_string("hud_item_invincible_icon_scale")));\r
if(dt > 0)\r
{\r
if(dt < 5)\r
{\r
- drawpic_expanding_two(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,\r
+ drawpic_expanding_two(pos, Sbar_GetTexture("sb_invinc"), sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,\r
bound(0, (ceil(dt) - dt) / 0.5, 1));\r
}\r
else\r
{\r
- drawpic(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
+ drawpic(pos, Sbar_GetTexture("sb_invinc"), sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
}\r
- Sbar_DrawXNum(pos - '30 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(stov(cvar_string("hud_item_invincible_text_position")), ceil(dt), 2, 0, cvar("hud_item_invincible_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
else if(dt > -1)\r
{\r
- drawpic_expanding(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,\r
+ drawpic_expanding(pos, Sbar_GetTexture("sb_invinc"), sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,\r
bound(0, -dt / 0.5, 1));\r
}\r
}\r
pos -= '-15 -6 0'; // adjust to the origin of these numbers\r
\r
pressedkeys = getstatf(STAT_PRESSED_KEYS);\r
- drawpic(pos + '-15 -6 0', "gfx/hud/keys/key_bg.tga", bgsize, '1 1 1', 0.1 * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- 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', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- 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', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- 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', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- 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', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- 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', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- 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', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos + '-15 -6 0', Sbar_GetTexture("keys/key_bg.tga"), bgsize, '1 1 1', 0.1 * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos + ' 83.5 9 0', Sbar_GetTexture((pressedkeys & KEY_CROUCH) ? "keys/key_crouch_inv.tga" : "keys/key_crouch.tga"), ' 24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos + ' 32 -1.5 0', Sbar_GetTexture((pressedkeys & KEY_FORWARD) ? "keys/key_forward_inv.tga" : "keys/key_forward.tga"), ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos + '-11.5 9 0', Sbar_GetTexture((pressedkeys & KEY_JUMP) ? "keys/key_jump_inv.tga" : "keys/key_jump.tga"), ' 24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos + ' -1 32 0', Sbar_GetTexture((pressedkeys & KEY_LEFT) ? "keys/key_left_inv.tga" : "keys/key_left.tga"), ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos + ' 32 32 0', Sbar_GetTexture((pressedkeys & KEY_BACKWARD) ? "keys/key_backward_inv.tga" : "keys/key_backward.tga"), ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos + ' 65 32 0', Sbar_GetTexture((pressedkeys & KEY_RIGHT) ? "keys/key_right_inv.tga" : "keys/key_right.tga"), ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
void Sbar_ShowSpeed(void)\r
}\r
\r
if (acceleration > 0)\r
- drawpic(pos, "gfx/hud/accelerometer_gradient", acceleration * scale * '40 0 0' + sz * '0 1 0', rgb, alpha * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("accelerometer_gradient"), acceleration * scale * '40 0 0' + sz * '0 1 0', rgb, alpha * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
else if (acceleration < 0)\r
- drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/accelerometer_gradient", -acceleration * scale * '40 0 0' + sz * '0 1 0', rgb, alpha * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos + acceleration * scale * '40 0 0', Sbar_GetTexture("accelerometer_gradient"), -acceleration * scale * '40 0 0' + sz * '0 1 0', rgb, alpha * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
void Sbar_DrawAccuracyStats_Description_Hitscan(vector position)\r
pos_y = top_border_splash + row_splash * (fill_size_y + row_margin);\r
\r
// background\r
- drawpic(pos, "gfx/hud/sb_accuracy", fill_size , fill_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("sb_accuracy"), fill_size , fill_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
drawborderlines(sbar_border_thickness, pos, fill_size, border_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
\r
// the weapon\r
- drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("inv_weapon"), self.netname), '1 0.5 0' * fill_size_x , '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
// the amount of shots fired or max damage\r
drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 3 0' * sbar_fontsize_y, ftos(weapon_damage), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
pos_y = top_border_hitscan + row_hitscan * (fill_size_y + row_margin);\r
\r
// background\r
- drawpic(pos, "gfx/hud/sb_accuracy", fill_size , fill_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture("sb_accuracy"), fill_size , fill_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
drawborderlines(sbar_border_thickness, pos, fill_size, border_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
\r
// the weapon\r
- drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(pos, Sbar_GetTexture(strcat("inv_weapon", self.netname)), '1 0.5 0' * fill_size_x , '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
// the amount of shots fired or max damage\r
drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 3 0' * sbar_fontsize_y, ftos(weapon_damage), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\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
vector voteorigin = bottomright - '290 135 0';\r
vector votesize = '280 70 0';\r
- drawpic(voteorigin, "gfx/hud/voteprogress_back", votesize, color, a * sbar_alpha_bg, DRAWFLAG_NORMAL);\r
+ drawpic(voteorigin, Sbar_GetTexture("voteprogress_back"), votesize, color, a * sbar_alpha_bg, DRAWFLAG_NORMAL);\r
\r
s = "A vote has been called for: ";\r
drawstring(voteorigin + '0.5 0 0' * votesize_x + '0 0.1 0' * votesize_y - '1 0 0' * stringwidth(s, FALSE, '6 0 0'), s, '12 12 0', '1 1 1', a * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
// draw the progress bars\r
drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5 * (vote_yescount/vote_needed), votesize_y);\r
- drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(voteorigin, Sbar_GetTexture("voteprogress_prog"), votesize, '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
drawsetcliparea(voteorigin_x + votesize_x - votesize_x * 0.5 * (vote_nocount/vote_needed), voteorigin_y, votesize_x * 0.5, votesize_y);\r
- drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(voteorigin, Sbar_GetTexture("voteprogress_prog"), votesize, '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
// draw the highlights\r
if(vote_highlighted == 1) {\r
drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5, votesize_y);\r
- drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(voteorigin, Sbar_GetTexture("voteprogress_voted"), votesize, '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
else if(vote_highlighted == 2) {\r
drawsetcliparea(voteorigin_x + 0.5 * votesize_x, voteorigin_y, votesize_x * 0.5, votesize_y);\r
- drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(voteorigin, Sbar_GetTexture("voteprogress_voted"), votesize, '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
drawresetcliparea();\r
Sbar_DrawScoreboard();\r
Sbar_Score();\r
Sbar_Timer();\r
+ Sbar_Portrait();\r
if(getstati(STAT_VORE_EATEN))\r
Sbar_Status();\r
\r
Sbar_Reset();\r
\r
- StomachStatus_ColorFade('0 0 0');\r
+ Sbar_ColorFade('0 0 0');\r
}\r
else\r
{\r
if(getstati(STAT_ARMOR) < g_power)\r
{\r
// subsystems are down\r
- drawpic(warn_pos - '128 0 0', "gfx/hud/sb_power_fail", '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(warn_pos - '16 0 0' + '0 150 0', "gfx/hud/sb_power_fail_icon", '32 32 0', '1 1 1', sbar_alpha_fg * (0.5 + sin(time * 5) / 2), DRAWFLAG_NORMAL);\r
+ drawpic(warn_pos - '128 0 0', Sbar_GetTexture("sb_power_fail"), '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(warn_pos - '16 0 0' + '0 150 0', Sbar_GetTexture("sb_power_fail_icon"), '32 32 0', '1 1 1', sbar_alpha_fg * (0.5 + sin(time * 5) / 2), DRAWFLAG_NORMAL);\r
power_boot = time + g_power_reboot;\r
+ Sbar_Portrait(); // draw the portrait still\r
return; // skip drawing the HUD\r
}\r
else if(time <= power_boot)\r
{\r
// subsystems are rebooting\r
- drawpic(warn_pos - '128 0 0', "gfx/hud/sb_power_reboot", '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(warn_pos - '16 0 0' + '0 150 0', "gfx/hud/sb_power_reboot_icon", '32 32 0', '1 1 1', sbar_alpha_fg * (0.5 + sin(time * 5) / 2), DRAWFLAG_NORMAL);\r
+ drawpic(warn_pos - '128 0 0', Sbar_GetTexture("sb_power_reboot"), '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(warn_pos - '16 0 0' + '0 150 0', Sbar_GetTexture("sb_power_reboot_icon"), '32 32 0', '1 1 1', sbar_alpha_fg * (0.5 + sin(time * 5) / 2), DRAWFLAG_NORMAL);\r
+ Sbar_Portrait(); // draw the portrait still\r
return; // skip drawing the HUD\r
}\r
}\r
\r
+ Sbar_DrawBackgrounds();\r
+\r
if(g_vore) // only when the vore system is active\r
{\r
// draw the stomach board\r
- if (cvar("viewsize") <= 100) {\r
- if (teamplay)\r
- drawpic(bottomleft- '0 256 0', "gfx/hud/bg_stomach", '256 256 0', 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(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);\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
\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
if(stomach_load)\r
{\r
status_text = strcat(ftos(stomach_load), "^8/", status_color, ftos(stomach_maxload));\r
- status_pos = bottomleft - '-43 168 0';\r
- status_size = 16;\r
+ status_pos = stov(cvar_string("hud_item_stomach_load_double_text_position"));\r
+ status_size = cvar("hud_item_stomach_load_double_text_scale");\r
}\r
- else if(g_healthsize_center >= 0) // no point in showing it otherwise\r
+ else\r
{\r
status_text = strcat(status_color, ftos(stomach_maxload));\r
- status_pos = bottomleft - '-43 170 0';\r
- status_size = 20;\r
+ status_pos = stov(cvar_string("hud_item_stomach_load_single_text_position"));\r
+ status_size = cvar("hud_item_stomach_load_single_text_scale");\r
}\r
- status_pos -= '1 0 0' * stringwidth(status_text, TRUE, '1 0 0' * status_size) * 0.5;\r
- drawcolorcodedstring(status_pos, status_text, '1 1 0' * status_size, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawString(status_text, status_pos, status_size);\r
\r
if(getstati(STAT_VORE_DIGESTING)) // we are currently digesting\r
- drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0 1 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic(Sbar_GetTexture("sb_digestion_active"), stov(cvar_string("hud_item_digestion_icon_position")), stov(cvar_string("hud_item_digestion_icon_scale")), FALSE);\r
else if(stomach_load) // we can digest at this time\r
- drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0.25 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic(Sbar_GetTexture("sb_digestion_possible"), stov(cvar_string("hud_item_digestion_icon_position")), stov(cvar_string("hud_item_digestion_icon_scale")), FALSE);\r
else // we cannot digest at this time\r
- drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawPic(Sbar_GetTexture("sb_digestion_impossible"), stov(cvar_string("hud_item_digestion_icon_position")), stov(cvar_string("hud_item_digestion_icon_scale")), FALSE);\r
\r
// draw the stomach board player list\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
f = pl.plpredator == player_localentnum;\r
}\r
\r
- if(f && l <= 8) // limit the stomach board to 9 entries due to the HUD design\r
+ if(f)\r
{\r
- Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
- pos_y += 1.1 * sbar_fontsize_y;\r
- l += 1;\r
+ if(l < cvar("hud_item_preylist_entry_number")) // limit the stomach board to the given number of entries\r
+ {\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
// set the predator's name\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, and ring\r
+ // draw status, scores, timer, ring and portrait\r
Sbar_Status();\r
Sbar_Score();\r
Sbar_Timer();\r
Sbar_Ring();\r
+ Sbar_Portrait();\r
\r
// draw strength/invincibility icon and timer\r
CSQC_Strength_Timer();\r
float red_alpha, red_alpha_prevstatus;\r
red_alpha = red_alpha_prevstatus = 1;\r
switch(redflag) {\r
- case 1: red_icon = "gfx/hud/sb_flag_red_taken"; break;\r
- case 2: red_icon = "gfx/hud/sb_flag_red_lost"; break;\r
- case 3: red_icon = "gfx/hud/sb_flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;\r
+ case 1: red_icon = Sbar_GetTexture("sb_flag_red_taken"); break;\r
+ case 2: red_icon = Sbar_GetTexture("sb_flag_red_lost"); break;\r
+ case 3: red_icon = Sbar_GetTexture("sb_flag_red_carrying"); red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;\r
default:\r
if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))\r
- red_icon = "gfx/hud/sb_flag_red_shielded";\r
+ red_icon = Sbar_GetTexture("sb_flag_red_shielded");\r
else\r
red_icon = string_null;\r
break;\r
}\r
switch(redflag_prevstatus) {\r
- case 1: red_icon_prevstatus = "gfx/hud/sb_flag_red_taken"; break;\r
- case 2: red_icon_prevstatus = "gfx/hud/sb_flag_red_lost"; break;\r
- case 3: red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;\r
+ case 1: red_icon_prevstatus = Sbar_GetTexture("sb_flag_red_taken"); break;\r
+ case 2: red_icon_prevstatus = Sbar_GetTexture("sb_flag_red_lost"); break;\r
+ case 3: red_icon_prevstatus = Sbar_GetTexture("sb_flag_red_carrying"); red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;\r
default:\r
if(redflag == 3)\r
- red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; // make it more visible\r
+ red_icon_prevstatus = Sbar_GetTexture("sb_flag_red_carrying"); // make it more visible\r
else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))\r
- red_icon_prevstatus = "gfx/hud/sb_flag_red_shielded";\r
+ red_icon_prevstatus = Sbar_GetTexture("sb_flag_red_shielded");\r
else\r
red_icon_prevstatus = string_null;\r
break;\r
float blue_alpha, blue_alpha_prevstatus;\r
blue_alpha = blue_alpha_prevstatus = 1;\r
switch(blueflag) {\r
- case 1: blue_icon = "gfx/hud/sb_flag_blue_taken"; break;\r
- case 2: blue_icon = "gfx/hud/sb_flag_blue_lost"; break;\r
- case 3: blue_icon = "gfx/hud/sb_flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;\r
+ case 1: blue_icon = Sbar_GetTexture("sb_flag_blue_taken"); break;\r
+ case 2: blue_icon = Sbar_GetTexture("sb_flag_blue_lost"); break;\r
+ case 3: blue_icon = Sbar_GetTexture("sb_flag_blue_carrying"); blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;\r
default:\r
if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))\r
- blue_icon = "gfx/hud/sb_flag_blue_shielded";\r
+ blue_icon = Sbar_GetTexture("sb_flag_blue_shielded");\r
else\r
blue_icon = string_null;\r
break;\r
}\r
switch(blueflag_prevstatus) {\r
- case 1: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_taken"; break;\r
- case 2: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_lost"; break;\r
- case 3: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;\r
+ case 1: blue_icon_prevstatus = Sbar_GetTexture("sb_flag_blue_taken"); break;\r
+ case 2: blue_icon_prevstatus = Sbar_GetTexture("sb_flag_blue_lost"); break;\r
+ case 3: blue_icon_prevstatus = Sbar_GetTexture("sb_flag_blue_carrying"); blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;\r
default:\r
if(blueflag == 3)\r
- blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; // make it more visible\r
+ blue_icon_prevstatus = Sbar_GetTexture("sb_flag_blue_carrying"); // make it more visible\r
else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))\r
- blue_icon_prevstatus = "gfx/hud/sb_flag_blue_shielded";\r
+ blue_icon_prevstatus = Sbar_GetTexture("sb_flag_blue_shielded");\r
else\r
blue_icon_prevstatus = string_null;\r
break;\r
switch(keyteam)\r
{\r
case COLOR_TEAM1:\r
- drawpic (pa, "gfx/hud/sb_kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key\r
+ drawpic (pa, Sbar_GetTexture("sb_kh_redarrow"), kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key\r
break;\r
case COLOR_TEAM2:\r
- drawpic (pa, "gfx/hud/sb_kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key\r
+ drawpic (pa, Sbar_GetTexture("sb_kh_bluearrow"), kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key\r
break;\r
case COLOR_TEAM3:\r
- drawpic (pa, "gfx/hud/sb_kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key\r
+ drawpic (pa, Sbar_GetTexture("sb_kh_yellowarrow"), kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key\r
break;\r
case COLOR_TEAM4:\r
- drawpic (pa, "gfx/hud/sb_kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key\r
+ drawpic (pa, Sbar_GetTexture("sb_kh_pinkarrow"), kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key\r
break;\r
default:\r
break;\r
switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come!\r
{\r
case 0:\r
- drawpic (p, "gfx/hud/sb_kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key\r
+ drawpic (p, Sbar_GetTexture("sb_kh_red"), kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key\r
break;\r
case 1:\r
- drawpic (p, "gfx/hud/sb_kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key\r
+ drawpic (p, Sbar_GetTexture("sb_kh_blue"), kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key\r
break;\r
case 2:\r
- drawpic (p, "gfx/hud/sb_kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key\r
+ drawpic (p, Sbar_GetTexture("sb_kh_yellow"), kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key\r
break;\r
case 3:\r
- drawpic (p, "gfx/hud/sb_kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key\r
+ drawpic (p, Sbar_GetTexture("sb_kh_pink"), kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key\r
break;\r
}\r
}\r
\r
void Ent_ReadPortrait()\r
{\r
- string s;\r
- s = ReadString();\r
+ // receives portrait values, which are used in Sbar_Portrait\r
+\r
+ string pl_model, pl_name, img;\r
+ float pl_skin;\r
+\r
+ pl_model = ReadString();\r
+ pl_skin = ReadByte();\r
+ pl_name = ReadString();\r
+\r
+ // update existing portraits\r
+ if(portrait_name)\r
+ strunzone(portrait_name);\r
+ if(portrait_image)\r
+ strunzone(portrait_image);\r
+\r
+ portrait_time = time;\r
+ portrait_name = strzone(pl_name);\r
+\r
+ // obtain the image name from the text file\r
+ float glob, i, fh;\r
+ string fn;\r
\r
- dprint(strcat(s, " --------\n"));\r
+ glob = search_begin("models/player/*.txt", TRUE, TRUE);\r
+ if(glob < 0)\r
+ return;\r
+ for(i = 0; i < search_getsize(glob); ++i)\r
+ {\r
+ fn = search_getfilename(glob, i);\r
+ fh = fopen(fn, FILE_READ);\r
+ if(fh < 0)\r
+ continue;\r
+\r
+ fgets(fh); // skip name\r
+ img = fgets(fh);\r
+ if(pl_skin == stof(fgets(fh)))\r
+ if(pl_model == fgets(fh))\r
+ portrait_image = strzone(img);\r
+\r
+ fclose(fh);\r
+ }\r
+ search_end(glob);\r
}\r
projects / voretournament / voretournament.git / blobdiff