X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sbar.c;h=d0cb826fd9b3c57da5108db3c3ee980df6866cfd;hp=2d69abe346c0388766ea0d8d7e4750e2d4c17e29;hb=e9916cf8bef5f8c2aa8017433c427db196308664;hpb=972b5927c26cc3fbe7426431deaf21a56b745dd9 diff --git a/sbar.c b/sbar.c index 2d69abe3..d0cb826f 100644 --- a/sbar.c +++ b/sbar.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -21,47 +21,89 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" +typedef struct +{ + char name[32]; +} +sbarpic_t; + +static sbarpic_t sbarpics[256]; +static int numsbarpics; + +static sbarpic_t *Sbar_NewPic(const char *name) +{ + strcpy(sbarpics[numsbarpics].name, name); + // precache it + // FIXME: precache on every renderer restart (or move this to client) + Draw_CachePic(sbarpics[numsbarpics].name, true); + return sbarpics + (numsbarpics++); +} -#define STAT_MINUS 10 // num frame for '-' stats digit -qpic_t *sb_nums[2][11]; -qpic_t *sb_colon, *sb_slash; -qpic_t *sb_ibar; -qpic_t *sb_sbar; -qpic_t *sb_scorebar; +sbarpic_t *sb_disc; -qpic_t *sb_weapons[7][8]; // 0 is active, 1 is owned, 2-5 are flashes -qpic_t *sb_ammo[4]; -qpic_t *sb_sigil[4]; -qpic_t *sb_armor[3]; -qpic_t *sb_items[32]; +#define STAT_MINUS 10 // num frame for '-' stats digit +sbarpic_t *sb_nums[2][11]; +sbarpic_t *sb_colon, *sb_slash; +sbarpic_t *sb_ibar; +sbarpic_t *sb_sbar; +sbarpic_t *sb_scorebar; +// AK only used by NEX +sbarpic_t *sb_sbar_minimal; +sbarpic_t *sb_sbar_overlay; -qpic_t *sb_faces[7][2]; // 0 is gibbed, 1 is dead, 2-6 are alive - // 0 is static, 1 is temporary animation -qpic_t *sb_face_invis; -qpic_t *sb_face_quad; -qpic_t *sb_face_invuln; -qpic_t *sb_face_invis_invuln; +// AK changed the bound to 9 +sbarpic_t *sb_weapons[7][9]; // 0 is active, 1 is owned, 2-5 are flashes +sbarpic_t *sb_ammo[4]; +sbarpic_t *sb_sigil[4]; +sbarpic_t *sb_armor[3]; +sbarpic_t *sb_items[32]; -qboolean sb_showscores; +// 0-4 are based on health (in 20 increments) +// 0 is static, 1 is temporary animation +sbarpic_t *sb_faces[5][2]; -int sb_lines; // scan lines to draw +sbarpic_t *sb_face_invis; +sbarpic_t *sb_face_quad; +sbarpic_t *sb_face_invuln; +sbarpic_t *sb_face_invis_invuln; -qpic_t *rsb_invbar[2]; -qpic_t *rsb_weapons[5]; -qpic_t *rsb_items[2]; -qpic_t *rsb_ammo[3]; -qpic_t *rsb_teambord; // PGM 01/19/97 - team color border +qboolean sb_showscores; + +int sb_lines; // scan lines to draw + +sbarpic_t *rsb_invbar[2]; +sbarpic_t *rsb_weapons[5]; +sbarpic_t *rsb_items[2]; +sbarpic_t *rsb_ammo[3]; +sbarpic_t *rsb_teambord; // PGM 01/19/97 - team color border //MED 01/04/97 added two more weapons + 3 alternates for grenade launcher -qpic_t *hsb_weapons[7][5]; // 0 is active, 1 is owned, 2-5 are flashes +sbarpic_t *hsb_weapons[7][5]; // 0 is active, 1 is owned, 2-5 are flashes //MED 01/04/97 added array to simplify weapon parsing -int hipweapons[4] = {HIT_LASER_CANNON_BIT,HIT_MJOLNIR_BIT,4,HIT_PROXIMITY_GUN_BIT}; +int hipweapons[4] = {HIT_LASER_CANNON_BIT,HIT_MJOLNIR_BIT,4,HIT_PROXIMITY_GUN_BIT}; //MED 01/04/97 added hipnotic items array -qpic_t *hsb_items[2]; +sbarpic_t *hsb_items[2]; + +//GAME_SOM stuff: +sbarpic_t *somsb_health; +sbarpic_t *somsb_ammo[4]; +sbarpic_t *somsb_armor[3]; + +cvar_t showfps = {CVAR_SAVE, "showfps", "0"}; +cvar_t showtime = {CVAR_SAVE, "showtime", "0"}; +cvar_t showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S"}; +cvar_t showdate = {CVAR_SAVE, "showdate", "0"}; +cvar_t showdate_format = {CVAR_SAVE, "showdate_format", "%Y-%m-%d"}; +cvar_t sbar_alpha_bg = {CVAR_SAVE, "sbar_alpha_bg", "0.4"}; +cvar_t sbar_alpha_fg = {CVAR_SAVE, "sbar_alpha_fg", "1"}; + +cvar_t cl_deathscoreboard = {0, "cl_deathscoreboard", "1"}; -void Sbar_MiniDeathmatchOverlay (void); +void Sbar_MiniDeathmatchOverlay (int x, int y); void Sbar_DeathmatchOverlay (void); -void M_DrawPic (int x, int y, qpic_t *pic); +void Sbar_IntermissionOverlay (void); +void Sbar_FinaleOverlay (void); + /* =============== @@ -75,7 +117,6 @@ void Sbar_ShowScores (void) if (sb_showscores) return; sb_showscores = true; -// sb_updates = 0; } /* @@ -88,201 +129,233 @@ Tab key up void Sbar_DontShowScores (void) { sb_showscores = false; -// sb_updates = 0; } -/* -=============== -Sbar_Changed -=============== -*/ -//void Sbar_Changed (void) -//{ -// sb_updates = 0; // update next frame -//} - -/* -=============== -Sbar_Init -=============== -*/ -void Sbar_Init (void) +void sbar_start(void) { - int i; + int i; - for (i=0 ; i<10 ; i++) + numsbarpics = 0; + + if (gamemode == GAME_SOM) { - sb_nums[0][i] = Draw_PicFromWad (va("num_%i",i)); - sb_nums[1][i] = Draw_PicFromWad (va("anum_%i",i)); + sb_disc = Sbar_NewPic("gfx/disc"); + + for (i = 0;i < 10;i++) + sb_nums[0][i] = Sbar_NewPic (va("gfx/num_%i",i)); + + somsb_health = Sbar_NewPic("gfx/hud_health"); + somsb_ammo[0] = Sbar_NewPic("gfx/sb_shells"); + somsb_ammo[1] = Sbar_NewPic("gfx/sb_nails"); + somsb_ammo[2] = Sbar_NewPic("gfx/sb_rocket"); + somsb_ammo[3] = Sbar_NewPic("gfx/sb_cells"); + somsb_armor[0] = Sbar_NewPic("gfx/sb_armor1"); + somsb_armor[1] = Sbar_NewPic("gfx/sb_armor2"); + somsb_armor[2] = Sbar_NewPic("gfx/sb_armor3"); } - - sb_nums[0][10] = Draw_PicFromWad ("num_minus"); - sb_nums[1][10] = Draw_PicFromWad ("anum_minus"); - - sb_colon = Draw_PicFromWad ("num_colon"); - sb_slash = Draw_PicFromWad ("num_slash"); - - sb_weapons[0][0] = Draw_PicFromWad ("inv_shotgun"); - sb_weapons[0][1] = Draw_PicFromWad ("inv_sshotgun"); - sb_weapons[0][2] = Draw_PicFromWad ("inv_nailgun"); - sb_weapons[0][3] = Draw_PicFromWad ("inv_snailgun"); - sb_weapons[0][4] = Draw_PicFromWad ("inv_rlaunch"); - sb_weapons[0][5] = Draw_PicFromWad ("inv_srlaunch"); - sb_weapons[0][6] = Draw_PicFromWad ("inv_lightng"); - - sb_weapons[1][0] = Draw_PicFromWad ("inv2_shotgun"); - sb_weapons[1][1] = Draw_PicFromWad ("inv2_sshotgun"); - sb_weapons[1][2] = Draw_PicFromWad ("inv2_nailgun"); - sb_weapons[1][3] = Draw_PicFromWad ("inv2_snailgun"); - sb_weapons[1][4] = Draw_PicFromWad ("inv2_rlaunch"); - sb_weapons[1][5] = Draw_PicFromWad ("inv2_srlaunch"); - sb_weapons[1][6] = Draw_PicFromWad ("inv2_lightng"); - - for (i=0 ; i<5 ; i++) + else if (gamemode == GAME_NEXUIZ) { - sb_weapons[2+i][0] = Draw_PicFromWad (va("inva%i_shotgun",i+1)); - sb_weapons[2+i][1] = Draw_PicFromWad (va("inva%i_sshotgun",i+1)); - sb_weapons[2+i][2] = Draw_PicFromWad (va("inva%i_nailgun",i+1)); - sb_weapons[2+i][3] = Draw_PicFromWad (va("inva%i_snailgun",i+1)); - sb_weapons[2+i][4] = Draw_PicFromWad (va("inva%i_rlaunch",i+1)); - sb_weapons[2+i][5] = Draw_PicFromWad (va("inva%i_srlaunch",i+1)); - sb_weapons[2+i][6] = Draw_PicFromWad (va("inva%i_lightng",i+1)); + for (i = 0;i < 10;i++) + sb_nums[0][i] = Sbar_NewPic (va("gfx/num_%i",i)); + sb_nums[0][10] = Sbar_NewPic ("gfx/num_minus"); + + sb_ammo[0] = Sbar_NewPic ("gfx/sb_shells"); + sb_ammo[1] = Sbar_NewPic ("gfx/sb_bullets"); + sb_ammo[2] = Sbar_NewPic ("gfx/sb_rocket"); + sb_ammo[3] = Sbar_NewPic ("gfx/sb_cells"); + + sb_items[2] = Sbar_NewPic ("gfx/sb_slowmo"); + sb_items[3] = Sbar_NewPic ("gfx/sb_invinc"); + sb_items[4] = Sbar_NewPic ("gfx/sb_energy"); + sb_items[5] = Sbar_NewPic ("gfx/sb_str"); + + sb_sbar = Sbar_NewPic("gfx/sbar"); + sb_sbar_minimal = Sbar_NewPic("gfx/sbar_minimal"); + sb_sbar_overlay = Sbar_NewPic("gfx/sbar_overlay"); + + for(i = 0; i < 9;i++) + sb_weapons[0][i] = Sbar_NewPic(va("gfx/inv_weapon%i",i)); } + else + { + sb_disc = Sbar_NewPic("gfx/disc"); - sb_ammo[0] = Draw_PicFromWad ("sb_shells"); - sb_ammo[1] = Draw_PicFromWad ("sb_nails"); - sb_ammo[2] = Draw_PicFromWad ("sb_rocket"); - sb_ammo[3] = Draw_PicFromWad ("sb_cells"); - - sb_armor[0] = Draw_PicFromWad ("sb_armor1"); - sb_armor[1] = Draw_PicFromWad ("sb_armor2"); - sb_armor[2] = Draw_PicFromWad ("sb_armor3"); - - sb_items[0] = Draw_PicFromWad ("sb_key1"); - sb_items[1] = Draw_PicFromWad ("sb_key2"); - sb_items[2] = Draw_PicFromWad ("sb_invis"); - sb_items[3] = Draw_PicFromWad ("sb_invuln"); - sb_items[4] = Draw_PicFromWad ("sb_suit"); - sb_items[5] = Draw_PicFromWad ("sb_quad"); - - sb_sigil[0] = Draw_PicFromWad ("sb_sigil1"); - sb_sigil[1] = Draw_PicFromWad ("sb_sigil2"); - sb_sigil[2] = Draw_PicFromWad ("sb_sigil3"); - sb_sigil[3] = Draw_PicFromWad ("sb_sigil4"); - - sb_faces[4][0] = Draw_PicFromWad ("face1"); - sb_faces[4][1] = Draw_PicFromWad ("face_p1"); - sb_faces[3][0] = Draw_PicFromWad ("face2"); - sb_faces[3][1] = Draw_PicFromWad ("face_p2"); - sb_faces[2][0] = Draw_PicFromWad ("face3"); - sb_faces[2][1] = Draw_PicFromWad ("face_p3"); - sb_faces[1][0] = Draw_PicFromWad ("face4"); - sb_faces[1][1] = Draw_PicFromWad ("face_p4"); - sb_faces[0][0] = Draw_PicFromWad ("face5"); - sb_faces[0][1] = Draw_PicFromWad ("face_p5"); - - sb_face_invis = Draw_PicFromWad ("face_invis"); - sb_face_invuln = Draw_PicFromWad ("face_invul2"); - sb_face_invis_invuln = Draw_PicFromWad ("face_inv2"); - sb_face_quad = Draw_PicFromWad ("face_quad"); - - Cmd_AddCommand ("+showscores", Sbar_ShowScores); - Cmd_AddCommand ("-showscores", Sbar_DontShowScores); + for (i = 0;i < 10;i++) + { + sb_nums[0][i] = Sbar_NewPic (va("gfx/num_%i",i)); + sb_nums[1][i] = Sbar_NewPic (va("gfx/anum_%i",i)); + } - sb_sbar = Draw_PicFromWad ("sbar"); - sb_ibar = Draw_PicFromWad ("ibar"); - sb_scorebar = Draw_PicFromWad ("scorebar"); + sb_nums[0][10] = Sbar_NewPic ("gfx/num_minus"); + sb_nums[1][10] = Sbar_NewPic ("gfx/anum_minus"); + + sb_colon = Sbar_NewPic ("gfx/num_colon"); + sb_slash = Sbar_NewPic ("gfx/num_slash"); + + sb_weapons[0][0] = Sbar_NewPic ("gfx/inv_shotgun"); + sb_weapons[0][1] = Sbar_NewPic ("gfx/inv_sshotgun"); + sb_weapons[0][2] = Sbar_NewPic ("gfx/inv_nailgun"); + sb_weapons[0][3] = Sbar_NewPic ("gfx/inv_snailgun"); + sb_weapons[0][4] = Sbar_NewPic ("gfx/inv_rlaunch"); + sb_weapons[0][5] = Sbar_NewPic ("gfx/inv_srlaunch"); + sb_weapons[0][6] = Sbar_NewPic ("gfx/inv_lightng"); + + sb_weapons[1][0] = Sbar_NewPic ("gfx/inv2_shotgun"); + sb_weapons[1][1] = Sbar_NewPic ("gfx/inv2_sshotgun"); + sb_weapons[1][2] = Sbar_NewPic ("gfx/inv2_nailgun"); + sb_weapons[1][3] = Sbar_NewPic ("gfx/inv2_snailgun"); + sb_weapons[1][4] = Sbar_NewPic ("gfx/inv2_rlaunch"); + sb_weapons[1][5] = Sbar_NewPic ("gfx/inv2_srlaunch"); + sb_weapons[1][6] = Sbar_NewPic ("gfx/inv2_lightng"); + + for (i = 0;i < 5;i++) + { + sb_weapons[2+i][0] = Sbar_NewPic (va("gfx/inva%i_shotgun",i+1)); + sb_weapons[2+i][1] = Sbar_NewPic (va("gfx/inva%i_sshotgun",i+1)); + sb_weapons[2+i][2] = Sbar_NewPic (va("gfx/inva%i_nailgun",i+1)); + sb_weapons[2+i][3] = Sbar_NewPic (va("gfx/inva%i_snailgun",i+1)); + sb_weapons[2+i][4] = Sbar_NewPic (va("gfx/inva%i_rlaunch",i+1)); + sb_weapons[2+i][5] = Sbar_NewPic (va("gfx/inva%i_srlaunch",i+1)); + sb_weapons[2+i][6] = Sbar_NewPic (va("gfx/inva%i_lightng",i+1)); + } -//MED 01/04/97 added new hipnotic weapons - if (hipnotic) - { - hsb_weapons[0][0] = Draw_PicFromWad ("inv_laser"); - hsb_weapons[0][1] = Draw_PicFromWad ("inv_mjolnir"); - hsb_weapons[0][2] = Draw_PicFromWad ("inv_gren_prox"); - hsb_weapons[0][3] = Draw_PicFromWad ("inv_prox_gren"); - hsb_weapons[0][4] = Draw_PicFromWad ("inv_prox"); - - hsb_weapons[1][0] = Draw_PicFromWad ("inv2_laser"); - hsb_weapons[1][1] = Draw_PicFromWad ("inv2_mjolnir"); - hsb_weapons[1][2] = Draw_PicFromWad ("inv2_gren_prox"); - hsb_weapons[1][3] = Draw_PicFromWad ("inv2_prox_gren"); - hsb_weapons[1][4] = Draw_PicFromWad ("inv2_prox"); - - for (i=0 ; i<5 ; i++) - { - hsb_weapons[2+i][0] = Draw_PicFromWad (va("inva%i_laser",i+1)); - hsb_weapons[2+i][1] = Draw_PicFromWad (va("inva%i_mjolnir",i+1)); - hsb_weapons[2+i][2] = Draw_PicFromWad (va("inva%i_gren_prox",i+1)); - hsb_weapons[2+i][3] = Draw_PicFromWad (va("inva%i_prox_gren",i+1)); - hsb_weapons[2+i][4] = Draw_PicFromWad (va("inva%i_prox",i+1)); - } - - hsb_items[0] = Draw_PicFromWad ("sb_wsuit"); - hsb_items[1] = Draw_PicFromWad ("sb_eshld"); - } + sb_ammo[0] = Sbar_NewPic ("gfx/sb_shells"); + sb_ammo[1] = Sbar_NewPic ("gfx/sb_nails"); + sb_ammo[2] = Sbar_NewPic ("gfx/sb_rocket"); + sb_ammo[3] = Sbar_NewPic ("gfx/sb_cells"); + + sb_armor[0] = Sbar_NewPic ("gfx/sb_armor1"); + sb_armor[1] = Sbar_NewPic ("gfx/sb_armor2"); + sb_armor[2] = Sbar_NewPic ("gfx/sb_armor3"); + + sb_items[0] = Sbar_NewPic ("gfx/sb_key1"); + sb_items[1] = Sbar_NewPic ("gfx/sb_key2"); + sb_items[2] = Sbar_NewPic ("gfx/sb_invis"); + sb_items[3] = Sbar_NewPic ("gfx/sb_invuln"); + sb_items[4] = Sbar_NewPic ("gfx/sb_suit"); + sb_items[5] = Sbar_NewPic ("gfx/sb_quad"); + + sb_sigil[0] = Sbar_NewPic ("gfx/sb_sigil1"); + sb_sigil[1] = Sbar_NewPic ("gfx/sb_sigil2"); + sb_sigil[2] = Sbar_NewPic ("gfx/sb_sigil3"); + sb_sigil[3] = Sbar_NewPic ("gfx/sb_sigil4"); + + sb_faces[4][0] = Sbar_NewPic ("gfx/face1"); + sb_faces[4][1] = Sbar_NewPic ("gfx/face_p1"); + sb_faces[3][0] = Sbar_NewPic ("gfx/face2"); + sb_faces[3][1] = Sbar_NewPic ("gfx/face_p2"); + sb_faces[2][0] = Sbar_NewPic ("gfx/face3"); + sb_faces[2][1] = Sbar_NewPic ("gfx/face_p3"); + sb_faces[1][0] = Sbar_NewPic ("gfx/face4"); + sb_faces[1][1] = Sbar_NewPic ("gfx/face_p4"); + sb_faces[0][0] = Sbar_NewPic ("gfx/face5"); + sb_faces[0][1] = Sbar_NewPic ("gfx/face_p5"); + + sb_face_invis = Sbar_NewPic ("gfx/face_invis"); + sb_face_invuln = Sbar_NewPic ("gfx/face_invul2"); + sb_face_invis_invuln = Sbar_NewPic ("gfx/face_inv2"); + sb_face_quad = Sbar_NewPic ("gfx/face_quad"); + + sb_sbar = Sbar_NewPic ("gfx/sbar"); + sb_ibar = Sbar_NewPic ("gfx/ibar"); + sb_scorebar = Sbar_NewPic ("gfx/scorebar"); + + //MED 01/04/97 added new hipnotic weapons + if (gamemode == GAME_HIPNOTIC) + { + hsb_weapons[0][0] = Sbar_NewPic ("gfx/inv_laser"); + hsb_weapons[0][1] = Sbar_NewPic ("gfx/inv_mjolnir"); + hsb_weapons[0][2] = Sbar_NewPic ("gfx/inv_gren_prox"); + hsb_weapons[0][3] = Sbar_NewPic ("gfx/inv_prox_gren"); + hsb_weapons[0][4] = Sbar_NewPic ("gfx/inv_prox"); + + hsb_weapons[1][0] = Sbar_NewPic ("gfx/inv2_laser"); + hsb_weapons[1][1] = Sbar_NewPic ("gfx/inv2_mjolnir"); + hsb_weapons[1][2] = Sbar_NewPic ("gfx/inv2_gren_prox"); + hsb_weapons[1][3] = Sbar_NewPic ("gfx/inv2_prox_gren"); + hsb_weapons[1][4] = Sbar_NewPic ("gfx/inv2_prox"); + + for (i = 0;i < 5;i++) + { + hsb_weapons[2+i][0] = Sbar_NewPic (va("gfx/inva%i_laser",i+1)); + hsb_weapons[2+i][1] = Sbar_NewPic (va("gfx/inva%i_mjolnir",i+1)); + hsb_weapons[2+i][2] = Sbar_NewPic (va("gfx/inva%i_gren_prox",i+1)); + hsb_weapons[2+i][3] = Sbar_NewPic (va("gfx/inva%i_prox_gren",i+1)); + hsb_weapons[2+i][4] = Sbar_NewPic (va("gfx/inva%i_prox",i+1)); + } - if (rogue) - { - rsb_invbar[0] = Draw_PicFromWad ("r_invbar1"); - rsb_invbar[1] = Draw_PicFromWad ("r_invbar2"); + hsb_items[0] = Sbar_NewPic ("gfx/sb_wsuit"); + hsb_items[1] = Sbar_NewPic ("gfx/sb_eshld"); + } + else if (gamemode == GAME_ROGUE) + { + rsb_invbar[0] = Sbar_NewPic ("gfx/r_invbar1"); + rsb_invbar[1] = Sbar_NewPic ("gfx/r_invbar2"); - rsb_weapons[0] = Draw_PicFromWad ("r_lava"); - rsb_weapons[1] = Draw_PicFromWad ("r_superlava"); - rsb_weapons[2] = Draw_PicFromWad ("r_gren"); - rsb_weapons[3] = Draw_PicFromWad ("r_multirock"); - rsb_weapons[4] = Draw_PicFromWad ("r_plasma"); + rsb_weapons[0] = Sbar_NewPic ("gfx/r_lava"); + rsb_weapons[1] = Sbar_NewPic ("gfx/r_superlava"); + rsb_weapons[2] = Sbar_NewPic ("gfx/r_gren"); + rsb_weapons[3] = Sbar_NewPic ("gfx/r_multirock"); + rsb_weapons[4] = Sbar_NewPic ("gfx/r_plasma"); - rsb_items[0] = Draw_PicFromWad ("r_shield1"); - rsb_items[1] = Draw_PicFromWad ("r_agrav1"); + rsb_items[0] = Sbar_NewPic ("gfx/r_shield1"); + rsb_items[1] = Sbar_NewPic ("gfx/r_agrav1"); -// PGM 01/19/97 - team color border - rsb_teambord = Draw_PicFromWad ("r_teambord"); -// PGM 01/19/97 - team color border + // PGM 01/19/97 - team color border + rsb_teambord = Sbar_NewPic ("gfx/r_teambord"); + // PGM 01/19/97 - team color border - rsb_ammo[0] = Draw_PicFromWad ("r_ammolava"); - rsb_ammo[1] = Draw_PicFromWad ("r_ammomulti"); - rsb_ammo[2] = Draw_PicFromWad ("r_ammoplasma"); + rsb_ammo[0] = Sbar_NewPic ("gfx/r_ammolava"); + rsb_ammo[1] = Sbar_NewPic ("gfx/r_ammomulti"); + rsb_ammo[2] = Sbar_NewPic ("gfx/r_ammoplasma"); + } } } +void sbar_shutdown(void) +{ +} + +void sbar_newmap(void) +{ +} + +void Sbar_Init (void) +{ + Cmd_AddCommand ("+showscores", Sbar_ShowScores); + Cmd_AddCommand ("-showscores", Sbar_DontShowScores); + Cvar_RegisterVariable (&showfps); + Cvar_RegisterVariable (&showtime); + Cvar_RegisterVariable (&showtime_format); + Cvar_RegisterVariable (&showdate); + Cvar_RegisterVariable (&showdate_format); + Cvar_RegisterVariable (&sbar_alpha_bg); + Cvar_RegisterVariable (&sbar_alpha_fg); + Cvar_RegisterVariable (&cl_deathscoreboard); + + R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap); +} + //============================================================================= // drawing routines are relative to the status bar location +int sbar_x, sbar_y; + /* ============= Sbar_DrawPic ============= */ -void Sbar_DrawPic (int x, int y, qpic_t *pic) +void Sbar_DrawPic (int x, int y, sbarpic_t *sbarpic) { - if (cl.gametype == GAME_DEATHMATCH) - Draw_Pic (x /* + ((vid.width - 320)>>1)*/, y + (vid.height-SBAR_HEIGHT), pic); - else - Draw_Pic (x + ((vid.width - 320)>>1), y + (vid.height-SBAR_HEIGHT), pic); + DrawQ_Pic (sbar_x + x, sbar_y + y, sbarpic->name, 0, 0, 1, 1, 1, sbar_alpha_fg.value, 0); } -void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha); -void Sbar_DrawAlphaPic (int x, int y, qpic_t *pic, float alpha) +void Sbar_DrawAlphaPic (int x, int y, sbarpic_t *sbarpic, float alpha) { - if (cl.gametype == GAME_DEATHMATCH) - Draw_AlphaPic (x /* + ((vid.width - 320)>>1)*/, y + (vid.height-SBAR_HEIGHT), pic, alpha); - else - Draw_AlphaPic (x + ((vid.width - 320)>>1), y + (vid.height-SBAR_HEIGHT), pic, alpha); -} - -/* -============= -Sbar_DrawTransPic -============= -*/ -void Sbar_DrawTransPic (int x, int y, qpic_t *pic) -{ - if (cl.gametype == GAME_DEATHMATCH) - Draw_TransPic (x /*+ ((vid.width - 320)>>1)*/, y + (vid.height-SBAR_HEIGHT), pic); - else - Draw_TransPic (x + ((vid.width - 320)>>1), y + (vid.height-SBAR_HEIGHT), pic); + DrawQ_Pic (sbar_x + x, sbar_y + y, sbarpic->name, 0, 0, 1, 1, 1, alpha, 0); } /* @@ -294,10 +367,7 @@ Draws one solid graphics character */ void Sbar_DrawCharacter (int x, int y, int num) { - if (cl.gametype == GAME_DEATHMATCH) - Draw_Character ( x /*+ ((vid.width - 320)>>1) */ + 4 , y + vid.height-SBAR_HEIGHT, num); - else - Draw_Character ( x + ((vid.width - 320)>>1) + 4 , y + vid.height-SBAR_HEIGHT, num); + DrawQ_String (sbar_x + x + 4 , sbar_y + y, va("%c", num), 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0); } /* @@ -307,65 +377,57 @@ Sbar_DrawString */ void Sbar_DrawString (int x, int y, char *str) { - if (cl.gametype == GAME_DEATHMATCH) - Draw_String (x /*+ ((vid.width - 320)>>1)*/, y+ vid.height-SBAR_HEIGHT, str, 0); - else - Draw_String (x + ((vid.width - 320)>>1), y+ vid.height-SBAR_HEIGHT, str, 0); + DrawQ_String (sbar_x + x, sbar_y + y, str, 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0); } /* ============= -Sbar_itoa +Sbar_DrawNum ============= */ -int Sbar_itoa (int num, char *buf) +void Sbar_DrawNum (int x, int y, int num, int digits, int color) { - char *str; - int pow10; - int dig; + char str[32], *ptr; + int l, frame; - str = buf; - - if (num < 0) - { - *str++ = '-'; - num = -num; - } - - for (pow10 = 10 ; num >= pow10 ; pow10 *= 10) - ; + l = sprintf(str, "%i", num); + ptr = str; + if (l > digits) + ptr += (l-digits); + if (l < digits) + x += (digits-l)*24; - do + while (*ptr) { - pow10 /= 10; - dig = num/pow10; - *str++ = '0'+dig; - num -= dig*pow10; - } while (pow10 != 1); + if (*ptr == '-') + frame = STAT_MINUS; + else + frame = *ptr -'0'; - *str = 0; + Sbar_DrawPic (x, y, sb_nums[color][frame]); + x += 24; - return str-buf; + ptr++; + } } - /* ============= -Sbar_DrawNum +Sbar_DrawXNum ============= */ -void Sbar_DrawNum (int x, int y, int num, int digits, int color) + +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[12]; - char *ptr; - int l, frame; + char str[32], *ptr; + int l, frame; - l = Sbar_itoa (num, str); + l = sprintf(str, "%i", num); ptr = str; if (l > digits) ptr += (l-digits); if (l < digits) - x += (digits-l)*24; + x += (digits-l) * lettersize; while (*ptr) { @@ -374,27 +436,23 @@ void Sbar_DrawNum (int x, int y, int num, int digits, int color) else frame = *ptr -'0'; - Sbar_DrawTransPic (x,y,sb_nums[color][frame]); - x += 24; + DrawQ_Pic (sbar_x + x, sbar_y + y, sb_nums[0][frame]->name,lettersize,lettersize,r,g,b,a * sbar_alpha_fg.value,flags); + x += lettersize; + ptr++; } } //============================================================================= -int fragsort[MAX_SCOREBOARD]; - -char scoreboardtext[MAX_SCOREBOARD][20]; -int scoreboardtop[MAX_SCOREBOARD]; -int scoreboardbottom[MAX_SCOREBOARD]; -int scoreboardcount[MAX_SCOREBOARD]; -int scoreboardlines; /* =============== Sbar_SortFrags =============== */ +static int fragsort[MAX_SCOREBOARD]; +static int scoreboardlines; void Sbar_SortFrags (void) { int i, j, k; @@ -420,42 +478,6 @@ void Sbar_SortFrags (void) } } -int Sbar_ColorForMap (int m) -{ - return m < 128 ? m + 8 : m + 8; -} - -/* -=============== -Sbar_UpdateScoreboard -=============== -*/ -void Sbar_UpdateScoreboard (void) -{ - int i, k; - int top, bottom; - scoreboard_t *s; - - Sbar_SortFrags (); - -// draw the text - memset (scoreboardtext, 0, sizeof(scoreboardtext)); - - for (i=0 ; ifrags, s->name); - - top = s->colors & 0xf0; - bottom = (s->colors & 15) <<4; - scoreboardtop[i] = Sbar_ColorForMap (top); - scoreboardbottom[i] = Sbar_ColorForMap (bottom); - } -} - - - /* =============== Sbar_SoloScoreboard @@ -467,11 +489,13 @@ void Sbar_SoloScoreboard (void) int minutes, seconds, tens, units; int l; - sprintf (str,"Monsters:%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]); - Sbar_DrawString (8, 4, str); + if (gamemode != GAME_NEXUIZ) { + sprintf (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]); - Sbar_DrawString (8, 12, str); + sprintf (str,"Secrets :%3i /%3i", cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]); + Sbar_DrawString (8, 12, str); + } // time minutes = cl.time / 60; @@ -482,8 +506,13 @@ void Sbar_SoloScoreboard (void) Sbar_DrawString (184, 4, str); // draw level name - l = strlen (cl.levelname); - Sbar_DrawString (232 - l*4, 12, cl.levelname); + if (gamemode == GAME_NEXUIZ) { + l = (int) strlen (cl.worldmodel->name); + Sbar_DrawString (232 - l*4, 12, cl.worldmodel->name); + } else { + l = (int) strlen (cl.levelname); + Sbar_DrawString (232 - l*4, 12, cl.levelname); + } } /* @@ -496,55 +525,24 @@ void Sbar_DrawScoreboard (void) Sbar_SoloScoreboard (); if (cl.gametype == GAME_DEATHMATCH) Sbar_DeathmatchOverlay (); -#if 0 - int i, j, c; - int x, y; - int l; - int top, bottom; - scoreboard_t *s; - - if (cl.gametype != GAME_DEATHMATCH) - { - Sbar_SoloScoreboard (); - return; - } - - Sbar_UpdateScoreboard (); - - l = scoreboardlines <= 6 ? scoreboardlines : 6; - - for (i=0 ; iname[0]) - continue; +//============================================================================= - // draw background - top = s->colors & 0xf0; - bottom = (s->colors & 15)<<4; - top = Sbar_ColorForMap (top); - bottom = Sbar_ColorForMap (bottom); +// AK to make DrawInventory smaller +static void Sbar_DrawWeapon(int nr, float fade, int active) +{ + // width = 300, height = 100 + const int w_width = 300, w_height = 100, w_space = 10; + const float w_scale = 0.4; - Draw_Fill ( x*8+10 + ((vid.width - 320)>>1), y + vid.height - SBAR_HEIGHT, 28, 4, top); - Draw_Fill ( x*8+10 + ((vid.width - 320)>>1), y+4 + vid.height - SBAR_HEIGHT, 28, 4, bottom); + DrawQ_Pic(vid_conwidth.integer - (w_width + w_space) * w_scale, (w_height + w_space) * w_scale * nr + w_space, sb_weapons[0][nr]->name, 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_ADDITIVE); + //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); - // draw text - for (j=0 ; j<20 ; j++) - { - c = scoreboardtext[i][j]; - if (c == 0 || c == ' ') - continue; - Sbar_DrawCharacter ( (x+j)*8, y, c); - } - } -#endif + if (active) + DrawQ_Fill(vid_conwidth.integer - (w_width + w_space) * w_scale, (w_height + w_space) * w_scale * nr + w_space, w_width * w_scale, w_height * w_scale, 0.3, 0.3, 0.3, fade * sbar_alpha_fg.value, DRAWFLAG_ADDITIVE); } -//============================================================================= - /* =============== Sbar_DrawInventory @@ -552,27 +550,25 @@ Sbar_DrawInventory */ void Sbar_DrawInventory (void) { - int i; - char num[6]; - float time; - int flashon; + int i; + char num[6]; + float time; + int flashon; - if (rogue) + if (gamemode == GAME_ROGUE) { if ( cl.stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN ) - Sbar_DrawAlphaPic (0, -24, rsb_invbar[0], 0.4); + Sbar_DrawAlphaPic (0, -24, rsb_invbar[0], sbar_alpha_bg.value); else - Sbar_DrawAlphaPic (0, -24, rsb_invbar[1], 0.4); + Sbar_DrawAlphaPic (0, -24, rsb_invbar[1], sbar_alpha_bg.value); } else - { - Sbar_DrawAlphaPic (0, -24, sb_ibar, 0.4); - } + Sbar_DrawAlphaPic (0, -24, sb_ibar, sbar_alpha_bg.value); -// weapons + // weapons for (i=0 ; i<7 ; i++) { - if (cl.items & (IT_SHOTGUN< 1) -// sb_updates = 0; // force update to remove flash + Sbar_DrawAlphaPic (i*24, -16, sb_weapons[flashon][i], sbar_alpha_bg.value); } } -// MED 01/04/97 -// hipnotic weapons - if (hipnotic) - { - int grenadeflashing=0; - for (i=0 ; i<4 ; i++) - { - if (cl.items & (1<= 10) - { - if ( cl.stats[STAT_ACTIVEWEAPON] == (1< 1) -// sb_updates = 0; // force update to remove flash - } - } - } - - if (rogue) + // MED 01/04/97 + // hipnotic weapons + if (gamemode == GAME_HIPNOTIC) { - // check for powered up weapon. - if ( cl.stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN ) + int grenadeflashing=0; + for (i=0 ; i<4 ; i++) { - for (i=0;i<5;i++) + if (cl.stats[STAT_ITEMS] & (1<= 10) { - Sbar_DrawPic ((i+2)*24, -16, rsb_weapons[i]); + if ( cl.stats[STAT_ACTIVEWEAPON] == (1<= RIT_LAVA_NAILGUN ) + for (i=0;i<5;i++) + if (cl.stats[STAT_ACTIVEWEAPON] == (RIT_LAVA_NAILGUN << i)) + Sbar_DrawPic ((i+2)*24, -16, rsb_weapons[i]); + } + + // ammo counts for (i=0 ; i<4 ; i++) { sprintf (num, "%3i",cl.stats[STAT_SHELLS+i] ); @@ -677,89 +656,37 @@ void Sbar_DrawInventory (void) Sbar_DrawCharacter ( (6*i+3)*8 - 2, -24, 18 + num[2] - '0'); } - flashon = 0; - // items - for (i=0 ; i<6 ; i++) - if (cl.items & (1<<(17+i))) - { - time = cl.item_gettime[17+i]; - if (time && time > cl.time - 2 && flashon ) - { // flash frame -// sb_updates = 0; - } - else - { - //MED 01/04/97 changed keys - if (!hipnotic || (i>1)) - { - Sbar_DrawPic (192 + i*16, -16, sb_items[i]); - } - } -// if (time && time > cl.time - 2) -// sb_updates = 0; - } - //MED 01/04/97 added hipnotic items - // hipnotic items - if (hipnotic) - { - for (i=0 ; i<2 ; i++) - if (cl.items & (1<<(24+i))) - { - time = cl.item_gettime[24+i]; - if (time && time > cl.time - 2 && flashon ) - { // flash frame -// sb_updates = 0; - } - else - { - Sbar_DrawPic (288 + i*16, -16, hsb_items[i]); - } -// if (time && time > cl.time - 2) -// sb_updates = 0; - } - } - - if (rogue) - { - // new rogue items - for (i=0 ; i<2 ; i++) + // items + for (i=0 ; i<6 ; i++) + if (cl.stats[STAT_ITEMS] & (1<<(17+i))) { - if (cl.items & (1<<(29+i))) - { - time = cl.item_gettime[29+i]; + //MED 01/04/97 changed keys + if (gamemode != GAME_HIPNOTIC || (i>1)) + Sbar_DrawPic (192 + i*16, -16, sb_items[i]); + } - if (time && time > cl.time - 2 && flashon ) - { // flash frame -// sb_updates = 0; - } - else - { - Sbar_DrawPic (288 + i*16, -16, rsb_items[i]); - } + //MED 01/04/97 added hipnotic items + // hipnotic items + if (gamemode == GAME_HIPNOTIC) + { + for (i=0 ; i<2 ; i++) + if (cl.stats[STAT_ITEMS] & (1<<(24+i))) + Sbar_DrawPic (288 + i*16, -16, hsb_items[i]); + } -// if (time && time > cl.time - 2) -// sb_updates = 0; - } - } + if (gamemode == GAME_ROGUE) + { + // new rogue items + for (i=0 ; i<2 ; i++) + if (cl.stats[STAT_ITEMS] & (1<<(29+i))) + Sbar_DrawPic (288 + i*16, -16, rsb_items[i]); } else { - // sigils + // sigils for (i=0 ; i<4 ; i++) - { - if (cl.items & (1<<(28+i))) - { - time = cl.item_gettime[28+i]; - if (time && time > cl.time - 2 && flashon ) - { // flash frame -// sb_updates = 0; - } - else - Sbar_DrawPic (320-32 + i*8, -16, sb_sigil[i]); -// if (time && time > cl.time - 2) -// sb_updates = 0; - } - } + if (cl.stats[STAT_ITEMS] & (1<<(28+i))) + Sbar_DrawPic (320-32 + i*8, -16, sb_sigil[i]); } } @@ -772,55 +699,42 @@ Sbar_DrawFrags */ void Sbar_DrawFrags (void) { - int i, k, l; - int top, bottom; - int x, y, f; - int xofs; - char num[12]; - scoreboard_t *s; + int i, k, l, x, f; + char num[12]; + scoreboard_t *s; + qbyte *c; Sbar_SortFrags (); -// draw the text - l = scoreboardlines <= 4 ? scoreboardlines : 4; + // draw the text + l = min(scoreboardlines, 4); - x = 23; - if (cl.gametype == GAME_DEATHMATCH) - xofs = 0; - else - xofs = (vid.width - 320)>>1; - y = vid.height - SBAR_HEIGHT - 23; + x = 23 * 8; - for (i=0 ; iname[0]) - continue; - - // draw background - top = s->colors & 0xf0; - bottom = (s->colors & 15)<<4; - top = Sbar_ColorForMap (top); - bottom = Sbar_ColorForMap (bottom); - Draw_Fill (xofs + x*8 + 10, y, 28, 4, top); - Draw_Fill (xofs + x*8 + 10, y+4, 28, 3, bottom); + // draw background + c = (qbyte *)&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 = (qbyte *)&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); - // draw number + // draw number f = s->frags; sprintf (num, "%3i",f); - Sbar_DrawCharacter ( (x+1)*8 , -24, num[0]); - Sbar_DrawCharacter ( (x+2)*8 , -24, num[1]); - Sbar_DrawCharacter ( (x+3)*8 , -24, num[2]); - if (k == cl.viewentity - 1) { - Sbar_DrawCharacter (x*8+2, -24, 16); - Sbar_DrawCharacter ( (x+4)*8-4, -24, 17); + Sbar_DrawCharacter ( x + 2, -24, 16); + Sbar_DrawCharacter ( x + 32 - 4, -24, 17); } - x+=4; + Sbar_DrawCharacter (x + 8, -24, num[0]); + Sbar_DrawCharacter (x + 16, -24, num[1]); + Sbar_DrawCharacter (x + 24, -24, num[2]); + x += 32; } } @@ -834,41 +748,29 @@ Sbar_DrawFace */ void Sbar_DrawFace (void) { - int f, anim; + int f; // PGM 01/19/97 - team color drawing // PGM 03/02/97 - fixed so color swatch only appears in CTF modes - if (rogue && - (cl.maxclients != 1) && - (teamplay.value>3) && - (teamplay.value<7)) + if (gamemode == GAME_ROGUE && !cl.islocalgame && (teamplay.integer > 3) && (teamplay.integer < 7)) { - int top, bottom; - int xofs; - char num[12]; - scoreboard_t *s; - + char num[12]; + scoreboard_t *s; + qbyte *c; + s = &cl.scores[cl.viewentity - 1]; // draw background - top = s->colors & 0xf0; - bottom = (s->colors & 15)<<4; - top = Sbar_ColorForMap (top); - bottom = Sbar_ColorForMap (bottom); - - if (cl.gametype == GAME_DEATHMATCH) - xofs = 113; - else - xofs = ((vid.width - 320)>>1) + 113; - Sbar_DrawPic (112, 0, rsb_teambord); - Draw_Fill (xofs, vid.height-SBAR_HEIGHT+3, 22, 9, top); - Draw_Fill (xofs, vid.height-SBAR_HEIGHT+12, 22, 9, bottom); + c = (qbyte *)&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 = (qbyte *)&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); // draw number f = s->frags; sprintf (num, "%3i",f); - if (top==8) + if ((s->colors & 0xf0)==0) { if (num[0] != ' ') Sbar_DrawCharacter(109, 3, 18 + num[0] - '0'); @@ -883,46 +785,124 @@ void Sbar_DrawFace (void) Sbar_DrawCharacter ( 116, 3, num[1]); Sbar_DrawCharacter ( 123, 3, num[2]); } - + return; } // PGM 01/19/97 - team color drawing - if ( (cl.items & (IT_INVISIBILITY | IT_INVULNERABILITY) ) - == (IT_INVISIBILITY | IT_INVULNERABILITY) ) - { + if ( (cl.stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY) ) == (IT_INVISIBILITY | IT_INVULNERABILITY) ) Sbar_DrawPic (112, 0, sb_face_invis_invuln); - return; - } - if (cl.items & IT_QUAD) - { + else if (cl.stats[STAT_ITEMS] & IT_QUAD) Sbar_DrawPic (112, 0, sb_face_quad ); - return; - } - if (cl.items & IT_INVISIBILITY) - { + else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) Sbar_DrawPic (112, 0, sb_face_invis ); - return; - } - if (cl.items & IT_INVULNERABILITY) - { + else if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) Sbar_DrawPic (112, 0, sb_face_invuln); - return; - } - - if (cl.stats[STAT_HEALTH] >= 100) - f = 4; else + { f = cl.stats[STAT_HEALTH] / 20; + f = bound(0, f, 4); + Sbar_DrawPic (112, 0, sb_faces[f][cl.time <= cl.faceanimtime]); + } +} - if (cl.time <= cl.faceanimtime) +void Sbar_ShowFPS(void) +{ + float fps_x, fps_y, fps_scalex, fps_scaley, fps_height; + char fpsstring[32]; + char timestring[32]; + char datestring[32]; + qboolean red; + fpsstring[0] = 0; + timestring[0] = 0; + datestring[0] = 0; + if (showfps.integer) { - anim = 1; -// sb_updates = 0; // make sure the anim gets drawn over + float calc; + if (showfps.integer > 1) + { + static double currtime, frametimes[32]; + double newtime, total; + int count, i; + static int framecycle = 0; + + newtime = Sys_DoubleTime(); + frametimes[framecycle] = newtime - currtime; + total = 0; + count = 0; + while(total < 0.2 && count < 32 && frametimes[i = (framecycle - count) & 31]) + { + total += frametimes[i]; + count++; + } + framecycle++; + framecycle &= 31; + if (showfps.integer == 2) + calc = (((double)count / total) + 0.5); + else // showfps 3, rapid update + calc = ((1.0 / (newtime - currtime)) + 0.5); + currtime = newtime; + } + else + { + static double nexttime = 0, lasttime = 0; + static float framerate = 0; + static int framecount = 0; + double newtime; + newtime = Sys_DoubleTime(); + if (newtime >= nexttime) + { + framerate = ((float)framecount / (newtime - lasttime) + 0.5); + lasttime = newtime; + nexttime = max(nexttime + 1, lasttime - 1); + framecount = 0; + } + 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]) + { + fps_scalex = 12; + fps_scaley = 12; + fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0)); + //fps_y = vid_conheight.integer - sb_lines; // yes this may draw over the sbar + //fps_y = bound(0, fps_y, vid_conheight.integer - fps_height); + fps_y = vid_conheight.integer - fps_height; + 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); + if (red) + DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 0, 0, 1, 0); + else + DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0); + 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); + 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); + fps_y += fps_scaley; + } } - else - anim = 0; - Sbar_DrawPic (112, 0, sb_faces[f][anim]); } /* @@ -932,211 +912,303 @@ Sbar_Draw */ void Sbar_Draw (void) { - if (scr_con_current == vid.height) - return; // console is full screen - - scr_copyeverything = 1; - -// sb_updates++; - - if (sb_lines > 24) + if (cl.intermission == 1) { - Sbar_DrawInventory (); - if (cl.maxclients != 1) - Sbar_DrawFrags (); + Sbar_IntermissionOverlay(); + return; + } + else if (cl.intermission == 2) + { + Sbar_FinaleOverlay(); + return; } - if (sb_showscores || cl.stats[STAT_HEALTH] <= 0) + if (gamemode == GAME_SOM) { - Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4); - Sbar_DrawScoreboard (); -// sb_updates = 0; + 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 (sb_lines) + else if (gamemode == GAME_NEXUIZ) { - Sbar_DrawAlphaPic (0, 0, sb_sbar, 0.4); - - // keys (hipnotic only) - //MED 01/04/97 moved keys here so they would not be overwritten - if (hipnotic) - { - if (cl.items & IT_KEY1) - Sbar_DrawPic (209, 3, sb_items[0]); - if (cl.items & IT_KEY2) - Sbar_DrawPic (209, 12, sb_items[1]); - } - // armor - if (cl.items & IT_INVULNERABILITY) + sbar_y = vid_conheight.integer - 47; + sbar_x = (vid_conwidth.integer - 640)/2; + + if (sb_showscores || (cl.stats[STAT_HEALTH] <= 0 && cl_deathscoreboard.integer)) { - Sbar_DrawNum (24, 0, 666, 3, 1); - Sbar_DrawPic (0, 0, draw_disc); + Sbar_DrawAlphaPic (0, 0, sb_scorebar, sbar_alpha_bg.value); + Sbar_DrawScoreboard (); } - else + else if (sb_lines) { - if (rogue) + int i; + double time; + float fade; + + // we have a max time 2s (min time = 0) + if ((time = cl.time - cl.weapontime) < 2) { - Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3, - cl.stats[STAT_ARMOR] <= 25); - if (cl.items & RIT_ARMOR3) - Sbar_DrawPic (0, 0, sb_armor[2]); - else if (cl.items & RIT_ARMOR2) - Sbar_DrawPic (0, 0, sb_armor[1]); - else if (cl.items & RIT_ARMOR1) - Sbar_DrawPic (0, 0, sb_armor[0]); + fade = (1.0 - 0.5 * time); + fade *= fade; + for (i = 0; i < 8;i++) + if (cl.stats[STAT_ITEMS] & (1 << i)) + Sbar_DrawWeapon(i + 1, fade, (i + 2 == cl.stats[STAT_ACTIVEWEAPON])); + + if((cl.stats[STAT_ITEMS] & (1<<12))) + Sbar_DrawWeapon(0, fade, (cl.stats[STAT_ACTIVEWEAPON] == 1)); } + + //if (!cl.islocalgame) + // Sbar_DrawFrags (); + + if (sb_lines > 24) + Sbar_DrawAlphaPic (0, 0, sb_sbar, sbar_alpha_fg.value); else + Sbar_DrawAlphaPic (0, 0, sb_sbar_minimal, sbar_alpha_fg.value); + + // special items + if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) { - Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3 - , cl.stats[STAT_ARMOR] <= 25); - if (cl.items & IT_ARMOR3) - Sbar_DrawPic (0, 0, sb_armor[2]); - else if (cl.items & IT_ARMOR2) - Sbar_DrawPic (0, 0, sb_armor[1]); - else if (cl.items & IT_ARMOR1) - Sbar_DrawPic (0, 0, sb_armor[0]); + // Nexuiz has no anum pics + //Sbar_DrawNum (36, 0, 666, 3, 1); + // Nexuiz has no disc pic + //Sbar_DrawPic (0, 0, sb_disc); } - } - // face - Sbar_DrawFace (); + // armor + Sbar_DrawXNum ((340-3*24), 12, cl.stats[STAT_ARMOR], 3, 24, 0.6,0.7,0.8,1,0); - // health - Sbar_DrawNum (136, 0, cl.stats[STAT_HEALTH], 3 - , cl.stats[STAT_HEALTH] <= 25); + // health + if(cl.stats[STAT_HEALTH] > 100) + Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,1,1,1,1,0); + else if(cl.stats[STAT_HEALTH] <= 25 && cl.time - (int)cl.time > 0.5) + Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,0.7,0,0,1,0); + else + Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,0.6,0.7,0.8,1,0); - // ammo icon - if (rogue) - { - if (cl.items & RIT_SHELLS) - Sbar_DrawPic (224, 0, sb_ammo[0]); - else if (cl.items & RIT_NAILS) - Sbar_DrawPic (224, 0, sb_ammo[1]); - else if (cl.items & RIT_ROCKETS) - Sbar_DrawPic (224, 0, sb_ammo[2]); - else if (cl.items & RIT_CELLS) - Sbar_DrawPic (224, 0, sb_ammo[3]); - else if (cl.items & RIT_LAVA_NAILS) - Sbar_DrawPic (224, 0, rsb_ammo[0]); - else if (cl.items & RIT_PLASMA_AMMO) - Sbar_DrawPic (224, 0, rsb_ammo[1]); - else if (cl.items & RIT_MULTI_ROCKETS) - Sbar_DrawPic (224, 0, rsb_ammo[2]); + // AK dont draw ammo for the laser + if(cl.stats[STAT_ACTIVEWEAPON] != 12) + { + if (cl.stats[STAT_ITEMS] & NEX_IT_SHELLS) + Sbar_DrawPic (519, 0, sb_ammo[0]); + else if (cl.stats[STAT_ITEMS] & NEX_IT_BULLETS) + Sbar_DrawPic (519, 0, sb_ammo[1]); + else if (cl.stats[STAT_ITEMS] & NEX_IT_ROCKETS) + Sbar_DrawPic (519, 0, sb_ammo[2]); + else if (cl.stats[STAT_ITEMS] & NEX_IT_CELLS) + Sbar_DrawPic (519, 0, sb_ammo[3]); + + if(cl.stats[STAT_AMMO] <= 10) + Sbar_DrawXNum ((519-3*24), 12, cl.stats[STAT_AMMO], 3, 24, 0.7, 0,0,1,0); + else + Sbar_DrawXNum ((519-3*24), 12, cl.stats[STAT_AMMO], 3, 24, 0.6, 0.7,0.8,1,0); + + } + + if (sb_lines > 24) + DrawQ_Pic(sbar_x,sbar_y,sb_sbar_overlay->name,0,0,1,1,1,1,DRAWFLAG_MODULATE); } + + //if (vid_conwidth.integer > 320 && cl.gametype == GAME_DEATHMATCH) + // Sbar_MiniDeathmatchOverlay (0, 17); + } + else // Quake and others + { + sbar_y = vid_conheight.integer - SBAR_HEIGHT; + if (cl.gametype == GAME_DEATHMATCH && gamemode != GAME_TRANSFUSION) + sbar_x = 0; else + sbar_x = (vid_conwidth.integer - 320)/2; + + if (sb_lines > 24) { - if (cl.items & IT_SHELLS) - Sbar_DrawPic (224, 0, sb_ammo[0]); - else if (cl.items & IT_NAILS) - Sbar_DrawPic (224, 0, sb_ammo[1]); - else if (cl.items & IT_ROCKETS) - Sbar_DrawPic (224, 0, sb_ammo[2]); - else if (cl.items & IT_CELLS) - Sbar_DrawPic (224, 0, sb_ammo[3]); + if (gamemode != GAME_GOODVSBAD2) + Sbar_DrawInventory (); + if (!cl.islocalgame && gamemode != GAME_TRANSFUSION) + Sbar_DrawFrags (); } - Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, - cl.stats[STAT_AMMO] <= 10); - } + if (sb_showscores || (cl.stats[STAT_HEALTH] <= 0 && cl_deathscoreboard.integer)) + { + if (gamemode != GAME_GOODVSBAD2) + Sbar_DrawAlphaPic (0, 0, sb_scorebar, sbar_alpha_bg.value); + Sbar_DrawScoreboard (); + } + else if (sb_lines) + { + Sbar_DrawAlphaPic (0, 0, sb_sbar, sbar_alpha_bg.value); - if (vid.width > 320) { - if (cl.gametype == GAME_DEATHMATCH) - Sbar_MiniDeathmatchOverlay (); - } -} + // keys (hipnotic only) + //MED 01/04/97 moved keys here so they would not be overwritten + if (gamemode == GAME_HIPNOTIC) + { + if (cl.stats[STAT_ITEMS] & IT_KEY1) + Sbar_DrawPic (209, 3, sb_items[0]); + if (cl.stats[STAT_ITEMS] & IT_KEY2) + Sbar_DrawPic (209, 12, sb_items[1]); + } + // armor + if (gamemode != GAME_GOODVSBAD2) + { + if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) + { + Sbar_DrawNum (24, 0, 666, 3, 1); + Sbar_DrawPic (0, 0, sb_disc); + } + else + { + if (gamemode == GAME_ROGUE) + { + Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25); + if (cl.stats[STAT_ITEMS] & RIT_ARMOR3) + Sbar_DrawPic (0, 0, sb_armor[2]); + else if (cl.stats[STAT_ITEMS] & RIT_ARMOR2) + Sbar_DrawPic (0, 0, sb_armor[1]); + else if (cl.stats[STAT_ITEMS] & RIT_ARMOR1) + Sbar_DrawPic (0, 0, sb_armor[0]); + } + else + { + Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25); + if (cl.stats[STAT_ITEMS] & IT_ARMOR3) + Sbar_DrawPic (0, 0, sb_armor[2]); + else if (cl.stats[STAT_ITEMS] & IT_ARMOR2) + Sbar_DrawPic (0, 0, sb_armor[1]); + else if (cl.stats[STAT_ITEMS] & IT_ARMOR1) + Sbar_DrawPic (0, 0, sb_armor[0]); + } + } + } -//============================================================================= + // face + Sbar_DrawFace (); -/* -================== -Sbar_IntermissionNumber + // health + Sbar_DrawNum (154, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25); -================== -*/ -void Sbar_IntermissionNumber (int x, int y, int num, int digits, int color) -{ - char str[12]; - char *ptr; - int l, frame; + // ammo icon + if (gamemode == GAME_ROGUE) + { + if (cl.stats[STAT_ITEMS] & RIT_SHELLS) + Sbar_DrawPic (224, 0, sb_ammo[0]); + else if (cl.stats[STAT_ITEMS] & RIT_NAILS) + Sbar_DrawPic (224, 0, sb_ammo[1]); + else if (cl.stats[STAT_ITEMS] & RIT_ROCKETS) + Sbar_DrawPic (224, 0, sb_ammo[2]); + else if (cl.stats[STAT_ITEMS] & RIT_CELLS) + Sbar_DrawPic (224, 0, sb_ammo[3]); + else if (cl.stats[STAT_ITEMS] & RIT_LAVA_NAILS) + Sbar_DrawPic (224, 0, rsb_ammo[0]); + else if (cl.stats[STAT_ITEMS] & RIT_PLASMA_AMMO) + Sbar_DrawPic (224, 0, rsb_ammo[1]); + else if (cl.stats[STAT_ITEMS] & RIT_MULTI_ROCKETS) + Sbar_DrawPic (224, 0, rsb_ammo[2]); + } + else + { + if (cl.stats[STAT_ITEMS] & IT_SHELLS) + Sbar_DrawPic (224, 0, sb_ammo[0]); + else if (cl.stats[STAT_ITEMS] & IT_NAILS) + Sbar_DrawPic (224, 0, sb_ammo[1]); + else if (cl.stats[STAT_ITEMS] & IT_ROCKETS) + Sbar_DrawPic (224, 0, sb_ammo[2]); + else if (cl.stats[STAT_ITEMS] & IT_CELLS) + Sbar_DrawPic (224, 0, sb_ammo[3]); + } - l = Sbar_itoa (num, str); - ptr = str; - if (l > digits) - ptr += (l-digits); - if (l < digits) - x += (digits-l)*24; + Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10); - while (*ptr) - { - if (*ptr == '-') - frame = STAT_MINUS; - else - frame = *ptr -'0'; + } - Draw_TransPic (x,y,sb_nums[color][frame]); - x += 24; - ptr++; + if (vid_conwidth.integer > 320 && cl.gametype == GAME_DEATHMATCH) + { + if (gamemode == GAME_TRANSFUSION) + Sbar_MiniDeathmatchOverlay (0, 0); + else + Sbar_MiniDeathmatchOverlay (324, vid_conheight.integer - sb_lines); + } } + + Sbar_ShowFPS(); + + R_Draw2DCrosshair(); + + 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, va("gfx/prydoncursor%03i", cl_prydoncursor.integer), 0, 0, 1, 1, 1, 1, 0); } +//============================================================================= + /* ================== Sbar_DeathmatchOverlay ================== */ -void Sbar_DeathmatchOverlay (void) +float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y) { - qpic_t *pic; - int i, k, l, top, bottom, x, y, total, n, minutes, tens, units, fph; - char num[128]; - scoreboard_t *s; + qbyte *c; + // draw colors behind score + c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8]; + DrawQ_Fill(x + 8, y+1, 32, 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 = (qbyte *)&palette_complete[((s->colors & 15)<<4) + 8]; + DrawQ_Fill(x + 8, y+4, 32, 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); + // print the text + //DrawQ_String(x, y, va("%c%4i %s", (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', (int) s->frags, s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); + // FIXME: use a constant for this color tag instead + DrawQ_ColoredString(x, y, va("%c%4i %s" STRING_COLOR_DEFAULT_STR, (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', (int) s->frags, s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL ); + return 8; +} - scr_copyeverything = 1; - scr_fullupdate = 0; +void Sbar_DeathmatchOverlay (void) +{ + int i, x, y; + cachepic_t *pic; - pic = Draw_CachePic ("gfx/ranking.lmp"); - M_DrawPic ((320-pic->width)/2, 8, pic); + pic = Draw_CachePic ("gfx/ranking", true); + DrawQ_Pic ((vid_conwidth.integer - pic->width)/2, 8, "gfx/ranking", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); -// scores + // scores Sbar_SortFrags (); - -// draw the text - l = scoreboardlines; - - x = ((vid.width - 320)>>1) - 140; + // draw the text + x = (vid_conwidth.integer - (6 + 15) * 8) / 2; y = 40; - for (i = 0;i < l;i++) - { - k = fragsort[i]; - s = &cl.scores[k]; - if (!s->name[0]) - continue; - - // draw background - top = s->colors & 0xf0; - bottom = (s->colors & 15)<<4; - top = Sbar_ColorForMap (top); - bottom = Sbar_ColorForMap (bottom); - - Draw_Fill ( x, y+1, 88, 3, top); - Draw_Fill ( x, y+4, 88, 3, bottom); - - total = cl.time - s->entertime; - minutes = (int)total/60; - n = total - minutes*60; - tens = n/10; - units = n%10; - - fph = total ? (int) ((float) s->frags * 3600.0 / total) : 0; - if (fph < -999) fph = -999; - if (fph > 9999) fph = 9999; - - // put it together - sprintf (num, "%c %4i:%4i %3i:%i%i %s", k == cl.viewentity - 1 ? 12 : ' ', (int) s->frags, fph, minutes, tens, units, s->name); - Draw_String(x - 8, y, num, 0); - - y += 8; - } + for (i = 0;i < scoreboardlines && y < vid_conheight.integer;i++) + y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); } /* @@ -1145,67 +1217,42 @@ Sbar_DeathmatchOverlay ================== */ -void Sbar_MiniDeathmatchOverlay (void) +void Sbar_MiniDeathmatchOverlay (int x, int y) { - int i, l, k, top, bottom, x, y, fph, numlines; - char num[128]; - scoreboard_t *s; + int i, numlines; - if (vid.width < 512 || !sb_lines) - return; + // decide where to print + if (gamemode == GAME_TRANSFUSION) + numlines = (vid_conwidth.integer - x + 127) / 128; + else + numlines = (vid_conheight.integer - y + 7) / 8; - scr_copyeverything = 1; - scr_fullupdate = 0; + // give up if there isn't room + if (x >= vid_conwidth.integer || y >= vid_conheight.integer || numlines < 1) + return; -// scores + // scores Sbar_SortFrags (); -// draw the text - l = scoreboardlines; - y = vid.height - sb_lines; - numlines = sb_lines/8; - if (numlines < 3) - return; - //find us for (i = 0; i < scoreboardlines; i++) - if (fragsort[i] == cl.viewentity - 1) + if (fragsort[i] == cl.playerentity - 1) break; - if (i == scoreboardlines) // we're not there - i = 0; - else // figure out start - i = i - numlines/2; - - if (i > scoreboardlines - numlines) - i = scoreboardlines - numlines; - if (i < 0) - i = 0; + // figure out start + i -= numlines/2; + i = min(i, scoreboardlines - numlines); + i = max(i, 0); - x = 324; - for (;i < scoreboardlines && y < vid.height - 8;i++) + if (gamemode == GAME_TRANSFUSION) { - k = fragsort[i]; - s = &cl.scores[k]; - if (!s->name[0]) - continue; - - // draw background - top = Sbar_ColorForMap (s->colors & 0xf0); - bottom = Sbar_ColorForMap ((s->colors & 15)<<4); - - Draw_Fill ( x, y+1, 72, 3, top); - Draw_Fill ( x, y+4, 72, 3, bottom); - - fph = (cl.time - s->entertime) ? (int) ((float) s->frags * 3600.0 / (cl.time - s->entertime)) : 0; - if (fph < -999) fph = -999; - if (fph > 9999) fph = 9999; - - // put it together - sprintf (num, "%c%4i:%4i%c %s", k == cl.viewentity - 1 ? 16 : ' ', (int) s->frags, fph, k == cl.viewentity - 1 ? 17 : ' ', s->name); - Draw_String(x - 8, y, num, 0); - - y += 8; + for (;i < scoreboardlines && x < vid_conwidth.integer;i++) + x += 128 + Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); + } + else + { + for (;i < scoreboardlines && y < vid_conheight.integer;i++) + y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); } } @@ -1217,40 +1264,39 @@ Sbar_IntermissionOverlay */ void Sbar_IntermissionOverlay (void) { - qpic_t *pic; int dig; int num; - scr_copyeverything = 1; - scr_fullupdate = 0; - if (cl.gametype == GAME_DEATHMATCH) { Sbar_DeathmatchOverlay (); return; } - pic = Draw_CachePic ("gfx/complete.lmp"); - Draw_Pic (64, 24, pic); + sbar_x = (vid_conwidth.integer - 320) >> 1; + sbar_y = (vid_conheight.integer - 200) >> 1; - pic = Draw_CachePic ("gfx/inter.lmp"); - Draw_TransPic (0, 56, pic); + DrawQ_Pic (sbar_x + 64, sbar_y + 24, "gfx/complete", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); + DrawQ_Pic (sbar_x + 0, sbar_y + 56, "gfx/inter", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); // time dig = cl.completed_time/60; - Sbar_IntermissionNumber (160, 64, dig, 3, 0); + Sbar_DrawNum (160, 64, dig, 3, 0); num = cl.completed_time - dig*60; - Draw_TransPic (234,64,sb_colon); - Draw_TransPic (246,64,sb_nums[0][num/10]); - Draw_TransPic (266,64,sb_nums[0][num%10]); + if (gamemode != GAME_NEXUIZ) + 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_IntermissionNumber (160, 104, cl.stats[STAT_SECRETS], 3, 0); - Draw_TransPic (232,104,sb_slash); - Sbar_IntermissionNumber (240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0); + 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_IntermissionNumber (160, 144, cl.stats[STAT_MONSTERS], 3, 0); - Draw_TransPic (232,144,sb_slash); - Sbar_IntermissionNumber (240, 144, cl.stats[STAT_TOTALMONSTERS], 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); } @@ -1263,10 +1309,9 @@ Sbar_FinaleOverlay */ void Sbar_FinaleOverlay (void) { - qpic_t *pic; + cachepic_t *pic; - scr_copyeverything = 1; - - pic = Draw_CachePic ("gfx/finale.lmp"); - Draw_TransPic ( (vid.width-pic->width)/2, 16, pic); + pic = Draw_CachePic ("gfx/finale", true); + DrawQ_Pic((vid_conwidth.integer - pic->width)/2, 16, "gfx/finale", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); } +