X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sbar.c;h=13f46e7b35ca1c3bf26d3d23adc7dcf755ea045f;hp=fad52b54a307e4a8ff769323327f7e4376757608;hb=5deb3054efec963265e40b9155ac6af3149a763a;hpb=82ec9844edd69fa0a5e6bd365615aa9a6b30f773 diff --git a/sbar.c b/sbar.c index fad52b54..13f46e7b 100644 --- a/sbar.c +++ b/sbar.c @@ -35,7 +35,7 @@ static sbarpic_t *Sbar_NewPic(const char *name) 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++); } @@ -135,22 +135,13 @@ void sbar_start(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"); - sb_nums[0][10] = Sbar_NewPic ("gfx/num_minus"); - sb_nums[1][10] = Sbar_NewPic ("gfx/anum_minus"); + for (i = 0;i < 10;i++) + sb_nums[0][i] = Sbar_NewPic (va("gfx/num_%i",i)); - sb_colon = Sbar_NewPic ("gfx/num_colon"); - sb_slash = Sbar_NewPic ("gfx/num_slash"); - - 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"); @@ -162,6 +153,10 @@ void sbar_start(void) } 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"); @@ -181,6 +176,20 @@ void sbar_start(void) } 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"); @@ -188,7 +197,7 @@ void sbar_start(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"); @@ -196,7 +205,7 @@ void sbar_start(void) 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)); @@ -207,28 +216,28 @@ void sbar_start(void) 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"); @@ -239,16 +248,16 @@ void sbar_start(void) 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) { @@ -257,13 +266,13 @@ void sbar_start(void) 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)); @@ -272,7 +281,7 @@ void sbar_start(void) 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"); } @@ -280,20 +289,20 @@ void sbar_start(void) { 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"); @@ -477,11 +486,13 @@ void Sbar_SoloScoreboard (void) 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; @@ -492,8 +503,13 @@ void Sbar_SoloScoreboard (void) 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); + } } /* @@ -514,14 +530,14 @@ void Sbar_DrawScoreboard (void) 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); } /* @@ -549,7 +565,7 @@ void Sbar_DrawInventory (void) // weapons for (i=0 ; i<7 ; i++) { - if (cl.items & (IT_SHOTGUN<1)) @@ -651,7 +667,7 @@ void Sbar_DrawInventory (void) if (gamemode == GAME_HIPNOTIC) { for (i=0 ; i<2 ; i++) - if (cl.items & (1<<(24+i))) + if (cl.stats[STAT_ITEMS] & (1<<(24+i))) Sbar_DrawPic (288 + i*16, -16, hsb_items[i]); } @@ -659,14 +675,14 @@ void Sbar_DrawInventory (void) { // new rogue items for (i=0 ; i<2 ; i++) - if (cl.items & (1<<(29+i))) + if (cl.stats[STAT_ITEMS] & (1<<(29+i))) Sbar_DrawPic (288 + i*16, -16, rsb_items[i]); } else { // sigils for (i=0 ; i<4 ; i++) - if (cl.items & (1<<(28+i))) + if (cl.stats[STAT_ITEMS] & (1<<(28+i))) Sbar_DrawPic (320-32 + i*8, -16, sb_sigil[i]); } } @@ -696,8 +712,6 @@ void Sbar_DrawFrags (void) { k = fragsort[i]; s = &cl.scores[k]; - if (!s->name[0]) - continue; // draw background c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8]; @@ -746,9 +760,9 @@ void Sbar_DrawFace (void) // 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; @@ -774,13 +788,13 @@ void Sbar_DrawFace (void) } // PGM 01/19/97 - team color drawing - if ( (cl.items & (IT_INVISIBILITY | IT_INVULNERABILITY) ) == (IT_INVISIBILITY | IT_INVULNERABILITY) ) + if ( (cl.stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY) ) == (IT_INVISIBILITY | IT_INVULNERABILITY) ) Sbar_DrawPic (112, 0, sb_face_invis_invuln); - else if (cl.items & IT_QUAD) + else if (cl.stats[STAT_ITEMS] & IT_QUAD) Sbar_DrawPic (112, 0, sb_face_quad ); - else if (cl.items & IT_INVISIBILITY) + else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) Sbar_DrawPic (112, 0, sb_face_invis ); - else if (cl.items & IT_INVULNERABILITY) + else if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) Sbar_DrawPic (112, 0, sb_face_invuln); else { @@ -832,18 +846,17 @@ void Sbar_ShowFPS(void) 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)); @@ -854,26 +867,26 @@ void Sbar_ShowFPS(void) 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; @@ -888,9 +901,6 @@ Sbar_Draw */ void Sbar_Draw (void) { - if (scr_con_current == vid.conheight) - return; // console is full screen - if (cl.intermission == 1) { Sbar_IntermissionOverlay(); @@ -910,16 +920,16 @@ void Sbar_Draw (void) { // 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]) { - 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); } @@ -929,13 +939,13 @@ void Sbar_Draw (void) 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]) @@ -944,8 +954,8 @@ void Sbar_Draw (void) } 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) { @@ -964,14 +974,11 @@ void Sbar_Draw (void) 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, ((1<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) { @@ -1056,15 +1065,15 @@ void Sbar_Draw (void) //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); @@ -1074,21 +1083,21 @@ void Sbar_Draw (void) 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]); } } @@ -1103,30 +1112,30 @@ void Sbar_Draw (void) // 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]); } @@ -1134,18 +1143,21 @@ void Sbar_Draw (void) } - 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); } } 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); } //============================================================================= @@ -1159,19 +1171,16 @@ Sbar_DeathmatchOverlay 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_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; - } - 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); + // FIXME: use a constant for this color tag instead + DrawQ_ColoredString(x, y, va("%c%4i %s^7", (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) @@ -1179,15 +1188,15 @@ 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_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); } @@ -1203,12 +1212,12 @@ void Sbar_MiniDeathmatchOverlay (int x, int 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 @@ -1221,16 +1230,17 @@ void Sbar_MiniDeathmatchOverlay (int x, int y) // 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) { - 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); } } @@ -1252,26 +1262,29 @@ void Sbar_IntermissionOverlay (void) 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); } @@ -1287,7 +1300,7 @@ void Sbar_FinaleOverlay (void) { cachepic_t *pic; - pic = Draw_CachePic ("gfx/finale.lmp"); - DrawQ_Pic((vid.conwidth - pic->width)/2, 16, "gfx/finale.lmp", 0, 0, 1, 1, 1, 1 * 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); }