// sbar.c -- status bar code
#include "quakedef.h"
+#include "time.h"
cachepic_t *sb_disc;
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)"};
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"};
void Sbar_IntermissionOverlay (void);
void Sbar_FinaleOverlay (void);
+void CL_VM_UpdateShowingScoresState (int showingscores);
+
/*
===============
if (sb_showscores)
return;
sb_showscores = true;
+ CL_VM_UpdateShowingScoresState(sb_showscores);
}
/*
void Sbar_DontShowScores (void)
{
sb_showscores = false;
+ CL_VM_UpdateShowingScoresState(sb_showscores);
}
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 ("gfx/disc");
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 (va("gfx/num_%i",i));
+
+ somsb_health = Draw_CachePic ("gfx/hud_health");
+ somsb_ammo[0] = Draw_CachePic ("gfx/sb_shells");
+ somsb_ammo[1] = Draw_CachePic ("gfx/sb_nails");
+ somsb_ammo[2] = Draw_CachePic ("gfx/sb_rocket");
+ somsb_ammo[3] = Draw_CachePic ("gfx/sb_cells");
+ somsb_armor[0] = Draw_CachePic ("gfx/sb_armor1");
+ somsb_armor[1] = Draw_CachePic ("gfx/sb_armor2");
+ somsb_armor[2] = Draw_CachePic ("gfx/sb_armor3");
}
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_nums[0][i] = Draw_CachePic (va("gfx/num_%i",i));
+ sb_nums[0][10] = Draw_CachePic ("gfx/num_minus");
+ sb_colon = Draw_CachePic ("gfx/num_colon");
- 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 ("gfx/sb_shells");
+ sb_ammo[1] = Draw_CachePic ("gfx/sb_bullets");
+ sb_ammo[2] = Draw_CachePic ("gfx/sb_rocket");
+ sb_ammo[3] = Draw_CachePic ("gfx/sb_cells");
- sb_armor[0] = Draw_CachePic ("gfx/sb_armor", true);
+ sb_armor[0] = Draw_CachePic ("gfx/sb_armor");
sb_armor[1] = NULL;
sb_armor[2] = NULL;
- sb_health = Draw_CachePic ("gfx/sb_health", true);
+ sb_health = Draw_CachePic ("gfx/sb_health");
- 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 ("gfx/sb_slowmo");
+ sb_items[3] = Draw_CachePic ("gfx/sb_invinc");
+ sb_items[4] = Draw_CachePic ("gfx/sb_energy");
+ sb_items[5] = Draw_CachePic ("gfx/sb_str");
- 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 ("gfx/sb_flag_red_taken");
+ sb_items[12] = Draw_CachePic ("gfx/sb_flag_red_lost");
+ sb_items[13] = Draw_CachePic ("gfx/sb_flag_red_carrying");
+ sb_items[14] = Draw_CachePic ("gfx/sb_key_carrying");
+ sb_items[15] = Draw_CachePic ("gfx/sb_flag_blue_taken");
+ sb_items[16] = Draw_CachePic ("gfx/sb_flag_blue_lost");
+ sb_items[17] = Draw_CachePic ("gfx/sb_flag_blue_carrying");
- 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 ("gfx/sbar");
+ sb_sbar_minimal = Draw_CachePic ("gfx/sbar_minimal");
+ sb_sbar_overlay = Draw_CachePic ("gfx/sbar_overlay");
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 (va("gfx/inv_weapon%i",i));
}
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 ("gfx/hud/crosshair_center");
+ zymsb_crosshair_line = Draw_CachePic ("gfx/hud/crosshair_line");
+ zymsb_crosshair_health = Draw_CachePic ("gfx/hud/crosshair_health");
+ zymsb_crosshair_clip = Draw_CachePic ("gfx/hud/crosshair_clip");
+ zymsb_crosshair_ammo = Draw_CachePic ("gfx/hud/crosshair_ammo");
+ zymsb_crosshair_background = Draw_CachePic ("gfx/hud/crosshair_background");
+ zymsb_crosshair_left1 = Draw_CachePic ("gfx/hud/crosshair_left1");
+ zymsb_crosshair_left2 = Draw_CachePic ("gfx/hud/crosshair_left2");
+ zymsb_crosshair_right = Draw_CachePic ("gfx/hud/crosshair_right");
}
else
{
- sb_disc = Draw_CachePic("gfx/disc", true);
+ sb_disc = Draw_CachePic ("gfx/disc");
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 (va("gfx/num_%i",i));
+ sb_nums[1][i] = Draw_CachePic (va("gfx/anum_%i",i));
}
- 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 ("gfx/num_minus");
+ sb_nums[1][10] = Draw_CachePic ("gfx/anum_minus");
- sb_colon = Draw_CachePic ("gfx/num_colon", true);
- sb_slash = Draw_CachePic ("gfx/num_slash", true);
+ sb_colon = Draw_CachePic ("gfx/num_colon");
+ sb_slash = Draw_CachePic ("gfx/num_slash");
- 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 ("gfx/inv_shotgun");
+ sb_weapons[0][1] = Draw_CachePic ("gfx/inv_sshotgun");
+ sb_weapons[0][2] = Draw_CachePic ("gfx/inv_nailgun");
+ sb_weapons[0][3] = Draw_CachePic ("gfx/inv_snailgun");
+ sb_weapons[0][4] = Draw_CachePic ("gfx/inv_rlaunch");
+ sb_weapons[0][5] = Draw_CachePic ("gfx/inv_srlaunch");
+ sb_weapons[0][6] = Draw_CachePic ("gfx/inv_lightng");
- 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 ("gfx/inv2_shotgun");
+ sb_weapons[1][1] = Draw_CachePic ("gfx/inv2_sshotgun");
+ sb_weapons[1][2] = Draw_CachePic ("gfx/inv2_nailgun");
+ sb_weapons[1][3] = Draw_CachePic ("gfx/inv2_snailgun");
+ sb_weapons[1][4] = Draw_CachePic ("gfx/inv2_rlaunch");
+ sb_weapons[1][5] = Draw_CachePic ("gfx/inv2_srlaunch");
+ sb_weapons[1][6] = Draw_CachePic ("gfx/inv2_lightng");
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 (va("gfx/inva%i_shotgun",i+1));
+ sb_weapons[2+i][1] = Draw_CachePic (va("gfx/inva%i_sshotgun",i+1));
+ sb_weapons[2+i][2] = Draw_CachePic (va("gfx/inva%i_nailgun",i+1));
+ sb_weapons[2+i][3] = Draw_CachePic (va("gfx/inva%i_snailgun",i+1));
+ sb_weapons[2+i][4] = Draw_CachePic (va("gfx/inva%i_rlaunch",i+1));
+ sb_weapons[2+i][5] = Draw_CachePic (va("gfx/inva%i_srlaunch",i+1));
+ sb_weapons[2+i][6] = Draw_CachePic (va("gfx/inva%i_lightng",i+1));
}
- 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 ("gfx/sb_shells");
+ sb_ammo[1] = Draw_CachePic ("gfx/sb_nails");
+ sb_ammo[2] = Draw_CachePic ("gfx/sb_rocket");
+ sb_ammo[3] = Draw_CachePic ("gfx/sb_cells");
+
+ sb_armor[0] = Draw_CachePic ("gfx/sb_armor1");
+ sb_armor[1] = Draw_CachePic ("gfx/sb_armor2");
+ sb_armor[2] = Draw_CachePic ("gfx/sb_armor3");
+
+ sb_items[0] = Draw_CachePic ("gfx/sb_key1");
+ sb_items[1] = Draw_CachePic ("gfx/sb_key2");
+ sb_items[2] = Draw_CachePic ("gfx/sb_invis");
+ sb_items[3] = Draw_CachePic ("gfx/sb_invuln");
+ sb_items[4] = Draw_CachePic ("gfx/sb_suit");
+ sb_items[5] = Draw_CachePic ("gfx/sb_quad");
+
+ sb_sigil[0] = Draw_CachePic ("gfx/sb_sigil1");
+ sb_sigil[1] = Draw_CachePic ("gfx/sb_sigil2");
+ sb_sigil[2] = Draw_CachePic ("gfx/sb_sigil3");
+ sb_sigil[3] = Draw_CachePic ("gfx/sb_sigil4");
+
+ sb_faces[4][0] = Draw_CachePic ("gfx/face1");
+ sb_faces[4][1] = Draw_CachePic ("gfx/face_p1");
+ sb_faces[3][0] = Draw_CachePic ("gfx/face2");
+ sb_faces[3][1] = Draw_CachePic ("gfx/face_p2");
+ sb_faces[2][0] = Draw_CachePic ("gfx/face3");
+ sb_faces[2][1] = Draw_CachePic ("gfx/face_p3");
+ sb_faces[1][0] = Draw_CachePic ("gfx/face4");
+ sb_faces[1][1] = Draw_CachePic ("gfx/face_p4");
+ sb_faces[0][0] = Draw_CachePic ("gfx/face5");
+ sb_faces[0][1] = Draw_CachePic ("gfx/face_p5");
+
+ sb_face_invis = Draw_CachePic ("gfx/face_invis");
+ sb_face_invuln = Draw_CachePic ("gfx/face_invul2");
+ sb_face_invis_invuln = Draw_CachePic ("gfx/face_inv2");
+ sb_face_quad = Draw_CachePic ("gfx/face_quad");
+
+ sb_sbar = Draw_CachePic ("gfx/sbar");
+ sb_ibar = Draw_CachePic ("gfx/ibar");
+ sb_scorebar = Draw_CachePic ("gfx/scorebar");
//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 ("gfx/inv_laser");
+ hsb_weapons[0][1] = Draw_CachePic ("gfx/inv_mjolnir");
+ hsb_weapons[0][2] = Draw_CachePic ("gfx/inv_gren_prox");
+ hsb_weapons[0][3] = Draw_CachePic ("gfx/inv_prox_gren");
+ hsb_weapons[0][4] = Draw_CachePic ("gfx/inv_prox");
+
+ hsb_weapons[1][0] = Draw_CachePic ("gfx/inv2_laser");
+ hsb_weapons[1][1] = Draw_CachePic ("gfx/inv2_mjolnir");
+ hsb_weapons[1][2] = Draw_CachePic ("gfx/inv2_gren_prox");
+ hsb_weapons[1][3] = Draw_CachePic ("gfx/inv2_prox_gren");
+ hsb_weapons[1][4] = Draw_CachePic ("gfx/inv2_prox");
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 (va("gfx/inva%i_laser",i+1));
+ hsb_weapons[2+i][1] = Draw_CachePic (va("gfx/inva%i_mjolnir",i+1));
+ hsb_weapons[2+i][2] = Draw_CachePic (va("gfx/inva%i_gren_prox",i+1));
+ hsb_weapons[2+i][3] = Draw_CachePic (va("gfx/inva%i_prox_gren",i+1));
+ hsb_weapons[2+i][4] = Draw_CachePic (va("gfx/inva%i_prox",i+1));
}
- hsb_items[0] = Draw_CachePic ("gfx/sb_wsuit", true);
- hsb_items[1] = Draw_CachePic ("gfx/sb_eshld", true);
+ hsb_items[0] = Draw_CachePic ("gfx/sb_wsuit");
+ hsb_items[1] = Draw_CachePic ("gfx/sb_eshld");
}
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 ("gfx/r_invbar1");
+ rsb_invbar[1] = Draw_CachePic ("gfx/r_invbar2");
- 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 ("gfx/r_lava");
+ rsb_weapons[1] = Draw_CachePic ("gfx/r_superlava");
+ rsb_weapons[2] = Draw_CachePic ("gfx/r_gren");
+ rsb_weapons[3] = Draw_CachePic ("gfx/r_multirock");
+ rsb_weapons[4] = Draw_CachePic ("gfx/r_plasma");
- rsb_items[0] = Draw_CachePic ("gfx/r_shield1", true);
- rsb_items[1] = Draw_CachePic ("gfx/r_agrav1", true);
+ rsb_items[0] = Draw_CachePic ("gfx/r_shield1");
+ rsb_items[1] = Draw_CachePic ("gfx/r_agrav1");
// PGM 01/19/97 - team color border
- rsb_teambord = Draw_CachePic ("gfx/r_teambord", true);
+ rsb_teambord = Draw_CachePic ("gfx/r_teambord");
// 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 ("gfx/r_ammolava");
+ rsb_ammo[1] = Draw_CachePic ("gfx/r_ammomulti");
+ rsb_ammo[2] = Draw_CachePic ("gfx/r_ammoplasma");
}
}
- 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 ("gfx/ranking");
+ sb_complete = Draw_CachePic ("gfx/complete");
+ sb_inter = Draw_CachePic ("gfx/inter");
+ sb_finale = Draw_CachePic ("gfx/finale");
}
void sbar_shutdown(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);
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);
Cvar_RegisterVariable(&crosshair_color_alpha);
Cvar_RegisterVariable(&crosshair_size);
+ if(gamemode == GAME_NEXUIZ)
+ {
+ Cvar_RegisterVariable(&sbar_flagstatus_right); // this cvar makes no sense in other games
+ Cvar_RegisterVariable(&sbar_flagstatus_pos); // this cvar makes no sense in other games
+ }
+
R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap);
}
*/
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_Font (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);
}
/*
*/
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_Font (sbar_x + x, sbar_y + y, str, 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR);
}
/*
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);
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);
//=============================================================================
-int Sbar_IsTeammatch()
+int Sbar_IsTeammatch(void)
{
// currently only nexuiz uses the team score board
return ((gamemode == GAME_NEXUIZ)
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];
// 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));
*(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;
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);
}
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
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);
+ // 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);
}
else
// ammo counts
for (i=0 ; i<4 ; i++)
{
- sprintf (num, "%3i",cl.stats[STAT_SHELLS+i] );
+ dpsnprintf (num, sizeof(num), "%4i",cl.stats[STAT_SHELLS+i] );
if (num[0] != ' ')
- Sbar_DrawCharacter ( (6*i+1)*8 - 2, -24, 18 + num[0] - '0');
+ Sbar_DrawCharacter ( (6*i+0)*8 - 2, -24, 18 + num[0] - '0');
if (num[1] != ' ')
- Sbar_DrawCharacter ( (6*i+2)*8 - 2, -24, 18 + num[1] - '0');
+ Sbar_DrawCharacter ( (6*i+1)*8 - 2, -24, 18 + num[1] - '0');
if (num[2] != ' ')
- Sbar_DrawCharacter ( (6*i+3)*8 - 2, -24, 18 + num[2] - '0');
+ Sbar_DrawCharacter ( (6*i+2)*8 - 2, -24, 18 + num[2] - '0');
+ if (num[3] != ' ')
+ Sbar_DrawCharacter ( (6*i+3)*8 - 2, -24, 18 + num[3] - '0');
}
// items
s = &cl.scores[k];
// draw background
- c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8];
- 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_complete[((s->colors & 15)<<4) + 8];
- 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)
{
s = &cl.scores[cl.viewentity - 1];
// draw background
Sbar_DrawPic (112, 0, rsb_teambord);
- c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8];
- 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_complete[((s->colors & 15)<<4) + 8];
- 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)
{
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)
+ *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) *conversion_factor *= 1.5;
+ // 1qu=1.5in is for non-Nexuiz only - Nexuiz 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) *conversion_factor *= 1.5;
+ break;
+ case 4:
+ *unit = "mph";
+ *conversion_factor = 0.0254 * 3.6 * 0.6213711922;
+ if(gamemode != GAME_NEXUIZ) *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) *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;
+ 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));
+ 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);
}
- 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));
if (showdate.integer)
strlcpy(datestring, Sys_TimeString(showdate_format.string), sizeof(datestring));
- if (fpsstring[0] || timestring[0])
+ if (showblur.integer)
+ dpsnprintf(blurstring, sizeof(blurstring), "%3i%% blur", (int)(cl.motionbluralpha * 100));
+ if (showsound.integer)
+ dpsnprintf(soundstring, sizeof(soundstring), "%4i/4%i at %3ims", cls.soundstats.mixedsounds, cls.soundstats.totalsounds, cls.soundstats.latency_milliseconds);
+ 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);
+ }
+ 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);
+ }
+ }
+ if (fpsstring[0] || timedemostring1[0] || timedemostring2[0] || timestring[0] || datestring[0] || speedstring[0] || blurstring[0] || topspeedstring[0])
{
fps_scalex = 12;
fps_scaley = 12;
- fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0));
+ fps_height = fps_scaley * ((soundstring[0] != 0) + (blurstring[0] != 0) + (fpsstring[0] != 0) + (timedemostring1[0] != 0) + (timedemostring2[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0) + (speedstring[0] != 0) + (topspeedstring[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 = vid_conheight.integer - sbar_info_pos.integer - fps_height;
+ if (soundstring[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(soundstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(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);
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(fpsstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ 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_Font(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_Font(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ fps_y += fps_scaley;
+ }
+ if (timedemostring1[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(timedemostring1, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(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_Font(timedemostring2, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(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_Font(timestring, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(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_Font(datestring, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(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_Font(speedstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(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_Font(topspeedstring, 0, false, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(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_Font(blurstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(fps_x, fps_y, blurstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
fps_y += fps_scaley;
}
}
*/
extern float v_dmg_time, v_dmg_roll, v_dmg_pitch;
extern cvar_t v_kicktime;
-void Sbar_Score (void);
+void Sbar_Score (int margin);
void Sbar_Draw (void)
{
cachepic_t *pic;
}
else if (cl.intermission == 2)
Sbar_FinaleOverlay();
- else if (gamemode == GAME_NETHERWORLD)
+ else if (gamemode == GAME_DELUXEQUAKE)
{
}
else if (gamemode == GAME_SOM)
int i;
float fade;
int redflag, blueflag;
+ float x;
sbar_x = (vid_conwidth.integer - 320)/2;
sbar_y = vid_conheight.integer - 24 - 16;
// 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, -109, 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, -169, 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)
Sbar_MiniDeathmatchOverlay (sbar_x + 320, sbar_y);
if (sbar_x > 0)
- Sbar_Score();
+ Sbar_Score(16);
+ // The margin can be at most 8 to support 640x480 console size:
+ // 320 + 2 * (144 + 16) = 640
}
else if (sb_lines)
{
int i;
float fade;
int redflag, blueflag;
+ float x;
sbar_x = (vid_conwidth.integer - 640)/2;
sbar_y = vid_conheight.integer - 47;
// 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, -109, sb_items[redflag+10]);
+ Sbar_DrawPic ((int) x, -117, sb_items[redflag+10]);
if (blueflag)
- Sbar_DrawPic (10 - sbar_x, -169, sb_items[blueflag+14]);
+ Sbar_DrawPic ((int) x, -177, sb_items[blueflag+14]);
}
// armor
Sbar_MiniDeathmatchOverlay (sbar_x + 600, sbar_y);
if (sbar_x > 0)
- Sbar_Score();
+ Sbar_Score(-16);
+ // Because:
+ // Mini scoreboard uses 12*4 per other team, that is, 144
+ // pixels when there are four teams...
+ // Nexuiz by default sets vid_conwidth to 800... makes
+ // sbar_x == 80...
+ // so we need to shift it by 64 pixels to the right to fit
+ // BUT: then it overlaps with the image that gets drawn
+ // for viewsize 100! Therefore, just account for 3 teams,
+ // that is, 96 pixels mini scoreboard size, needing 16 pixels
+ // to the right!
}
}
else if (gamemode == GAME_ZYMOTIC)
}
else // Quake and others
{
+ sbar_x = (vid_conwidth.integer - 320)/2;
sbar_y = vid_conheight.integer - SBAR_HEIGHT;
// LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode
//if (cl.gametype == GAME_DEATHMATCH && gamemode != GAME_TRANSFUSION)
- if (!cl.islocalgame && gamemode != GAME_TRANSFUSION)
- sbar_x = 0;
- else
- sbar_x = (vid_conwidth.integer - 320)/2;
if (sb_lines > 24)
{
Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
- }
-
- // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode
- //if (vid_conwidth.integer > 320 && cl.gametype == GAME_DEATHMATCH)
- if (!cl.islocalgame && vid_conwidth.integer > 320)
- {
- if (gamemode == GAME_TRANSFUSION)
- Sbar_MiniDeathmatchOverlay (0, 0);
- else
- Sbar_MiniDeathmatchOverlay (324, vid_conheight.integer - sb_lines);
- if (sbar_x > 0)
- Sbar_Score();
+ // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode
+ if ((!cl.islocalgame || cl.gametype != GAME_COOP))
+ {
+ if (gamemode == GAME_TRANSFUSION)
+ Sbar_MiniDeathmatchOverlay (0, 0);
+ else
+ Sbar_MiniDeathmatchOverlay (sbar_x + 324, vid_conheight.integer - 8*8);
+ Sbar_Score(24);
+ }
}
}
}
- 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);
+ 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);
}
//=============================================================================
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_Font(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_Font(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
{
// draw colors behind score
- c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8];
- 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_complete[((s->colors & 15)<<4) + 8];
- 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);
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_Font(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_Font(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
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_Font(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_Font(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_complete[(s->colors & 0xf0) + 8];
- 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_complete[((s->colors & 15)<<4) + 8];
- 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);
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_Font(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_Font(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;
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)
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;
}
}
- 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_Font(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_Font(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;
{
// 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);
}
/*
{
int i, j, numlines, range_begin, range_end, myteam, teamsep;
+ // do not draw this if sbar_miniscoreboard_size is zero
+ if(sbar_miniscoreboard_size.value == 0)
+ return;
+ // adjust the given y if sbar_miniscoreboard_size doesn't indicate default (< 0)
+ if(sbar_miniscoreboard_size.value > 0)
+ y = (int) (vid_conheight.integer - sbar_miniscoreboard_size.value * 8);
+
// scores
Sbar_SortFrags ();
}
}
-void Sbar_Score (void)
+int Sbar_TeamColorCompare(const void *t1_, const void *t2_)
+{
+ static int const sortorder[16] =
+ {
+ 1001,
+ 1002,
+ 1003,
+ 1004,
+ 1, // red
+ 1005,
+ 1006,
+ 1007,
+ 1008,
+ 4, // pink
+ 1009,
+ 1010,
+ 3, // yellow
+ 2, // blue
+ 1011,
+ 1012
+ };
+ const scoreboard_t *t1 = *(scoreboard_t **) t1_;
+ const scoreboard_t *t2 = *(scoreboard_t **) t2_;
+ int tc1 = sortorder[t1->colors & 15];
+ int tc2 = sortorder[t2->colors & 15];
+ return tc1 - tc2;
+}
+
+void Sbar_Score (int margin)
{
int i, me, score, otherleader, place, distribution, minutes, seconds;
double timeleft;
+ int sbar_x_save = sbar_x;
+ int sbar_y_save = sbar_y;
+
+
+ sbar_y = (int) (vid_conheight.value - (32+12));
+ sbar_x -= margin;
- sbar_y = vid_conheight.value - (32+12);
me = cl.playerentity - 1;
- if (me >= 0 && me < cl.maxclients)
+ if (sbar_scorerank.integer && me >= 0 && me < cl.maxclients)
{
- // find leading score other than ourselves, to calculate distribution
- // find our place in the scoreboard
- score = cl.scores[me].frags;
- for (i = 0, otherleader = -1, place = 1;i < cl.maxclients;i++)
+ if(Sbar_IsTeammatch())
{
- if (cl.scores[i].name[0] && i != me)
+ // Layout:
+ //
+ // team1 team3 team4
+ //
+ // TEAM2
+
+ scoreboard_t *teamcolorsort[16];
+
+ Sbar_SortFrags();
+ for(i = 0; i < teamlines; ++i)
+ teamcolorsort[i] = &(teams[i]);
+
+ // Now sort them by color
+ qsort(teamcolorsort, teamlines, sizeof(*teamcolorsort), Sbar_TeamColorCompare);
+
+ // : margin
+ // -12*4: four digits space
+ place = (teamlines - 1) * (-12 * 4);
+
+ for(i = 0; i < teamlines; ++i)
{
- if (otherleader == -1 || cl.scores[i].frags > cl.scores[otherleader].frags)
- otherleader = i;
- if (score < cl.scores[i].frags || (score == cl.scores[i].frags && i < me))
- place++;
+ int cindex = teamcolorsort[i]->colors & 15;
+ 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;
+ float cb = c[2] / cm;
+ if(cindex == (cl.scores[cl.playerentity - 1].colors & 15)) // my team
+ {
+ Sbar_DrawXNum(-32*4, 0, teamcolorsort[i]->frags, 4, 32, cr, cg, cb, 1, 0);
+ }
+ else // other team
+ {
+ Sbar_DrawXNum(place, -12, teamcolorsort[i]->frags, 4, 12, cr, cg, cb, 1, 0);
+ place += 4 * 12;
+ }
}
}
- distribution = otherleader >= 0 ? score - cl.scores[otherleader].frags : 0;
- if (place == 1)
- Sbar_DrawXNum(-3*12-24, -12, place, 3, 12, 0, 1, 1, 1, 0);
- else if (place == 2)
- Sbar_DrawXNum(-3*12-24, -12, place, 3, 12, 1, 1, 1, 1, 0);
- else if (place == 3)
- Sbar_DrawXNum(-3*12-24, -12, place, 3, 12, 1, 1, 0, 1, 0);
else
- Sbar_DrawXNum(-3*12-24, -12, place, 3, 12, 1, 0, 0, 1, 0);
- if (otherleader < 0)
- Sbar_DrawXNum(-32*4-24, 0, score, 4, 32, 1, 1, 1, 1, 0);
- else if (distribution >= 5)
- {
- Sbar_DrawXNum(-7*12-24, -12, distribution, 4, 12, 0, 1, 1, 1, 0);
- Sbar_DrawXNum(-32*4-24, 0, score, 4, 32, 0, 1, 1, 1, 0);
- }
- else if (distribution >= 0)
{
- Sbar_DrawXNum(-7*12-24, -12, distribution, 4, 12, 1, 1, 1, 1, 0);
- Sbar_DrawXNum(-32*4-24, 0, score, 4, 32, 1, 1, 1, 1, 0);
- }
- else if (distribution >= -5)
- {
- Sbar_DrawXNum(-7*12-24, -12, distribution, 4, 12, 1, 1, 0, 1, 0);
- Sbar_DrawXNum(-32*4-24, 0, score, 4, 32, 1, 1, 0, 1, 0);
- }
- else
- {
- Sbar_DrawXNum(-7*12-24, -12, distribution, 4, 12, 1, 0, 0, 1, 0);
- Sbar_DrawXNum(-32*4-24, 0, score, 4, 32, 1, 0, 0, 1, 0);
+ // Layout:
+ //
+ // leading place
+ //
+ // FRAGS
+ //
+ // find leading score other than ourselves, to calculate distribution
+ // find our place in the scoreboard
+ score = cl.scores[me].frags;
+ for (i = 0, otherleader = -1, place = 1;i < cl.maxclients;i++)
+ {
+ if (cl.scores[i].name[0] && i != me)
+ {
+ if (otherleader == -1 || cl.scores[i].frags > cl.scores[otherleader].frags)
+ otherleader = i;
+ if (score < cl.scores[i].frags || (score == cl.scores[i].frags && i < me))
+ place++;
+ }
+ }
+ distribution = otherleader >= 0 ? score - cl.scores[otherleader].frags : 0;
+ if (place == 1)
+ Sbar_DrawXNum(-3*12, -12, place, 3, 12, 1, 1, 1, 1, 0);
+ else if (place == 2)
+ Sbar_DrawXNum(-3*12, -12, place, 3, 12, 1, 1, 0, 1, 0);
+ else
+ Sbar_DrawXNum(-3*12, -12, place, 3, 12, 1, 0, 0, 1, 0);
+ if (otherleader < 0)
+ Sbar_DrawXNum(-32*4, 0, score, 4, 32, 1, 1, 1, 1, 0);
+ if (distribution >= 0)
+ {
+ Sbar_DrawXNum(-7*12, -12, distribution, 4, 12, 1, 1, 1, 1, 0);
+ Sbar_DrawXNum(-32*4, 0, score, 4, 32, 1, 1, 1, 1, 0);
+ }
+ else if (distribution >= -5)
+ {
+ Sbar_DrawXNum(-7*12, -12, distribution, 4, 12, 1, 1, 0, 1, 0);
+ Sbar_DrawXNum(-32*4, 0, score, 4, 32, 1, 1, 0, 1, 0);
+ }
+ else
+ {
+ Sbar_DrawXNum(-7*12, -12, distribution, 4, 12, 1, 0, 0, 1, 0);
+ Sbar_DrawXNum(-32*4, 0, score, 4, 32, 1, 0, 0, 1, 0);
+ }
}
}
- 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);
seconds = (int)(floor(timeleft) - minutes * 60);
if (minutes >= 5)
{
- Sbar_DrawXNum(-12*6-24, 32, minutes, 3, 12, 1, 1, 1, 1, 0);
- Sbar_DrawXNum(-12*2-24, 32, seconds, -2, 12, 1, 1, 1, 1, 0);
+ Sbar_DrawXNum(-12*6, 32, minutes, 3, 12, 1, 1, 1, 1, 0);
+ if(sb_colon && sb_colon->tex != r_texture_notexture)
+ DrawQ_Pic(sbar_x + -12*3, sbar_y + 32, sb_colon, 12, 12, 1, 1, 1, sbar_alpha_fg.value, 0);
+ Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 1, 1, 1, 0);
}
else if (minutes >= 1)
{
- Sbar_DrawXNum(-12*6-24, 32, minutes, 3, 12, 1, 1, 0, 1, 0);
- Sbar_DrawXNum(-12*2-24, 32, seconds, -2, 12, 1, 1, 0, 1, 0);
+ Sbar_DrawXNum(-12*6, 32, minutes, 3, 12, 1, 1, 0, 1, 0);
+ if(sb_colon && sb_colon->tex != r_texture_notexture)
+ DrawQ_Pic(sbar_x + -12*3, sbar_y + 32, sb_colon, 12, 12, 1, 1, 0, sbar_alpha_fg.value, 0);
+ Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 1, 0, 1, 0);
}
else if ((int)(timeleft * 4) & 1)
- Sbar_DrawXNum(-12*2-24, 32, seconds, -2, 12, 1, 1, 1, 1, 0);
+ Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 1, 1, 1, 0);
else
- Sbar_DrawXNum(-12*2-24, 32, seconds, -2, 12, 1, 0, 0, 1, 0);
+ 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);
- Sbar_DrawXNum(-12*6-24, 32, minutes, 3, 12, 0, 1, 1, 1, 0);
- Sbar_DrawXNum(-12*2-24, 32, seconds, -2, 12, 0, 1, 1, 1, 0);
+ Sbar_DrawXNum(-12*6, 32, minutes, 3, 12, 1, 1, 1, 1, 0);
+ if(sb_colon && sb_colon->tex != r_texture_notexture)
+ DrawQ_Pic(sbar_x + -12*3, sbar_y + 32, sb_colon, 12, 12, 1, 1, 1, sbar_alpha_fg.value, 0);
+ Sbar_DrawXNum(-12*2, 32, seconds, -2, 12, 1, 1, 1, 1, 0);
}
+
+ sbar_x = sbar_x_save;
+ sbar_y = sbar_y_save;
}
/*
int dig;
int num;
- // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode
- //if (cl.gametype == GAME_DEATHMATCH)
- if (!cl.islocalgame)
+ if (cl.gametype == GAME_DEATHMATCH)
{
Sbar_DeathmatchOverlay ();
return;
dig = (int)cl.completed_time / 60;
Sbar_DrawNum (160, 64, dig, 3, 0);
num = (int)cl.completed_time - dig*60;
- if (gamemode != GAME_NEXUIZ)
- Sbar_DrawPic (234,64,sb_colon);
+ Sbar_DrawPic (234,64,sb_colon);
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);
+ }
}
projects / xonotic / darkplaces.git / blobdiff