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++);
}
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 = {CVAR_SAVE, "sbar_alpha", "1"};
+cvar_t sbar_alpha_bg = {CVAR_SAVE, "sbar_alpha_bg", "0.4"};
+cvar_t sbar_alpha_fg = {CVAR_SAVE, "sbar_alpha_fg", "1"};
void Sbar_MiniDeathmatchOverlay (int x, int y);
void Sbar_DeathmatchOverlay (void);
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][4] = Sbar_NewPic ("gfx/inv2_rlaunch");
sb_weapons[1][5] = Sbar_NewPic ("gfx/inv2_srlaunch");
sb_weapons[1][6] = Sbar_NewPic ("gfx/inv2_lightng");
-
+
for (i = 0;i < 5;i++)
{
sb_weapons[2+i][0] = Sbar_NewPic (va("gfx/inva%i_shotgun",i+1));
sb_weapons[2+i][5] = Sbar_NewPic (va("gfx/inva%i_srlaunch",i+1));
sb_weapons[2+i][6] = Sbar_NewPic (va("gfx/inva%i_lightng",i+1));
}
-
+
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[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][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][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");
}
{
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_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
-
+
rsb_ammo[0] = Sbar_NewPic ("gfx/r_ammolava");
rsb_ammo[1] = Sbar_NewPic ("gfx/r_ammomulti");
rsb_ammo[2] = Sbar_NewPic ("gfx/r_ammoplasma");
Cvar_RegisterVariable (&showtime_format);
Cvar_RegisterVariable (&showdate);
Cvar_RegisterVariable (&showdate_format);
- Cvar_RegisterVariable (&sbar_alpha);
+ Cvar_RegisterVariable (&sbar_alpha_bg);
+ Cvar_RegisterVariable (&sbar_alpha_fg);
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, sbar_alpha.value, 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)
{
- DrawQ_Pic (sbar_x + x, sbar_y + y, sbarpic->name, 0, 0, 1, 1, 1, alpha * sbar_alpha.value, 0);
+ DrawQ_Pic (sbar_x + x, sbar_y + y, sbarpic->name, 0, 0, 1, 1, 1, alpha, 0);
}
/*
*/
void Sbar_DrawCharacter (int x, int y, int num)
{
- DrawQ_String (sbar_x + x + 4 , sbar_y + y, va("%c", num), 0, 8, 8, 1, 1, 1, sbar_alpha.value, 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, sbar_alpha.value, 0);
+ DrawQ_String (sbar_x + x, sbar_y + y, str, 0, 8, 8, 1, 1, 1, sbar_alpha_fg.value, 0);
}
/*
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.value,flags);
+ 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 = strlen (cl.worldmodel->name);
+ Sbar_DrawString (232 - l*4, 12, cl.worldmodel->name);
+ } else {
+ l = strlen (cl.levelname);
+ Sbar_DrawString (232 - l*4, 12, cl.levelname);
+ }
}
/*
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, font_size = 10;
+ const int w_width = 300, w_height = 100, w_space = 10;
const float w_scale = 0.4;
- DrawQ_Pic(vid.conwidth - (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.value, DRAWFLAG_ADDITIVE);
- DrawQ_String(vid.conwidth - (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);
+ DrawQ_Pic(vid.conwidth - (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 - (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 - (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.value, DRAWFLAG_ADDITIVE);
+ DrawQ_Fill(vid.conwidth - (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);
}
/*
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]);
}
}
{
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) * sbar_alpha.value, 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) * sbar_alpha.value, 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;
// 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) * sbar_alpha.value, 0);
+ 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) * 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) * sbar_alpha.value, 0);
+ 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) * 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
{
static int framerate = 0, framecount = 0;
double newtime;
newtime = Sys_DoubleTime();
- if (newtime < nexttime)
- framecount++;
- else
+ if (newtime >= nexttime)
{
framerate = (int) (framecount / (newtime - lasttime) + 0.5);
lasttime = newtime;
- nexttime = lasttime + 0.2;
- framecount = 1;
+ nexttime = max(nexttime + 1, lasttime - 1);
+ framecount = 0;
}
+ framecount++;
calc = framerate;
}
- snprintf(fpsstring, sizeof(fpsstring), "%4i fps", calc);
+ dpsnprintf(fpsstring, sizeof(fpsstring), "%4i fps", calc);
}
if (showtime.integer)
strlcpy(timestring, Sys_TimeString(showtime_format.string), sizeof(timestring));
if (fpsstring[0])
{
fps_x = vid.conwidth - fps_scalex * strlen(fpsstring);
- DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(fpsstring), fps_scaley, 0, 0, 0, 0.5 * sbar_alpha.value, 0);
- DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1 * sbar_alpha.value, 0);
+ DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(fpsstring), fps_scaley, 0, 0, 0, 0.5, 0);
+ 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 - fps_scalex * strlen(timestring);
- DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(timestring), fps_scaley, 0, 0, 0, 0.5 * sbar_alpha.value, 0);
- DrawQ_String(fps_x, fps_y, timestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1 * sbar_alpha.value, 0);
+ 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 - fps_scalex * strlen(datestring);
- DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(datestring), fps_scaley, 0, 0, 0, 0.5 * sbar_alpha.value, 0);
- DrawQ_String(fps_x, fps_y, datestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1 * sbar_alpha.value, 0);
+ 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();
// armor
if (cl.stats[STAT_ARMOR])
{
- if (cl.items & IT_ARMOR3)
+ if (cl.stats[STAT_ITEMS] & IT_ARMOR3)
Sbar_DrawPic(0, 0, somsb_armor[2]);
- else if (cl.items & IT_ARMOR2)
+ else if (cl.stats[STAT_ITEMS] & IT_ARMOR2)
Sbar_DrawPic(0, 0, somsb_armor[1]);
- else if (cl.items & IT_ARMOR1)
+ 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);
}
Sbar_DrawNum(24, 24, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
// ammo icon
- if (cl.items & IT_SHELLS)
+ if (cl.stats[STAT_ITEMS] & IT_SHELLS)
Sbar_DrawPic(0, 48, somsb_ammo[0]);
- else if (cl.items & IT_NAILS)
+ else if (cl.stats[STAT_ITEMS] & IT_NAILS)
Sbar_DrawPic(0, 48, somsb_ammo[1]);
- else if (cl.items & IT_ROCKETS)
+ else if (cl.stats[STAT_ITEMS] & IT_ROCKETS)
Sbar_DrawPic(0, 48, somsb_ammo[2]);
- else if (cl.items & IT_CELLS)
+ 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])
if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
{
- Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
+ Sbar_DrawAlphaPic (0, 0, sb_scorebar, sbar_alpha_bg.value);
Sbar_DrawScoreboard ();
}
else if (sb_lines)
fade = (1.0 - 0.5 * time);
fade *= fade;
for (i = 0; i < 8;i++)
- {
- if (!(cl.items & (1 << i)))
- continue;
- Sbar_DrawWeapon(i + 1, fade, (i == cl.stats[STAT_ACTIVEWEAPON]));
- }
-
- if((cl.items & (1<<12)))
- Sbar_DrawWeapon(0, fade, (cl.stats[STAT_ACTIVEWEAPON] == 12));
+ 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.value);
+ Sbar_DrawAlphaPic (0, 0, sb_sbar, sbar_alpha_fg.value);
else
- Sbar_DrawAlphaPic (0, 0, sb_sbar_minimal, sbar_alpha.value);
+ Sbar_DrawAlphaPic (0, 0, sb_sbar_minimal, sbar_alpha_fg.value);
// special items
- if (cl.items & IT_INVULNERABILITY)
+ if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY)
{
Sbar_DrawNum (36, 0, 666, 3, 1);
Sbar_DrawPic (0, 0, sb_disc);
// AK dont draw ammo for the laser
if(cl.stats[STAT_ACTIVEWEAPON] != 12)
{
- if (cl.items & NEX_IT_SHELLS)
+ if (cl.stats[STAT_ITEMS] & NEX_IT_SHELLS)
Sbar_DrawPic (519, 0, sb_ammo[0]);
- else if (cl.items & NEX_IT_BULLETS)
+ else if (cl.stats[STAT_ITEMS] & NEX_IT_BULLETS)
Sbar_DrawPic (519, 0, sb_ammo[1]);
- else if (cl.items & NEX_IT_ROCKETS)
+ else if (cl.stats[STAT_ITEMS] & NEX_IT_ROCKETS)
Sbar_DrawPic (519, 0, sb_ammo[2]);
- else if (cl.items & NEX_IT_CELLS)
+ else if (cl.stats[STAT_ITEMS] & NEX_IT_CELLS)
Sbar_DrawPic (519, 0, sb_ammo[3]);
if(cl.stats[STAT_AMMO] <= 10)
if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
{
if (gamemode != GAME_GOODVSBAD2)
- Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
+ Sbar_DrawAlphaPic (0, 0, sb_scorebar, sbar_alpha_bg.value);
Sbar_DrawScoreboard ();
}
else if (sb_lines)
{
- Sbar_DrawAlphaPic (0, 0, sb_sbar, 0.4);
+ 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.items & IT_KEY1)
+ if (cl.stats[STAT_ITEMS] & IT_KEY1)
Sbar_DrawPic (209, 3, sb_items[0]);
- if (cl.items & IT_KEY2)
+ if (cl.stats[STAT_ITEMS] & IT_KEY2)
Sbar_DrawPic (209, 12, sb_items[1]);
}
// armor
if (gamemode != GAME_GOODVSBAD2)
{
- if (cl.items & IT_INVULNERABILITY)
+ if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY)
{
Sbar_DrawNum (24, 0, 666, 3, 1);
Sbar_DrawPic (0, 0, sb_disc);
if (gamemode == GAME_ROGUE)
{
Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25);
- if (cl.items & RIT_ARMOR3)
+ if (cl.stats[STAT_ITEMS] & RIT_ARMOR3)
Sbar_DrawPic (0, 0, sb_armor[2]);
- else if (cl.items & RIT_ARMOR2)
+ else if (cl.stats[STAT_ITEMS] & RIT_ARMOR2)
Sbar_DrawPic (0, 0, sb_armor[1]);
- else if (cl.items & RIT_ARMOR1)
+ 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.items & IT_ARMOR3)
+ if (cl.stats[STAT_ITEMS] & IT_ARMOR3)
Sbar_DrawPic (0, 0, sb_armor[2]);
- else if (cl.items & IT_ARMOR2)
+ else if (cl.stats[STAT_ITEMS] & IT_ARMOR2)
Sbar_DrawPic (0, 0, sb_armor[1]);
- else if (cl.items & IT_ARMOR1)
+ else if (cl.stats[STAT_ITEMS] & IT_ARMOR1)
Sbar_DrawPic (0, 0, sb_armor[0]);
}
}
// ammo icon
if (gamemode == GAME_ROGUE)
{
- if (cl.items & RIT_SHELLS)
+ if (cl.stats[STAT_ITEMS] & RIT_SHELLS)
Sbar_DrawPic (224, 0, sb_ammo[0]);
- else if (cl.items & RIT_NAILS)
+ else if (cl.stats[STAT_ITEMS] & RIT_NAILS)
Sbar_DrawPic (224, 0, sb_ammo[1]);
- else if (cl.items & RIT_ROCKETS)
+ else if (cl.stats[STAT_ITEMS] & RIT_ROCKETS)
Sbar_DrawPic (224, 0, sb_ammo[2]);
- else if (cl.items & RIT_CELLS)
+ else if (cl.stats[STAT_ITEMS] & RIT_CELLS)
Sbar_DrawPic (224, 0, sb_ammo[3]);
- else if (cl.items & RIT_LAVA_NAILS)
+ else if (cl.stats[STAT_ITEMS] & RIT_LAVA_NAILS)
Sbar_DrawPic (224, 0, rsb_ammo[0]);
- else if (cl.items & RIT_PLASMA_AMMO)
+ else if (cl.stats[STAT_ITEMS] & RIT_PLASMA_AMMO)
Sbar_DrawPic (224, 0, rsb_ammo[1]);
- else if (cl.items & RIT_MULTI_ROCKETS)
+ else if (cl.stats[STAT_ITEMS] & RIT_MULTI_ROCKETS)
Sbar_DrawPic (224, 0, rsb_ammo[2]);
}
else
{
- if (cl.items & IT_SHELLS)
+ if (cl.stats[STAT_ITEMS] & IT_SHELLS)
Sbar_DrawPic (224, 0, sb_ammo[0]);
- else if (cl.items & IT_NAILS)
+ else if (cl.stats[STAT_ITEMS] & IT_NAILS)
Sbar_DrawPic (224, 0, sb_ammo[1]);
- else if (cl.items & IT_ROCKETS)
+ else if (cl.stats[STAT_ITEMS] & IT_ROCKETS)
Sbar_DrawPic (224, 0, sb_ammo[2]);
- else if (cl.items & IT_CELLS)
+ else if (cl.stats[STAT_ITEMS] & IT_CELLS)
Sbar_DrawPic (224, 0, sb_ammo[3]);
}
Sbar_ShowFPS();
R_Draw2DCrosshair();
+
+ if (cl_prydoncursor.integer)
+ DrawQ_Pic((cl.cmd.cursor_screen[0] + 1) * 0.5 * vid.conwidth, (cl.cmd.cursor_screen[1] + 1) * 0.5 * vid.conheight, va("gfx/prydoncursor%03i.lmp", cl_prydoncursor.integer), 0, 0, 1, 1, 1, 1, 0);
}
//=============================================================================
float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y)
{
qbyte *c;
- if (s->name[0] || s->frags || s->colors || (s - cl.scores) == cl.playerentity - 1)
- {
- // 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.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.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.value, 0);
- return 8;
- }
- else
- return 0;
+ // 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);
+ return 8;
}
void Sbar_DeathmatchOverlay (void)
int i, x, y;
cachepic_t *pic;
- pic = Draw_CachePic ("gfx/ranking.lmp");
- DrawQ_Pic ((vid.conwidth - pic->width)/2, 8, "gfx/ranking.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha.value, 0);
+ pic = Draw_CachePic ("gfx/ranking.lmp", true);
+ DrawQ_Pic ((vid.conwidth - pic->width)/2, 8, "gfx/ranking.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
// scores
Sbar_SortFrags ();
// figure out start
i -= numlines/2;
- i = bound(0, i, scoreboardlines - numlines);
+ i = min(i, scoreboardlines - numlines);
+ i = max(i, 0);
if (gamemode == GAME_TRANSFUSION)
{
sbar_x = (vid.conwidth - 320) >> 1;
sbar_y = (vid.conheight - 200) >> 1;
- DrawQ_Pic (sbar_x + 64, sbar_y + 24, "gfx/complete.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha.value, 0);
- DrawQ_Pic (sbar_x + 0, sbar_y + 56, "gfx/inter.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha.value, 0);
+ DrawQ_Pic (sbar_x + 64, sbar_y + 24, "gfx/complete.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
+ DrawQ_Pic (sbar_x + 0, sbar_y + 56, "gfx/inter.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
// time
dig = cl.completed_time/60;
{
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 * sbar_alpha.value, 0);
+ pic = Draw_CachePic ("gfx/finale.lmp", true);
+ DrawQ_Pic((vid.conwidth - pic->width)/2, 16, "gfx/finale.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
}
projects / xonotic / darkplaces.git / blobdiff