replaced all uses of sv_player with host_client->edict (because sv_player was often...

[xonotic/darkplaces.git] / sbar.c

diff --git a/sbar.c b/sbar.c
index ec1870bdca0487c0c32914ca724b55292b80f4db..8bdb4655119037b10be8331852ef66982555160d 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -696,8 +696,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];
@@ -888,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();
@@ -967,11 +962,11 @@ 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<<i) == cl.stats[STAT_ACTIVEWEAPON]));
                                }
                        
                                if((cl.items & (1<<12)))
-                                       Sbar_DrawWeapon(0, fade, (cl.stats[STAT_ACTIVEWEAPON] == 12));
+                                       Sbar_DrawWeapon(0, fade, (cl.stats[STAT_ACTIVEWEAPON] == (1<<12)));
                        }
 
                        //if (!cl.islocalgame)
@@ -1159,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_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);
+       return 8;
 }
 
 void Sbar_DeathmatchOverlay (void)
@@ -1221,7 +1211,8 @@ 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)
        {