X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sbar.c;h=8bdb4655119037b10be8331852ef66982555160d;hb=48978ee14d2f77912ad239c5797fc23f12a2fc94;hp=5171686914042c40d51e313d57543fdfc00adb0b;hpb=e120cda4dbc83afd8dd92dba66e55f96a640e234;p=xonotic%2Fdarkplaces.git diff --git a/sbar.c b/sbar.c index 51716869..8bdb4655 100644 --- a/sbar.c +++ b/sbar.c @@ -90,7 +90,12 @@ sbarpic_t *somsb_ammo[4]; sbarpic_t *somsb_armor[3]; cvar_t showfps = {CVAR_SAVE, "showfps", "0"}; -cvar_t sbar_alpha = {CVAR_SAVE, "sbar_alpha", "1"}; +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"}; void Sbar_MiniDeathmatchOverlay (int x, int y); void Sbar_DeathmatchOverlay (void); @@ -309,7 +314,12 @@ void Sbar_Init (void) Cmd_AddCommand ("+showscores", Sbar_ShowScores); Cmd_AddCommand ("-showscores", Sbar_DontShowScores); Cvar_RegisterVariable (&showfps); - Cvar_RegisterVariable (&sbar_alpha); + Cvar_RegisterVariable (&showtime); + Cvar_RegisterVariable (&showtime_format); + Cvar_RegisterVariable (&showdate); + Cvar_RegisterVariable (&showdate_format); + Cvar_RegisterVariable (&sbar_alpha_bg); + Cvar_RegisterVariable (&sbar_alpha_fg); R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap); } @@ -328,12 +338,12 @@ Sbar_DrawPic */ 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); } /* @@ -345,7 +355,7 @@ Draws one solid graphics character */ 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); } /* @@ -355,7 +365,7 @@ Sbar_DrawString */ 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); } /* @@ -414,7 +424,7 @@ void Sbar_DrawXNum (int x, int y, int num, int digits, int lettersize, float r, 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++; @@ -507,11 +517,11 @@ static void Sbar_DrawWeapon(int nr, float fade, int active) const int w_width = 300, w_height = 100, w_space = 10, font_size = 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_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); } /* @@ -529,12 +539,12 @@ void Sbar_DrawInventory (void) 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++) @@ -553,7 +563,7 @@ void Sbar_DrawInventory (void) 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); } } @@ -678,7 +688,7 @@ void Sbar_DrawFrags (void) Sbar_SortFrags (); // draw the text - l = scoreboardlines <= 4 ? scoreboardlines : 4; + l = min(scoreboardlines, 4); x = 23 * 8; @@ -686,14 +696,12 @@ 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]; - 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; @@ -736,9 +744,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.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; @@ -782,11 +790,16 @@ void Sbar_DrawFace (void) void Sbar_ShowFPS(void) { + float fps_x, fps_y, fps_scalex, fps_scaley, fps_height; + char fpsstring[32]; + char timestring[32]; + char datestring[32]; + 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; if (showfps.integer > 1) { static double currtime, frametimes[32]; @@ -828,15 +841,41 @@ void Sbar_ShowFPS(void) } calc = framerate; } - sprintf(temp, "%4i", calc); + snprintf(fpsstring, sizeof(fpsstring), "%4i fps", calc); + } + 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 * sbar_alpha.value, 0); - DrawQ_String(fps_x, fps_y, temp, 0, fps_scalex, fps_scaley, 1, 1, 1, 1 * sbar_alpha.value, 0); + 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; + 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, 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, 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, 0); + DrawQ_String(fps_x, fps_y, datestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0); + fps_y += fps_scaley; + } } } @@ -847,9 +886,6 @@ Sbar_Draw */ void Sbar_Draw (void) { - if (scr_con_current == vid.conheight) - return; // console is full screen - if (cl.intermission == 1) { Sbar_IntermissionOverlay(); @@ -908,7 +944,7 @@ void Sbar_Draw (void) 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) @@ -926,20 +962,20 @@ void Sbar_Draw (void) { if (!(cl.items & (1 << i))) continue; - Sbar_DrawWeapon(i + 1, fade, (i == cl.stats[STAT_ACTIVEWEAPON])); + Sbar_DrawWeapon(i + 1, fade, ((1< 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) @@ -982,13 +1018,13 @@ void Sbar_Draw (void) 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) - Sbar_MiniDeathmatchOverlay (0, 17); + //if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH) + // Sbar_MiniDeathmatchOverlay (0, 17); } else // Quake and others { sbar_y = vid.conheight - SBAR_HEIGHT; - if (cl.gametype == GAME_DEATHMATCH) + if (cl.gametype == GAME_DEATHMATCH && gamemode != GAME_TRANSFUSION) sbar_x = 0; else sbar_x = (vid.conwidth - 320)/2; @@ -997,19 +1033,19 @@ void Sbar_Draw (void) { if (gamemode != GAME_GOODVSBAD2) Sbar_DrawInventory (); - if (!cl.islocalgame) + if (!cl.islocalgame && gamemode != GAME_TRANSFUSION) Sbar_DrawFrags (); } 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 @@ -1094,7 +1130,12 @@ void Sbar_Draw (void) } if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH) - Sbar_MiniDeathmatchOverlay (324, vid.conheight - sb_lines); + { + if (gamemode == GAME_TRANSFUSION) + Sbar_MiniDeathmatchOverlay (0, 0); + else + Sbar_MiniDeathmatchOverlay (324, vid.conheight - sb_lines); + } } Sbar_ShowFPS(); @@ -1113,19 +1154,14 @@ 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.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) @@ -1134,7 +1170,7 @@ void Sbar_DeathmatchOverlay (void) 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); + 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 (); @@ -1156,10 +1192,13 @@ void Sbar_MiniDeathmatchOverlay (int x, int y) int i, numlines; // decide where to print + if (gamemode == GAME_TRANSFUSION) + numlines = (vid.conwidth - x + 127) / 128; + else + numlines = (vid.conheight - y + 7) / 8; - numlines = (vid.conheight - y) / 8; // give up if there isn't room - if (x + (6 + 15) * 8 > vid.conwidth || numlines < 1) + if (x >= vid.conwidth || y >= vid.conheight || numlines < 1) return; // scores @@ -1170,16 +1209,21 @@ void Sbar_MiniDeathmatchOverlay (int x, int y) if (fragsort[i] == cl.playerentity - 1) break; - if (i == scoreboardlines) // we're not there - i = 0; - else // figure out start + // figure out start + i -= numlines/2; + i = min(i, scoreboardlines - numlines); + i = max(i, 0); + + if (gamemode == GAME_TRANSFUSION) { - i -= numlines/2; - i = bound(0, i, scoreboardlines - numlines); + for (;i < scoreboardlines && x < vid.conwidth;i++) + x += 128 + Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); + } + else + { + for (;i < scoreboardlines && y < vid.conheight;i++) + y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); } - - for (;i < scoreboardlines && y < vid.conheight;i++) - y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y); } /* @@ -1202,8 +1246,8 @@ void Sbar_IntermissionOverlay (void) 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; @@ -1235,6 +1279,6 @@ 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.value, 0); + DrawQ_Pic((vid.conwidth - pic->width)/2, 16, "gfx/finale.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0); }