strcpy(sbarpics[numsbarpics].name, name);
// precache it
// FIXME: precache on every renderer restart (or move this to client)
- Draw_CachePic(sbarpics[numsbarpics].name);
+ Draw_CachePic(sbarpics[numsbarpics].name, true);
return sbarpics + (numsbarpics++);
}
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;
-sbarpic_t *sb_weapons[7][8]; // 0 is active, 1 is owned, 2-5 are flashes
+// 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];
//MED 01/04/97 added hipnotic items array
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 Sbar_IntermissionOverlay (void);
void Sbar_FinaleOverlay (void);
numsbarpics = 0;
- sb_disc = Sbar_NewPic("gfx/disc");
-
- for (i = 0;i < 10;i++)
+ if (gamemode == GAME_SOM)
{
- sb_nums[0][i] = Sbar_NewPic (va("gfx/num_%i",i));
- sb_nums[1][i] = Sbar_NewPic (va("gfx/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] = 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++)
+ else if (gamemode == GAME_NEXUIZ)
{
- 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));
+ 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));
}
-
- 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)
+ else
{
- 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");
+ sb_disc = Sbar_NewPic("gfx/disc");
+
+ 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_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++)
{
- 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));
+ 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));
}
- 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");
+ 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));
+ }
+
+ 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] = 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_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] = Sbar_NewPic ("gfx/r_shield1");
- rsb_items[1] = Sbar_NewPic ("gfx/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 = Sbar_NewPic ("gfx/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] = Sbar_NewPic ("gfx/r_ammolava");
- rsb_ammo[1] = Sbar_NewPic ("gfx/r_ammomulti");
- rsb_ammo[2] = Sbar_NewPic ("gfx/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");
+ }
}
}
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);
}
*/
void Sbar_DrawPic (int x, int y, sbarpic_t *sbarpic)
{
- 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, sbarpic->name, 0, 0, 1, 1, 1, sbar_alpha_fg.value, 0);
}
void Sbar_DrawAlphaPic (int x, int y, sbarpic_t *sbarpic, float alpha)
*/
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);
}
/*
*/
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);
}
/*
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]->name,lettersize,lettersize,r,g,b,a * sbar_alpha_fg.value,flags);
+ x += lettersize;
+
ptr++;
}
}
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;
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);
+ }
}
/*
//=============================================================================
+// 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]->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);
+
+ 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
*/
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<<i) )
+ if (cl.stats[STAT_ITEMS] & (IT_SHOTGUN<<i) )
{
time = cl.item_gettime[i];
flashon = (int)((cl.time - time)*10);
else
flashon = (flashon%5) + 2;
- Sbar_DrawAlphaPic (i*24, -16, sb_weapons[flashon][i], 0.4);
+ Sbar_DrawAlphaPic (i*24, -16, sb_weapons[flashon][i], sbar_alpha_bg.value);
}
}
int grenadeflashing=0;
for (i=0 ; i<4 ; i++)
{
- if (cl.items & (1<<hipweapons[i]) )
+ if (cl.stats[STAT_ITEMS] & (1<<hipweapons[i]) )
{
time = cl.item_gettime[hipweapons[i]];
flashon = (int)((cl.time - time)*10);
// check grenade launcher
if (i==2)
{
- if (cl.items & HIT_PROXIMITY_GUN)
+ if (cl.stats[STAT_ITEMS] & HIT_PROXIMITY_GUN)
{
if (flashon)
{
}
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]);
// 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))
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]);
}
{
// 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]);
}
}
Sbar_SortFrags ();
// draw the text
- l = scoreboardlines <= 4 ? scoreboardlines : 4;
+ l = min(scoreboardlines, 4);
x = 23 * 8;
{
k = fragsort[i];
s = &cl.scores[k];
- if (!s->name[0])
- continue;
// 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), 0);
+ 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), 0);
+ 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;
}
}
// 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;
// draw background
Sbar_DrawPic (112, 0, rsb_teambord);
c = (qbyte *)&palette_complete[(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);
+ 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-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);
+ 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;
}
// 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
{
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)
{
- int calc;
- char temp[32];
- float fps_x, fps_y, fps_scalex, fps_scaley;
+ float calc;
if (showfps.integer > 1)
{
static double currtime, frametimes[32];
framecycle++;
framecycle &= 31;
if (showfps.integer == 2)
- calc = (int) (((double) count / total) + 0.5);
+ calc = (((double)count / total) + 0.5);
else // showfps 3, rapid update
- calc = (int) ((1.0 / (newtime - currtime)) + 0.5);
+ calc = ((1.0 / (newtime - currtime)) + 0.5);
currtime = newtime;
}
else
{
static double nexttime = 0, lasttime = 0;
- static int framerate = 0, framecount = 0;
+ static float framerate = 0;
+ static int framecount = 0;
double newtime;
newtime = Sys_DoubleTime();
- if (newtime < nexttime)
- framecount++;
- else
+ if (newtime >= nexttime)
{
- framerate = (int) (framecount / (newtime - lasttime) + 0.5);
+ framerate = ((float)framecount / (newtime - lasttime) + 0.5);
lasttime = newtime;
- nexttime = lasttime + 0.2;
- framecount = 1;
+ nexttime = max(nexttime + 1, lasttime - 1);
+ framecount = 0;
}
+ framecount++;
calc = framerate;
}
- sprintf(temp, "%4i", calc);
+
+ 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);
+ 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;
+ }
}
}
*/
void Sbar_Draw (void)
{
- if (scr_con_current == vid.conheight)
- return; // console is full screen
-
if (cl.intermission == 1)
{
Sbar_IntermissionOverlay();
return;
}
- 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)
+ if (gamemode == GAME_SOM)
{
- if (gamemode != GAME_GOODVSBAD2)
- Sbar_DrawInventory ();
- if (cl.maxclients != 1)
- Sbar_DrawFrags ();
- }
+ 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;
- if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
- {
- if (gamemode != GAME_GOODVSBAD2)
- Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
- Sbar_DrawScoreboard ();
+ // 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);
+ sbar_y = vid_conheight.integer - 47;
+ sbar_x = (vid_conwidth.integer - 640)/2;
-// keys (hipnotic only)
- //MED 01/04/97 moved keys here so they would not be overwritten
- if (gamemode == GAME_HIPNOTIC)
+ if (sb_showscores || (cl.stats[STAT_HEALTH] <= 0 && cl_deathscoreboard.integer))
{
- 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_DrawAlphaPic (0, 0, sb_scorebar, sbar_alpha_bg.value);
+ Sbar_DrawScoreboard ();
}
-// armor
- if (gamemode != GAME_GOODVSBAD2)
+ else if (sb_lines)
{
- if (cl.items & IT_INVULNERABILITY)
+ 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, 666, 3, 1);
- Sbar_DrawPic (0, 0, sb_disc);
+ 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)
+ {
+ // Nexuiz has no anum pics
+ //Sbar_DrawNum (36, 0, 666, 3, 1);
+ // Nexuiz has no disc pic
+ //Sbar_DrawPic (0, 0, sb_disc);
+ }
+
+ // 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->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 (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 (gamemode == GAME_ROGUE)
+ if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY)
{
- 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]);
+ Sbar_DrawNum (24, 0, 666, 3, 1);
+ Sbar_DrawPic (0, 0, sb_disc);
}
else
{
- 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]);
+ 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 ();
+ // face
+ Sbar_DrawFace ();
- // health
- Sbar_DrawNum (136, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
+ // health
+ Sbar_DrawNum (154, 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);
- // 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]);
}
- else
+
+ if (vid_conwidth.integer > 320 && cl.gametype == GAME_DEATHMATCH)
{
- 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_TRANSFUSION)
+ Sbar_MiniDeathmatchOverlay (0, 0);
+ else
+ Sbar_MiniDeathmatchOverlay (324, vid_conheight.integer - sb_lines);
}
-
- Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
}
- if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH)
- Sbar_MiniDeathmatchOverlay ();
-
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);
}
//=============================================================================
==================
*/
+float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y)
+{
+ 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;
+}
+
void Sbar_DeathmatchOverlay (void)
{
+ int i, x, y;
cachepic_t *pic;
- int i, k, l, x, y, total, n, minutes, tens, units, fph;
- char num[128];
- scoreboard_t *s;
- qbyte *c;
- pic = Draw_CachePic ("gfx/ranking.lmp");
- DrawQ_Pic ((vid.conwidth - pic->width)/2, 8, "gfx/ranking.lmp", 0, 0, 1, 1, 1, 1, 0);
+ 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.conwidth - 280)>>1;
+ // 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
- c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8];
- DrawQ_Fill ( x + 8, 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 *)&palette_complete[((s->colors & 15)<<4) + 8];
- DrawQ_Fill ( x + 8, 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, y, num, 0, 8, 8, 1, 1, 1, 1, 0);
-
- y += 8;
- }
+ for (i = 0;i < scoreboardlines && y < vid_conheight.integer;i++)
+ y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
}
/*
==================
*/
-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;
+
+ // decide where to print
+ if (gamemode == GAME_TRANSFUSION)
+ numlines = (vid_conwidth.integer - x + 127) / 128;
+ else
+ numlines = (vid_conheight.integer - y + 7) / 8;
- if (vid.conwidth < 512 || !sb_lines)
+ // 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;
+ // figure out start
+ i -= numlines/2;
+ i = min(i, scoreboardlines - numlines);
+ i = max(i, 0);
- if (i > scoreboardlines - numlines)
- i = scoreboardlines - numlines;
- if (i < 0)
- 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 *)&palette_complete[(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 *)&palette_complete[((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 + 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);
}
}
return;
}
- sbar_x = (vid.conwidth - 320) >> 1;
- sbar_y = (vid.conheight - 200) >> 1;
+ sbar_x = (vid_conwidth.integer - 320) >> 1;
+ sbar_y = (vid_conheight.integer - 200) >> 1;
- DrawQ_Pic (sbar_x + 64, sbar_y + 24, "gfx/complete.lmp", 0, 0, 1, 1, 1, 1, 0);
- DrawQ_Pic (sbar_x + 0, sbar_y + 56, "gfx/inter.lmp", 0, 0, 1, 1, 1, 1, 0);
+ 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_DrawNum (160, 64, dig, 3, 0);
num = cl.completed_time - dig*60;
- Sbar_DrawPic (234,64,sb_colon);
+ 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);
}
{
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);
+ 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);
}
projects / xonotic / darkplaces.git / blobdiff