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++);
}
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_nums[0][10] = Sbar_NewPic ("gfx/num_minus");
- sb_nums[1][10] = Sbar_NewPic ("gfx/anum_minus");
+ sb_disc = Sbar_NewPic("gfx/disc");
- sb_colon = Sbar_NewPic ("gfx/num_colon");
- sb_slash = Sbar_NewPic ("gfx/num_slash");
+ for (i = 0;i < 10;i++)
+ sb_nums[0][i] = Sbar_NewPic (va("gfx/num_%i",i));
- if (gamemode == GAME_SOM)
- {
somsb_health = Sbar_NewPic("gfx/hud_health");
somsb_ammo[0] = Sbar_NewPic("gfx/sb_shells");
somsb_ammo[1] = Sbar_NewPic("gfx/sb_nails");
}
else if (gamemode == GAME_NEXUIZ)
{
+ 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");
}
else
{
+ 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][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");
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_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);
+ 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 - (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);
+ 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);
}
/*
// 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_fg.value, 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) * sbar_alpha_fg.value, 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;
fps_scalex = 12;
fps_scaley = 12;
fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0));
- //fps_y = vid.conheight - sb_lines; // yes this may draw over the sbar
- //fps_y = bound(0, fps_y, vid.conheight - fps_height);
- fps_y = vid.conheight - fps_height;
+ //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 - fps_scalex * strlen(fpsstring);
+ 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);
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);
+ 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 - fps_scalex * strlen(datestring);
+ 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;
{
// this is the top left of the sbar area
sbar_x = 0;
- sbar_y = vid.conheight - 24*3;
+ sbar_y = vid_conheight.integer - 24*3;
// armor
if (cl.stats[STAT_ARMOR])
}
else if (gamemode == GAME_NEXUIZ)
{
- sbar_y = vid.conheight - 47;
- sbar_x = (vid.conwidth - 640)/2;
+ sbar_y = vid_conheight.integer - 47;
+ sbar_x = (vid_conwidth.integer - 640)/2;
if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
{
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));
}
// special items
if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY)
{
- Sbar_DrawNum (36, 0, 666, 3, 1);
- Sbar_DrawPic (0, 0, sb_disc);
+ // Nexuiz has no anum pics
+ //Sbar_DrawNum (36, 0, 666, 3, 1);
+ // Nexuiz has no disc pic
+ //Sbar_DrawPic (0, 0, sb_disc);
}
// armor
DrawQ_Pic(sbar_x,sbar_y,sb_sbar_overlay->name,0,0,1,1,1,1,DRAWFLAG_MODULATE);
}
- //if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH)
+ //if (vid_conwidth.integer > 320 && cl.gametype == GAME_DEATHMATCH)
// Sbar_MiniDeathmatchOverlay (0, 17);
}
else // Quake and others
{
- sbar_y = vid.conheight - SBAR_HEIGHT;
+ sbar_y = vid_conheight.integer - SBAR_HEIGHT;
if (cl.gametype == GAME_DEATHMATCH && gamemode != GAME_TRANSFUSION)
sbar_x = 0;
else
- sbar_x = (vid.conwidth - 320)/2;
+ sbar_x = (vid_conwidth.integer - 320)/2;
if (sb_lines > 24)
{
}
- if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH)
+ if (vid_conwidth.integer > 320 && cl.gametype == GAME_DEATHMATCH)
{
if (gamemode == GAME_TRANSFUSION)
Sbar_MiniDeathmatchOverlay (0, 0);
else
- Sbar_MiniDeathmatchOverlay (324, vid.conheight - sb_lines);
+ Sbar_MiniDeathmatchOverlay (324, vid_conheight.integer - sb_lines);
}
}
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);
+ 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);
}
//=============================================================================
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_fg.value, 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
Sbar_SortFrags ();
// draw the text
- x = (vid.conwidth - (6 + 15) * 8) / 2;
+ x = (vid_conwidth.integer - (6 + 15) * 8) / 2;
y = 40;
- for (i = 0;i < scoreboardlines && y < vid.conheight;i++)
+ for (i = 0;i < scoreboardlines && y < vid_conheight.integer;i++)
y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
}
// decide where to print
if (gamemode == GAME_TRANSFUSION)
- numlines = (vid.conwidth - x + 127) / 128;
+ numlines = (vid_conwidth.integer - x + 127) / 128;
else
- numlines = (vid.conheight - y + 7) / 8;
+ numlines = (vid_conheight.integer - y + 7) / 8;
// give up if there isn't room
- if (x >= vid.conwidth || y >= vid.conheight || numlines < 1)
+ if (x >= vid_conwidth.integer || y >= vid_conheight.integer || numlines < 1)
return;
// scores
if (gamemode == GAME_TRANSFUSION)
{
- for (;i < scoreboardlines && x < vid.conwidth;i++)
+ 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;i++)
+ 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 * 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);
+ 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 * sbar_alpha_fg.value, 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);
}