if (sb_showscores)
return;
sb_showscores = true;
-// sb_updates = 0;
}
/*
void Sbar_DontShowScores (void)
{
sb_showscores = false;
-// sb_updates = 0;
}
-/*
-===============
-Sbar_Changed
-===============
-*/
-//void Sbar_Changed (void)
-//{
-// sb_updates = 0; // update next frame
-//}
-
/*
===============
Sbar_Init
sb_scorebar = Draw_PicFromWad ("scorebar");
//MED 01/04/97 added new hipnotic weapons
- if (hipnotic)
+ if (gamemode == GAME_HIPNOTIC)
{
- hsb_weapons[0][0] = Draw_PicFromWad ("inv_laser");
- hsb_weapons[0][1] = Draw_PicFromWad ("inv_mjolnir");
- hsb_weapons[0][2] = Draw_PicFromWad ("inv_gren_prox");
- hsb_weapons[0][3] = Draw_PicFromWad ("inv_prox_gren");
- hsb_weapons[0][4] = Draw_PicFromWad ("inv_prox");
-
- hsb_weapons[1][0] = Draw_PicFromWad ("inv2_laser");
- hsb_weapons[1][1] = Draw_PicFromWad ("inv2_mjolnir");
- hsb_weapons[1][2] = Draw_PicFromWad ("inv2_gren_prox");
- hsb_weapons[1][3] = Draw_PicFromWad ("inv2_prox_gren");
- hsb_weapons[1][4] = Draw_PicFromWad ("inv2_prox");
-
- for (i=0 ; i<5 ; i++)
- {
- hsb_weapons[2+i][0] = Draw_PicFromWad (va("inva%i_laser",i+1));
- hsb_weapons[2+i][1] = Draw_PicFromWad (va("inva%i_mjolnir",i+1));
- hsb_weapons[2+i][2] = Draw_PicFromWad (va("inva%i_gren_prox",i+1));
- hsb_weapons[2+i][3] = Draw_PicFromWad (va("inva%i_prox_gren",i+1));
- hsb_weapons[2+i][4] = Draw_PicFromWad (va("inva%i_prox",i+1));
- }
-
- hsb_items[0] = Draw_PicFromWad ("sb_wsuit");
- hsb_items[1] = Draw_PicFromWad ("sb_eshld");
+ hsb_weapons[0][0] = Draw_PicFromWad ("inv_laser");
+ hsb_weapons[0][1] = Draw_PicFromWad ("inv_mjolnir");
+ hsb_weapons[0][2] = Draw_PicFromWad ("inv_gren_prox");
+ hsb_weapons[0][3] = Draw_PicFromWad ("inv_prox_gren");
+ hsb_weapons[0][4] = Draw_PicFromWad ("inv_prox");
+
+ hsb_weapons[1][0] = Draw_PicFromWad ("inv2_laser");
+ hsb_weapons[1][1] = Draw_PicFromWad ("inv2_mjolnir");
+ hsb_weapons[1][2] = Draw_PicFromWad ("inv2_gren_prox");
+ hsb_weapons[1][3] = Draw_PicFromWad ("inv2_prox_gren");
+ hsb_weapons[1][4] = Draw_PicFromWad ("inv2_prox");
+
+ for (i=0 ; i<5 ; i++)
+ {
+ hsb_weapons[2+i][0] = Draw_PicFromWad (va("inva%i_laser",i+1));
+ hsb_weapons[2+i][1] = Draw_PicFromWad (va("inva%i_mjolnir",i+1));
+ hsb_weapons[2+i][2] = Draw_PicFromWad (va("inva%i_gren_prox",i+1));
+ hsb_weapons[2+i][3] = Draw_PicFromWad (va("inva%i_prox_gren",i+1));
+ hsb_weapons[2+i][4] = Draw_PicFromWad (va("inva%i_prox",i+1));
+ }
+
+ hsb_items[0] = Draw_PicFromWad ("sb_wsuit");
+ hsb_items[1] = Draw_PicFromWad ("sb_eshld");
}
- if (rogue)
+ else if (gamemode == GAME_ROGUE)
{
rsb_invbar[0] = Draw_PicFromWad ("r_invbar1");
rsb_invbar[1] = Draw_PicFromWad ("r_invbar2");
rsb_weapons[4] = Draw_PicFromWad ("r_plasma");
rsb_items[0] = Draw_PicFromWad ("r_shield1");
- rsb_items[1] = Draw_PicFromWad ("r_agrav1");
+ rsb_items[1] = Draw_PicFromWad ("r_agrav1");
// PGM 01/19/97 - team color border
- rsb_teambord = Draw_PicFromWad ("r_teambord");
+ rsb_teambord = Draw_PicFromWad ("r_teambord");
// PGM 01/19/97 - team color border
rsb_ammo[0] = Draw_PicFromWad ("r_ammolava");
void Sbar_DrawPic (int x, int y, qpic_t *pic)
{
if (cl.gametype == GAME_DEATHMATCH)
- Draw_Pic (x /* + ((vid.width - 320)>>1)*/, y + (vid.height-SBAR_HEIGHT), pic);
+ Draw_Pic (x, y + (vid.conheight-SBAR_HEIGHT), pic);
else
- Draw_Pic (x + ((vid.width - 320)>>1), y + (vid.height-SBAR_HEIGHT), pic);
+ Draw_Pic (x + ((vid.conwidth - 320)>>1), y + (vid.conheight-SBAR_HEIGHT), pic);
}
-/*
-=============
-Sbar_DrawTransPic
-=============
-*/
-void Sbar_DrawTransPic (int x, int y, qpic_t *pic)
+void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha);
+void Sbar_DrawAlphaPic (int x, int y, qpic_t *pic, float alpha)
{
if (cl.gametype == GAME_DEATHMATCH)
- Draw_TransPic (x /*+ ((vid.width - 320)>>1)*/, y + (vid.height-SBAR_HEIGHT), pic);
+ Draw_AlphaPic (x, y + (vid.conheight-SBAR_HEIGHT), pic, alpha);
else
- Draw_TransPic (x + ((vid.width - 320)>>1), y + (vid.height-SBAR_HEIGHT), pic);
+ Draw_AlphaPic (x + ((vid.conwidth - 320)>>1), y + (vid.conheight-SBAR_HEIGHT), pic, alpha);
}
/*
void Sbar_DrawCharacter (int x, int y, int num)
{
if (cl.gametype == GAME_DEATHMATCH)
- Draw_Character ( x /*+ ((vid.width - 320)>>1) */ + 4 , y + vid.height-SBAR_HEIGHT, num);
+ Draw_Character ( x + 4 , y + vid.conheight-SBAR_HEIGHT, num);
else
- Draw_Character ( x + ((vid.width - 320)>>1) + 4 , y + vid.height-SBAR_HEIGHT, num);
+ Draw_Character ( x + ((vid.conwidth - 320)>>1) + 4 , y + vid.conheight-SBAR_HEIGHT, num);
}
/*
void Sbar_DrawString (int x, int y, char *str)
{
if (cl.gametype == GAME_DEATHMATCH)
- Draw_String (x /*+ ((vid.width - 320)>>1)*/, y+ vid.height-SBAR_HEIGHT, str, 0);
+ Draw_String (x, y+ vid.conheight-SBAR_HEIGHT, str, 0);
else
- Draw_String (x + ((vid.width - 320)>>1), y+ vid.height-SBAR_HEIGHT, str, 0);
+ Draw_String (x + ((vid.conwidth - 320)>>1), y+ vid.conheight-SBAR_HEIGHT, str, 0);
}
/*
else
frame = *ptr -'0';
- Sbar_DrawTransPic (x,y,sb_nums[color][frame]);
+ Sbar_DrawPic (x,y,sb_nums[color][frame]);
x += 24;
ptr++;
}
}
}
-int Sbar_ColorForMap (int m)
-{
- return m < 128 ? m + 8 : m + 8;
-}
-
/*
===============
Sbar_UpdateScoreboard
top = s->colors & 0xf0;
bottom = (s->colors & 15) <<4;
- scoreboardtop[i] = Sbar_ColorForMap (top);
- scoreboardbottom[i] = Sbar_ColorForMap (bottom);
+ scoreboardtop[i] = top + 8;
+ scoreboardbottom[i] = bottom + 8;
}
}
Sbar_SoloScoreboard ();
if (cl.gametype == GAME_DEATHMATCH)
Sbar_DeathmatchOverlay ();
-#if 0
- int i, j, c;
- int x, y;
- int l;
- int top, bottom;
- scoreboard_t *s;
-
- if (cl.gametype != GAME_DEATHMATCH)
- {
- Sbar_SoloScoreboard ();
- return;
- }
-
- Sbar_UpdateScoreboard ();
-
- l = scoreboardlines <= 6 ? scoreboardlines : 6;
-
- for (i=0 ; i<l ; i++)
- {
- x = 20*(i&1);
- y = i/2 * 8;
-
- s = &cl.scores[fragsort[i]];
- if (!s->name[0])
- continue;
-
- // draw background
- top = s->colors & 0xf0;
- bottom = (s->colors & 15)<<4;
- top = Sbar_ColorForMap (top);
- bottom = Sbar_ColorForMap (bottom);
-
- Draw_Fill ( x*8+10 + ((vid.width - 320)>>1), y + vid.height - SBAR_HEIGHT, 28, 4, top);
- Draw_Fill ( x*8+10 + ((vid.width - 320)>>1), y+4 + vid.height - SBAR_HEIGHT, 28, 4, bottom);
-
- // draw text
- for (j=0 ; j<20 ; j++)
- {
- c = scoreboardtext[i][j];
- if (c == 0 || c == ' ')
- continue;
- Sbar_DrawCharacter ( (x+j)*8, y, c);
- }
- }
-#endif
}
//=============================================================================
float time;
int flashon;
- if (rogue)
+ if (gamemode == GAME_ROGUE)
{
if ( cl.stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN )
- Sbar_DrawPic (0, -24, rsb_invbar[0]);
+ Sbar_DrawAlphaPic (0, -24, rsb_invbar[0], 0.4);
else
- Sbar_DrawPic (0, -24, rsb_invbar[1]);
+ Sbar_DrawAlphaPic (0, -24, rsb_invbar[1], 0.4);
}
else
- {
- Sbar_DrawPic (0, -24, sb_ibar);
- }
+ Sbar_DrawAlphaPic (0, -24, sb_ibar, 0.4);
-// weapons
+ // weapons
for (i=0 ; i<7 ; i++)
{
if (cl.items & (IT_SHOTGUN<<i) )
else
flashon = (flashon%5) + 2;
- Sbar_DrawPic (i*24, -16, sb_weapons[flashon][i]);
-
-// if (flashon > 1)
-// sb_updates = 0; // force update to remove flash
+ Sbar_DrawAlphaPic (i*24, -16, sb_weapons[flashon][i], 0.4);
}
}
-// MED 01/04/97
-// hipnotic weapons
- if (hipnotic)
- {
- int grenadeflashing=0;
- for (i=0 ; i<4 ; i++)
- {
- if (cl.items & (1<<hipweapons[i]) )
- {
- time = cl.item_gettime[hipweapons[i]];
- flashon = (int)((cl.time - time)*10);
- if (flashon >= 10)
- {
- if ( cl.stats[STAT_ACTIVEWEAPON] == (1<<hipweapons[i]) )
- flashon = 1;
- else
- flashon = 0;
- }
- else
- flashon = (flashon%5) + 2;
-
- // check grenade launcher
- if (i==2)
- {
- if (cl.items & HIT_PROXIMITY_GUN)
- {
- if (flashon)
- {
- grenadeflashing = 1;
- Sbar_DrawPic (96, -16, hsb_weapons[flashon][2]);
- }
- }
- }
- else if (i==3)
- {
- if (cl.items & (IT_SHOTGUN<<4))
- {
- if (flashon && !grenadeflashing)
- {
- Sbar_DrawPic (96, -16, hsb_weapons[flashon][3]);
- }
- else if (!grenadeflashing)
- {
- Sbar_DrawPic (96, -16, hsb_weapons[0][3]);
- }
- }
- else
- Sbar_DrawPic (96, -16, hsb_weapons[flashon][4]);
- }
- else
- Sbar_DrawPic (176 + (i*24), -16, hsb_weapons[flashon][i]);
-// if (flashon > 1)
-// sb_updates = 0; // force update to remove flash
- }
- }
- }
-
- if (rogue)
+ // MED 01/04/97
+ // hipnotic weapons
+ if (gamemode == GAME_HIPNOTIC)
{
- // check for powered up weapon.
- if ( cl.stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN )
+ int grenadeflashing=0;
+ for (i=0 ; i<4 ; i++)
{
- for (i=0;i<5;i++)
+ if (cl.items & (1<<hipweapons[i]) )
{
- if (cl.stats[STAT_ACTIVEWEAPON] == (RIT_LAVA_NAILGUN << i))
+ time = cl.item_gettime[hipweapons[i]];
+ flashon = (int)((cl.time - time)*10);
+ if (flashon >= 10)
{
- Sbar_DrawPic ((i+2)*24, -16, rsb_weapons[i]);
+ if ( cl.stats[STAT_ACTIVEWEAPON] == (1<<hipweapons[i]) )
+ flashon = 1;
+ else
+ flashon = 0;
+ }
+ else
+ flashon = (flashon%5) + 2;
+
+ // check grenade launcher
+ if (i==2)
+ {
+ if (cl.items & HIT_PROXIMITY_GUN)
+ {
+ if (flashon)
+ {
+ grenadeflashing = 1;
+ Sbar_DrawPic (96, -16, hsb_weapons[flashon][2]);
+ }
+ }
+ }
+ else if (i==3)
+ {
+ if (cl.items & (IT_SHOTGUN<<4))
+ {
+ if (!grenadeflashing)
+ Sbar_DrawPic (96, -16, hsb_weapons[flashon][3]);
+ }
+ else
+ Sbar_DrawPic (96, -16, hsb_weapons[flashon][4]);
}
+ else
+ Sbar_DrawPic (176 + (i*24), -16, hsb_weapons[flashon][i]);
}
}
}
-// ammo counts
+ if (gamemode == GAME_ROGUE)
+ {
+ // check for powered up weapon.
+ if ( cl.stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN )
+ for (i=0;i<5;i++)
+ if (cl.stats[STAT_ACTIVEWEAPON] == (RIT_LAVA_NAILGUN << i))
+ Sbar_DrawPic ((i+2)*24, -16, rsb_weapons[i]);
+ }
+
+ // ammo counts
for (i=0 ; i<4 ; i++)
{
sprintf (num, "%3i",cl.stats[STAT_SHELLS+i] );
Sbar_DrawCharacter ( (6*i+3)*8 - 2, -24, 18 + num[2] - '0');
}
- flashon = 0;
- // items
- for (i=0 ; i<6 ; i++)
- if (cl.items & (1<<(17+i)))
- {
- time = cl.item_gettime[17+i];
- if (time && time > cl.time - 2 && flashon )
- { // flash frame
-// sb_updates = 0;
- }
- else
- {
- //MED 01/04/97 changed keys
- if (!hipnotic || (i>1))
- {
- Sbar_DrawPic (192 + i*16, -16, sb_items[i]);
- }
- }
-// if (time && time > cl.time - 2)
-// sb_updates = 0;
- }
- //MED 01/04/97 added hipnotic items
- // hipnotic items
- if (hipnotic)
- {
- for (i=0 ; i<2 ; i++)
- if (cl.items & (1<<(24+i)))
- {
- time = cl.item_gettime[24+i];
- if (time && time > cl.time - 2 && flashon )
- { // flash frame
-// sb_updates = 0;
- }
- else
- {
- Sbar_DrawPic (288 + i*16, -16, hsb_items[i]);
- }
-// if (time && time > cl.time - 2)
-// sb_updates = 0;
- }
- }
-
- if (rogue)
- {
- // new rogue items
- for (i=0 ; i<2 ; i++)
+ // items
+ for (i=0 ; i<6 ; i++)
+ if (cl.items & (1<<(17+i)))
{
- if (cl.items & (1<<(29+i)))
- {
- time = cl.item_gettime[29+i];
+ //MED 01/04/97 changed keys
+ if (gamemode != GAME_HIPNOTIC || (i>1))
+ Sbar_DrawPic (192 + i*16, -16, sb_items[i]);
+ }
- if (time && time > cl.time - 2 && flashon )
- { // flash frame
-// sb_updates = 0;
- }
- else
- {
- Sbar_DrawPic (288 + i*16, -16, rsb_items[i]);
- }
+ //MED 01/04/97 added hipnotic items
+ // hipnotic items
+ if (gamemode == GAME_HIPNOTIC)
+ {
+ for (i=0 ; i<2 ; i++)
+ if (cl.items & (1<<(24+i)))
+ Sbar_DrawPic (288 + i*16, -16, hsb_items[i]);
+ }
-// if (time && time > cl.time - 2)
-// sb_updates = 0;
- }
- }
+ if (gamemode == GAME_ROGUE)
+ {
+ // new rogue items
+ for (i=0 ; i<2 ; i++)
+ if (cl.items & (1<<(29+i)))
+ Sbar_DrawPic (288 + i*16, -16, rsb_items[i]);
}
else
{
- // sigils
+ // sigils
for (i=0 ; i<4 ; i++)
- {
if (cl.items & (1<<(28+i)))
- {
- time = cl.item_gettime[28+i];
- if (time && time > cl.time - 2 && flashon )
- { // flash frame
-// sb_updates = 0;
- }
- else
- Sbar_DrawPic (320-32 + i*8, -16, sb_sigil[i]);
-// if (time && time > cl.time - 2)
-// sb_updates = 0;
- }
- }
+ Sbar_DrawPic (320-32 + i*8, -16, sb_sigil[i]);
}
}
if (cl.gametype == GAME_DEATHMATCH)
xofs = 0;
else
- xofs = (vid.width - 320)>>1;
- y = vid.height - SBAR_HEIGHT - 23;
+ xofs = (vid.conwidth - 320)>>1;
+ y = vid.conheight - SBAR_HEIGHT - 23;
for (i=0 ; i<l ; i++)
{
continue;
// draw background
- top = s->colors & 0xf0;
- bottom = (s->colors & 15)<<4;
- top = Sbar_ColorForMap (top);
- bottom = Sbar_ColorForMap (bottom);
+ top = (s->colors & 0xf0) + 8;
+ bottom = ((s->colors & 15)<<4) + 8;
Draw_Fill (xofs + x*8 + 10, y, 28, 4, top);
Draw_Fill (xofs + x*8 + 10, y+4, 28, 3, bottom);
*/
void Sbar_DrawFace (void)
{
- int f, anim;
+ int f;
// PGM 01/19/97 - team color drawing
// PGM 03/02/97 - fixed so color swatch only appears in CTF modes
- if (rogue &&
- (cl.maxclients != 1) &&
- (teamplay.value>3) &&
- (teamplay.value<7))
+ if (gamemode == GAME_ROGUE && (cl.maxclients != 1) && (teamplay.value > 3) && (teamplay.value < 7))
{
int top, bottom;
int xofs;
char num[12];
scoreboard_t *s;
-
+
s = &cl.scores[cl.viewentity - 1];
// draw background
- top = s->colors & 0xf0;
- bottom = (s->colors & 15)<<4;
- top = Sbar_ColorForMap (top);
- bottom = Sbar_ColorForMap (bottom);
+ top = (s->colors & 0xf0) + 8;
+ bottom = ((s->colors & 15)<<4) + 8;
if (cl.gametype == GAME_DEATHMATCH)
xofs = 113;
else
- xofs = ((vid.width - 320)>>1) + 113;
+ xofs = ((vid.conwidth - 320)>>1) + 113;
Sbar_DrawPic (112, 0, rsb_teambord);
- Draw_Fill (xofs, vid.height-SBAR_HEIGHT+3, 22, 9, top);
- Draw_Fill (xofs, vid.height-SBAR_HEIGHT+12, 22, 9, bottom);
+ Draw_Fill (xofs, vid.conheight-SBAR_HEIGHT+3, 22, 9, top);
+ Draw_Fill (xofs, vid.conheight-SBAR_HEIGHT+12, 22, 9, bottom);
// draw number
f = s->frags;
Sbar_DrawCharacter ( 116, 3, num[1]);
Sbar_DrawCharacter ( 123, 3, num[2]);
}
-
+
return;
}
// PGM 01/19/97 - team color drawing
- if ( (cl.items & (IT_INVISIBILITY | IT_INVULNERABILITY) )
- == (IT_INVISIBILITY | IT_INVULNERABILITY) )
- {
+ if ( (cl.items & (IT_INVISIBILITY | IT_INVULNERABILITY) ) == (IT_INVISIBILITY | IT_INVULNERABILITY) )
Sbar_DrawPic (112, 0, sb_face_invis_invuln);
- return;
- }
- if (cl.items & IT_QUAD)
- {
+ else if (cl.items & IT_QUAD)
Sbar_DrawPic (112, 0, sb_face_quad );
- return;
- }
- if (cl.items & IT_INVISIBILITY)
- {
+ else if (cl.items & IT_INVISIBILITY)
Sbar_DrawPic (112, 0, sb_face_invis );
- return;
- }
- if (cl.items & IT_INVULNERABILITY)
- {
+ else if (cl.items & IT_INVULNERABILITY)
Sbar_DrawPic (112, 0, sb_face_invuln);
- return;
- }
-
- if (cl.stats[STAT_HEALTH] >= 100)
- f = 4;
else
- f = cl.stats[STAT_HEALTH] / 20;
-
- if (cl.time <= cl.faceanimtime)
{
- anim = 1;
-// sb_updates = 0; // make sure the anim gets drawn over
+ f = cl.stats[STAT_HEALTH] / 20;
+ f = bound(0, f, 4);
+ Sbar_DrawPic (112, 0, sb_faces[f][cl.time <= cl.faceanimtime]);
}
- else
- anim = 0;
- Sbar_DrawPic (112, 0, sb_faces[f][anim]);
}
/*
*/
void Sbar_Draw (void)
{
- if (scr_con_current == vid.height)
+ if (scr_con_current == vid.conheight)
return; // console is full screen
- scr_copyeverything = 1;
-
-// sb_updates++;
-
if (sb_lines > 24)
{
Sbar_DrawInventory ();
if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
{
- Sbar_DrawPic (0, 0, sb_scorebar);
+ Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
Sbar_DrawScoreboard ();
-// sb_updates = 0;
}
else if (sb_lines)
{
- Sbar_DrawPic (0, 0, sb_sbar);
-
- // keys (hipnotic only)
- //MED 01/04/97 moved keys here so they would not be overwritten
- if (hipnotic)
- {
- if (cl.items & IT_KEY1)
- Sbar_DrawPic (209, 3, sb_items[0]);
- if (cl.items & IT_KEY2)
- Sbar_DrawPic (209, 12, sb_items[1]);
- }
- // armor
+ 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.items & IT_KEY1)
+ Sbar_DrawPic (209, 3, sb_items[0]);
+ if (cl.items & IT_KEY2)
+ Sbar_DrawPic (209, 12, sb_items[1]);
+ }
+// armor
if (cl.items & IT_INVULNERABILITY)
{
Sbar_DrawNum (24, 0, 666, 3, 1);
}
else
{
- if (rogue)
+ if (gamemode == GAME_ROGUE)
{
- Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3,
- cl.stats[STAT_ARMOR] <= 25);
+ 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)
}
else
{
- Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3
- , cl.stats[STAT_ARMOR] <= 25);
+ 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_DrawFace ();
// health
- Sbar_DrawNum (136, 0, cl.stats[STAT_HEALTH], 3
- , cl.stats[STAT_HEALTH] <= 25);
+ Sbar_DrawNum (136, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
// ammo icon
- if (rogue)
+ if (gamemode == GAME_ROGUE)
{
if (cl.items & RIT_SHELLS)
Sbar_DrawPic (224, 0, sb_ammo[0]);
Sbar_DrawPic (224, 0, sb_ammo[3]);
}
- Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3,
- cl.stats[STAT_AMMO] <= 10);
+ Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
}
- if (vid.width > 320) {
- if (cl.gametype == GAME_DEATHMATCH)
- Sbar_MiniDeathmatchOverlay ();
- }
+ if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH)
+ Sbar_MiniDeathmatchOverlay ();
}
//=============================================================================
else
frame = *ptr -'0';
- Draw_TransPic (x,y,sb_nums[color][frame]);
+ Draw_Pic (x,y,sb_nums[color][frame]);
x += 24;
ptr++;
}
char num[128];
scoreboard_t *s;
- scr_copyeverything = 1;
- scr_fullupdate = 0;
-
pic = Draw_CachePic ("gfx/ranking.lmp");
M_DrawPic ((320-pic->width)/2, 8, pic);
// draw the text
l = scoreboardlines;
- x = ((vid.width - 320)>>1) - 140;
+ x = ((vid.conwidth - 320)>>1) - 140;
y = 40;
for (i = 0;i < l;i++)
{
continue;
// draw background
- top = s->colors & 0xf0;
- bottom = (s->colors & 15)<<4;
- top = Sbar_ColorForMap (top);
- bottom = Sbar_ColorForMap (bottom);
+ top = (s->colors & 0xf0) + 8;
+ bottom = ((s->colors & 15)<<4) + 8;
Draw_Fill ( x, y+1, 88, 3, top);
Draw_Fill ( x, y+4, 88, 3, bottom);
char num[128];
scoreboard_t *s;
- if (vid.width < 512 || !sb_lines)
+ if (vid.conwidth < 512 || !sb_lines)
return;
- scr_copyeverything = 1;
- scr_fullupdate = 0;
-
// scores
Sbar_SortFrags ();
// draw the text
l = scoreboardlines;
- y = vid.height - sb_lines;
+ y = vid.conheight - sb_lines;
numlines = sb_lines/8;
if (numlines < 3)
return;
i = 0;
x = 324;
- for (;i < scoreboardlines && y < vid.height - 8;i++)
+ for (;i < scoreboardlines && y < vid.conheight - 8;i++)
{
k = fragsort[i];
s = &cl.scores[k];
continue;
// draw background
- top = Sbar_ColorForMap (s->colors & 0xf0);
- bottom = Sbar_ColorForMap ((s->colors & 15)<<4);
+ top = (s->colors & 0xf0) + 8;
+ bottom = ((s->colors & 15)<<4) + 8;
Draw_Fill ( x, y+1, 72, 3, top);
Draw_Fill ( x, y+4, 72, 3, bottom);
int dig;
int num;
- scr_copyeverything = 1;
- scr_fullupdate = 0;
-
if (cl.gametype == GAME_DEATHMATCH)
{
Sbar_DeathmatchOverlay ();
Draw_Pic (64, 24, pic);
pic = Draw_CachePic ("gfx/inter.lmp");
- Draw_TransPic (0, 56, pic);
+ Draw_Pic (0, 56, pic);
// time
dig = cl.completed_time/60;
Sbar_IntermissionNumber (160, 64, dig, 3, 0);
num = cl.completed_time - dig*60;
- Draw_TransPic (234,64,sb_colon);
- Draw_TransPic (246,64,sb_nums[0][num/10]);
- Draw_TransPic (266,64,sb_nums[0][num%10]);
+ Draw_Pic (234,64,sb_colon);
+ Draw_Pic (246,64,sb_nums[0][num/10]);
+ Draw_Pic (266,64,sb_nums[0][num%10]);
Sbar_IntermissionNumber (160, 104, cl.stats[STAT_SECRETS], 3, 0);
- Draw_TransPic (232,104,sb_slash);
+ Draw_Pic (232,104,sb_slash);
Sbar_IntermissionNumber (240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0);
Sbar_IntermissionNumber (160, 144, cl.stats[STAT_MONSTERS], 3, 0);
- Draw_TransPic (232,144,sb_slash);
+ Draw_Pic (232,144,sb_slash);
Sbar_IntermissionNumber (240, 144, cl.stats[STAT_TOTALMONSTERS], 3, 0);
}
{
qpic_t *pic;
- scr_copyeverything = 1;
-
pic = Draw_CachePic ("gfx/finale.lmp");
- Draw_TransPic ( (vid.width-pic->width)/2, 16, pic);
+ Draw_Pic ( (vid.conwidth-pic->width)/2, 16, pic);
}
projects / xonotic / darkplaces.git / blobdiff