X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sbar.c;h=c660db8833cc24f81db406d12a284cff6013728a;hp=f4d01ce9be2a6015f5f08932c261ff8dbcc28fd7;hb=76ed5d5ee3a2517bfae3df09fb0b8d912f7286bc;hpb=d2bafd01fc8cbc2da7d204bef35c6246e957cb2e diff --git a/sbar.c b/sbar.c index f4d01ce9..c660db88 100644 --- a/sbar.c +++ b/sbar.c @@ -21,68 +21,88 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -typedef struct -{ - char name[16]; -} -sbarpic_t; - -static sbarpic_t sbarpics[256]; -static int numsbarpics; - -static sbarpic_t *Sbar_NewPic(char *name) -{ - strcpy(sbarpics[numsbarpics].name, name); - // precache it - // FIXME: precache on every renderer restart (or move this to client) - Draw_CachePic(name); - return sbarpics + (numsbarpics++); -} - -sbarpic_t *sb_disc; +cachepic_t *sb_disc; #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; - -sbarpic_t *sb_weapons[7][8]; // 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]; - -// 0 is gibbed, 1 is dead, 2-6 are alive +cachepic_t *sb_nums[2][11]; +cachepic_t *sb_colon, *sb_slash; +cachepic_t *sb_ibar; +cachepic_t *sb_sbar; +cachepic_t *sb_scorebar; +// AK only used by NEX +cachepic_t *sb_sbar_minimal; +cachepic_t *sb_sbar_overlay; + +// AK changed the bound to 9 +cachepic_t *sb_weapons[7][9]; // 0 is active, 1 is owned, 2-5 are flashes +cachepic_t *sb_ammo[4]; +cachepic_t *sb_sigil[4]; +cachepic_t *sb_armor[3]; +cachepic_t *sb_items[32]; + +// 0-4 are based on health (in 20 increments) // 0 is static, 1 is temporary animation -sbarpic_t *sb_faces[7][2]; +cachepic_t *sb_faces[5][2]; -sbarpic_t *sb_face_invis; -sbarpic_t *sb_face_quad; -sbarpic_t *sb_face_invuln; -sbarpic_t *sb_face_invis_invuln; +cachepic_t *sb_face_invis; +cachepic_t *sb_face_quad; +cachepic_t *sb_face_invuln; +cachepic_t *sb_face_invis_invuln; 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 +cachepic_t *rsb_invbar[2]; +cachepic_t *rsb_weapons[5]; +cachepic_t *rsb_items[2]; +cachepic_t *rsb_ammo[3]; +cachepic_t *rsb_teambord; // PGM 01/19/97 - team color border //MED 01/04/97 added two more weapons + 3 alternates for grenade launcher -sbarpic_t *hsb_weapons[7][5]; // 0 is active, 1 is owned, 2-5 are flashes +cachepic_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}; //MED 01/04/97 added hipnotic items array -sbarpic_t *hsb_items[2]; - -cvar_t showfps = {CVAR_SAVE, "showfps", "0"}; - -void Sbar_MiniDeathmatchOverlay (void); +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; +cachepic_t *zymsb_crosshair_ammo; +cachepic_t *zymsb_crosshair_clip; +cachepic_t *zymsb_crosshair_background; +cachepic_t *zymsb_crosshair_left1; +cachepic_t *zymsb_crosshair_left2; +cachepic_t *zymsb_crosshair_right; + +cachepic_t *sb_ranking; +cachepic_t *sb_complete; +cachepic_t *sb_inter; +cachepic_t *sb_finale; + +cvar_t showfps = {CVAR_SAVE, "showfps", "0", "shows your rendered fps (frames per second)"}; +cvar_t showtime = {CVAR_SAVE, "showtime", "0", "shows current time of day (useful on screenshots)"}; +cvar_t showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S", "format string for time of day"}; +cvar_t showdate = {CVAR_SAVE, "showdate", "0", "shows current date (useful on screenshots)"}; +cvar_t showdate_format = {CVAR_SAVE, "showdate_format", "%Y-%m-%d", "format string for date"}; +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 cl_deathscoreboard = {0, "cl_deathscoreboard", "1", "shows scoreboard (+showscores) while dead"}; + +cvar_t crosshair_color_red = {CVAR_SAVE, "crosshair_color_red", "1", "customizable crosshair color"}; +cvar_t crosshair_color_green = {CVAR_SAVE, "crosshair_color_green", "0", "customizable crosshair color"}; +cvar_t crosshair_color_blue = {CVAR_SAVE, "crosshair_color_blue", "0", "customizable crosshair color"}; +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); @@ -114,152 +134,240 @@ void Sbar_DontShowScores (void) sb_showscores = false; } -/* -=============== -Sbar_Init -=============== -*/ -void Sbar_Init (void) +void sbar_start(void) { int i; - Cmd_AddCommand ("+showscores", Sbar_ShowScores); - Cmd_AddCommand ("-showscores", Sbar_DontShowScores); - Cvar_RegisterVariable (&showfps); - - numsbarpics = 0; - - sb_disc = Sbar_NewPic("disc"); - - for (i=0 ; i<10 ; i++) + if (gamemode == GAME_NETHERWORLD) { - sb_nums[0][i] = Sbar_NewPic (va("num_%i",i)); - sb_nums[1][i] = Sbar_NewPic (va("anum_%i",i)); } - - sb_nums[0][10] = Sbar_NewPic ("num_minus"); - sb_nums[1][10] = Sbar_NewPic ("anum_minus"); - - sb_colon = Sbar_NewPic ("num_colon"); - sb_slash = Sbar_NewPic ("num_slash"); - - sb_weapons[0][0] = Sbar_NewPic ("inv_shotgun"); - sb_weapons[0][1] = Sbar_NewPic ("inv_sshotgun"); - sb_weapons[0][2] = Sbar_NewPic ("inv_nailgun"); - sb_weapons[0][3] = Sbar_NewPic ("inv_snailgun"); - sb_weapons[0][4] = Sbar_NewPic ("inv_rlaunch"); - sb_weapons[0][5] = Sbar_NewPic ("inv_srlaunch"); - sb_weapons[0][6] = Sbar_NewPic ("inv_lightng"); - - sb_weapons[1][0] = Sbar_NewPic ("inv2_shotgun"); - sb_weapons[1][1] = Sbar_NewPic ("inv2_sshotgun"); - sb_weapons[1][2] = Sbar_NewPic ("inv2_nailgun"); - sb_weapons[1][3] = Sbar_NewPic ("inv2_snailgun"); - sb_weapons[1][4] = Sbar_NewPic ("inv2_rlaunch"); - sb_weapons[1][5] = Sbar_NewPic ("inv2_srlaunch"); - sb_weapons[1][6] = Sbar_NewPic ("inv2_lightng"); - - for (i=0 ; i<5 ; i++) + else if (gamemode == GAME_SOM) { - sb_weapons[2+i][0] = Sbar_NewPic (va("inva%i_shotgun",i+1)); - sb_weapons[2+i][1] = Sbar_NewPic (va("inva%i_sshotgun",i+1)); - sb_weapons[2+i][2] = Sbar_NewPic (va("inva%i_nailgun",i+1)); - sb_weapons[2+i][3] = Sbar_NewPic (va("inva%i_snailgun",i+1)); - sb_weapons[2+i][4] = Sbar_NewPic (va("inva%i_rlaunch",i+1)); - sb_weapons[2+i][5] = Sbar_NewPic (va("inva%i_srlaunch",i+1)); - sb_weapons[2+i][6] = Sbar_NewPic (va("inva%i_lightng",i+1)); + sb_disc = Draw_CachePic("gfx/disc", true); + + for (i = 0;i < 10;i++) + sb_nums[0][i] = Draw_CachePic (va("gfx/num_%i",i), true); + + somsb_health = Draw_CachePic("gfx/hud_health", true); + somsb_ammo[0] = Draw_CachePic("gfx/sb_shells", true); + somsb_ammo[1] = Draw_CachePic("gfx/sb_nails", true); + somsb_ammo[2] = Draw_CachePic("gfx/sb_rocket", true); + somsb_ammo[3] = Draw_CachePic("gfx/sb_cells", true); + somsb_armor[0] = Draw_CachePic("gfx/sb_armor1", true); + somsb_armor[1] = Draw_CachePic("gfx/sb_armor2", true); + somsb_armor[2] = Draw_CachePic("gfx/sb_armor3", true); } - - sb_ammo[0] = Sbar_NewPic ("sb_shells"); - sb_ammo[1] = Sbar_NewPic ("sb_nails"); - sb_ammo[2] = Sbar_NewPic ("sb_rocket"); - sb_ammo[3] = Sbar_NewPic ("sb_cells"); - - sb_armor[0] = Sbar_NewPic ("sb_armor1"); - sb_armor[1] = Sbar_NewPic ("sb_armor2"); - sb_armor[2] = Sbar_NewPic ("sb_armor3"); - - sb_items[0] = Sbar_NewPic ("sb_key1"); - sb_items[1] = Sbar_NewPic ("sb_key2"); - sb_items[2] = Sbar_NewPic ("sb_invis"); - sb_items[3] = Sbar_NewPic ("sb_invuln"); - sb_items[4] = Sbar_NewPic ("sb_suit"); - sb_items[5] = Sbar_NewPic ("sb_quad"); - - sb_sigil[0] = Sbar_NewPic ("sb_sigil1"); - sb_sigil[1] = Sbar_NewPic ("sb_sigil2"); - sb_sigil[2] = Sbar_NewPic ("sb_sigil3"); - sb_sigil[3] = Sbar_NewPic ("sb_sigil4"); - - sb_faces[4][0] = Sbar_NewPic ("face1"); - sb_faces[4][1] = Sbar_NewPic ("face_p1"); - sb_faces[3][0] = Sbar_NewPic ("face2"); - sb_faces[3][1] = Sbar_NewPic ("face_p2"); - sb_faces[2][0] = Sbar_NewPic ("face3"); - sb_faces[2][1] = Sbar_NewPic ("face_p3"); - sb_faces[1][0] = Sbar_NewPic ("face4"); - sb_faces[1][1] = Sbar_NewPic ("face_p4"); - sb_faces[0][0] = Sbar_NewPic ("face5"); - sb_faces[0][1] = Sbar_NewPic ("face_p5"); - - sb_face_invis = Sbar_NewPic ("face_invis"); - sb_face_invuln = Sbar_NewPic ("face_invul2"); - sb_face_invis_invuln = Sbar_NewPic ("face_inv2"); - sb_face_quad = Sbar_NewPic ("face_quad"); - - sb_sbar = Sbar_NewPic ("sbar"); - sb_ibar = Sbar_NewPic ("ibar"); - sb_scorebar = Sbar_NewPic ("scorebar"); - -//MED 01/04/97 added new hipnotic weapons - if (gamemode == GAME_HIPNOTIC) + else if (gamemode == GAME_NEXUIZ) { - hsb_weapons[0][0] = Sbar_NewPic ("inv_laser"); - hsb_weapons[0][1] = Sbar_NewPic ("inv_mjolnir"); - hsb_weapons[0][2] = Sbar_NewPic ("inv_gren_prox"); - hsb_weapons[0][3] = Sbar_NewPic ("inv_prox_gren"); - hsb_weapons[0][4] = Sbar_NewPic ("inv_prox"); - - hsb_weapons[1][0] = Sbar_NewPic ("inv2_laser"); - hsb_weapons[1][1] = Sbar_NewPic ("inv2_mjolnir"); - hsb_weapons[1][2] = Sbar_NewPic ("inv2_gren_prox"); - hsb_weapons[1][3] = Sbar_NewPic ("inv2_prox_gren"); - hsb_weapons[1][4] = Sbar_NewPic ("inv2_prox"); - - for (i=0 ; i<5 ; i++) + for (i = 0;i < 10;i++) + sb_nums[0][i] = Draw_CachePic (va("gfx/num_%i",i), true); + sb_nums[0][10] = Draw_CachePic ("gfx/num_minus", true); + + sb_ammo[0] = Draw_CachePic ("gfx/sb_shells", true); + sb_ammo[1] = Draw_CachePic ("gfx/sb_bullets", true); + sb_ammo[2] = Draw_CachePic ("gfx/sb_rocket", true); + sb_ammo[3] = Draw_CachePic ("gfx/sb_cells", true); + + sb_items[2] = Draw_CachePic ("gfx/sb_slowmo", true); + sb_items[3] = Draw_CachePic ("gfx/sb_invinc", true); + sb_items[4] = Draw_CachePic ("gfx/sb_energy", true); + sb_items[5] = Draw_CachePic ("gfx/sb_str", true); + + sb_items[11] = Draw_CachePic ("gfx/sb_flag_red_taken", true); + sb_items[12] = Draw_CachePic ("gfx/sb_flag_red_lost", true); + sb_items[13] = Draw_CachePic ("gfx/sb_flag_red_carrying", true); + sb_items[15] = Draw_CachePic ("gfx/sb_flag_blue_taken", true); + sb_items[16] = Draw_CachePic ("gfx/sb_flag_blue_lost", true); + sb_items[17] = Draw_CachePic ("gfx/sb_flag_blue_carrying", true); + + sb_sbar = Draw_CachePic("gfx/sbar", true); + sb_sbar_minimal = Draw_CachePic("gfx/sbar_minimal", true); + sb_sbar_overlay = Draw_CachePic("gfx/sbar_overlay", true); + + for(i = 0; i < 9;i++) + sb_weapons[0][i] = Draw_CachePic(va("gfx/inv_weapon%i",i), true); + } + else if (gamemode == GAME_ZYMOTIC) + { + zymsb_crosshair_center = Draw_CachePic ("gfx/hud/crosshair_center", true); + zymsb_crosshair_line = Draw_CachePic ("gfx/hud/crosshair_line", true); + zymsb_crosshair_health = Draw_CachePic ("gfx/hud/crosshair_health", true); + zymsb_crosshair_clip = Draw_CachePic ("gfx/hud/crosshair_clip", true); + zymsb_crosshair_ammo = Draw_CachePic ("gfx/hud/crosshair_ammo", true); + zymsb_crosshair_background = Draw_CachePic ("gfx/hud/crosshair_background", true); + zymsb_crosshair_left1 = Draw_CachePic ("gfx/hud/crosshair_left1", true); + zymsb_crosshair_left2 = Draw_CachePic ("gfx/hud/crosshair_left2", true); + zymsb_crosshair_right = Draw_CachePic ("gfx/hud/crosshair_right", true); + } + else + { + sb_disc = Draw_CachePic("gfx/disc", true); + + for (i = 0;i < 10;i++) { - hsb_weapons[2+i][0] = Sbar_NewPic (va("inva%i_laser",i+1)); - hsb_weapons[2+i][1] = Sbar_NewPic (va("inva%i_mjolnir",i+1)); - hsb_weapons[2+i][2] = Sbar_NewPic (va("inva%i_gren_prox",i+1)); - hsb_weapons[2+i][3] = Sbar_NewPic (va("inva%i_prox_gren",i+1)); - hsb_weapons[2+i][4] = Sbar_NewPic (va("inva%i_prox",i+1)); + sb_nums[0][i] = Draw_CachePic (va("gfx/num_%i",i), true); + sb_nums[1][i] = Draw_CachePic (va("gfx/anum_%i",i), true); } - hsb_items[0] = Sbar_NewPic ("sb_wsuit"); - hsb_items[1] = Sbar_NewPic ("sb_eshld"); - } - else if (gamemode == GAME_ROGUE) - { - rsb_invbar[0] = Sbar_NewPic ("r_invbar1"); - rsb_invbar[1] = Sbar_NewPic ("r_invbar2"); + sb_nums[0][10] = Draw_CachePic ("gfx/num_minus", true); + sb_nums[1][10] = Draw_CachePic ("gfx/anum_minus", true); + + sb_colon = Draw_CachePic ("gfx/num_colon", true); + sb_slash = Draw_CachePic ("gfx/num_slash", true); + + sb_weapons[0][0] = Draw_CachePic ("gfx/inv_shotgun", true); + sb_weapons[0][1] = Draw_CachePic ("gfx/inv_sshotgun", true); + sb_weapons[0][2] = Draw_CachePic ("gfx/inv_nailgun", true); + sb_weapons[0][3] = Draw_CachePic ("gfx/inv_snailgun", true); + sb_weapons[0][4] = Draw_CachePic ("gfx/inv_rlaunch", true); + sb_weapons[0][5] = Draw_CachePic ("gfx/inv_srlaunch", true); + sb_weapons[0][6] = Draw_CachePic ("gfx/inv_lightng", true); + + sb_weapons[1][0] = Draw_CachePic ("gfx/inv2_shotgun", true); + sb_weapons[1][1] = Draw_CachePic ("gfx/inv2_sshotgun", true); + sb_weapons[1][2] = Draw_CachePic ("gfx/inv2_nailgun", true); + sb_weapons[1][3] = Draw_CachePic ("gfx/inv2_snailgun", true); + sb_weapons[1][4] = Draw_CachePic ("gfx/inv2_rlaunch", true); + sb_weapons[1][5] = Draw_CachePic ("gfx/inv2_srlaunch", true); + sb_weapons[1][6] = Draw_CachePic ("gfx/inv2_lightng", true); + + for (i = 0;i < 5;i++) + { + sb_weapons[2+i][0] = Draw_CachePic (va("gfx/inva%i_shotgun",i+1), true); + sb_weapons[2+i][1] = Draw_CachePic (va("gfx/inva%i_sshotgun",i+1), true); + sb_weapons[2+i][2] = Draw_CachePic (va("gfx/inva%i_nailgun",i+1), true); + sb_weapons[2+i][3] = Draw_CachePic (va("gfx/inva%i_snailgun",i+1), true); + sb_weapons[2+i][4] = Draw_CachePic (va("gfx/inva%i_rlaunch",i+1), true); + sb_weapons[2+i][5] = Draw_CachePic (va("gfx/inva%i_srlaunch",i+1), true); + sb_weapons[2+i][6] = Draw_CachePic (va("gfx/inva%i_lightng",i+1), true); + } - rsb_weapons[0] = Sbar_NewPic ("r_lava"); - rsb_weapons[1] = Sbar_NewPic ("r_superlava"); - rsb_weapons[2] = Sbar_NewPic ("r_gren"); - rsb_weapons[3] = Sbar_NewPic ("r_multirock"); - rsb_weapons[4] = Sbar_NewPic ("r_plasma"); + sb_ammo[0] = Draw_CachePic ("gfx/sb_shells", true); + sb_ammo[1] = Draw_CachePic ("gfx/sb_nails", true); + sb_ammo[2] = Draw_CachePic ("gfx/sb_rocket", true); + sb_ammo[3] = Draw_CachePic ("gfx/sb_cells", true); + + sb_armor[0] = Draw_CachePic ("gfx/sb_armor1", true); + sb_armor[1] = Draw_CachePic ("gfx/sb_armor2", true); + sb_armor[2] = Draw_CachePic ("gfx/sb_armor3", true); + + sb_items[0] = Draw_CachePic ("gfx/sb_key1", true); + sb_items[1] = Draw_CachePic ("gfx/sb_key2", true); + sb_items[2] = Draw_CachePic ("gfx/sb_invis", true); + sb_items[3] = Draw_CachePic ("gfx/sb_invuln", true); + sb_items[4] = Draw_CachePic ("gfx/sb_suit", true); + sb_items[5] = Draw_CachePic ("gfx/sb_quad", true); + + sb_sigil[0] = Draw_CachePic ("gfx/sb_sigil1", true); + sb_sigil[1] = Draw_CachePic ("gfx/sb_sigil2", true); + sb_sigil[2] = Draw_CachePic ("gfx/sb_sigil3", true); + sb_sigil[3] = Draw_CachePic ("gfx/sb_sigil4", true); + + sb_faces[4][0] = Draw_CachePic ("gfx/face1", true); + sb_faces[4][1] = Draw_CachePic ("gfx/face_p1", true); + sb_faces[3][0] = Draw_CachePic ("gfx/face2", true); + sb_faces[3][1] = Draw_CachePic ("gfx/face_p2", true); + sb_faces[2][0] = Draw_CachePic ("gfx/face3", true); + sb_faces[2][1] = Draw_CachePic ("gfx/face_p3", true); + sb_faces[1][0] = Draw_CachePic ("gfx/face4", true); + sb_faces[1][1] = Draw_CachePic ("gfx/face_p4", true); + sb_faces[0][0] = Draw_CachePic ("gfx/face5", true); + sb_faces[0][1] = Draw_CachePic ("gfx/face_p5", true); + + sb_face_invis = Draw_CachePic ("gfx/face_invis", true); + sb_face_invuln = Draw_CachePic ("gfx/face_invul2", true); + sb_face_invis_invuln = Draw_CachePic ("gfx/face_inv2", true); + sb_face_quad = Draw_CachePic ("gfx/face_quad", true); + + sb_sbar = Draw_CachePic ("gfx/sbar", true); + sb_ibar = Draw_CachePic ("gfx/ibar", true); + sb_scorebar = Draw_CachePic ("gfx/scorebar", true); + + //MED 01/04/97 added new hipnotic weapons + if (gamemode == GAME_HIPNOTIC) + { + hsb_weapons[0][0] = Draw_CachePic ("gfx/inv_laser", true); + hsb_weapons[0][1] = Draw_CachePic ("gfx/inv_mjolnir", true); + hsb_weapons[0][2] = Draw_CachePic ("gfx/inv_gren_prox", true); + hsb_weapons[0][3] = Draw_CachePic ("gfx/inv_prox_gren", true); + hsb_weapons[0][4] = Draw_CachePic ("gfx/inv_prox", true); + + hsb_weapons[1][0] = Draw_CachePic ("gfx/inv2_laser", true); + hsb_weapons[1][1] = Draw_CachePic ("gfx/inv2_mjolnir", true); + hsb_weapons[1][2] = Draw_CachePic ("gfx/inv2_gren_prox", true); + hsb_weapons[1][3] = Draw_CachePic ("gfx/inv2_prox_gren", true); + hsb_weapons[1][4] = Draw_CachePic ("gfx/inv2_prox", true); + + for (i = 0;i < 5;i++) + { + hsb_weapons[2+i][0] = Draw_CachePic (va("gfx/inva%i_laser",i+1), true); + hsb_weapons[2+i][1] = Draw_CachePic (va("gfx/inva%i_mjolnir",i+1), true); + hsb_weapons[2+i][2] = Draw_CachePic (va("gfx/inva%i_gren_prox",i+1), true); + hsb_weapons[2+i][3] = Draw_CachePic (va("gfx/inva%i_prox_gren",i+1), true); + hsb_weapons[2+i][4] = Draw_CachePic (va("gfx/inva%i_prox",i+1), true); + } - rsb_items[0] = Sbar_NewPic ("r_shield1"); - rsb_items[1] = Sbar_NewPic ("r_agrav1"); + hsb_items[0] = Draw_CachePic ("gfx/sb_wsuit", true); + hsb_items[1] = Draw_CachePic ("gfx/sb_eshld", true); + } + else if (gamemode == GAME_ROGUE) + { + rsb_invbar[0] = Draw_CachePic ("gfx/r_invbar1", true); + rsb_invbar[1] = Draw_CachePic ("gfx/r_invbar2", true); + + rsb_weapons[0] = Draw_CachePic ("gfx/r_lava", true); + rsb_weapons[1] = Draw_CachePic ("gfx/r_superlava", true); + rsb_weapons[2] = Draw_CachePic ("gfx/r_gren", true); + rsb_weapons[3] = Draw_CachePic ("gfx/r_multirock", true); + rsb_weapons[4] = Draw_CachePic ("gfx/r_plasma", true); -// PGM 01/19/97 - team color border - rsb_teambord = Sbar_NewPic ("r_teambord"); -// PGM 01/19/97 - team color border + rsb_items[0] = Draw_CachePic ("gfx/r_shield1", true); + rsb_items[1] = Draw_CachePic ("gfx/r_agrav1", true); - rsb_ammo[0] = Sbar_NewPic ("r_ammolava"); - rsb_ammo[1] = Sbar_NewPic ("r_ammomulti"); - rsb_ammo[2] = Sbar_NewPic ("r_ammoplasma"); + // PGM 01/19/97 - team color border + rsb_teambord = Draw_CachePic ("gfx/r_teambord", true); + // PGM 01/19/97 - team color border + + rsb_ammo[0] = Draw_CachePic ("gfx/r_ammolava", true); + rsb_ammo[1] = Draw_CachePic ("gfx/r_ammomulti", true); + rsb_ammo[2] = Draw_CachePic ("gfx/r_ammoplasma", true); + } } + + sb_ranking = Draw_CachePic ("gfx/ranking", true); + sb_complete = Draw_CachePic ("gfx/complete", true); + sb_inter = Draw_CachePic ("gfx/inter", true); + sb_finale = Draw_CachePic ("gfx/finale", true); +} + +void sbar_shutdown(void) +{ +} + +void sbar_newmap(void) +{ +} + +void Sbar_Init (void) +{ + Cmd_AddCommand("+showscores", Sbar_ShowScores, "show scoreboard"); + Cmd_AddCommand("-showscores", Sbar_DontShowScores, "hide scoreboard"); + 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); + + Cvar_RegisterVariable(&crosshair_color_red); + Cvar_RegisterVariable(&crosshair_color_green); + Cvar_RegisterVariable(&crosshair_color_blue); + Cvar_RegisterVariable(&crosshair_color_alpha); + Cvar_RegisterVariable(&crosshair_size); + + R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap); } @@ -274,14 +382,14 @@ int sbar_x, sbar_y; Sbar_DrawPic ============= */ -void Sbar_DrawPic (int x, int y, sbarpic_t *sbarpic) +void Sbar_DrawPic (int x, int y, cachepic_t *pic) { - DrawQ_Pic (sbar_x + x, sbar_y + y, sbarpic->name, 0, 0, 1, 1, 1, 1, 0); + 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, sbarpic_t *sbarpic, float alpha) +void Sbar_DrawAlphaPic (int x, int y, cachepic_t *pic, float alpha) { - DrawQ_Pic (sbar_x + x, sbar_y + y, sbarpic->name, 0, 0, 1, 1, 1, alpha, 0); + DrawQ_Pic (sbar_x + x, sbar_y + y, pic, 0, 0, 1, 1, 1, alpha, 0); } /* @@ -293,7 +401,7 @@ Draws one solid graphics character */ void Sbar_DrawCharacter (int x, int y, int num) { - DrawQ_String (sbar_x + x + 4 , sbar_y + y, va("%c", num), 0, 8, 8, 1, 1, 1, 1, 0); + DrawQ_String (sbar_x + x + 4 , sbar_y + y, va("%c", num), 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0, NULL, true); } /* @@ -303,7 +411,7 @@ Sbar_DrawString */ void Sbar_DrawString (int x, int y, char *str) { - DrawQ_String (sbar_x + x, sbar_y + y, str, 0, 8, 8, 1, 1, 1, 1, 0); + DrawQ_String (sbar_x + x, sbar_y + y, str, 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0, NULL, true); } /* @@ -332,30 +440,84 @@ void Sbar_DrawNum (int x, int y, int num, int digits, int color) Sbar_DrawPic (x, y, sb_nums[color][frame]); x += 24; + + ptr++; + } +} + +/* +============= +Sbar_DrawXNum +============= +*/ + +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; + + l = sprintf(str, "%i", num); + ptr = str; + if (l > digits) + ptr += (l-digits); + if (l < digits) + x += (digits-l) * lettersize; + + while (*ptr) + { + if (*ptr == '-') + frame = STAT_MINUS; + else + frame = *ptr -'0'; + + DrawQ_Pic (sbar_x + x, sbar_y + y, sb_nums[0][frame],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; +int Sbar_IsTeammatch() +{ + // currently only nexuiz uses the team score board + return ((gamemode == GAME_NEXUIZ) + && (teamplay.integer > 0)); +} /* =============== Sbar_SortFrags =============== */ +static int fragsort[MAX_SCOREBOARD]; +static int scoreboardlines; + +//[515]: Sbar_GetPlayer for csqc "getplayerkey" func +int Sbar_GetPlayer (int index) +{ + if(index < 0) + { + index = -1-index; + if(index >= scoreboardlines) + return -1; + index = fragsort[index]; + } + if(index >= scoreboardlines) + return -1; + return index; +} + +static scoreboard_t teams[MAX_SCOREBOARD]; +static int teamsort[MAX_SCOREBOARD]; +static int teamlines; void Sbar_SortFrags (void) { - int i, j, k; + int i, j, k, color; -// sort by frags + // sort by frags scoreboardlines = 0; for (i=0 ; ifrags, s->name); + switch (color) + { + case 4: + teamname = "^1Red Team"; + break; + case 13: + teamname = "^4Blue Team"; + break; + case 9: + teamname = "^6Pink Team"; + break; + case 12: + teamname = "^3Yellow Team"; + break; + default: + teamname = "Total Team Score"; + break; + } + strlcpy(teams[teamlines-1].name, teamname, sizeof(teams[teamlines-1].name)); - top = s->colors & 0xf0; - bottom = (s->colors & 15) <<4; - scoreboardtop[i] = top + 8; - scoreboardbottom[i] = bottom + 8; + teams[teamlines-1].frags = 0; + teams[teamlines-1].colors = color + 16 * color; + } + + if (cl.scores[fragsort[i]].frags != -666) + { + // do not add spedcators + // (ugly hack for nexuiz) + teams[teamlines-1].frags += cl.scores[fragsort[i]].frags; + } + } + + // now sort teams by scores. + for (i=0 ; iname : ""), sizeof(str)); + if (strrchr(str, '.')) + *(strrchr(str, '.')) = 0; + + // append a : separator and then the full title + strlcat(str, ":", sizeof(str)); + strlcat(str, cl.levelname, sizeof(str)); + + // make the time string + max = 38 - sprintf(timestr, " %i:%02i", minutes, seconds); + + // if there's a newline character, terminate the string there + if (strchr(str, '\n')) + *(strchr(str, '\n')) = 0; + + // pad with spaces to fill the allotted space and append the time + i = bound(0, (int)strlen(str), max); + while (i < max) + str[i++] = ' '; + str[i] = 0; + strlcat(str, timestr, sizeof(str)); + + // print the line of text + Sbar_DrawString(8, 12, str); + +#else char str[80]; 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; - seconds = cl.time - 60*minutes; + minutes = (int)(cl.time / 60); + seconds = (int)(cl.time - 60*minutes); tens = seconds / 10; units = seconds - 10*tens; sprintf (str,"Time :%3i:%i%i", minutes, tens, units); 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); + } +#endif } /* @@ -444,12 +700,25 @@ Sbar_DrawScoreboard void Sbar_DrawScoreboard (void) { Sbar_SoloScoreboard (); - if (cl.gametype == GAME_DEATHMATCH) + // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode + //if (cl.gametype == GAME_DEATHMATCH) + if (!cl.islocalgame) Sbar_DeathmatchOverlay (); } //============================================================================= +// 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; + + 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); +} + /* =============== Sbar_DrawInventory @@ -457,28 +726,28 @@ 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 (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 for (i=0 ; i<7 ; i++) { - if (cl.items & (IT_SHOTGUN<= 10) { if ( cl.stats[STAT_ACTIVEWEAPON] == (IT_SHOTGUN<= 10) { @@ -517,7 +786,7 @@ void Sbar_DrawInventory (void) // check grenade launcher if (i==2) { - if (cl.items & HIT_PROXIMITY_GUN) + if (cl.stats[STAT_ITEMS] & HIT_PROXIMITY_GUN) { if (flashon) { @@ -528,7 +797,7 @@ void Sbar_DrawInventory (void) } else if (i==3) { - if (cl.items & (IT_SHOTGUN<<4)) + if (cl.stats[STAT_ITEMS] & (IT_SHOTGUN<<4)) { if (!grenadeflashing) Sbar_DrawPic (96, -16, hsb_weapons[flashon][3]); @@ -565,7 +834,7 @@ void Sbar_DrawInventory (void) // items for (i=0 ; i<6 ; i++) - if (cl.items & (1<<(17+i))) + if (cl.stats[STAT_ITEMS] & (1<<(17+i))) { //MED 01/04/97 changed keys if (gamemode != GAME_HIPNOTIC || (i>1)) @@ -577,7 +846,7 @@ void Sbar_DrawInventory (void) if (gamemode == GAME_HIPNOTIC) { for (i=0 ; i<2 ; i++) - if (cl.items & (1<<(24+i))) + if (cl.stats[STAT_ITEMS] & (1<<(24+i))) Sbar_DrawPic (288 + i*16, -16, hsb_items[i]); } @@ -585,14 +854,14 @@ void Sbar_DrawInventory (void) { // new rogue items for (i=0 ; i<2 ; i++) - if (cl.items & (1<<(29+i))) + if (cl.stats[STAT_ITEMS] & (1<<(29+i))) Sbar_DrawPic (288 + i*16, -16, rsb_items[i]); } else { // sigils for (i=0 ; i<4 ; i++) - if (cl.items & (1<<(28+i))) + if (cl.stats[STAT_ITEMS] & (1<<(28+i))) Sbar_DrawPic (320-32 + i*8, -16, sb_sigil[i]); } } @@ -609,12 +878,12 @@ void Sbar_DrawFrags (void) int i, k, l, x, f; char num[12]; scoreboard_t *s; - qbyte *c; + unsigned char *c; Sbar_SortFrags (); // draw the text - l = scoreboardlines <= 4 ? scoreboardlines : 4; + l = min(scoreboardlines, 4); x = 23 * 8; @@ -622,28 +891,25 @@ void Sbar_DrawFrags (void) { k = fragsort[i]; s = &cl.scores[k]; - if (!s->name[0]) - continue; // draw background - c = (qbyte *)&d_8to24table[(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), 0); - c = (qbyte *)&d_8to24table[((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), 0); + c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8]; + DrawQ_Fill (sbar_x + x + 10, sbar_y - 23, 28, 4, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + c = (unsigned char *)&palette_complete[((s->colors & 15)<<4) + 8]; + DrawQ_Fill (sbar_x + x + 10, sbar_y + 4 - 23, 28, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); // draw number f = s->frags; sprintf (num, "%3i",f); - Sbar_DrawCharacter (x + 8, -24, num[0]); - Sbar_DrawCharacter (x + 16, -24, num[1]); - Sbar_DrawCharacter (x + 24, -24, num[2]); - if (k == cl.viewentity - 1) { Sbar_DrawCharacter ( x + 2, -24, 16); Sbar_DrawCharacter ( x + 32 - 4, -24, 17); } + Sbar_DrawCharacter (x + 8, -24, num[0]); + Sbar_DrawCharacter (x + 16, -24, num[1]); + Sbar_DrawCharacter (x + 24, -24, num[2]); x += 32; } } @@ -662,19 +928,19 @@ void Sbar_DrawFace (void) // PGM 01/19/97 - team color drawing // PGM 03/02/97 - fixed so color swatch only appears in CTF modes - if (gamemode == GAME_ROGUE && (cl.maxclients != 1) && (teamplay.integer > 3) && (teamplay.integer < 7)) + if (gamemode == GAME_ROGUE && !cl.islocalgame && (teamplay.integer > 3) && (teamplay.integer < 7)) { char num[12]; scoreboard_t *s; - qbyte *c; + unsigned char *c; s = &cl.scores[cl.viewentity - 1]; // draw background Sbar_DrawPic (112, 0, rsb_teambord); - c = (qbyte *)&d_8to24table[(s->colors & 0xf0) + 8]; - DrawQ_Fill (sbar_x + 113, vid.conheight-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), 0); - c = (qbyte *)&d_8to24table[((s->colors & 15)<<4) + 8]; - DrawQ_Fill (sbar_x + 113, vid.conheight-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), 0); + c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8]; + DrawQ_Fill (sbar_x + 113, vid_conheight.integer-SBAR_HEIGHT+3, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + c = (unsigned char *)&palette_complete[((s->colors & 15)<<4) + 8]; + DrawQ_Fill (sbar_x + 113, vid_conheight.integer-SBAR_HEIGHT+12, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); // draw number f = s->frags; @@ -700,13 +966,13 @@ void Sbar_DrawFace (void) } // 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); - else if (cl.items & IT_QUAD) + else if (cl.stats[STAT_ITEMS] & IT_QUAD) Sbar_DrawPic (112, 0, sb_face_quad ); - else if (cl.items & IT_INVISIBILITY) + else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) Sbar_DrawPic (112, 0, sb_face_invis ); - else if (cl.items & IT_INVULNERABILITY) + else if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) Sbar_DrawPic (112, 0, sb_face_invuln); else { @@ -718,166 +984,438 @@ void Sbar_DrawFace (void) 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 = false; + fpsstring[0] = 0; + timestring[0] = 0; + datestring[0] = 0; if (showfps.integer) { - static double currtime, frametimes[32]; - double newtime, total; - char temp[32]; - int calc, count, i; - static int framecycle = 0; - float fps_x, fps_y, fps_scalex, fps_scaley; - - newtime = Sys_DoubleTime(); - frametimes[framecycle] = newtime - currtime; - total = 0; - count = 0; - while(total < 0.2 && count < 32 && frametimes[i = (framecycle - count) & 31]) + float calc; + static double nexttime = 0, lasttime = 0; + static double framerate = 0; + static int framecount = 0; + double newtime; + newtime = realtime; + if (newtime >= nexttime) { - total += frametimes[i]; - count++; + framerate = framecount / (newtime - lasttime); + lasttime = newtime; + nexttime = max(nexttime + 1, lasttime - 1); + framecount = 0; } - framecycle++; - framecycle &= 31; - if (showfps.integer == 1) - calc = (int) (((double) count / total) + 0.5); - else // showfps 2, rapid update - calc = (int) ((1.0 / (newtime - currtime)) + 0.5); - sprintf(temp, "%4i", calc); - currtime = newtime; + 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_x = vid.conwidth - (fps_scalex * strlen(temp)); - fps_y = vid.conheight - sb_lines/* - 8*/; // yes this might draw over the sbar - if (fps_y > vid.conheight - fps_scaley) - fps_y = vid.conheight - fps_scaley; - DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(temp), fps_scaley, 0, 0, 0, 0.5, 0); - DrawQ_String(fps_x, fps_y, temp, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0); + 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, NULL, true); + else + DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true); + fps_y += fps_scaley; + } + if (timestring[0]) + { + fps_x = vid_conwidth.integer - fps_scalex * strlen(timestring); + DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(timestring), fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, timestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true); + fps_y += fps_scaley; + } + if (datestring[0]) + { + fps_x = vid_conwidth.integer - fps_scalex * strlen(datestring); + DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(datestring), fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String(fps_x, fps_y, datestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true); + fps_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) +{ + float r[5]; + c2 = bound(0, c2, 1); + c1 = bound(0, c1, 1 - c2); + r[0] = 0; + r[1] = rangey + rangeheight * (c2 + c1); + r[2] = rangey + rangeheight * (c2); + r[3] = rangey; + r[4] = height; + if (r[1] > r[0]) + DrawQ_SuperPic(x, y + r[0], pic, width, (r[1] - r[0]), 0,(r[0] / height), c3r,c3g,c3b,c3a, 1,(r[0] / height), c3r,c3g,c3b,c3a, 0,(r[1] / height), c3r,c3g,c3b,c3a, 1,(r[1] / height), c3r,c3g,c3b,c3a, drawflags); + if (r[2] > r[1]) + DrawQ_SuperPic(x, y + r[1], pic, width, (r[2] - r[1]), 0,(r[1] / height), c1r,c1g,c1b,c1a, 1,(r[1] / height), c1r,c1g,c1b,c1a, 0,(r[2] / height), c1r,c1g,c1b,c1a, 1,(r[2] / height), c1r,c1g,c1b,c1a, drawflags); + if (r[3] > r[2]) + DrawQ_SuperPic(x, y + r[2], pic, width, (r[3] - r[2]), 0,(r[2] / height), c2r,c2g,c2b,c2a, 1,(r[2] / height), c2r,c2g,c2b,c2a, 0,(r[3] / height), c2r,c2g,c2b,c2a, 1,(r[3] / height), c2r,c2g,c2b,c2a, drawflags); + if (r[4] > r[3]) + DrawQ_SuperPic(x, y + r[3], pic, width, (r[4] - r[3]), 0,(r[3] / height), c3r,c3g,c3b,c3a, 1,(r[3] / height), c3r,c3g,c3b,c3a, 0,(r[4] / height), c3r,c3g,c3b,c3a, 1,(r[4] / height), c3r,c3g,c3b,c3a, drawflags); +} + /* =============== Sbar_Draw =============== */ -//void DrawCrosshair(int num); +extern float v_dmg_time, v_dmg_roll, v_dmg_pitch; +extern cvar_t v_kicktime; void Sbar_Draw (void) { - if (scr_con_current == vid.conheight) - return; // console is full screen - - sbar_y = vid.conheight - SBAR_HEIGHT; - if (cl.gametype == GAME_DEATHMATCH) - sbar_x = 0; - else - sbar_x = (vid.conwidth - 320)/2; - - if (sb_lines > 24) - { - Sbar_DrawInventory (); - if (cl.maxclients != 1) - Sbar_DrawFrags (); - } + cachepic_t *pic; - if (sb_showscores || cl.stats[STAT_HEALTH] <= 0) - { - Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4); - Sbar_DrawScoreboard (); - } - else if (sb_lines) + if(cl.csqc_vidvars.drawenginesbar) //[515]: csqc drawsbar { - 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 (gamemode == GAME_HIPNOTIC) + if (cl.intermission == 1) { - if (cl.items & IT_KEY1) - Sbar_DrawPic (209, 3, sb_items[0]); - if (cl.items & IT_KEY2) - Sbar_DrawPic (209, 12, sb_items[1]); + Sbar_IntermissionOverlay(); + return; } -// armor - if (cl.items & IT_INVULNERABILITY) + else if (cl.intermission == 2) { - Sbar_DrawNum (24, 0, 666, 3, 1); - Sbar_DrawPic (0, 0, sb_disc); + Sbar_FinaleOverlay(); + return; } - else + + if (gamemode == GAME_NETHERWORLD) + { + } + else if (gamemode == GAME_SOM) { - if (gamemode == GAME_ROGUE) + if (sb_showscores || (cl.stats[STAT_HEALTH] <= 0 && cl_deathscoreboard.integer)) + Sbar_DrawScoreboard (); + else if (sb_lines) { - 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]); + // 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 + } + else if (gamemode == GAME_NEXUIZ) + { + 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, 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]); + Sbar_DrawAlphaPic (0, 0, sb_scorebar, sbar_alpha_bg.value); + Sbar_DrawScoreboard (); } - } + else if (sb_lines) + { + int i; + float fade; + int redflag, blueflag; - // face - Sbar_DrawFace (); + // calculate intensity to draw weapons bar at + fade = 3 - 2 * (cl.time - cl.weapontime); + if (fade > 0) + { + fade = min(fade, 1); + for (i = 0; i < 8;i++) + if (cl.stats[STAT_ITEMS] & (1 << i)) + Sbar_DrawWeapon(i + 1, fade, (i + 2 == cl.stats[STAT_ACTIVEWEAPON])); - // health - Sbar_DrawNum (136, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25); + if((cl.stats[STAT_ITEMS] & (1<<12))) + Sbar_DrawWeapon(0, fade, (cl.stats[STAT_ACTIVEWEAPON] == 1)); + } - // ammo icon - if (gamemode == GAME_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]); + //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); + + // flag icons + redflag = ((cl.stats[STAT_ITEMS]>>15) & 3); + if (redflag) + Sbar_DrawPic (10 - sbar_x, -85, sb_items[redflag+10]); + blueflag = ((cl.stats[STAT_ITEMS]>>17) & 3); + if (blueflag) + Sbar_DrawPic (10 - sbar_x, -145, sb_items[blueflag+14]); + + // armor + Sbar_DrawXNum ((340-3*24), 12, cl.stats[STAT_ARMOR], 3, 24, 0.6,0.7,0.8,1,0); + + // 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); + + // 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,0,0,1,1,1,1,DRAWFLAG_MODULATE); + } + + //if (vid_conwidth.integer > 320 && cl.gametype == GAME_DEATHMATCH) + // Sbar_MiniDeathmatchOverlay (0, 17); } - else + else if (gamemode == GAME_ZYMOTIC) { - 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 1 + float scale = 64.0f / 256.0f; + float kickoffset[3]; + VectorClear(kickoffset); + if (v_dmg_time > 0) + { + kickoffset[0] = (v_dmg_time/v_kicktime.value*v_dmg_roll) * 10 * scale; + kickoffset[1] = (v_dmg_time/v_kicktime.value*v_dmg_pitch) * 10 * scale; + } + sbar_x = (int)((vid_conwidth.integer - 256 * scale)/2 + kickoffset[0]); + sbar_y = (int)((vid_conheight.integer - 256 * scale)/2 + kickoffset[1]); + // left1 16, 48 : 126 -66 + // left2 16, 128 : 196 -66 + // right 176, 48 : 196 -136 + Sbar_DrawGauge(sbar_x + 16 * scale, sbar_y + 48 * scale, zymsb_crosshair_left1, 64*scale, 80*scale, 78*scale, -66*scale, cl.stats[STAT_AMMO] * (1.0 / 200.0), cl.stats[STAT_SHELLS] * (1.0 / 200.0), 0.8f,0.8f,0.0f,1.0f, 0.8f,0.5f,0.0f,1.0f, 0.3f,0.3f,0.3f,1.0f, DRAWFLAG_NORMAL); + Sbar_DrawGauge(sbar_x + 16 * scale, sbar_y + 128 * scale, zymsb_crosshair_left2, 64*scale, 80*scale, 68*scale, -66*scale, cl.stats[STAT_NAILS] * (1.0 / 200.0), cl.stats[STAT_ROCKETS] * (1.0 / 200.0), 0.8f,0.8f,0.0f,1.0f, 0.8f,0.5f,0.0f,1.0f, 0.3f,0.3f,0.3f,1.0f, DRAWFLAG_NORMAL); + Sbar_DrawGauge(sbar_x + 176 * scale, sbar_y + 48 * scale, zymsb_crosshair_right, 64*scale, 160*scale, 148*scale, -136*scale, cl.stats[STAT_ARMOR] * (1.0 / 300.0), cl.stats[STAT_HEALTH] * (1.0 / 300.0), 0.0f,0.5f,1.0f,1.0f, 1.0f,0.0f,0.0f,1.0f, 0.3f,0.3f,0.3f,1.0f, DRAWFLAG_NORMAL); + DrawQ_Pic(sbar_x + 120 * scale, sbar_y + 120 * scale, zymsb_crosshair_center, 16 * scale, 16 * scale, 1, 1, 1, 1, DRAWFLAG_NORMAL); +#else + float scale = 128.0f / 256.0f; + float healthstart, healthheight, healthstarttc, healthendtc; + float shieldstart, shieldheight, shieldstarttc, shieldendtc; + float ammostart, ammoheight, ammostarttc, ammoendtc; + float clipstart, clipheight, clipstarttc, clipendtc; + float kickoffset[3], offset; + VectorClear(kickoffset); + if (v_dmg_time > 0) + { + kickoffset[0] = (v_dmg_time/v_kicktime.value*v_dmg_roll) * 10 * scale; + kickoffset[1] = (v_dmg_time/v_kicktime.value*v_dmg_pitch) * 10 * scale; + } + sbar_x = (vid_conwidth.integer - 256 * scale)/2 + kickoffset[0]; + sbar_y = (vid_conheight.integer - 256 * scale)/2 + kickoffset[1]; + offset = 0; // TODO: offset should be controlled by recoil (question: how to detect firing?) + DrawQ_SuperPic(sbar_x + 120 * scale, sbar_y + ( 88 - offset) * scale, zymsb_crosshair_line, 16 * scale, 36 * scale, 0,0, 1,1,1,1, 1,0, 1,1,1,1, 0,1, 1,1,1,1, 1,1, 1,1,1,1, 0); + DrawQ_SuperPic(sbar_x + (132 + offset) * scale, sbar_y + 120 * scale, zymsb_crosshair_line, 36 * scale, 16 * scale, 0,1, 1,1,1,1, 0,0, 1,1,1,1, 1,1, 1,1,1,1, 1,0, 1,1,1,1, 0); + DrawQ_SuperPic(sbar_x + 120 * scale, sbar_y + (132 + offset) * scale, zymsb_crosshair_line, 16 * scale, 36 * scale, 1,1, 1,1,1,1, 0,1, 1,1,1,1, 1,0, 1,1,1,1, 0,0, 1,1,1,1, 0); + DrawQ_SuperPic(sbar_x + ( 88 - offset) * scale, sbar_y + 120 * scale, zymsb_crosshair_line, 36 * scale, 16 * scale, 1,0, 1,1,1,1, 1,1, 1,1,1,1, 0,0, 1,1,1,1, 0,1, 1,1,1,1, 0); + healthheight = cl.stats[STAT_HEALTH] * (152.0f / 300.0f); + shieldheight = cl.stats[STAT_ARMOR] * (152.0f / 300.0f); + healthstart = 204 - healthheight; + shieldstart = healthstart - shieldheight; + healthstarttc = healthstart * (1.0f / 256.0f); + healthendtc = (healthstart + healthheight) * (1.0f / 256.0f); + shieldstarttc = shieldstart * (1.0f / 256.0f); + shieldendtc = (shieldstart + shieldheight) * (1.0f / 256.0f); + ammoheight = cl.stats[STAT_SHELLS] * (62.0f / 200.0f); + ammostart = 114 - ammoheight; + ammostarttc = ammostart * (1.0f / 256.0f); + ammoendtc = (ammostart + ammoheight) * (1.0f / 256.0f); + clipheight = cl.stats[STAT_AMMO] * (122.0f / 200.0f); + clipstart = 190 - clipheight; + clipstarttc = clipstart * (1.0f / 256.0f); + clipendtc = (clipstart + clipheight) * (1.0f / 256.0f); + if (healthheight > 0) DrawQ_SuperPic(sbar_x + 0 * scale, sbar_y + healthstart * scale, zymsb_crosshair_health, 256 * scale, healthheight * scale, 0,healthstarttc, 1.0f,0.0f,0.0f,1.0f, 1,healthstarttc, 1.0f,0.0f,0.0f,1.0f, 0,healthendtc, 1.0f,0.0f,0.0f,1.0f, 1,healthendtc, 1.0f,0.0f,0.0f,1.0f, DRAWFLAG_NORMAL); + if (shieldheight > 0) DrawQ_SuperPic(sbar_x + 0 * scale, sbar_y + shieldstart * scale, zymsb_crosshair_health, 256 * scale, shieldheight * scale, 0,shieldstarttc, 0.0f,0.5f,1.0f,1.0f, 1,shieldstarttc, 0.0f,0.5f,1.0f,1.0f, 0,shieldendtc, 0.0f,0.5f,1.0f,1.0f, 1,shieldendtc, 0.0f,0.5f,1.0f,1.0f, DRAWFLAG_NORMAL); + if (ammoheight > 0) DrawQ_SuperPic(sbar_x + 0 * scale, sbar_y + ammostart * scale, zymsb_crosshair_ammo, 256 * scale, ammoheight * scale, 0,ammostarttc, 0.8f,0.8f,0.0f,1.0f, 1,ammostarttc, 0.8f,0.8f,0.0f,1.0f, 0,ammoendtc, 0.8f,0.8f,0.0f,1.0f, 1,ammoendtc, 0.8f,0.8f,0.0f,1.0f, DRAWFLAG_NORMAL); + if (clipheight > 0) DrawQ_SuperPic(sbar_x + 0 * scale, sbar_y + clipstart * scale, zymsb_crosshair_clip, 256 * scale, clipheight * scale, 0,clipstarttc, 1.0f,1.0f,0.0f,1.0f, 1,clipstarttc, 1.0f,1.0f,0.0f,1.0f, 0,clipendtc, 1.0f,1.0f,0.0f,1.0f, 1,clipendtc, 1.0f,1.0f,0.0f,1.0f, DRAWFLAG_NORMAL); + DrawQ_Pic(sbar_x + 0 * scale, sbar_y + 0 * scale, zymsb_crosshair_background, 256 * scale, 256 * scale, 1, 1, 1, 1, DRAWFLAG_NORMAL); + DrawQ_Pic(sbar_x + 120 * scale, sbar_y + 120 * scale, zymsb_crosshair_center, 16 * scale, 16 * scale, 1, 1, 1, 1, DRAWFLAG_NORMAL); +#endif } + else // Quake and others + { + sbar_y = vid_conheight.integer - SBAR_HEIGHT; + // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode + //if (cl.gametype == GAME_DEATHMATCH && gamemode != GAME_TRANSFUSION) + if (!cl.islocalgame && gamemode != GAME_TRANSFUSION) + sbar_x = 0; + else + sbar_x = (vid_conwidth.integer - 320)/2; - Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10); - } + if (sb_lines > 24) + { + if (gamemode != GAME_GOODVSBAD2) + Sbar_DrawInventory (); + if (!cl.islocalgame && gamemode != GAME_TRANSFUSION) + Sbar_DrawFrags (); + } + + 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); + + // 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]); + } + } + } - if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH) - Sbar_MiniDeathmatchOverlay (); + // face + Sbar_DrawFace (); -// if (crosshair.integer >= 1) -// DrawCrosshair(crosshair.integer - 1); + // health + Sbar_DrawNum (136, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25); + + // 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]); + } + + Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10); + + } - if (cl.intermission == 1) - Sbar_IntermissionOverlay(); - else if (cl.intermission == 2) - Sbar_FinaleOverlay(); + // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode + //if (vid_conwidth.integer > 320 && cl.gametype == GAME_DEATHMATCH) + if (!cl.islocalgame && vid_conwidth.integer > 320) + { + if (gamemode == GAME_TRANSFUSION) + Sbar_MiniDeathmatchOverlay (0, 0); + else + Sbar_MiniDeathmatchOverlay (324, vid_conheight.integer - sb_lines); + } + } + } Sbar_ShowFPS(); + + if (cl.csqc_vidvars.drawcrosshair && crosshair.integer >= 1 && crosshair.integer <= NUMCROSSHAIRS && !cl.intermission && !r_letterbox.value && (pic = r_crosshairs[crosshair.integer])) + DrawQ_Pic((vid_conwidth.integer - pic->width * crosshair_size.value) * 0.5f, (vid_conheight.integer - pic->height * crosshair_size.value) * 0.5f, pic, pic->width * crosshair_size.value, pic->height * crosshair_size.value, crosshair_color_red.value, crosshair_color_green.value, crosshair_color_blue.value, crosshair_color_alpha.value, 0); + + if (cl_prydoncursor.integer) + DrawQ_Pic((cl.cmd.cursor_screen[0] + 1) * 0.5 * vid_conwidth.integer, (cl.cmd.cursor_screen[1] + 1) * 0.5 * vid_conheight.integer, Draw_CachePic(va("gfx/prydoncursor%03i", cl_prydoncursor.integer), true), 0, 0, 1, 1, 1, 1, 0); } //============================================================================= @@ -888,54 +1426,129 @@ Sbar_DeathmatchOverlay ================== */ -void Sbar_DeathmatchOverlay (void) +float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y) { - cachepic_t *pic; - int i, k, l, x, y, total, n, minutes, tens, units, fph; - char num[128]; - scoreboard_t *s; - qbyte *c; + int minutes; + unsigned char *c; + minutes = (int)((cl.intermission ? cl.completed_time - s->qw_entertime : cl.time - s->qw_entertime) / 60.0); + if (cls.protocol == PROTOCOL_QUAKEWORLD) + { + if (s->qw_spectator) + { + if (s->qw_ping || s->qw_packetloss) + DrawQ_String(x, y, va("%4i %3i %4i spectator %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), minutes, (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + else + DrawQ_String(x, y, va(" %4i spectator %c%s", minutes, (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + } + else + { + // draw colors behind score + c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8]; + DrawQ_Fill(x + 14*8, y+1, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + c = (unsigned char *)&palette_complete[((s->colors & 15)<<4) + 8]; + DrawQ_Fill(x + 14*8, y+4, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + // 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, NULL, true); + if (s->qw_ping || s->qw_packetloss) + DrawQ_String(x, y, va("%4i %3i %4i %5i %-4s %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), minutes,(int) s->frags, cl.qw_teamplay ? s->qw_team : "", (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + else + DrawQ_String(x, y, va(" %4i %5i %-4s %c%s", minutes,(int) s->frags, cl.qw_teamplay ? s->qw_team : "", (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + } + } + else + { + if (s->qw_spectator) + { + if (s->qw_ping || s->qw_packetloss) + DrawQ_String(x, y, va("%4i %3i spect %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + else + DrawQ_String(x, y, va(" spect %c%s", (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + } + else + { + // draw colors behind score + c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8]; + DrawQ_Fill(x + 9*8, y+1, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + c = (unsigned char *)&palette_complete[((s->colors & 15)<<4) + 8]; + DrawQ_Fill(x + 9*8, y+4, 40, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha_fg.value, 0); + // 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, NULL, true); + if (s->qw_ping || s->qw_packetloss) + DrawQ_String(x, y, va("%4i %3i %5i %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), (int) s->frags, (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + else + DrawQ_String(x, y, va(" %5i %c%s", (int) s->frags, (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + } + } + return 8; +} - pic = Draw_CachePic ("gfx/ranking.lmp"); - DrawQ_Pic ((vid.conwidth - pic->width)/2, 8, "gfx/ranking.lmp", 0, 0, 1, 1, 1, 1, 0); +void Sbar_DeathmatchOverlay (void) +{ + int i, x, y; -// scores - Sbar_SortFrags (); + // request new ping times every two second + if (cl.last_ping_request < realtime - 2 && cls.netcon) + { + cl.last_ping_request = realtime; + if (cls.protocol == PROTOCOL_QUAKEWORLD) + { + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, "pings"); + } + else if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5 || cls.protocol == PROTOCOL_DARKPLACES6 || cls.protocol == PROTOCOL_DARKPLACES7) + { + // these servers usually lack the pings command and so a less efficient "ping" command must be sent, which on modern DP servers will also reply with a pingplreport command after the ping listing + static int ping_anyway_counter = 0; + if(cl.parsingtextexpectingpingforscores == 1) + { + Con_DPrintf("want to send ping, but still waiting for other reply\n"); + if(++ping_anyway_counter >= 5) + cl.parsingtextexpectingpingforscores = 0; + } + if(cl.parsingtextexpectingpingforscores != 1) + { + ping_anyway_counter = 0; + cl.parsingtextexpectingpingforscores = 1; // hide the output of the next ping report + MSG_WriteByte(&cls.netcon->message, clc_stringcmd); + MSG_WriteString(&cls.netcon->message, "ping"); + } + } + else + { + // newer server definitely has pings command, so use it for more efficiency + MSG_WriteByte(&cls.netcon->message, clc_stringcmd); + MSG_WriteString(&cls.netcon->message, "pings"); + } + } -// draw the text - l = scoreboardlines; + DrawQ_Pic ((vid_conwidth.integer - sb_ranking->width)/2, 8, sb_ranking, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); - x = ((vid.conwidth - 320)>>1) - 140; + // scores + Sbar_SortFrags (); + // draw the text y = 40; - for (i = 0;i < l;i++) + if (cls.protocol == PROTOCOL_QUAKEWORLD) { - k = fragsort[i]; - s = &cl.scores[k]; - if (!s->name[0]) - continue; - - // draw background - c = (qbyte *)&d_8to24table[(s->colors & 0xf0) + 8]; - DrawQ_Fill ( x, y+1, 88, 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), 0); - c = (qbyte *)&d_8to24table[((s->colors & 15)<<4) + 8]; - DrawQ_Fill ( x, y+4, 88, 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), 0); - - total = cl.time - s->entertime; - minutes = (int)total/60; - n = total - minutes*60; - tens = '0' + n/10; - units = '0' + 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 %4i:%c%c %s", k == cl.viewentity - 1 ? 12 : ' ', (int) s->frags, fph, minutes, tens, units, s->name); - DrawQ_String(x - 8, y, num, 0, 8, 8, 1, 1, 1, 1, 0); - - y += 8; + x = (vid_conwidth.integer - (26 + 15) * 8) / 2; // 26 characters until name, then we assume 15 character names (they can be longer but usually aren't) + DrawQ_String(x, y, va("ping pl%% time frags team name"), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + } + else + { + x = (vid_conwidth.integer - (16 + 15) * 8) / 2; // 16 characters until name, then we assume 15 character names (they can be longer but usually aren't) + DrawQ_String(x, y, va("ping pl%% frags name"), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL, false ); + } + y += 8; + + if (Sbar_IsTeammatch ()) + { + // show team scores first + for (i = 0;i < teamlines && y < vid_conheight.integer;i++) + y += (int)Sbar_PrintScoreboardItem((teams + teamsort[i]), x, y); + y += 5; } + + for (i = 0;i < scoreboardlines && y < vid_conheight.integer;i++) + y += (int)Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); } /* @@ -944,64 +1557,42 @@ Sbar_DeathmatchOverlay ================== */ -void Sbar_MiniDeathmatchOverlay (void) +void Sbar_MiniDeathmatchOverlay (int x, int y) { - int i, l, k, x, y, fph, numlines; - char num[128]; - scoreboard_t *s; - qbyte *c; + int i, numlines; - if (vid.conwidth < 512 || !sb_lines) + // decide where to print + if (gamemode == GAME_TRANSFUSION) + numlines = (vid_conwidth.integer - x + 127) / 128; + else + numlines = (vid_conheight.integer - y + 7) / 8; + + // give up if there isn't room + if (x >= vid_conwidth.integer || y >= vid_conheight.integer || numlines < 1) return; // scores Sbar_SortFrags (); - // draw the text - l = scoreboardlines; - y = vid.conheight - 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.conheight - 8;i++) + if (gamemode == GAME_TRANSFUSION) { - k = fragsort[i]; - s = &cl.scores[k]; - if (!s->name[0]) - continue; - - // draw background - c = (qbyte *)&d_8to24table[(s->colors & 0xf0) + 8]; - DrawQ_Fill ( x, y+1, 72, 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), 0); - c = (qbyte *)&d_8to24table[((s->colors & 15)<<4) + 8]; - DrawQ_Fill ( x, y+4, 72, 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), 0); - - 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); - DrawQ_String(x - 8, y, num, 0, 8, 8, 1, 1, 1, 1, 0); - - y += 8; + for (;i < scoreboardlines && x < vid_conwidth.integer;i++) + x += 128 + (int)Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); + } + else + { + for (;i < scoreboardlines && y < vid_conheight.integer;i++) + y += (int)Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); } } @@ -1016,32 +1607,37 @@ void Sbar_IntermissionOverlay (void) int dig; int num; - if (cl.gametype == GAME_DEATHMATCH) + // LordHavoc: changed to draw the deathmatch overlays in any multiplayer mode + //if (cl.gametype == GAME_DEATHMATCH) + if (!cl.islocalgame) { Sbar_DeathmatchOverlay (); return; } - sbar_x = 0; - sbar_y = 0; + sbar_x = (vid_conwidth.integer - 320) >> 1; + sbar_y = (vid_conheight.integer - 200) >> 1; - DrawQ_Pic (64, 24, "gfx/complete.lmp", 0, 0, 1, 1, 1, 1, 0); - DrawQ_Pic (0, 56, "gfx/inter.lmp", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (sbar_x + 64, sbar_y + 24, sb_complete, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); + DrawQ_Pic (sbar_x + 0, sbar_y + 56, sb_inter, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); // time - dig = cl.completed_time/60; + dig = (int)cl.completed_time / 60; Sbar_DrawNum (160, 64, dig, 3, 0); - num = cl.completed_time - dig*60; - Sbar_DrawPic (234,64,sb_colon); + num = (int)cl.completed_time - dig*60; + 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_DrawNum (160, 104, cl.stats[STAT_SECRETS], 3, 0); - Sbar_DrawPic (232, 104, sb_slash); + if (gamemode != GAME_NEXUIZ) + Sbar_DrawPic (232, 104, sb_slash); Sbar_DrawNum (240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0); Sbar_DrawNum (160, 144, cl.stats[STAT_MONSTERS], 3, 0); - Sbar_DrawPic (232, 144, sb_slash); + if (gamemode != GAME_NEXUIZ) + Sbar_DrawPic (232, 144, sb_slash); Sbar_DrawNum (240, 144, cl.stats[STAT_TOTALMONSTERS], 3, 0); } @@ -1055,9 +1651,6 @@ Sbar_FinaleOverlay */ void Sbar_FinaleOverlay (void) { - cachepic_t *pic; - - pic = Draw_CachePic ("gfx/finale.lmp"); - DrawQ_Pic((vid.conwidth - pic->width)/2, 16, "gfx/finale.lmp", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic((vid_conwidth.integer - sb_finale->width)/2, 16, sb_finale, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); }