X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sbar.c;h=28d7f604e48b936b2f33eb290e31c78580eeb3a8;hp=e0c7ec870faa04e36ab2df6b0f612788c7f6c4c7;hb=2c92bb5623c37c0fcbc64e6d3a6e6a3febc9ce5b;hpb=353e8145caaa147fc7a469a7081f93cbd0966d57 diff --git a/sbar.c b/sbar.c index e0c7ec87..28d7f604 100644 --- a/sbar.c +++ b/sbar.c @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // sbar.c -- status bar code #include "quakedef.h" +#include "time.h" cachepic_t *sb_disc; @@ -88,6 +89,10 @@ cachepic_t *sb_inter; cachepic_t *sb_finale; cvar_t showfps = {CVAR_SAVE, "showfps", "0", "shows your rendered fps (frames per second)"}; +cvar_t showsound = {CVAR_SAVE, "showsound", "0", "shows number of active sound sources, sound latency, and other statistics"}; +cvar_t showblur = {CVAR_SAVE, "showblur", "0", "shows the current alpha level of motionblur"}; +cvar_t showspeed = {CVAR_SAVE, "showspeed", "0", "shows your current speed (qu per second); number selects unit: 1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots"}; +cvar_t showtopspeed = {CVAR_SAVE, "showtopspeed", "0", "shows your top speed (kept on screen for max 3 seconds); value -1 takes over the unit from showspeed, otherwise it's an unit number just like in showspeed"}; cvar_t showtime = {CVAR_SAVE, "showtime", "0", "shows current time of day (useful on screenshots)"}; cvar_t showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S", "format string for time of day"}; cvar_t showdate = {CVAR_SAVE, "showdate", "0", "shows current date (useful on screenshots)"}; @@ -95,7 +100,12 @@ cvar_t showdate_format = {CVAR_SAVE, "showdate_format", "%Y-%m-%d", "format stri cvar_t sbar_alpha_bg = {CVAR_SAVE, "sbar_alpha_bg", "0.4", "opacity value of the statusbar background image"}; cvar_t sbar_alpha_fg = {CVAR_SAVE, "sbar_alpha_fg", "1", "opacity value of the statusbar weapon/item icons and numbers"}; cvar_t sbar_hudselector = {CVAR_SAVE, "sbar_hudselector", "0", "selects which of the builtin hud layouts to use (meaning is somewhat dependent on gamemode, so nexuiz has a very different set of hud layouts than quake for example)"}; +cvar_t sbar_scorerank = {CVAR_SAVE, "sbar_scorerank", "1", "shows an overlay for your score (or team score) and rank in the scoreboard"}; +cvar_t sbar_gametime = {CVAR_SAVE, "sbar_gametime", "1", "shows an overlay for the time left in the current match/level (or current game time if there is no timelimit set)"}; cvar_t sbar_miniscoreboard_size = {CVAR_SAVE, "sbar_miniscoreboard_size", "-1", "sets the size of the mini deathmatch overlay in items, or disables it when set to 0, or sets it to a sane default when set to -1"}; +cvar_t sbar_flagstatus_right = {CVAR_SAVE, "sbar_flagstatus_right", "0", "moves Nexuiz flag status icons to the right"}; +cvar_t sbar_flagstatus_pos = {CVAR_SAVE, "sbar_flagstatus_pos", "115", "pixel position of the Nexuiz flag status icons, from the bottom"}; +cvar_t sbar_info_pos = {CVAR_SAVE, "sbar_info_pos", "0", "pixel position of the info strings (such as showfps), from the bottom"}; cvar_t cl_deathscoreboard = {0, "cl_deathscoreboard", "1", "shows scoreboard (+showscores) while dead"}; @@ -145,214 +155,214 @@ void sbar_start(void) { int i; - if (gamemode == GAME_NETHERWORLD) + if (gamemode == GAME_DELUXEQUAKE || gamemode == GAME_BLOODOMNICIDE) { } else if (gamemode == GAME_SOM) { - sb_disc = Draw_CachePic("gfx/disc", true); + sb_disc = Draw_CachePic_Flags ("gfx/disc", CACHEPICFLAG_QUIET); for (i = 0;i < 10;i++) - sb_nums[0][i] = Draw_CachePic (va("gfx/num_%i",i), true); - - somsb_health = Draw_CachePic("gfx/hud_health", true); - somsb_ammo[0] = Draw_CachePic("gfx/sb_shells", true); - somsb_ammo[1] = Draw_CachePic("gfx/sb_nails", true); - somsb_ammo[2] = Draw_CachePic("gfx/sb_rocket", true); - somsb_ammo[3] = Draw_CachePic("gfx/sb_cells", true); - somsb_armor[0] = Draw_CachePic("gfx/sb_armor1", true); - somsb_armor[1] = Draw_CachePic("gfx/sb_armor2", true); - somsb_armor[2] = Draw_CachePic("gfx/sb_armor3", true); + sb_nums[0][i] = Draw_CachePic_Flags (va("gfx/num_%i",i), CACHEPICFLAG_QUIET); + + somsb_health = Draw_CachePic_Flags ("gfx/hud_health", CACHEPICFLAG_QUIET); + somsb_ammo[0] = Draw_CachePic_Flags ("gfx/sb_shells", CACHEPICFLAG_QUIET); + somsb_ammo[1] = Draw_CachePic_Flags ("gfx/sb_nails", CACHEPICFLAG_QUIET); + somsb_ammo[2] = Draw_CachePic_Flags ("gfx/sb_rocket", CACHEPICFLAG_QUIET); + somsb_ammo[3] = Draw_CachePic_Flags ("gfx/sb_cells", CACHEPICFLAG_QUIET); + somsb_armor[0] = Draw_CachePic_Flags ("gfx/sb_armor1", CACHEPICFLAG_QUIET); + somsb_armor[1] = Draw_CachePic_Flags ("gfx/sb_armor2", CACHEPICFLAG_QUIET); + somsb_armor[2] = Draw_CachePic_Flags ("gfx/sb_armor3", CACHEPICFLAG_QUIET); } else if (gamemode == GAME_NEXUIZ) { for (i = 0;i < 10;i++) - sb_nums[0][i] = Draw_CachePic (va("gfx/num_%i",i), true); - sb_nums[0][10] = Draw_CachePic ("gfx/num_minus", true); - sb_colon = Draw_CachePic ("gfx/num_colon", true); + sb_nums[0][i] = Draw_CachePic_Flags (va("gfx/num_%i",i), CACHEPICFLAG_QUIET); + sb_nums[0][10] = Draw_CachePic_Flags ("gfx/num_minus", CACHEPICFLAG_QUIET); + sb_colon = Draw_CachePic_Flags ("gfx/num_colon", CACHEPICFLAG_QUIET); - sb_ammo[0] = Draw_CachePic ("gfx/sb_shells", true); - sb_ammo[1] = Draw_CachePic ("gfx/sb_bullets", true); - sb_ammo[2] = Draw_CachePic ("gfx/sb_rocket", true); - sb_ammo[3] = Draw_CachePic ("gfx/sb_cells", true); + sb_ammo[0] = Draw_CachePic_Flags ("gfx/sb_shells", CACHEPICFLAG_QUIET); + sb_ammo[1] = Draw_CachePic_Flags ("gfx/sb_bullets", CACHEPICFLAG_QUIET); + sb_ammo[2] = Draw_CachePic_Flags ("gfx/sb_rocket", CACHEPICFLAG_QUIET); + sb_ammo[3] = Draw_CachePic_Flags ("gfx/sb_cells", CACHEPICFLAG_QUIET); - sb_armor[0] = Draw_CachePic ("gfx/sb_armor", true); + sb_armor[0] = Draw_CachePic_Flags ("gfx/sb_armor", CACHEPICFLAG_QUIET); sb_armor[1] = NULL; sb_armor[2] = NULL; - sb_health = Draw_CachePic ("gfx/sb_health", true); + sb_health = Draw_CachePic_Flags ("gfx/sb_health", CACHEPICFLAG_QUIET); - sb_items[2] = Draw_CachePic ("gfx/sb_slowmo", true); - sb_items[3] = Draw_CachePic ("gfx/sb_invinc", true); - sb_items[4] = Draw_CachePic ("gfx/sb_energy", true); - sb_items[5] = Draw_CachePic ("gfx/sb_str", true); + sb_items[2] = Draw_CachePic_Flags ("gfx/sb_slowmo", CACHEPICFLAG_QUIET); + sb_items[3] = Draw_CachePic_Flags ("gfx/sb_invinc", CACHEPICFLAG_QUIET); + sb_items[4] = Draw_CachePic_Flags ("gfx/sb_energy", CACHEPICFLAG_QUIET); + sb_items[5] = Draw_CachePic_Flags ("gfx/sb_str", CACHEPICFLAG_QUIET); - sb_items[11] = Draw_CachePic ("gfx/sb_flag_red_taken", true); - sb_items[12] = Draw_CachePic ("gfx/sb_flag_red_lost", true); - sb_items[13] = Draw_CachePic ("gfx/sb_flag_red_carrying", true); - sb_items[14] = Draw_CachePic ("gfx/sb_key_carrying", true); - sb_items[15] = Draw_CachePic ("gfx/sb_flag_blue_taken", true); - sb_items[16] = Draw_CachePic ("gfx/sb_flag_blue_lost", true); - sb_items[17] = Draw_CachePic ("gfx/sb_flag_blue_carrying", true); + sb_items[11] = Draw_CachePic_Flags ("gfx/sb_flag_red_taken", CACHEPICFLAG_QUIET); + sb_items[12] = Draw_CachePic_Flags ("gfx/sb_flag_red_lost", CACHEPICFLAG_QUIET); + sb_items[13] = Draw_CachePic_Flags ("gfx/sb_flag_red_carrying", CACHEPICFLAG_QUIET); + sb_items[14] = Draw_CachePic_Flags ("gfx/sb_key_carrying", CACHEPICFLAG_QUIET); + sb_items[15] = Draw_CachePic_Flags ("gfx/sb_flag_blue_taken", CACHEPICFLAG_QUIET); + sb_items[16] = Draw_CachePic_Flags ("gfx/sb_flag_blue_lost", CACHEPICFLAG_QUIET); + sb_items[17] = Draw_CachePic_Flags ("gfx/sb_flag_blue_carrying", CACHEPICFLAG_QUIET); - sb_sbar = Draw_CachePic("gfx/sbar", true); - sb_sbar_minimal = Draw_CachePic("gfx/sbar_minimal", true); - sb_sbar_overlay = Draw_CachePic("gfx/sbar_overlay", true); + sb_sbar = Draw_CachePic_Flags ("gfx/sbar", CACHEPICFLAG_QUIET); + sb_sbar_minimal = Draw_CachePic_Flags ("gfx/sbar_minimal", CACHEPICFLAG_QUIET); + sb_sbar_overlay = Draw_CachePic_Flags ("gfx/sbar_overlay", CACHEPICFLAG_QUIET); for(i = 0; i < 9;i++) - sb_weapons[0][i] = Draw_CachePic(va("gfx/inv_weapon%i",i), true); + sb_weapons[0][i] = Draw_CachePic_Flags (va("gfx/inv_weapon%i",i), CACHEPICFLAG_QUIET); } else if (gamemode == GAME_ZYMOTIC) { - zymsb_crosshair_center = Draw_CachePic ("gfx/hud/crosshair_center", true); - zymsb_crosshair_line = Draw_CachePic ("gfx/hud/crosshair_line", true); - zymsb_crosshair_health = Draw_CachePic ("gfx/hud/crosshair_health", true); - zymsb_crosshair_clip = Draw_CachePic ("gfx/hud/crosshair_clip", true); - zymsb_crosshair_ammo = Draw_CachePic ("gfx/hud/crosshair_ammo", true); - zymsb_crosshair_background = Draw_CachePic ("gfx/hud/crosshair_background", true); - zymsb_crosshair_left1 = Draw_CachePic ("gfx/hud/crosshair_left1", true); - zymsb_crosshair_left2 = Draw_CachePic ("gfx/hud/crosshair_left2", true); - zymsb_crosshair_right = Draw_CachePic ("gfx/hud/crosshair_right", true); + zymsb_crosshair_center = Draw_CachePic_Flags ("gfx/hud/crosshair_center", CACHEPICFLAG_QUIET); + zymsb_crosshair_line = Draw_CachePic_Flags ("gfx/hud/crosshair_line", CACHEPICFLAG_QUIET); + zymsb_crosshair_health = Draw_CachePic_Flags ("gfx/hud/crosshair_health", CACHEPICFLAG_QUIET); + zymsb_crosshair_clip = Draw_CachePic_Flags ("gfx/hud/crosshair_clip", CACHEPICFLAG_QUIET); + zymsb_crosshair_ammo = Draw_CachePic_Flags ("gfx/hud/crosshair_ammo", CACHEPICFLAG_QUIET); + zymsb_crosshair_background = Draw_CachePic_Flags ("gfx/hud/crosshair_background", CACHEPICFLAG_QUIET); + zymsb_crosshair_left1 = Draw_CachePic_Flags ("gfx/hud/crosshair_left1", CACHEPICFLAG_QUIET); + zymsb_crosshair_left2 = Draw_CachePic_Flags ("gfx/hud/crosshair_left2", CACHEPICFLAG_QUIET); + zymsb_crosshair_right = Draw_CachePic_Flags ("gfx/hud/crosshair_right", CACHEPICFLAG_QUIET); } else { - sb_disc = Draw_CachePic("gfx/disc", true); + sb_disc = Draw_CachePic_Flags ("gfx/disc", CACHEPICFLAG_QUIET); for (i = 0;i < 10;i++) { - sb_nums[0][i] = Draw_CachePic (va("gfx/num_%i",i), true); - sb_nums[1][i] = Draw_CachePic (va("gfx/anum_%i",i), true); + sb_nums[0][i] = Draw_CachePic_Flags (va("gfx/num_%i",i), CACHEPICFLAG_QUIET); + sb_nums[1][i] = Draw_CachePic_Flags (va("gfx/anum_%i",i), CACHEPICFLAG_QUIET); } - sb_nums[0][10] = Draw_CachePic ("gfx/num_minus", true); - sb_nums[1][10] = Draw_CachePic ("gfx/anum_minus", true); + sb_nums[0][10] = Draw_CachePic_Flags ("gfx/num_minus", CACHEPICFLAG_QUIET); + sb_nums[1][10] = Draw_CachePic_Flags ("gfx/anum_minus", CACHEPICFLAG_QUIET); - sb_colon = Draw_CachePic ("gfx/num_colon", true); - sb_slash = Draw_CachePic ("gfx/num_slash", true); + sb_colon = Draw_CachePic_Flags ("gfx/num_colon", CACHEPICFLAG_QUIET); + sb_slash = Draw_CachePic_Flags ("gfx/num_slash", CACHEPICFLAG_QUIET); - sb_weapons[0][0] = Draw_CachePic ("gfx/inv_shotgun", true); - sb_weapons[0][1] = Draw_CachePic ("gfx/inv_sshotgun", true); - sb_weapons[0][2] = Draw_CachePic ("gfx/inv_nailgun", true); - sb_weapons[0][3] = Draw_CachePic ("gfx/inv_snailgun", true); - sb_weapons[0][4] = Draw_CachePic ("gfx/inv_rlaunch", true); - sb_weapons[0][5] = Draw_CachePic ("gfx/inv_srlaunch", true); - sb_weapons[0][6] = Draw_CachePic ("gfx/inv_lightng", true); + sb_weapons[0][0] = Draw_CachePic_Flags ("gfx/inv_shotgun", CACHEPICFLAG_QUIET); + sb_weapons[0][1] = Draw_CachePic_Flags ("gfx/inv_sshotgun", CACHEPICFLAG_QUIET); + sb_weapons[0][2] = Draw_CachePic_Flags ("gfx/inv_nailgun", CACHEPICFLAG_QUIET); + sb_weapons[0][3] = Draw_CachePic_Flags ("gfx/inv_snailgun", CACHEPICFLAG_QUIET); + sb_weapons[0][4] = Draw_CachePic_Flags ("gfx/inv_rlaunch", CACHEPICFLAG_QUIET); + sb_weapons[0][5] = Draw_CachePic_Flags ("gfx/inv_srlaunch", CACHEPICFLAG_QUIET); + sb_weapons[0][6] = Draw_CachePic_Flags ("gfx/inv_lightng", CACHEPICFLAG_QUIET); - sb_weapons[1][0] = Draw_CachePic ("gfx/inv2_shotgun", true); - sb_weapons[1][1] = Draw_CachePic ("gfx/inv2_sshotgun", true); - sb_weapons[1][2] = Draw_CachePic ("gfx/inv2_nailgun", true); - sb_weapons[1][3] = Draw_CachePic ("gfx/inv2_snailgun", true); - sb_weapons[1][4] = Draw_CachePic ("gfx/inv2_rlaunch", true); - sb_weapons[1][5] = Draw_CachePic ("gfx/inv2_srlaunch", true); - sb_weapons[1][6] = Draw_CachePic ("gfx/inv2_lightng", true); + sb_weapons[1][0] = Draw_CachePic_Flags ("gfx/inv2_shotgun", CACHEPICFLAG_QUIET); + sb_weapons[1][1] = Draw_CachePic_Flags ("gfx/inv2_sshotgun", CACHEPICFLAG_QUIET); + sb_weapons[1][2] = Draw_CachePic_Flags ("gfx/inv2_nailgun", CACHEPICFLAG_QUIET); + sb_weapons[1][3] = Draw_CachePic_Flags ("gfx/inv2_snailgun", CACHEPICFLAG_QUIET); + sb_weapons[1][4] = Draw_CachePic_Flags ("gfx/inv2_rlaunch", CACHEPICFLAG_QUIET); + sb_weapons[1][5] = Draw_CachePic_Flags ("gfx/inv2_srlaunch", CACHEPICFLAG_QUIET); + sb_weapons[1][6] = Draw_CachePic_Flags ("gfx/inv2_lightng", CACHEPICFLAG_QUIET); for (i = 0;i < 5;i++) { - sb_weapons[2+i][0] = Draw_CachePic (va("gfx/inva%i_shotgun",i+1), true); - sb_weapons[2+i][1] = Draw_CachePic (va("gfx/inva%i_sshotgun",i+1), true); - sb_weapons[2+i][2] = Draw_CachePic (va("gfx/inva%i_nailgun",i+1), true); - sb_weapons[2+i][3] = Draw_CachePic (va("gfx/inva%i_snailgun",i+1), true); - sb_weapons[2+i][4] = Draw_CachePic (va("gfx/inva%i_rlaunch",i+1), true); - sb_weapons[2+i][5] = Draw_CachePic (va("gfx/inva%i_srlaunch",i+1), true); - sb_weapons[2+i][6] = Draw_CachePic (va("gfx/inva%i_lightng",i+1), true); + sb_weapons[2+i][0] = Draw_CachePic_Flags (va("gfx/inva%i_shotgun",i+1), CACHEPICFLAG_QUIET); + sb_weapons[2+i][1] = Draw_CachePic_Flags (va("gfx/inva%i_sshotgun",i+1), CACHEPICFLAG_QUIET); + sb_weapons[2+i][2] = Draw_CachePic_Flags (va("gfx/inva%i_nailgun",i+1), CACHEPICFLAG_QUIET); + sb_weapons[2+i][3] = Draw_CachePic_Flags (va("gfx/inva%i_snailgun",i+1), CACHEPICFLAG_QUIET); + sb_weapons[2+i][4] = Draw_CachePic_Flags (va("gfx/inva%i_rlaunch",i+1), CACHEPICFLAG_QUIET); + sb_weapons[2+i][5] = Draw_CachePic_Flags (va("gfx/inva%i_srlaunch",i+1), CACHEPICFLAG_QUIET); + sb_weapons[2+i][6] = Draw_CachePic_Flags (va("gfx/inva%i_lightng",i+1), CACHEPICFLAG_QUIET); } - sb_ammo[0] = Draw_CachePic ("gfx/sb_shells", true); - sb_ammo[1] = Draw_CachePic ("gfx/sb_nails", true); - sb_ammo[2] = Draw_CachePic ("gfx/sb_rocket", true); - sb_ammo[3] = Draw_CachePic ("gfx/sb_cells", true); - - sb_armor[0] = Draw_CachePic ("gfx/sb_armor1", true); - sb_armor[1] = Draw_CachePic ("gfx/sb_armor2", true); - sb_armor[2] = Draw_CachePic ("gfx/sb_armor3", true); - - sb_items[0] = Draw_CachePic ("gfx/sb_key1", true); - sb_items[1] = Draw_CachePic ("gfx/sb_key2", true); - sb_items[2] = Draw_CachePic ("gfx/sb_invis", true); - sb_items[3] = Draw_CachePic ("gfx/sb_invuln", true); - sb_items[4] = Draw_CachePic ("gfx/sb_suit", true); - sb_items[5] = Draw_CachePic ("gfx/sb_quad", true); - - sb_sigil[0] = Draw_CachePic ("gfx/sb_sigil1", true); - sb_sigil[1] = Draw_CachePic ("gfx/sb_sigil2", true); - sb_sigil[2] = Draw_CachePic ("gfx/sb_sigil3", true); - sb_sigil[3] = Draw_CachePic ("gfx/sb_sigil4", true); - - sb_faces[4][0] = Draw_CachePic ("gfx/face1", true); - sb_faces[4][1] = Draw_CachePic ("gfx/face_p1", true); - sb_faces[3][0] = Draw_CachePic ("gfx/face2", true); - sb_faces[3][1] = Draw_CachePic ("gfx/face_p2", true); - sb_faces[2][0] = Draw_CachePic ("gfx/face3", true); - sb_faces[2][1] = Draw_CachePic ("gfx/face_p3", true); - sb_faces[1][0] = Draw_CachePic ("gfx/face4", true); - sb_faces[1][1] = Draw_CachePic ("gfx/face_p4", true); - sb_faces[0][0] = Draw_CachePic ("gfx/face5", true); - sb_faces[0][1] = Draw_CachePic ("gfx/face_p5", true); - - sb_face_invis = Draw_CachePic ("gfx/face_invis", true); - sb_face_invuln = Draw_CachePic ("gfx/face_invul2", true); - sb_face_invis_invuln = Draw_CachePic ("gfx/face_inv2", true); - sb_face_quad = Draw_CachePic ("gfx/face_quad", true); - - sb_sbar = Draw_CachePic ("gfx/sbar", true); - sb_ibar = Draw_CachePic ("gfx/ibar", true); - sb_scorebar = Draw_CachePic ("gfx/scorebar", true); + sb_ammo[0] = Draw_CachePic_Flags ("gfx/sb_shells", CACHEPICFLAG_QUIET); + sb_ammo[1] = Draw_CachePic_Flags ("gfx/sb_nails", CACHEPICFLAG_QUIET); + sb_ammo[2] = Draw_CachePic_Flags ("gfx/sb_rocket", CACHEPICFLAG_QUIET); + sb_ammo[3] = Draw_CachePic_Flags ("gfx/sb_cells", CACHEPICFLAG_QUIET); + + sb_armor[0] = Draw_CachePic_Flags ("gfx/sb_armor1", CACHEPICFLAG_QUIET); + sb_armor[1] = Draw_CachePic_Flags ("gfx/sb_armor2", CACHEPICFLAG_QUIET); + sb_armor[2] = Draw_CachePic_Flags ("gfx/sb_armor3", CACHEPICFLAG_QUIET); + + sb_items[0] = Draw_CachePic_Flags ("gfx/sb_key1", CACHEPICFLAG_QUIET); + sb_items[1] = Draw_CachePic_Flags ("gfx/sb_key2", CACHEPICFLAG_QUIET); + sb_items[2] = Draw_CachePic_Flags ("gfx/sb_invis", CACHEPICFLAG_QUIET); + sb_items[3] = Draw_CachePic_Flags ("gfx/sb_invuln", CACHEPICFLAG_QUIET); + sb_items[4] = Draw_CachePic_Flags ("gfx/sb_suit", CACHEPICFLAG_QUIET); + sb_items[5] = Draw_CachePic_Flags ("gfx/sb_quad", CACHEPICFLAG_QUIET); + + sb_sigil[0] = Draw_CachePic_Flags ("gfx/sb_sigil1", CACHEPICFLAG_QUIET); + sb_sigil[1] = Draw_CachePic_Flags ("gfx/sb_sigil2", CACHEPICFLAG_QUIET); + sb_sigil[2] = Draw_CachePic_Flags ("gfx/sb_sigil3", CACHEPICFLAG_QUIET); + sb_sigil[3] = Draw_CachePic_Flags ("gfx/sb_sigil4", CACHEPICFLAG_QUIET); + + sb_faces[4][0] = Draw_CachePic_Flags ("gfx/face1", CACHEPICFLAG_QUIET); + sb_faces[4][1] = Draw_CachePic_Flags ("gfx/face_p1", CACHEPICFLAG_QUIET); + sb_faces[3][0] = Draw_CachePic_Flags ("gfx/face2", CACHEPICFLAG_QUIET); + sb_faces[3][1] = Draw_CachePic_Flags ("gfx/face_p2", CACHEPICFLAG_QUIET); + sb_faces[2][0] = Draw_CachePic_Flags ("gfx/face3", CACHEPICFLAG_QUIET); + sb_faces[2][1] = Draw_CachePic_Flags ("gfx/face_p3", CACHEPICFLAG_QUIET); + sb_faces[1][0] = Draw_CachePic_Flags ("gfx/face4", CACHEPICFLAG_QUIET); + sb_faces[1][1] = Draw_CachePic_Flags ("gfx/face_p4", CACHEPICFLAG_QUIET); + sb_faces[0][0] = Draw_CachePic_Flags ("gfx/face5", CACHEPICFLAG_QUIET); + sb_faces[0][1] = Draw_CachePic_Flags ("gfx/face_p5", CACHEPICFLAG_QUIET); + + sb_face_invis = Draw_CachePic_Flags ("gfx/face_invis", CACHEPICFLAG_QUIET); + sb_face_invuln = Draw_CachePic_Flags ("gfx/face_invul2", CACHEPICFLAG_QUIET); + sb_face_invis_invuln = Draw_CachePic_Flags ("gfx/face_inv2", CACHEPICFLAG_QUIET); + sb_face_quad = Draw_CachePic_Flags ("gfx/face_quad", CACHEPICFLAG_QUIET); + + sb_sbar = Draw_CachePic_Flags ("gfx/sbar", CACHEPICFLAG_QUIET); + sb_ibar = Draw_CachePic_Flags ("gfx/ibar", CACHEPICFLAG_QUIET); + sb_scorebar = Draw_CachePic_Flags ("gfx/scorebar", CACHEPICFLAG_QUIET); //MED 01/04/97 added new hipnotic weapons if (gamemode == GAME_HIPNOTIC) { - hsb_weapons[0][0] = Draw_CachePic ("gfx/inv_laser", true); - hsb_weapons[0][1] = Draw_CachePic ("gfx/inv_mjolnir", true); - hsb_weapons[0][2] = Draw_CachePic ("gfx/inv_gren_prox", true); - hsb_weapons[0][3] = Draw_CachePic ("gfx/inv_prox_gren", true); - hsb_weapons[0][4] = Draw_CachePic ("gfx/inv_prox", true); - - hsb_weapons[1][0] = Draw_CachePic ("gfx/inv2_laser", true); - hsb_weapons[1][1] = Draw_CachePic ("gfx/inv2_mjolnir", true); - hsb_weapons[1][2] = Draw_CachePic ("gfx/inv2_gren_prox", true); - hsb_weapons[1][3] = Draw_CachePic ("gfx/inv2_prox_gren", true); - hsb_weapons[1][4] = Draw_CachePic ("gfx/inv2_prox", true); + hsb_weapons[0][0] = Draw_CachePic_Flags ("gfx/inv_laser", CACHEPICFLAG_QUIET); + hsb_weapons[0][1] = Draw_CachePic_Flags ("gfx/inv_mjolnir", CACHEPICFLAG_QUIET); + hsb_weapons[0][2] = Draw_CachePic_Flags ("gfx/inv_gren_prox", CACHEPICFLAG_QUIET); + hsb_weapons[0][3] = Draw_CachePic_Flags ("gfx/inv_prox_gren", CACHEPICFLAG_QUIET); + hsb_weapons[0][4] = Draw_CachePic_Flags ("gfx/inv_prox", CACHEPICFLAG_QUIET); + + hsb_weapons[1][0] = Draw_CachePic_Flags ("gfx/inv2_laser", CACHEPICFLAG_QUIET); + hsb_weapons[1][1] = Draw_CachePic_Flags ("gfx/inv2_mjolnir", CACHEPICFLAG_QUIET); + hsb_weapons[1][2] = Draw_CachePic_Flags ("gfx/inv2_gren_prox", CACHEPICFLAG_QUIET); + hsb_weapons[1][3] = Draw_CachePic_Flags ("gfx/inv2_prox_gren", CACHEPICFLAG_QUIET); + hsb_weapons[1][4] = Draw_CachePic_Flags ("gfx/inv2_prox", CACHEPICFLAG_QUIET); for (i = 0;i < 5;i++) { - hsb_weapons[2+i][0] = Draw_CachePic (va("gfx/inva%i_laser",i+1), true); - hsb_weapons[2+i][1] = Draw_CachePic (va("gfx/inva%i_mjolnir",i+1), true); - hsb_weapons[2+i][2] = Draw_CachePic (va("gfx/inva%i_gren_prox",i+1), true); - hsb_weapons[2+i][3] = Draw_CachePic (va("gfx/inva%i_prox_gren",i+1), true); - hsb_weapons[2+i][4] = Draw_CachePic (va("gfx/inva%i_prox",i+1), true); + hsb_weapons[2+i][0] = Draw_CachePic_Flags (va("gfx/inva%i_laser",i+1), CACHEPICFLAG_QUIET); + hsb_weapons[2+i][1] = Draw_CachePic_Flags (va("gfx/inva%i_mjolnir",i+1), CACHEPICFLAG_QUIET); + hsb_weapons[2+i][2] = Draw_CachePic_Flags (va("gfx/inva%i_gren_prox",i+1), CACHEPICFLAG_QUIET); + hsb_weapons[2+i][3] = Draw_CachePic_Flags (va("gfx/inva%i_prox_gren",i+1), CACHEPICFLAG_QUIET); + hsb_weapons[2+i][4] = Draw_CachePic_Flags (va("gfx/inva%i_prox",i+1), CACHEPICFLAG_QUIET); } - hsb_items[0] = Draw_CachePic ("gfx/sb_wsuit", true); - hsb_items[1] = Draw_CachePic ("gfx/sb_eshld", true); + hsb_items[0] = Draw_CachePic_Flags ("gfx/sb_wsuit", CACHEPICFLAG_QUIET); + hsb_items[1] = Draw_CachePic_Flags ("gfx/sb_eshld", CACHEPICFLAG_QUIET); } else if (gamemode == GAME_ROGUE) { - rsb_invbar[0] = Draw_CachePic ("gfx/r_invbar1", true); - rsb_invbar[1] = Draw_CachePic ("gfx/r_invbar2", true); + rsb_invbar[0] = Draw_CachePic_Flags ("gfx/r_invbar1", CACHEPICFLAG_QUIET); + rsb_invbar[1] = Draw_CachePic_Flags ("gfx/r_invbar2", CACHEPICFLAG_QUIET); - rsb_weapons[0] = Draw_CachePic ("gfx/r_lava", true); - rsb_weapons[1] = Draw_CachePic ("gfx/r_superlava", true); - rsb_weapons[2] = Draw_CachePic ("gfx/r_gren", true); - rsb_weapons[3] = Draw_CachePic ("gfx/r_multirock", true); - rsb_weapons[4] = Draw_CachePic ("gfx/r_plasma", true); + rsb_weapons[0] = Draw_CachePic_Flags ("gfx/r_lava", CACHEPICFLAG_QUIET); + rsb_weapons[1] = Draw_CachePic_Flags ("gfx/r_superlava", CACHEPICFLAG_QUIET); + rsb_weapons[2] = Draw_CachePic_Flags ("gfx/r_gren", CACHEPICFLAG_QUIET); + rsb_weapons[3] = Draw_CachePic_Flags ("gfx/r_multirock", CACHEPICFLAG_QUIET); + rsb_weapons[4] = Draw_CachePic_Flags ("gfx/r_plasma", CACHEPICFLAG_QUIET); - rsb_items[0] = Draw_CachePic ("gfx/r_shield1", true); - rsb_items[1] = Draw_CachePic ("gfx/r_agrav1", true); + rsb_items[0] = Draw_CachePic_Flags ("gfx/r_shield1", CACHEPICFLAG_QUIET); + rsb_items[1] = Draw_CachePic_Flags ("gfx/r_agrav1", CACHEPICFLAG_QUIET); // PGM 01/19/97 - team color border - rsb_teambord = Draw_CachePic ("gfx/r_teambord", true); + rsb_teambord = Draw_CachePic_Flags ("gfx/r_teambord", CACHEPICFLAG_QUIET); // PGM 01/19/97 - team color border - rsb_ammo[0] = Draw_CachePic ("gfx/r_ammolava", true); - rsb_ammo[1] = Draw_CachePic ("gfx/r_ammomulti", true); - rsb_ammo[2] = Draw_CachePic ("gfx/r_ammoplasma", true); + rsb_ammo[0] = Draw_CachePic_Flags ("gfx/r_ammolava", CACHEPICFLAG_QUIET); + rsb_ammo[1] = Draw_CachePic_Flags ("gfx/r_ammomulti", CACHEPICFLAG_QUIET); + rsb_ammo[2] = Draw_CachePic_Flags ("gfx/r_ammoplasma", CACHEPICFLAG_QUIET); } } - sb_ranking = Draw_CachePic ("gfx/ranking", true); - sb_complete = Draw_CachePic ("gfx/complete", true); - sb_inter = Draw_CachePic ("gfx/inter", true); - sb_finale = Draw_CachePic ("gfx/finale", true); + sb_ranking = Draw_CachePic_Flags ("gfx/ranking", CACHEPICFLAG_QUIET); + sb_complete = Draw_CachePic_Flags ("gfx/complete", CACHEPICFLAG_QUIET); + sb_inter = Draw_CachePic_Flags ("gfx/inter", CACHEPICFLAG_QUIET); + sb_finale = Draw_CachePic_Flags ("gfx/finale", CACHEPICFLAG_QUIET); } void sbar_shutdown(void) @@ -368,6 +378,10 @@ void Sbar_Init (void) Cmd_AddCommand("+showscores", Sbar_ShowScores, "show scoreboard"); Cmd_AddCommand("-showscores", Sbar_DontShowScores, "hide scoreboard"); Cvar_RegisterVariable(&showfps); + Cvar_RegisterVariable(&showsound); + Cvar_RegisterVariable(&showblur); + Cvar_RegisterVariable(&showspeed); + Cvar_RegisterVariable(&showtopspeed); Cvar_RegisterVariable(&showtime); Cvar_RegisterVariable(&showtime_format); Cvar_RegisterVariable(&showdate); @@ -375,7 +389,10 @@ void Sbar_Init (void) Cvar_RegisterVariable(&sbar_alpha_bg); Cvar_RegisterVariable(&sbar_alpha_fg); Cvar_RegisterVariable(&sbar_hudselector); + Cvar_RegisterVariable(&sbar_scorerank); + Cvar_RegisterVariable(&sbar_gametime); Cvar_RegisterVariable(&sbar_miniscoreboard_size); + Cvar_RegisterVariable(&sbar_info_pos); Cvar_RegisterVariable(&cl_deathscoreboard); Cvar_RegisterVariable(&crosshair_color_red); @@ -384,7 +401,10 @@ void Sbar_Init (void) Cvar_RegisterVariable(&crosshair_color_alpha); Cvar_RegisterVariable(&crosshair_size); - R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap); + Cvar_RegisterVariable(&sbar_flagstatus_right); // (GAME_NEXUZI ONLY) + Cvar_RegisterVariable(&sbar_flagstatus_pos); // (GAME_NEXUIZ ONLY) + + R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap, NULL, NULL); } @@ -423,7 +443,7 @@ Draws one solid graphics character */ void Sbar_DrawCharacter (int x, int y, int num) { - DrawQ_String (sbar_x + x + 4 , sbar_y + y, va("%c", num), 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0, NULL, true); + DrawQ_String (sbar_x + x + 4 , sbar_y + y, va("%c", num), 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0, NULL, true, FONT_SBAR); } /* @@ -433,7 +453,7 @@ Sbar_DrawString */ void Sbar_DrawString (int x, int y, char *str) { - DrawQ_String (sbar_x + x, sbar_y + y, str, 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0, NULL, false); + DrawQ_String (sbar_x + x, sbar_y + y, str, 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR); } /* @@ -446,7 +466,7 @@ void Sbar_DrawNum (int x, int y, int num, int digits, int color) char str[32], *ptr; int l, frame; - l = sprintf(str, "%i", num); + l = dpsnprintf(str, sizeof(str), "%i", num); ptr = str; if (l > digits) ptr += (l-digits); @@ -481,10 +501,10 @@ void Sbar_DrawXNum (int x, int y, int num, int digits, int lettersize, float r, if (digits < 0) { digits = -digits; - l = sprintf(str, "%0*i", digits, num); + l = dpsnprintf(str, sizeof(str), "%0*i", digits, num); } else - l = sprintf(str, "%i", num); + l = dpsnprintf(str, sizeof(str), "%i", num); ptr = str; if (l > digits) ptr += (l-digits); @@ -508,7 +528,7 @@ void Sbar_DrawXNum (int x, int y, int num, int digits, int lettersize, float r, //============================================================================= -int Sbar_IsTeammatch() +int Sbar_IsTeammatch(void) { // currently only nexuiz uses the team score board return ((gamemode == GAME_NEXUIZ) @@ -523,19 +543,9 @@ Sbar_SortFrags static int fragsort[MAX_SCOREBOARD]; static int scoreboardlines; -//[515]: Sbar_GetPlayer for csqc "getplayerkey" func -int Sbar_GetPlayer (int index) +int Sbar_GetSortedPlayerIndex (int index) { - if(index < 0) - { - index = -1-index; - if(index >= scoreboardlines) - return -1; - index = fragsort[index]; - } - if(index >= scoreboardlines) - return -1; - return index; + return index >= 0 && index < scoreboardlines ? fragsort[index] : -1; } static scoreboard_t teams[MAX_SCOREBOARD]; @@ -663,24 +673,23 @@ void Sbar_SoloScoreboard (void) // monsters and secrets are now both on the top row if (cl.stats[STAT_TOTALMONSTERS]) Sbar_DrawString(8, 4, va("Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS])); + else if (cl.stats[STAT_MONSTERS]) // LA: Display something if monsters_killed is non-zero, but total_monsters is zero + Sbar_DrawString(8, 4, va("Monsters:%3i", cl.stats[STAT_MONSTERS])); + if (cl.stats[STAT_TOTALSECRETS]) Sbar_DrawString(8+22*8, 4, va("Secrets:%3i /%3i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS])); + else if (cl.stats[STAT_SECRETS]) // LA: And similarly for secrets + Sbar_DrawString(8+22*8, 4, va("Secrets:%3i", cl.stats[STAT_SECRETS])); - // figure out the map's filename without path or extension - strlcpy(str, FS_FileWithoutPath(cl.worldmodel ? cl.worldmodel->name : ""), sizeof(str)); - if (strrchr(str, '.')) - *(strrchr(str, '.')) = 0; - - // append a : separator and then the full title - strlcat(str, ":", sizeof(str)); - strlcat(str, cl.levelname, sizeof(str)); + // format is like this: e1m1:The Sligpate Complex + dpsnprintf(str, sizeof(str), "%s:%s", cl.worldbasename, cl.worldmessage); // if there's a newline character, terminate the string there if (strchr(str, '\n')) *(strchr(str, '\n')) = 0; // make the time string - timelen = sprintf(timestr, " %i:%02i", minutes, seconds); + timelen = dpsnprintf(timestr, sizeof(timestr), " %i:%02i", minutes, seconds); // truncate the level name if necessary to make room for time max = 38 - timelen; @@ -699,10 +708,10 @@ void Sbar_SoloScoreboard (void) int l; if (gamemode != GAME_NEXUIZ) { - sprintf (str,"Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]); + dpsnprintf (str, sizeof(str), "Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]); Sbar_DrawString (8, 4, str); - sprintf (str,"Secrets :%3i /%3i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]); + dpsnprintf (str, sizeof(str), "Secrets :%3i /%3i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]); Sbar_DrawString (8, 12, str); } @@ -711,16 +720,16 @@ void Sbar_SoloScoreboard (void) seconds = (int)(cl.time - 60*minutes); tens = seconds / 10; units = seconds - 10*tens; - sprintf (str,"Time :%3i:%i%i", minutes, tens, units); + dpsnprintf (str, sizeof(str), "Time :%3i:%i%i", minutes, tens, units); Sbar_DrawString (184, 4, str); // draw level name if (gamemode == GAME_NEXUIZ) { - l = (int) strlen (cl.worldmodel->name); - Sbar_DrawString (232 - l*4, 12, cl.worldmodel->name); + l = (int) strlen (cl.worldname); + Sbar_DrawString (232 - l*4, 12, cl.worldname); } else { - l = (int) strlen (cl.levelname); - Sbar_DrawString (232 - l*4, 12, cl.levelname); + l = (int) strlen (cl.worldmessage); + Sbar_DrawString (232 - l*4, 12, cl.worldmessage); } #endif } @@ -750,7 +759,8 @@ static void Sbar_DrawWeapon(int nr, float fade, int active) const int w_width = 32, w_height = 12, w_space = 2, font_size = 8; DrawQ_Pic((vid_conwidth.integer - w_width * 9) * 0.5 + w_width * nr, vid_conheight.integer - w_height, sb_weapons[0][nr], w_width, w_height, (active) ? 1 : 0.6, active ? 1 : 0.6, active ? 1 : 0.6, (active ? 1 : 0.6) * fade * sbar_alpha_fg.value, DRAWFLAG_NORMAL); - DrawQ_String((vid_conwidth.integer - w_width * 9) * 0.5 + w_width * nr + w_space, vid_conheight.integer - w_height + w_space, va("%i",nr+1), 0, font_size, font_size, 1, 1, 0, sbar_alpha_fg.value, 0, NULL, true); + // FIXME ?? + DrawQ_String((vid_conwidth.integer - w_width * 9) * 0.5 + w_width * nr + w_space, vid_conheight.integer - w_height + w_space, va("%i",nr+1), 0, font_size, font_size, 1, 1, 0, sbar_alpha_fg.value, 0, NULL, true, FONT_DEFAULT); } else { @@ -759,7 +769,7 @@ static void Sbar_DrawWeapon(int nr, float fade, int active) const float w_scale = 0.4; DrawQ_Pic(vid_conwidth.integer - (w_width + w_space) * w_scale, (w_height + w_space) * w_scale * nr + w_space, sb_weapons[0][nr], w_width * w_scale, w_height * w_scale, (active) ? 1 : 0.6, active ? 1 : 0.6, active ? 1 : 1, fade * sbar_alpha_fg.value, DRAWFLAG_NORMAL); - //DrawQ_String(vid_conwidth.integer - (w_space + font_size ), (w_height + w_space) * w_scale * nr + w_space, va("%i",nr+1), 0, font_size, font_size, 1, 0, 0, fade, 0, NULL, true); + //DrawQ_String(vid_conwidth.integer - (w_space + font_size ), (w_height + w_space) * w_scale * nr + w_space, va("%i",nr+1), 0, font_size, font_size, 1, 0, 0, fade, 0, NULL, true, FONT_DEFAULT); } } @@ -867,7 +877,7 @@ void Sbar_DrawInventory (void) // ammo counts for (i=0 ; i<4 ; i++) { - sprintf (num, "%4i",cl.stats[STAT_SHELLS+i] ); + dpsnprintf (num, sizeof(num), "%4i",cl.stats[STAT_SHELLS+i] ); if (num[0] != ' ') Sbar_DrawCharacter ( (6*i+0)*8 - 2, -24, 18 + num[0] - '0'); if (num[1] != ' ') @@ -939,14 +949,14 @@ void Sbar_DrawFrags (void) s = &cl.scores[k]; // draw background - c = (unsigned char *)&palette_pantsscoreboard[(s->colors & 0xf0) >> 4]; - DrawQ_Fill (sbar_x + x + 10, sbar_y - 23, 28, 4, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); - c = (unsigned char *)&palette_shirtscoreboard[s->colors & 0xf]; - DrawQ_Fill (sbar_x + x + 10, sbar_y + 4 - 23, 28, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4]; + DrawQ_Fill (sbar_x + x + 10, sbar_y - 23, 28, 4, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0); + c = palette_rgb_shirtscoreboard[s->colors & 0xf]; + DrawQ_Fill (sbar_x + x + 10, sbar_y + 4 - 23, 28, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0); // draw number f = s->frags; - sprintf (num, "%3i",f); + dpsnprintf (num, sizeof(num), "%3i",f); if (k == cl.viewentity - 1) { @@ -983,14 +993,14 @@ void Sbar_DrawFace (void) s = &cl.scores[cl.viewentity - 1]; // draw background Sbar_DrawPic (112, 0, rsb_teambord); - c = (unsigned char *)&palette_pantsscoreboard[(s->colors & 0xf0) >> 4]; - DrawQ_Fill (sbar_x + 113, vid_conheight.integer-SBAR_HEIGHT+3, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); - c = (unsigned char *)&palette_shirtscoreboard[s->colors & 0xf]; - DrawQ_Fill (sbar_x + 113, vid_conheight.integer-SBAR_HEIGHT+12, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4]; + DrawQ_Fill (sbar_x + 113, vid_conheight.integer-SBAR_HEIGHT+3, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0); + c = palette_rgb_shirtscoreboard[s->colors & 0xf]; + DrawQ_Fill (sbar_x + 113, vid_conheight.integer-SBAR_HEIGHT+12, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0); // draw number f = s->frags; - sprintf (num, "%3i",f); + dpsnprintf (num, sizeof(num), "%3i",f); if ((s->colors & 0xf0)==0) { @@ -1027,74 +1037,242 @@ void Sbar_DrawFace (void) Sbar_DrawPic (112, 0, sb_faces[f][cl.time <= cl.faceanimtime]); } } +double topspeed = 0; +double topspeedxy = 0; +time_t current_time = 3; +time_t top_time = 0; +time_t topxy_time = 0; + +static void get_showspeed_unit(int unitnumber, double *conversion_factor, const char **unit) +{ + if(unitnumber < 0) + unitnumber = showspeed.integer; + switch(unitnumber) + { + default: + case 1: + if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC) + *unit = "in/s"; + else + *unit = "qu/s"; + *conversion_factor = 1.0; + break; + case 2: + *unit = "m/s"; + *conversion_factor = 0.0254; + if(gamemode != GAME_NEXUIZ && gamemode != GAME_XONOTIC) *conversion_factor *= 1.5; + // 1qu=1.5in is for non-Nexuiz/Xonotic only - Nexuiz/Xonotic players are overly large, but 1qu=1in fixes that + break; + case 3: + *unit = "km/h"; + *conversion_factor = 0.0254 * 3.6; + if(gamemode != GAME_NEXUIZ && gamemode != GAME_XONOTIC) *conversion_factor *= 1.5; + break; + case 4: + *unit = "mph"; + *conversion_factor = 0.0254 * 3.6 * 0.6213711922; + if(gamemode != GAME_NEXUIZ && gamemode != GAME_XONOTIC) *conversion_factor *= 1.5; + break; + case 5: + *unit = "knots"; + *conversion_factor = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h + if(gamemode != GAME_NEXUIZ && gamemode != GAME_XONOTIC) *conversion_factor *= 1.5; + break; + } +} + +static double showfps_nexttime = 0, showfps_lasttime = -1; +static double showfps_framerate = 0; +static int showfps_framecount = 0; + +void Sbar_ShowFPS_Update(void) +{ + double interval = 1; + double newtime; + newtime = realtime; + if (newtime >= showfps_nexttime) + { + showfps_framerate = showfps_framecount / (newtime - showfps_lasttime); + if (showfps_nexttime < newtime - interval * 1.5) + showfps_nexttime = newtime; + showfps_lasttime = newtime; + showfps_nexttime += interval; + showfps_framecount = 0; + } + showfps_framecount++; +} void Sbar_ShowFPS(void) { - float fps_x, fps_y, fps_scalex, fps_scaley, fps_height; + float fps_x, fps_y, fps_scalex, fps_scaley, fps_strings = 0; + char soundstring[32]; char fpsstring[32]; char timestring[32]; char datestring[32]; + char timedemostring1[32]; + char timedemostring2[32]; + char speedstring[32]; + char blurstring[32]; + char topspeedstring[48]; qboolean red = false; + soundstring[0] = 0; fpsstring[0] = 0; + timedemostring1[0] = 0; + timedemostring2[0] = 0; timestring[0] = 0; datestring[0] = 0; + speedstring[0] = 0; + blurstring[0] = 0; + topspeedstring[0] = 0; if (showfps.integer) { - float calc; - static double nexttime = 0, lasttime = 0; - static double framerate = 0; - static int framecount = 0; - double newtime; - newtime = realtime; - if (newtime >= nexttime) + red = (showfps_framerate < 1.0f); + if(showfps.integer == 2) + dpsnprintf(fpsstring, sizeof(fpsstring), "%7.3f mspf", (1000.0 / showfps_framerate)); + else if (red) + dpsnprintf(fpsstring, sizeof(fpsstring), "%4i spf", (int)(1.0 / showfps_framerate + 0.5)); + else + dpsnprintf(fpsstring, sizeof(fpsstring), "%4i fps", (int)(showfps_framerate + 0.5)); + fps_strings++; + if (cls.timedemo) { - framerate = framecount / (newtime - lasttime); - lasttime = newtime; - nexttime = max(nexttime + 1, lasttime - 1); - framecount = 0; + dpsnprintf(timedemostring1, sizeof(timedemostring1), "frame%4i %f", cls.td_frames, realtime - cls.td_starttime); + dpsnprintf(timedemostring2, sizeof(timedemostring2), "%i seconds %3.0f/%3.0f/%3.0f fps", cls.td_onesecondavgcount, cls.td_onesecondminfps, cls.td_onesecondavgfps / max(1, cls.td_onesecondavgcount), cls.td_onesecondmaxfps); + fps_strings++; + fps_strings++; } - framecount++; - calc = framerate; - - if ((red = (calc < 1.0f))) - dpsnprintf(fpsstring, sizeof(fpsstring), "%4i spf", (int)(1.0f / calc + 0.5)); - else - dpsnprintf(fpsstring, sizeof(fpsstring), "%4i fps", (int)(calc + 0.5)); } if (showtime.integer) + { strlcpy(timestring, Sys_TimeString(showtime_format.string), sizeof(timestring)); + fps_strings++; + } if (showdate.integer) + { strlcpy(datestring, Sys_TimeString(showdate_format.string), sizeof(datestring)); - if (fpsstring[0] || timestring[0]) + fps_strings++; + } + if (showblur.integer) + { + dpsnprintf(blurstring, sizeof(blurstring), "%3i%% blur", (int)(cl.motionbluralpha * 100)); + fps_strings++; + } + if (showsound.integer) + { + dpsnprintf(soundstring, sizeof(soundstring), "%4i/4%i at %3ims", cls.soundstats.mixedsounds, cls.soundstats.totalsounds, cls.soundstats.latency_milliseconds); + fps_strings++; + } + if (showspeed.integer || showtopspeed.integer) + { + double speed, speedxy, f; + const char *unit; + speed = VectorLength(cl.movement_velocity); + speedxy = sqrt(cl.movement_velocity[0] * cl.movement_velocity[0] + cl.movement_velocity[1] * cl.movement_velocity[1]); + if (showspeed.integer) + { + get_showspeed_unit(showspeed.integer, &f, &unit); + dpsnprintf(speedstring, sizeof(speedstring), "%.0f (%.0f) %s", f*speed, f*speedxy, unit); + fps_strings++; + } + if (showtopspeed.integer) + { + qboolean topspeed_latched = false, topspeedxy_latched = false; + get_showspeed_unit(showtopspeed.integer, &f, &unit); + if (speed >= topspeed || current_time - top_time > 3) + { + topspeed = speed; + time(&top_time); + } + else + topspeed_latched = true; + if (speedxy >= topspeedxy || current_time - topxy_time > 3) + { + topspeedxy = speedxy; + time(&topxy_time); + } + else + topspeedxy_latched = true; + dpsnprintf(topspeedstring, sizeof(topspeedstring), "%s%.0f%s (%s%.0f%s) %s", + topspeed_latched ? "^1" : "^xf88", f*topspeed, "^xf88", + topspeedxy_latched ? "^1" : "^xf88", f*topspeedxy, "^xf88", + unit); + time(¤t_time); + fps_strings++; + } + } + if (fps_strings) { fps_scalex = 12; fps_scaley = 12; - fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0)); //fps_y = vid_conheight.integer - sb_lines; // yes this may draw over the sbar - //fps_y = bound(0, fps_y, vid_conheight.integer - fps_height); - fps_y = vid_conheight.integer - fps_height; + //fps_y = bound(0, fps_y, vid_conheight.integer - fps_strings*fps_scaley); + fps_y = vid_conheight.integer - sbar_info_pos.integer - fps_strings*fps_scaley; + if (soundstring[0]) + { + fps_x = vid_conwidth.integer - DrawQ_TextWidth(soundstring, 0, fps_scalex, fps_scaley, true, FONT_INFOBAR); + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, soundstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); + fps_y += fps_scaley; + } if (fpsstring[0]) { - fps_x = vid_conwidth.integer - fps_scalex * strlen(fpsstring); - DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(fpsstring), fps_scaley, 0, 0, 0, 0.5, 0); + r_draw2d_force = true; + fps_x = vid_conwidth.integer - DrawQ_TextWidth(fpsstring, 0, fps_scalex, fps_scaley, true, FONT_INFOBAR); + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); if (red) - DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 0, 0, 1, 0, NULL, true); + DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 0, 0, 1, 0, NULL, true, FONT_INFOBAR); else - DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true); + DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); + fps_y += fps_scaley; + r_draw2d_force = false; + } + if (timedemostring1[0]) + { + fps_x = vid_conwidth.integer - DrawQ_TextWidth(timedemostring1, 0, fps_scalex, fps_scaley, true, FONT_INFOBAR); + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, timedemostring1, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); + fps_y += fps_scaley; + } + if (timedemostring2[0]) + { + fps_x = vid_conwidth.integer - DrawQ_TextWidth(timedemostring2, 0, fps_scalex, fps_scaley, true, FONT_INFOBAR); + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, timedemostring2, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); fps_y += fps_scaley; } if (timestring[0]) { - fps_x = vid_conwidth.integer - fps_scalex * strlen(timestring); - DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(timestring), fps_scaley, 0, 0, 0, 0.5, 0); - DrawQ_String(fps_x, fps_y, timestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true); + fps_x = vid_conwidth.integer - DrawQ_TextWidth(timestring, 0, fps_scalex, fps_scaley, true, FONT_INFOBAR); + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, timestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); fps_y += fps_scaley; } if (datestring[0]) { - fps_x = vid_conwidth.integer - fps_scalex * strlen(datestring); - DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(datestring), fps_scaley, 0, 0, 0, 0.5, 0); - DrawQ_String(fps_x, fps_y, datestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true); + fps_x = vid_conwidth.integer - DrawQ_TextWidth(datestring, 0, fps_scalex, fps_scaley, true, FONT_INFOBAR); + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, datestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); + fps_y += fps_scaley; + } + if (speedstring[0]) + { + fps_x = vid_conwidth.integer - DrawQ_TextWidth(speedstring, 0, fps_scalex, fps_scaley, true, FONT_INFOBAR); + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, speedstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); + fps_y += fps_scaley; + } + if (topspeedstring[0]) + { + fps_x = vid_conwidth.integer - DrawQ_TextWidth(topspeedstring, 0, fps_scalex, fps_scaley, false, FONT_INFOBAR); + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, topspeedstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, false, FONT_INFOBAR); + fps_y += fps_scaley; + } + if (blurstring[0]) + { + fps_x = vid_conwidth.integer - DrawQ_TextWidth(blurstring, 0, fps_scalex, fps_scaley, true, FONT_INFOBAR); + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, blurstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); fps_y += fps_scaley; } } @@ -1147,7 +1325,7 @@ void Sbar_Draw (void) } else if (cl.intermission == 2) Sbar_FinaleOverlay(); - else if (gamemode == GAME_NETHERWORLD) + else if (gamemode == GAME_DELUXEQUAKE) { } else if (gamemode == GAME_SOM) @@ -1204,6 +1382,7 @@ void Sbar_Draw (void) int i; float fade; int redflag, blueflag; + float x; sbar_x = (vid_conwidth.integer - 320)/2; sbar_y = vid_conheight.integer - 24 - 16; @@ -1220,59 +1399,68 @@ void Sbar_Draw (void) // flag icons redflag = ((cl.stats[STAT_ITEMS]>>15) & 3); blueflag = ((cl.stats[STAT_ITEMS]>>17) & 3); + x = sbar_flagstatus_right.integer ? vid_conwidth.integer - 10 - sbar_x - 64 : 10 - sbar_x; if (redflag == 3 && blueflag == 3) { // The Impossible Combination[tm] // Can only happen in Key Hunt mode... - Sbar_DrawPic (10 - sbar_x, -179, sb_items[14]); + Sbar_DrawPic ((int) x, (int) ((vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 128)), sb_items[14]); } else { if (redflag) - Sbar_DrawPic (10 - sbar_x, -117, sb_items[redflag+10]); + Sbar_DrawPic ((int) x, (int) ((vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 64)), sb_items[redflag+10]); if (blueflag) - Sbar_DrawPic (10 - sbar_x, -177, sb_items[blueflag+14]); + Sbar_DrawPic ((int) x, (int) ((vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 128)), sb_items[blueflag+14]); } // armor if (cl.stats[STAT_ARMOR] > 0) { - Sbar_DrawStretchPic (0, 0, sb_armor[0], sbar_alpha_fg.value, 24, 24); - if(cl.stats[STAT_ARMOR] > 100) - Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,1,1,0,1,0); + Sbar_DrawStretchPic (72, 0, sb_armor[0], sbar_alpha_fg.value, 24, 24); + if(cl.stats[STAT_ARMOR] > 200) + Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,0,1,0,1,0); + else if(cl.stats[STAT_ARMOR] > 100) + Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,0.2,1,0.2,1,0); + else if(cl.stats[STAT_ARMOR] > 50) + Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,0.6,0.7,0.8,1,0); else if(cl.stats[STAT_ARMOR] > 25) - Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0.6,0.7,0.8,1,0); + Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,1,1,0.2,1,0); else - Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0.7,0,0,1,0); + Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,0.7,0,0,1,0); } // health if (cl.stats[STAT_HEALTH] != 0) { - Sbar_DrawStretchPic (112, 0, sb_health, sbar_alpha_fg.value, 24, 24); - if(cl.stats[STAT_HEALTH] > 100) - Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,1,1,0,1,0); + Sbar_DrawStretchPic (184, 0, sb_health, sbar_alpha_fg.value, 24, 24); + if(cl.stats[STAT_HEALTH] > 200) + Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,0,1,0,1,0); + else if(cl.stats[STAT_HEALTH] > 100) + Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,0.2,1,0.2,1,0); + else if(cl.stats[STAT_HEALTH] > 50) + Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,0.6,0.7,0.8,1,0); else if(cl.stats[STAT_HEALTH] > 25) - Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0.6,0.7,0.8,1,0); + Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,1,1,0.2,1,0); else - Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0.7,0,0,1,0); + Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,0.7,0,0,1,0); } // ammo if ((cl.stats[STAT_ITEMS] & (NEX_IT_SHELLS | NEX_IT_BULLETS | NEX_IT_ROCKETS | NEX_IT_CELLS)) || cl.stats[STAT_AMMO] != 0) { if (cl.stats[STAT_ITEMS] & NEX_IT_SHELLS) - Sbar_DrawStretchPic (224, 0, sb_ammo[0], sbar_alpha_fg.value, 24, 24); + Sbar_DrawStretchPic (296, 0, sb_ammo[0], sbar_alpha_fg.value, 24, 24); else if (cl.stats[STAT_ITEMS] & NEX_IT_BULLETS) - Sbar_DrawStretchPic (224, 0, sb_ammo[1], sbar_alpha_fg.value, 24, 24); + Sbar_DrawStretchPic (296, 0, sb_ammo[1], sbar_alpha_fg.value, 24, 24); else if (cl.stats[STAT_ITEMS] & NEX_IT_ROCKETS) - Sbar_DrawStretchPic (224, 0, sb_ammo[2], sbar_alpha_fg.value, 24, 24); + Sbar_DrawStretchPic (296, 0, sb_ammo[2], sbar_alpha_fg.value, 24, 24); else if (cl.stats[STAT_ITEMS] & NEX_IT_CELLS) - Sbar_DrawStretchPic (224, 0, sb_ammo[3], sbar_alpha_fg.value, 24, 24); + Sbar_DrawStretchPic (296, 0, sb_ammo[3], sbar_alpha_fg.value, 24, 24); if(cl.stats[STAT_AMMO] > 10) - Sbar_DrawXNum(248, 0, cl.stats[STAT_AMMO], 3, 24, 0.6,0.7,0.8,1,0); + Sbar_DrawXNum(224, 0, cl.stats[STAT_AMMO], 3, 24, 0.6,0.7,0.8,1,0); else - Sbar_DrawXNum(248, 0, cl.stats[STAT_AMMO], 3, 24, 0.7,0,0,1,0); + Sbar_DrawXNum(224, 0, cl.stats[STAT_AMMO], 3, 24, 0.7,0,0,1,0); } if (sbar_x + 320 + 160 <= vid_conwidth.integer) @@ -1287,6 +1475,7 @@ void Sbar_Draw (void) int i; float fade; int redflag, blueflag; + float x; sbar_x = (vid_conwidth.integer - 640)/2; sbar_y = vid_conheight.integer - 47; @@ -1315,18 +1504,19 @@ void Sbar_Draw (void) // flag icons redflag = ((cl.stats[STAT_ITEMS]>>15) & 3); blueflag = ((cl.stats[STAT_ITEMS]>>17) & 3); + x = sbar_flagstatus_right.integer ? vid_conwidth.integer - 10 - sbar_x - 64 : 10 - sbar_x; if (redflag == 3 && blueflag == 3) { // The Impossible Combination[tm] // Can only happen in Key Hunt mode... - Sbar_DrawPic (10 - sbar_x, -179, sb_items[14]); + Sbar_DrawPic ((int) x, -179, sb_items[14]); } else { if (redflag) - Sbar_DrawPic (10 - sbar_x, -117, sb_items[redflag+10]); + Sbar_DrawPic ((int) x, -117, sb_items[redflag+10]); if (blueflag) - Sbar_DrawPic (10 - sbar_x, -177, sb_items[blueflag+14]); + Sbar_DrawPic ((int) x, -177, sb_items[blueflag+14]); } // armor @@ -1561,13 +1751,14 @@ void Sbar_Draw (void) } } - Sbar_ShowFPS(); - - if (cl.csqc_vidvars.drawcrosshair && crosshair.integer >= 1 && crosshair.integer <= NUMCROSSHAIRS && !cl.intermission && !r_letterbox.value && (pic = r_crosshairs[crosshair.integer])) + if (cl.csqc_vidvars.drawcrosshair && crosshair.integer >= 1 && !cl.intermission && !r_letterbox.value) + { + pic = Draw_CachePic (va("gfx/crosshair%i", crosshair.integer)); DrawQ_Pic((vid_conwidth.integer - pic->width * crosshair_size.value) * 0.5f, (vid_conheight.integer - pic->height * crosshair_size.value) * 0.5f, pic, pic->width * crosshair_size.value, pic->height * crosshair_size.value, crosshair_color_red.value, crosshair_color_green.value, crosshair_color_blue.value, crosshair_color_alpha.value, 0); + } - if (cl_prydoncursor.integer) - DrawQ_Pic((cl.cmd.cursor_screen[0] + 1) * 0.5 * vid_conwidth.integer, (cl.cmd.cursor_screen[1] + 1) * 0.5 * vid_conheight.integer, Draw_CachePic(va("gfx/prydoncursor%03i", cl_prydoncursor.integer), true), 0, 0, 1, 1, 1, 1, 0); + if (cl_prydoncursor.integer > 0) + DrawQ_Pic((cl.cmd.cursor_screen[0] + 1) * 0.5 * vid_conwidth.integer, (cl.cmd.cursor_screen[1] + 1) * 0.5 * vid_conheight.integer, Draw_CachePic (va("gfx/prydoncursor%03i", cl_prydoncursor.integer)), 0, 0, 1, 1, 1, 1, 0); } //============================================================================= @@ -1596,9 +1787,9 @@ float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y) if (s->qw_spectator) { if (s->qw_ping || s->qw_packetloss) - DrawQ_String(x, y, va("%4i %3i %4i spectator %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), minutes, myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(x, y, va("%4i %3i %4i spectator %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), minutes, myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); else - DrawQ_String(x, y, va(" %4i spectator %c%s", minutes, myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(x, y, va(" %4i spectator %c%s", minutes, myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); } else { @@ -1608,16 +1799,16 @@ float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y) // // // - c = (unsigned char *)&palette_pantsscoreboard[(s->colors & 0xf0) >> 4]; - DrawQ_Fill(x + 14*8, y+1, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); - c = (unsigned char *)&palette_shirtscoreboard[s->colors & 0xf]; - DrawQ_Fill(x + 14*8, y+4, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4]; + DrawQ_Fill(x + 14*8*FONT_SBAR->maxwidth, y+1, 40*FONT_SBAR->maxwidth, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0); + c = palette_rgb_shirtscoreboard[s->colors & 0xf]; + DrawQ_Fill(x + 14*8*FONT_SBAR->maxwidth, y+4, 40*FONT_SBAR->maxwidth, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0); // print the text - //DrawQ_String(x, y, va("%c%4i %s", myself ? 13 : ' ', (int) s->frags, s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, true); + //DrawQ_String(x, y, va("%c%4i %s", myself ? 13 : ' ', (int) s->frags, s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, true, FONT_DEFAULT); if (s->qw_ping || s->qw_packetloss) - DrawQ_String(x, y, va("%4i %3i %4i %5i %-4s %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), minutes,(int) s->frags, cl.qw_teamplay ? s->qw_team : "", myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(x, y, va("%4i %3i %4i %5i %-4s %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), minutes,(int) s->frags, cl.qw_teamplay ? s->qw_team : "", myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); else - DrawQ_String(x, y, va(" %4i %5i %-4s %c%s", minutes,(int) s->frags, cl.qw_teamplay ? s->qw_team : "", myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(x, y, va(" %4i %5i %-4s %c%s", minutes,(int) s->frags, cl.qw_teamplay ? s->qw_team : "", myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); } } else @@ -1625,23 +1816,23 @@ float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y) if (s->qw_spectator) { if (s->qw_ping || s->qw_packetloss) - DrawQ_String(x, y, va("%4i %3i spect %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(x, y, va("%4i %3i spect %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); else - DrawQ_String(x, y, va(" spect %c%s", myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(x, y, va(" spect %c%s", myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); } else { // draw colors behind score - c = (unsigned char *)&palette_pantsscoreboard[(s->colors & 0xf0) >> 4]; - DrawQ_Fill(x + 9*8, y+1, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); - c = (unsigned char *)&palette_shirtscoreboard[s->colors & 0xf]; - DrawQ_Fill(x + 9*8, y+4, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + c = palette_rgb_pantsscoreboard[(s->colors & 0xf0) >> 4]; + DrawQ_Fill(x + 9*8*FONT_SBAR->maxwidth, y+1, 40*FONT_SBAR->maxwidth, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0); + c = palette_rgb_shirtscoreboard[s->colors & 0xf]; + DrawQ_Fill(x + 9*8*FONT_SBAR->maxwidth, y+4, 40*FONT_SBAR->maxwidth, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), sbar_alpha_fg.value, 0); // print the text - //DrawQ_String(x, y, va("%c%4i %s", myself ? 13 : ' ', (int) s->frags, s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, true); + //DrawQ_String(x, y, va("%c%4i %s", myself ? 13 : ' ', (int) s->frags, s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, true, FONT_DEFAULT); if (s->qw_ping || s->qw_packetloss) - DrawQ_String(x, y, va("%4i %3i %5i %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), (int) s->frags, myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(x, y, va("%4i %3i %5i %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), (int) s->frags, myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); else - DrawQ_String(x, y, va(" %5i %c%s", (int) s->frags, myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(x, y, va(" %5i %c%s", (int) s->frags, myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); } } return 8; @@ -1649,7 +1840,7 @@ float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y) void Sbar_DeathmatchOverlay (void) { - int i, x, y; + int i, y, xmin, xmax, ymin, ymax; // request new ping times every two second if (cl.last_ping_request < realtime - 2 && cls.netcon) @@ -1660,7 +1851,7 @@ void Sbar_DeathmatchOverlay (void) MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); MSG_WriteString(&cls.netcon->message, "pings"); } - else if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5 || cls.protocol == PROTOCOL_DARKPLACES6/* || cls.protocol == PROTOCOL_DARKPLACES7*/) + else if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5 || cls.protocol == PROTOCOL_DARKPLACES6/* || cls.protocol == PROTOCOL_DARKPLACES7*/) { // these servers usually lack the pings command and so a less efficient "ping" command must be sent, which on modern DP servers will also reply with a pingplreport command after the ping listing static int ping_anyway_counter = 0; @@ -1686,21 +1877,32 @@ void Sbar_DeathmatchOverlay (void) } } - DrawQ_Pic ((vid_conwidth.integer - sb_ranking->width)/2, 8, sb_ranking, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); - // scores Sbar_SortFrags (); + + ymin = 8; + ymax = 40 + 8 + (Sbar_IsTeammatch() ? (teamlines * 8 + 5): 0) + scoreboardlines * 8 - 1; + + if (cls.protocol == PROTOCOL_QUAKEWORLD) + xmin = (int) (vid_conwidth.integer - (26 + 15) * 8 * FONT_SBAR->maxwidth) / 2; // 26 characters until name, then we assume 15 character names (they can be longer but usually aren't) + else + xmin = (int) (vid_conwidth.integer - (16 + 25) * 8 * FONT_SBAR->maxwidth) / 2; // 16 characters until name, then we assume 25 character names (they can be longer but usually aren't) + xmax = vid_conwidth.integer - xmin; + + if(gamemode == GAME_NEXUIZ) + DrawQ_Pic (xmin - 8, ymin - 8, 0, xmax-xmin+1 + 2*8, ymax-ymin+1 + 2*8, 0, 0, 0, sbar_alpha_bg.value, 0); + + DrawQ_Pic ((vid_conwidth.integer - sb_ranking->width)/2, 8, sb_ranking, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); + // draw the text y = 40; if (cls.protocol == PROTOCOL_QUAKEWORLD) { - x = (vid_conwidth.integer - (26 + 15) * 8) / 2; // 26 characters until name, then we assume 15 character names (they can be longer but usually aren't) - DrawQ_String(x, y, va("ping pl%% time frags team name"), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(xmin, y, va("ping pl%% time frags team name"), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); } else { - x = (vid_conwidth.integer - (16 + 15) * 8) / 2; // 16 characters until name, then we assume 15 character names (they can be longer but usually aren't) - DrawQ_String(x, y, va("ping pl%% frags name"), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + DrawQ_String(xmin, y, va("ping pl%% frags name"), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR ); } y += 8; @@ -1708,12 +1910,12 @@ void Sbar_DeathmatchOverlay (void) { // show team scores first for (i = 0;i < teamlines && y < vid_conheight.integer;i++) - y += (int)Sbar_PrintScoreboardItem((teams + teamsort[i]), x, y); + y += (int)Sbar_PrintScoreboardItem((teams + teamsort[i]), xmin, y); y += 5; } for (i = 0;i < scoreboardlines && y < vid_conheight.integer;i++) - y += (int)Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); + y += (int)Sbar_PrintScoreboardItem(cl.scores + fragsort[i], xmin, y); } /* @@ -1731,7 +1933,7 @@ void Sbar_MiniDeathmatchOverlay (int x, int y) return; // adjust the given y if sbar_miniscoreboard_size doesn't indicate default (< 0) if(sbar_miniscoreboard_size.value > 0) - y = vid_conheight.integer - sbar_miniscoreboard_size.value * 8; + y = (int) (vid_conheight.integer - sbar_miniscoreboard_size.value * 8); // scores Sbar_SortFrags (); @@ -1835,11 +2037,12 @@ void Sbar_Score (int margin) int sbar_x_save = sbar_x; int sbar_y_save = sbar_y; - sbar_y = vid_conheight.value - (32+12); + + sbar_y = (int) (vid_conheight.value - (32+12)); sbar_x -= margin; me = cl.playerentity - 1; - if (me >= 0 && me < cl.maxclients) + if (sbar_scorerank.integer && me >= 0 && me < cl.maxclients) { if(Sbar_IsTeammatch()) { @@ -1865,7 +2068,7 @@ void Sbar_Score (int margin) for(i = 0; i < teamlines; ++i) { int cindex = teamcolorsort[i]->colors & 15; - unsigned char *c = (unsigned char *)&palette_shirtscoreboard[cindex]; + unsigned char *c = palette_rgb_shirtscoreboard[cindex]; float cm = max(max(c[0], c[1]), c[2]); float cr = c[0] / cm; float cg = c[1] / cm; @@ -1929,7 +2132,7 @@ void Sbar_Score (int margin) } } - if (cl.statsf[STAT_TIMELIMIT]) + if (sbar_gametime.integer && cl.statsf[STAT_TIMELIMIT]) { timeleft = max(0, cl.statsf[STAT_TIMELIMIT] * 60 - cl.time); minutes = (int)floor(timeleft / 60); @@ -1953,7 +2156,7 @@ void Sbar_Score (int margin) else Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 0, 0, 1, 0); } - else + else if (sbar_gametime.integer) { minutes = (int)floor(cl.time / 60); seconds = (int)(floor(cl.time) - minutes * 60); @@ -1998,16 +2201,30 @@ void Sbar_IntermissionOverlay (void) Sbar_DrawPic (246,64,sb_nums[0][num/10]); Sbar_DrawPic (266,64,sb_nums[0][num%10]); - Sbar_DrawNum (160, 104, cl.stats[STAT_SECRETS], 3, 0); - if (gamemode != GAME_NEXUIZ) - Sbar_DrawPic (232, 104, sb_slash); - Sbar_DrawNum (240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0); - - Sbar_DrawNum (160, 144, cl.stats[STAT_MONSTERS], 3, 0); - if (gamemode != GAME_NEXUIZ) - Sbar_DrawPic (232, 144, sb_slash); - Sbar_DrawNum (240, 144, cl.stats[STAT_TOTALMONSTERS], 3, 0); +// LA: Display as "a" instead of "a/b" if b is 0 + if(cl.stats[STAT_TOTALSECRETS]) + { + Sbar_DrawNum (160, 104, cl.stats[STAT_SECRETS], 3, 0); + if (gamemode != GAME_NEXUIZ) + Sbar_DrawPic (232, 104, sb_slash); + Sbar_DrawNum (240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0); + } + else + { + Sbar_DrawNum (240, 104, cl.stats[STAT_SECRETS], 3, 0); + } + if(cl.stats[STAT_TOTALMONSTERS]) + { + Sbar_DrawNum (160, 144, cl.stats[STAT_MONSTERS], 3, 0); + if (gamemode != GAME_NEXUIZ) + Sbar_DrawPic (232, 144, sb_slash); + Sbar_DrawNum (240, 144, cl.stats[STAT_TOTALMONSTERS], 3, 0); + } + else + { + Sbar_DrawNum (240, 144, cl.stats[STAT_MONSTERS], 3, 0); + } }