// sbar.c -- status bar code
#include "quakedef.h"
-#include "time.h"
+#include <time.h>
+#include "cl_collision.h"
+#include "csprogs.h"
cachepic_t *sb_disc;
//MED 01/04/97 added hipnotic items array
cachepic_t *hsb_items[2];
-//GAME_SOM stuff:
-cachepic_t *somsb_health;
-cachepic_t *somsb_ammo[4];
-cachepic_t *somsb_armor[3];
-
cachepic_t *zymsb_crosshair_center;
cachepic_t *zymsb_crosshair_line;
cachepic_t *zymsb_crosshair_health;
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 showdate_format = {CVAR_SAVE, "showdate_format", "%Y-%m-%d", "format string for date"};
+cvar_t showtex = {0, "showtex", "0", "shows the name of the texture on the crosshair (for map debugging)"};
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 crosshair_color_alpha = {CVAR_SAVE, "crosshair_color_alpha", "1", "how opaque the crosshair should be"};
cvar_t crosshair_size = {CVAR_SAVE, "crosshair_size", "1", "adjusts size of the crosshair on the screen"};
-void Sbar_MiniDeathmatchOverlay (int x, int y);
-void Sbar_DeathmatchOverlay (void);
-void Sbar_IntermissionOverlay (void);
-void Sbar_FinaleOverlay (void);
+static void Sbar_MiniDeathmatchOverlay (int x, int y);
+static void Sbar_DeathmatchOverlay (void);
+static void Sbar_IntermissionOverlay (void);
+static void Sbar_FinaleOverlay (void);
-void CL_VM_UpdateShowingScoresState (int showingscores);
/*
Tab key down
===============
*/
-void Sbar_ShowScores (void)
+static void Sbar_ShowScores (void)
{
if (sb_showscores)
return;
Tab key up
===============
*/
-void Sbar_DontShowScores (void)
+static void Sbar_DontShowScores (void)
{
sb_showscores = false;
CL_VM_UpdateShowingScoresState(sb_showscores);
}
-void sbar_start(void)
+static void sbar_start(void)
{
+ char vabuf[1024];
int i;
- if (gamemode == GAME_DELUXEQUAKE)
- {
- }
- else if (gamemode == GAME_SOM)
+ if (gamemode == GAME_DELUXEQUAKE || gamemode == GAME_BLOODOMNICIDE)
{
- sb_disc = Draw_CachePic ("gfx/disc");
-
- for (i = 0;i < 10;i++)
- 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)
+ else if (IS_OLDNEXUIZ_DERIVED(gamemode))
{
for (i = 0;i < 10;i++)
- 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_nums[0][i] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "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 | CACHEPICFLAG_FAILONMISSING);
- 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_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");
+ 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");
+ sb_health = Draw_CachePic_Flags ("gfx/sb_health", CACHEPICFLAG_QUIET);
- 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[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");
- 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_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");
- sb_sbar_minimal = Draw_CachePic ("gfx/sbar_minimal");
- sb_sbar_overlay = Draw_CachePic ("gfx/sbar_overlay");
+ 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));
+ sb_weapons[0][i] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inv_weapon%i",i), CACHEPICFLAG_QUIET);
}
else if (gamemode == GAME_ZYMOTIC)
{
- 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");
+ 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");
+ 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));
- sb_nums[1][i] = Draw_CachePic (va("gfx/anum_%i",i));
+ sb_nums[0][i] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/num_%i",i), CACHEPICFLAG_QUIET);
+ sb_nums[1][i] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/anum_%i",i), CACHEPICFLAG_QUIET);
}
- sb_nums[0][10] = Draw_CachePic ("gfx/num_minus");
- sb_nums[1][10] = Draw_CachePic ("gfx/anum_minus");
+ 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");
- sb_slash = Draw_CachePic ("gfx/num_slash");
+ sb_colon = Draw_CachePic_Flags ("gfx/num_colon", CACHEPICFLAG_QUIET | CACHEPICFLAG_FAILONMISSING);
+ sb_slash = Draw_CachePic_Flags ("gfx/num_slash", CACHEPICFLAG_QUIET);
- 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[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");
- 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");
+ 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));
- 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_weapons[2+i][0] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_shotgun",i+1), CACHEPICFLAG_QUIET);
+ sb_weapons[2+i][1] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_sshotgun",i+1), CACHEPICFLAG_QUIET);
+ sb_weapons[2+i][2] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_nailgun",i+1), CACHEPICFLAG_QUIET);
+ sb_weapons[2+i][3] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_snailgun",i+1), CACHEPICFLAG_QUIET);
+ sb_weapons[2+i][4] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_rlaunch",i+1), CACHEPICFLAG_QUIET);
+ sb_weapons[2+i][5] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_srlaunch",i+1), CACHEPICFLAG_QUIET);
+ sb_weapons[2+i][6] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_lightng",i+1), CACHEPICFLAG_QUIET);
}
- 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");
+ 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)
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
{
- 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");
+ 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));
- 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_weapons[2+i][0] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_laser",i+1), CACHEPICFLAG_QUIET);
+ hsb_weapons[2+i][1] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_mjolnir",i+1), CACHEPICFLAG_QUIET);
+ hsb_weapons[2+i][2] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_gren_prox",i+1), CACHEPICFLAG_QUIET);
+ hsb_weapons[2+i][3] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_prox_gren",i+1), CACHEPICFLAG_QUIET);
+ hsb_weapons[2+i][4] = Draw_CachePic_Flags (va(vabuf, sizeof(vabuf), "gfx/inva%i_prox",i+1), CACHEPICFLAG_QUIET);
}
- hsb_items[0] = Draw_CachePic ("gfx/sb_wsuit");
- hsb_items[1] = Draw_CachePic ("gfx/sb_eshld");
+ 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");
- rsb_invbar[1] = Draw_CachePic ("gfx/r_invbar2");
+ 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");
- 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_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");
- rsb_items[1] = Draw_CachePic ("gfx/r_agrav1");
+ 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");
+ 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");
- rsb_ammo[1] = Draw_CachePic ("gfx/r_ammomulti");
- rsb_ammo[2] = Draw_CachePic ("gfx/r_ammoplasma");
+ 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");
- sb_complete = Draw_CachePic ("gfx/complete");
- sb_inter = Draw_CachePic ("gfx/inter");
- sb_finale = Draw_CachePic ("gfx/finale");
+ 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)
+static void sbar_shutdown(void)
{
}
-void sbar_newmap(void)
+static void sbar_newmap(void)
{
}
Cvar_RegisterVariable(&showtime_format);
Cvar_RegisterVariable(&showdate);
Cvar_RegisterVariable(&showdate_format);
+ Cvar_RegisterVariable(&showtex);
Cvar_RegisterVariable(&sbar_alpha_bg);
Cvar_RegisterVariable(&sbar_alpha_fg);
Cvar_RegisterVariable(&sbar_hudselector);
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
- }
+ 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);
+ R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap, NULL, NULL);
}
Sbar_DrawPic
=============
*/
-void Sbar_DrawStretchPic (int x, int y, cachepic_t *pic, float alpha, float overridewidth, float overrideheight)
+static void Sbar_DrawStretchPic (int x, int y, cachepic_t *pic, float alpha, float overridewidth, float overrideheight)
{
DrawQ_Pic (sbar_x + x, sbar_y + y, pic, overridewidth, overrideheight, 1, 1, 1, alpha, 0);
}
-void Sbar_DrawPic (int x, int y, cachepic_t *pic)
+static void Sbar_DrawPic (int x, int y, cachepic_t *pic)
{
DrawQ_Pic (sbar_x + x, sbar_y + y, pic, 0, 0, 1, 1, 1, sbar_alpha_fg.value, 0);
}
-void Sbar_DrawAlphaPic (int x, int y, cachepic_t *pic, float alpha)
+static void Sbar_DrawAlphaPic (int x, int y, cachepic_t *pic, float alpha)
{
DrawQ_Pic (sbar_x + x, sbar_y + y, pic, 0, 0, 1, 1, 1, alpha, 0);
}
Draws one solid graphics character
================
*/
-void Sbar_DrawCharacter (int x, int y, int num)
+static void Sbar_DrawCharacter (int x, int y, int num)
{
- 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);
+ char vabuf[1024];
+ DrawQ_String (sbar_x + x + 4 , sbar_y + y, va(vabuf, sizeof(vabuf), "%c", num), 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0, NULL, true, FONT_SBAR);
}
/*
Sbar_DrawString
================
*/
-void Sbar_DrawString (int x, int y, char *str)
+static void Sbar_DrawString (int x, int y, char *str)
{
- 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);
+ DrawQ_String (sbar_x + x, sbar_y + y, str, 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR);
}
/*
Sbar_DrawNum
=============
*/
-void Sbar_DrawNum (int x, int y, int num, int digits, int color)
+static void Sbar_DrawNum (int x, int y, int num, int digits, int color)
{
char str[32], *ptr;
int l, frame;
=============
*/
-void Sbar_DrawXNum (int x, int y, int num, int digits, int lettersize, float r, float g, float b, float a, int flags)
+static void Sbar_DrawXNum (int x, int y, int num, int digits, int lettersize, float r, float g, float b, float a, int flags)
{
char str[32], *ptr;
int l, frame;
//=============================================================================
-int Sbar_IsTeammatch(void)
+static int Sbar_IsTeammatch(void)
{
// currently only nexuiz uses the team score board
- return ((gamemode == GAME_NEXUIZ)
+ return (IS_OLDNEXUIZ_DERIVED(gamemode)
&& (teamplay.integer > 0));
}
Sbar_SoloScoreboard
===============
*/
-void Sbar_SoloScoreboard (void)
+static void Sbar_SoloScoreboard (void)
{
#if 1
char str[80], timestr[40];
int max, timelen;
int minutes, seconds;
double t;
+ char vabuf[1024];
t = (cl.intermission ? cl.completed_time : cl.time);
minutes = (int)(t / 60);
// 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]));
+ Sbar_DrawString(8, 4, va(vabuf, sizeof(vabuf), "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]));
+ Sbar_DrawString(8, 4, va(vabuf, sizeof(vabuf), "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]));
+ Sbar_DrawString(8+22*8, 4, va(vabuf, sizeof(vabuf), "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;
+ Sbar_DrawString(8+22*8, 4, va(vabuf, sizeof(vabuf), "Secrets:%3i", cl.stats[STAT_SECRETS]));
- // 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'))
int minutes, seconds, tens, units;
int l;
- if (gamemode != GAME_NEXUIZ) {
+ if (IS_OLDNEXUIZ_DERIVED(gamemode)) {
dpsnprintf (str, sizeof(str), "Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]);
Sbar_DrawString (8, 4, str);
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);
+ if (IS_OLDNEXUIZ_DERIVED(gamemode)) {
+ 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
}
Sbar_DrawScoreboard
===============
*/
-void Sbar_DrawScoreboard (void)
+static void Sbar_DrawScoreboard (void)
{
Sbar_SoloScoreboard ();
// LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode
// AK to make DrawInventory smaller
static void Sbar_DrawWeapon(int nr, float fade, int active)
{
+ char vabuf[1024];
if (sbar_hudselector.integer == 1)
{
// width = 300, height = 100
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);
+ DrawQ_String((vid_conwidth.integer - w_width * 9) * 0.5 + w_width * nr + w_space, vid_conheight.integer - w_height + w_space, va(vabuf, sizeof(vabuf), "%i",nr+1), 0, font_size, font_size, 1, 1, 0, sbar_alpha_fg.value, 0, NULL, true, FONT_DEFAULT);
}
else
{
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(vabuf, sizeof(vabuf), "%i",nr+1), 0, font_size, font_size, 1, 0, 0, fade, 0, NULL, true, FONT_DEFAULT);
}
}
Sbar_DrawInventory
===============
*/
-void Sbar_DrawInventory (void)
+static void Sbar_DrawInventory (void)
{
int i;
char num[6];
else
flashon = (flashon%5) + 2;
- Sbar_DrawAlphaPic (i*24, -16, sb_weapons[flashon][i], sbar_alpha_bg.value);
+ Sbar_DrawPic (i*24, -16, sb_weapons[flashon][i]);
}
}
// MED 01/04/97
// hipnotic weapons
- if (gamemode == GAME_HIPNOTIC)
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
{
int grenadeflashing=0;
for (i=0 ; i<4 ; i++)
if (cl.stats[STAT_ITEMS] & (1<<(17+i)))
{
//MED 01/04/97 changed keys
- if (gamemode != GAME_HIPNOTIC || (i>1))
+ if (!(gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH) || (i>1))
Sbar_DrawPic (192 + i*16, -16, sb_items[i]);
}
//MED 01/04/97 added hipnotic items
// hipnotic items
- if (gamemode == GAME_HIPNOTIC)
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
{
for (i=0 ; i<2 ; i++)
if (cl.stats[STAT_ITEMS] & (1<<(24+i)))
Sbar_DrawFrags
===============
*/
-void Sbar_DrawFrags (void)
+static void Sbar_DrawFrags (void)
{
int i, k, l, x, f;
char num[12];
Sbar_DrawFace
===============
*/
-void Sbar_DrawFace (void)
+static void Sbar_DrawFace (void)
{
int f;
{
default:
case 1:
- if(gamemode == GAME_NEXUIZ)
+ if(IS_NEXUIZ_DERIVED(gamemode))
*unit = "in/s";
else
*unit = "qu/s";
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
+ if(!IS_NEXUIZ_DERIVED(gamemode))
+ *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) *conversion_factor *= 1.5;
+ if(!IS_NEXUIZ_DERIVED(gamemode))
+ *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;
+ if(!IS_NEXUIZ_DERIVED(gamemode))
+ *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;
+ if(!IS_NEXUIZ_DERIVED(gamemode))
+ *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];
+ char texstring[MAX_QPATH];
+ char entstring[32];
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;
+ texstring[0] = 0;
+ entstring[0] = 0;
if (showfps.integer)
{
- float calc;
- static double nexttime = 0, lasttime = 0;
- static double framerate = 0;
- static int framecount = 0;
- double interval = 1;
- double newtime;
- newtime = Sys_DoubleTime();
- if (newtime >= nexttime)
- {
- framerate = framecount / (newtime - lasttime);
- if (nexttime < newtime - interval * 1.5)
- nexttime = newtime;
- lasttime = newtime;
- nexttime += interval;
- framecount = 0;
- }
- framecount++;
- calc = framerate;
-
+ red = (showfps_framerate < 1.0f);
if(showfps.integer == 2)
- dpsnprintf(fpsstring, sizeof(fpsstring), "%7.3f mspf", (1000.0 / calc));
- else if ((red = (calc < 1.0f)))
- dpsnprintf(fpsstring, sizeof(fpsstring), "%4i spf", (int)(1.0 / calc + 0.5));
+ 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)(calc + 0.5));
+ dpsnprintf(fpsstring, sizeof(fpsstring), "%4i fps", (int)(showfps_framerate + 0.5));
+ fps_strings++;
+ if (cls.timedemo)
+ {
+ 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++;
+ }
}
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));
+ 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;
{
get_showspeed_unit(showspeed.integer, &f, &unit);
dpsnprintf(speedstring, sizeof(speedstring), "%.0f (%.0f) %s", f*speed, f*speedxy, unit);
+ fps_strings++;
}
if (showtopspeed.integer)
{
topspeedxy_latched ? "^1" : "^xf88", f*topspeedxy, "^xf88",
unit);
time(¤t_time);
+ fps_strings++;
}
}
- if (fpsstring[0] || timestring[0] || datestring[0] || speedstring[0] || blurstring[0] || topspeedstring[0])
+ if (showtex.integer)
+ {
+ vec3_t org;
+ vec3_t dest;
+ vec3_t temp;
+ trace_t svtrace, cltrace;
+ int hitnetentity = -1;
+
+ Matrix4x4_OriginFromMatrix(&r_refdef.view.matrix, org);
+ VectorSet(temp, 65536, 0, 0);
+ Matrix4x4_Transform(&r_refdef.view.matrix, temp, dest);
+ // clear the traces as we may or may not fill them out, and mark them with an invalid fraction so we know if we did
+ memset(&svtrace, 0, sizeof(svtrace));
+ memset(&cltrace, 0, sizeof(cltrace));
+ svtrace.fraction = 2.0;
+ cltrace.fraction = 2.0;
+ // ray hits models (even animated ones) and ignores translucent materials
+ if (SVVM_prog != NULL)
+ svtrace = SV_TraceLine(org, dest, MOVE_HITMODEL, NULL, SUPERCONTENTS_SOLID, 0, MATERIALFLAGMASK_TRANSLUCENT, collision_extendmovelength.value);
+ cltrace = CL_TraceLine(org, dest, MOVE_HITMODEL, NULL, SUPERCONTENTS_SOLID, 0, MATERIALFLAGMASK_TRANSLUCENT, collision_extendmovelength.value, true, false, &hitnetentity, true, true);
+ if (cltrace.hittexture)
+ strlcpy(texstring, cltrace.hittexture->name, sizeof(texstring));
+ else
+ strlcpy(texstring, "(no texture hit)", sizeof(texstring));
+ fps_strings++;
+ if (svtrace.fraction < cltrace.fraction)
+ {
+ if (svtrace.ent != NULL)
+ {
+ prvm_prog_t *prog = SVVM_prog;
+ dpsnprintf(entstring, sizeof(entstring), "server entity %i", (int)PRVM_EDICT_TO_PROG(svtrace.ent));
+ }
+ else
+ strlcpy(entstring, "(no entity hit)", sizeof(entstring));
+ }
+ else
+ {
+ if (CLVM_prog != NULL && cltrace.ent != NULL)
+ {
+ prvm_prog_t *prog = CLVM_prog;
+ dpsnprintf(entstring, sizeof(entstring), "client entity %i", (int)PRVM_EDICT_TO_PROG(cltrace.ent));
+ }
+ else if (hitnetentity > 0)
+ dpsnprintf(entstring, sizeof(entstring), "network entity %i", hitnetentity);
+ else if (hitnetentity == 0)
+ strlcpy(entstring, "world entity", sizeof(entstring));
+ else
+ strlcpy(entstring, "(no entity hit)", sizeof(entstring));
+ }
+ fps_strings++;
+ }
+ if (fps_strings)
{
fps_scalex = 12;
fps_scaley = 12;
- fps_height = fps_scaley * ((soundstring[0] != 0) + (blurstring[0] != 0) + (fpsstring[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 - sbar_info_pos.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_Font(soundstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ 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_Font(fps_x, fps_y, soundstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ 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 - DrawQ_TextWidth_Font(fpsstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ 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_Font(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 0, 0, 1, 0, NULL, true, FONT_INFOBAR);
+ DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 0, 0, 1, 0, NULL, true, FONT_INFOBAR);
else
- DrawQ_String_Font(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ 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 - DrawQ_TextWidth_Font(timestring, 0, true, FONT_INFOBAR) * fps_scalex;
+ 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_Font(fps_x, fps_y, timestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ 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 - DrawQ_TextWidth_Font(datestring, 0, true, FONT_INFOBAR) * fps_scalex;
+ 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_Font(fps_x, fps_y, datestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ 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_Font(speedstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ 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_Font(fps_x, fps_y, speedstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ 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_Font(topspeedstring, 0, false, FONT_INFOBAR) * fps_scalex;
+ 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_Font(fps_x, fps_y, topspeedstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, false, FONT_INFOBAR);
+ 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_Font(blurstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ 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;
+ }
+ if (texstring[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth(texstring, 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, texstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ fps_y += fps_scaley;
+ }
+ if (entstring[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth(entstring, 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_Font(fps_x, fps_y, blurstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ DrawQ_String(fps_x, fps_y, entstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
fps_y += fps_scaley;
}
}
}
-void Sbar_DrawGauge(float x, float y, cachepic_t *pic, float width, float height, float rangey, float rangeheight, float c1, float c2, float c1r, float c1g, float c1b, float c1a, float c2r, float c2g, float c2b, float c2a, float c3r, float c3g, float c3b, float c3a, int drawflags)
+static void Sbar_DrawGauge(float x, float y, cachepic_t *pic, float width, float height, float rangey, float rangeheight, float c1, float c2, float c1r, float c1g, float c1b, float c1a, float c2r, float c2g, float c2b, float c2a, float c3r, float c3g, float c3b, float c3a, int drawflags)
{
float r[5];
c2 = bound(0, c2, 1);
void Sbar_Draw (void)
{
cachepic_t *pic;
+ char vabuf[1024];
if(cl.csqc_vidvars.drawenginesbar) //[515]: csqc drawsbar
{
Sbar_DrawScoreboard ();
else if (cl.intermission == 1)
{
- if(gamemode == GAME_NEXUIZ) // display full scoreboard (that is, show scores + map name)
+ if(IS_OLDNEXUIZ_DERIVED(gamemode)) // display full scoreboard (that is, show scores + map name)
{
Sbar_DrawScoreboard();
return;
else if (gamemode == GAME_DELUXEQUAKE)
{
}
- else if (gamemode == GAME_SOM)
- {
- if (sb_showscores || (cl.stats[STAT_HEALTH] <= 0 && cl_deathscoreboard.integer))
- Sbar_DrawScoreboard ();
- else if (sb_lines)
- {
- // this is the top left of the sbar area
- sbar_x = 0;
- sbar_y = vid_conheight.integer - 24*3;
-
- // armor
- if (cl.stats[STAT_ARMOR])
- {
- if (cl.stats[STAT_ITEMS] & IT_ARMOR3)
- Sbar_DrawPic(0, 0, somsb_armor[2]);
- else if (cl.stats[STAT_ITEMS] & IT_ARMOR2)
- Sbar_DrawPic(0, 0, somsb_armor[1]);
- else if (cl.stats[STAT_ITEMS] & IT_ARMOR1)
- Sbar_DrawPic(0, 0, somsb_armor[0]);
- Sbar_DrawNum(24, 0, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25);
- }
-
- // health
- Sbar_DrawPic(0, 24, somsb_health);
- Sbar_DrawNum(24, 24, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
-
- // ammo icon
- if (cl.stats[STAT_ITEMS] & IT_SHELLS)
- Sbar_DrawPic(0, 48, somsb_ammo[0]);
- else if (cl.stats[STAT_ITEMS] & IT_NAILS)
- Sbar_DrawPic(0, 48, somsb_ammo[1]);
- else if (cl.stats[STAT_ITEMS] & IT_ROCKETS)
- Sbar_DrawPic(0, 48, somsb_ammo[2]);
- else if (cl.stats[STAT_ITEMS] & IT_CELLS)
- Sbar_DrawPic(0, 48, somsb_ammo[3]);
- Sbar_DrawNum(24, 48, cl.stats[STAT_AMMO], 3, false);
- if (cl.stats[STAT_SHELLS])
- Sbar_DrawNum(24 + 3*24, 48, cl.stats[STAT_SHELLS], 1, true);
- }
- }
- else if (gamemode == GAME_NEXUIZ)
+ else if (IS_OLDNEXUIZ_DERIVED(gamemode))
{
if (sb_showscores || (cl.stats[STAT_HEALTH] <= 0 && cl_deathscoreboard.integer))
{
// keys (hipnotic only)
//MED 01/04/97 moved keys here so they would not be overwritten
- if (gamemode == GAME_HIPNOTIC)
+ if (gamemode == GAME_HIPNOTIC || gamemode == GAME_QUOTH)
{
if (cl.stats[STAT_ITEMS] & IT_KEY1)
Sbar_DrawPic (209, 3, sb_items[0]);
}
}
- Sbar_ShowFPS();
-
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);
+ pic = Draw_CachePic (va(vabuf, sizeof(vabuf), "gfx/crosshair%i", crosshair.integer));
+ DrawQ_Pic((vid_conwidth.integer - Draw_GetPicWidth(pic) * crosshair_size.value) * 0.5f, (vid_conheight.integer - Draw_GetPicHeight(pic) * crosshair_size.value) * 0.5f, pic, Draw_GetPicWidth(pic) * crosshair_size.value, Draw_GetPicHeight(pic) * 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)), 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(vabuf, sizeof(vabuf), "gfx/prydoncursor%03i", cl_prydoncursor.integer)), 0, 0, 1, 1, 1, 1, 0);
}
//=============================================================================
==================
*/
-float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y)
+static float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y)
{
int minutes;
qboolean myself = false;
unsigned char *c;
+ char vabuf[1024];
minutes = (int)((cl.intermission ? cl.completed_time - s->qw_entertime : cl.time - s->qw_entertime) / 60.0);
if((s - cl.scores) == cl.playerentity - 1)
if (s->qw_spectator)
{
if (s->qw_ping || s->qw_packetloss)
- 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 );
+ DrawQ_String(x, y, va(vabuf, sizeof(vabuf), "%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_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 );
+ DrawQ_String(x, y, va(vabuf, sizeof(vabuf), " %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
{
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(vabuf, sizeof(vabuf), "%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_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 );
+ DrawQ_String(x, y, va(vabuf, sizeof(vabuf), "%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_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 );
+ DrawQ_String(x, y, va(vabuf, sizeof(vabuf), " %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_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 );
+ DrawQ_String(x, y, va(vabuf, sizeof(vabuf), "%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_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 );
+ DrawQ_String(x, y, va(vabuf, sizeof(vabuf), " spect %c%s", myself ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR );
}
else
{
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(vabuf, sizeof(vabuf), "%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_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 );
+ DrawQ_String(x, y, va(vabuf, sizeof(vabuf), "%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_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 );
+ DrawQ_String(x, y, va(vabuf, sizeof(vabuf), " %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, y, xmin, xmax, ymin, ymax;
+ char vabuf[1024];
// request new ping times every two second
if (cl.last_ping_request < realtime - 2 && cls.netcon)
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)
+ if(IS_OLDNEXUIZ_DERIVED(gamemode))
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);
+ DrawQ_Pic ((vid_conwidth.integer - Draw_GetPicWidth(sb_ranking))/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)
{
- 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 );
+ DrawQ_String(xmin, y, va(vabuf, sizeof(vabuf), "ping pl%% time frags team name"), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR );
}
else
{
- 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 );
+ DrawQ_String(xmin, y, va(vabuf, sizeof(vabuf), "ping pl%% frags name"), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false, FONT_SBAR );
}
y += 8;
}
}
-int Sbar_TeamColorCompare(const void *t1_, const void *t2_)
+static int Sbar_TeamColorCompare(const void *t1_, const void *t2_)
{
static int const sortorder[16] =
{
if (minutes >= 5)
{
Sbar_DrawXNum(-12*6, 32, minutes, 3, 12, 1, 1, 1, 1, 0);
- if(sb_colon && sb_colon->tex != r_texture_notexture)
+ if (Draw_IsPicLoaded(sb_colon))
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, 32, minutes, 3, 12, 1, 1, 0, 1, 0);
- if(sb_colon && sb_colon->tex != r_texture_notexture)
+ if (Draw_IsPicLoaded(sb_colon))
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);
}
minutes = (int)floor(cl.time / 60);
seconds = (int)(floor(cl.time) - minutes * 60);
Sbar_DrawXNum(-12*6, 32, minutes, 3, 12, 1, 1, 1, 1, 0);
- if(sb_colon && sb_colon->tex != r_texture_notexture)
+ if (Draw_IsPicLoaded(sb_colon))
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);
}
if(cl.stats[STAT_TOTALSECRETS])
{
Sbar_DrawNum (160, 104, cl.stats[STAT_SECRETS], 3, 0);
- if (gamemode != GAME_NEXUIZ)
+ if (!IS_OLDNEXUIZ_DERIVED(gamemode))
Sbar_DrawPic (232, 104, sb_slash);
Sbar_DrawNum (240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0);
}
if(cl.stats[STAT_TOTALMONSTERS])
{
Sbar_DrawNum (160, 144, cl.stats[STAT_MONSTERS], 3, 0);
- if (gamemode != GAME_NEXUIZ)
+ if (!IS_OLDNEXUIZ_DERIVED(gamemode))
Sbar_DrawPic (232, 144, sb_slash);
Sbar_DrawNum (240, 144, cl.stats[STAT_TOTALMONSTERS], 3, 0);
}
*/
void Sbar_FinaleOverlay (void)
{
- DrawQ_Pic((vid_conwidth.integer - sb_finale->width)/2, 16, sb_finale, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
+ DrawQ_Pic((vid_conwidth.integer - Draw_GetPicWidth(sb_finale))/2, 16, sb_finale, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
}
projects / xonotic / darkplaces.git / blobdiff