]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sbar.c
rewrote FS_Search, hopefully it will work better now, and it now matches directories...
[xonotic/darkplaces.git] / sbar.c
diff --git a/sbar.c b/sbar.c
index 77fd4586b532171963f8a9f74ef8d9088ac2ebcd..5ef0fdb1576b8d9d5e45c9fb340f04d021859378 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -47,8 +47,11 @@ sbarpic_t *sb_colon, *sb_slash;
 sbarpic_t *sb_ibar;
 sbarpic_t *sb_sbar;
 sbarpic_t *sb_scorebar;
+// AK only used by NEX(and only if everybody agrees)
+sbarpic_t *sb_sbar_overlay;
 
-sbarpic_t *sb_weapons[7][8]; // 0 is active, 1 is owned, 2-5 are flashes
+// AK changed the bound to 9
+sbarpic_t *sb_weapons[7][9]; // 0 is active, 1 is owned, 2-5 are flashes
 sbarpic_t *sb_ammo[4];
 sbarpic_t *sb_sigil[4];
 sbarpic_t *sb_armor[3];
@@ -134,6 +137,28 @@ void sbar_start(void)
        sb_colon = Sbar_NewPic ("gfx/num_colon");
        sb_slash = Sbar_NewPic ("gfx/num_slash");
 
+       //AK NX uses its own hud
+       if(gamemode == GAME_NEXUIZ)
+       {
+               sb_ammo[0] = Sbar_NewPic ("gfx/sb_shells");
+               sb_ammo[1] = Sbar_NewPic ("gfx/sb_bullets");
+               sb_ammo[2] = Sbar_NewPic ("gfx/sb_rocket");
+               sb_ammo[3] = Sbar_NewPic ("gfx/sb_cells");
+
+               sb_items[2] = Sbar_NewPic ("gfx/sb_slowmo");
+               sb_items[3] = Sbar_NewPic ("gfx/sb_invinc");
+               sb_items[4] = Sbar_NewPic ("gfx/sb_energy");
+               sb_items[5] = Sbar_NewPic ("gfx/sb_str");
+
+               sb_sbar = Sbar_NewPic("gfx/sbar");
+               sb_sbar_overlay = Sbar_NewPic("gfx/sbar_overlay");
+
+               for(i = 0; i < 9;i++)
+                       sb_weapons[0][i] = Sbar_NewPic(va("gfx/inv_weapon%i",i));
+
+               return;
+       }
+
        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");
@@ -340,25 +365,53 @@ void Sbar_DrawNum (int x, int y, int num, int digits, int color)
 
                Sbar_DrawPic (x, y, sb_nums[color][frame]);
                x += 24;
+
                ptr++;
        }
 }
 
-//=============================================================================
+/*
+=============
+Sbar_DrawXNum
+=============
+*/
+
+void Sbar_DrawXNum (int x, int y, int num, int digits, int lettersize, float r, float g, float b, float a, int flags)
+{
+       char str[32], *ptr;
+       int l, frame;
+
+       l = sprintf(str, "%i", num);
+       ptr = str;
+       if (l > digits)
+               ptr += (l-digits);
+       if (l < digits)
+               x += (digits-l) * lettersize;
+
+       while (*ptr)
+       {
+               if (*ptr == '-')
+                       frame = STAT_MINUS;
+               else
+                       frame = *ptr -'0';
+
+               DrawQ_Pic (sbar_x + x, sbar_y + y, sb_nums[0][frame]->name,lettersize,lettersize,r,g,b,a,flags);
+               x += lettersize;
+
+               ptr++;
+       }
+}
 
-int            fragsort[MAX_SCOREBOARD];
+//=============================================================================
 
-char   scoreboardtext[MAX_SCOREBOARD][20];
-int            scoreboardtop[MAX_SCOREBOARD];
-int            scoreboardbottom[MAX_SCOREBOARD];
-int            scoreboardcount[MAX_SCOREBOARD];
-int            scoreboardlines;
 
 /*
 ===============
 Sbar_SortFrags
 ===============
 */
+static int fragsort[MAX_SCOREBOARD];
+static int scoreboardlines;
 void Sbar_SortFrags (void)
 {
        int             i, j, k;
@@ -384,36 +437,6 @@ void Sbar_SortFrags (void)
                        }
 }
 
-/*
-===============
-Sbar_UpdateScoreboard
-===============
-*/
-void Sbar_UpdateScoreboard (void)
-{
-       int             i, k;
-       int             top, bottom;
-       scoreboard_t    *s;
-
-       Sbar_SortFrags ();
-
-// draw the text
-       memset (scoreboardtext, 0, sizeof(scoreboardtext));
-
-       for (i=0 ; i<scoreboardlines; i++)
-       {
-               k = fragsort[i];
-               s = &cl.scores[k];
-               sprintf (&scoreboardtext[i][1], "%3i %s", s->frags, s->name);
-
-               top = s->colors & 0xf0;
-               bottom = (s->colors & 15) <<4;
-               scoreboardtop[i] = top + 8;
-               scoreboardbottom[i] = bottom + 8;
-       }
-}
-
-
 /*
 ===============
 Sbar_SoloScoreboard
@@ -458,6 +481,20 @@ void Sbar_DrawScoreboard (void)
 
 //=============================================================================
 
+// AK to make DrawInventory smaller
+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 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, 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, DRAWFLAG_ADDITIVE);
+}
+
 /*
 ===============
 Sbar_DrawInventory
@@ -465,10 +502,34 @@ Sbar_DrawInventory
 */
 void Sbar_DrawInventory (void)
 {
-       int             i;
-       char    num[6];
-       float   time;
-       int             flashon;
+       int i;
+       char num[6];
+       float time;
+       int flashon;
+       // AK 2003
+       float fade;
+
+       if(gamemode == GAME_NEXUIZ)
+       {
+               num[0] = cl.stats[STAT_ACTIVEWEAPON];
+               // we have a max time 2s (min time = 0)
+               if ((time = cl.time - cl.weapontime) > 2)
+                       return;
+
+               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, (i == num[0]));
+               }
+
+               if(!(cl.items & (1<<12)))
+                       return;
+               Sbar_DrawWeapon(0, fade, (num[0] == 12));
+               return;
+       }
 
        if (gamemode == GAME_ROGUE)
        {
@@ -670,7 +731,7 @@ void Sbar_DrawFace (void)
 
 // PGM 01/19/97 - team color drawing
 // PGM 03/02/97 - fixed so color swatch only appears in CTF modes
-       if (gamemode == GAME_ROGUE && (cl.maxclients != 1) && (teamplay.integer > 3) && (teamplay.integer < 7))
+       if (gamemode == GAME_ROGUE && !cl.islocalgame && (teamplay.integer > 3) && (teamplay.integer < 7))
        {
                char num[12];
                scoreboard_t *s;
@@ -805,104 +866,174 @@ void Sbar_Draw (void)
                return;
        }
 
-       sbar_y = vid.conheight - SBAR_HEIGHT;
-       if (cl.gametype == GAME_DEATHMATCH)
-               sbar_x = 0;
-       else
-               sbar_x = (vid.conwidth - 320)/2;
-
-       if (sb_lines > 24)
+       if (gamemode == GAME_NEXUIZ)
        {
-               Sbar_DrawInventory ();
-               if (cl.maxclients != 1)
-                       Sbar_DrawFrags ();
-       }
+               sbar_y = vid.conheight - 47;
+               sbar_x = (vid.conwidth - 640)/2;
 
-       if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
-       {
-               Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
-               Sbar_DrawScoreboard ();
-       }
-       else if (sb_lines)
-       {
-               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 (sb_lines)
                {
-                       if (cl.items & IT_KEY1)
-                               Sbar_DrawPic (209, 3, sb_items[0]);
-                       if (cl.items & IT_KEY2)
-                               Sbar_DrawPic (209, 12, sb_items[1]);
+                       Sbar_DrawInventory();
+                       if (!cl.islocalgame)
+                               Sbar_DrawFrags ();
                }
-// armor
-               if (cl.items & IT_INVULNERABILITY)
+
+               if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
                {
-                       Sbar_DrawNum (24, 0, 666, 3, 1);
-                       Sbar_DrawPic (0, 0, sb_disc);
+                       Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
+                       Sbar_DrawScoreboard ();
                }
-               else
+               else if (sb_lines)
                {
-                       if (gamemode == GAME_ROGUE)
+                       Sbar_DrawPic (0, 0, sb_sbar);
+
+                       // special items
+                       if (cl.items & IT_INVULNERABILITY)
                        {
-                               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)
-                                       Sbar_DrawPic (0, 0, sb_armor[1]);
-                               else if (cl.items & RIT_ARMOR1)
-                                       Sbar_DrawPic (0, 0, sb_armor[0]);
+                               Sbar_DrawNum (36, 0, 666, 3, 1);
+                               Sbar_DrawPic (0, 0, sb_disc);
                        }
+
+                       // armor
+                       Sbar_DrawXNum ((340-3*24), 12, cl.stats[STAT_ARMOR], 3, 24, 0.6,0.7,0.8,1,0);
+
+                       // health
+                       if(cl.stats[STAT_HEALTH] > 100)
+                               Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,1,1,1,1,0);
+                       else if(cl.stats[STAT_HEALTH] <= 25 && cl.time - (int)cl.time > 0.5)
+                               Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,0.7,0,0,1,0);
                        else
+                               Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,0.6,0.7,0.8,1,0);
+
+                       // AK dont draw ammo for the laser
+                       if(cl.stats[STAT_ACTIVEWEAPON] != 12)
                        {
-                               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_DrawPic (0, 0, sb_armor[1]);
-                               else if (cl.items & IT_ARMOR1)
-                                       Sbar_DrawPic (0, 0, sb_armor[0]);
-                       }
-               }
+                               if (cl.items & NEX_IT_SHELLS)
+                                       Sbar_DrawPic (519, 0, sb_ammo[0]);
+                               else if (cl.items & NEX_IT_BULLETS)
+                                       Sbar_DrawPic (519, 0, sb_ammo[1]);
+                               else if (cl.items & NEX_IT_ROCKETS)
+                                       Sbar_DrawPic (519, 0, sb_ammo[2]);
+                               else if (cl.items & NEX_IT_CELLS)
+                                       Sbar_DrawPic (519, 0, sb_ammo[3]);
+
+                               if(cl.stats[STAT_AMMO] <= 10)
+                                       Sbar_DrawXNum ((519-3*24), 12, cl.stats[STAT_AMMO], 3, 24, 0.7, 0,0,1,0);
+                               else
+                                       Sbar_DrawXNum ((519-3*24), 12, cl.stats[STAT_AMMO], 3, 24, 0.6, 0.7,0.8,1,0);
 
-       // face
-               Sbar_DrawFace ();
+                       }
 
-       // health
-               Sbar_DrawNum (136, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
+                       DrawQ_Pic(sbar_x,sbar_y,sb_sbar_overlay->name,0,0,1,1,1,1,DRAWFLAG_MODULATE);
+               }
+       }
+       else
+       {
+               sbar_y = vid.conheight - SBAR_HEIGHT;
+               if (cl.gametype == GAME_DEATHMATCH)
+                       sbar_x = 0;
+               else
+                       sbar_x = (vid.conwidth - 320)/2;
 
-       // ammo icon
-               if (gamemode == GAME_ROGUE)
+               if (sb_lines > 24)
                {
-                       if (cl.items & RIT_SHELLS)
-                               Sbar_DrawPic (224, 0, sb_ammo[0]);
-                       else if (cl.items & RIT_NAILS)
-                               Sbar_DrawPic (224, 0, sb_ammo[1]);
-                       else if (cl.items & RIT_ROCKETS)
-                               Sbar_DrawPic (224, 0, sb_ammo[2]);
-                       else if (cl.items & RIT_CELLS)
-                               Sbar_DrawPic (224, 0, sb_ammo[3]);
-                       else if (cl.items & RIT_LAVA_NAILS)
-                               Sbar_DrawPic (224, 0, rsb_ammo[0]);
-                       else if (cl.items & RIT_PLASMA_AMMO)
-                               Sbar_DrawPic (224, 0, rsb_ammo[1]);
-                       else if (cl.items & RIT_MULTI_ROCKETS)
-                               Sbar_DrawPic (224, 0, rsb_ammo[2]);
+                       if (gamemode != GAME_GOODVSBAD2)
+                               Sbar_DrawInventory ();
+                       if (!cl.islocalgame)
+                               Sbar_DrawFrags ();
                }
-               else
+
+               if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
                {
-                       if (cl.items & IT_SHELLS)
-                               Sbar_DrawPic (224, 0, sb_ammo[0]);
-                       else if (cl.items & IT_NAILS)
-                               Sbar_DrawPic (224, 0, sb_ammo[1]);
-                       else if (cl.items & IT_ROCKETS)
-                               Sbar_DrawPic (224, 0, sb_ammo[2]);
-                       else if (cl.items & IT_CELLS)
-                               Sbar_DrawPic (224, 0, sb_ammo[3]);
+                       if (gamemode != GAME_GOODVSBAD2)
+                               Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
+                       Sbar_DrawScoreboard ();
                }
+               else if (sb_lines)
+               {
+                       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 (gamemode != GAME_GOODVSBAD2)
+                       {
+                               if (cl.items & IT_INVULNERABILITY)
+                               {
+                                       Sbar_DrawNum (24, 0, 666, 3, 1);
+                                       Sbar_DrawPic (0, 0, sb_disc);
+                               }
+                               else
+                               {
+                                       if (gamemode == GAME_ROGUE)
+                                       {
+                                               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)
+                                                       Sbar_DrawPic (0, 0, sb_armor[1]);
+                                               else if (cl.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)
+                                                       Sbar_DrawPic (0, 0, sb_armor[2]);
+                                               else if (cl.items & IT_ARMOR2)
+                                                       Sbar_DrawPic (0, 0, sb_armor[1]);
+                                               else if (cl.items & IT_ARMOR1)
+                                                       Sbar_DrawPic (0, 0, sb_armor[0]);
+                                       }
+                               }
+                       }
+
+                       // face
+                       Sbar_DrawFace ();
 
-               Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
+                       // health
+                       Sbar_DrawNum (154, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
+
+                       // ammo icon
+                       if (gamemode == GAME_ROGUE)
+                       {
+                               if (cl.items & RIT_SHELLS)
+                                       Sbar_DrawPic (224, 0, sb_ammo[0]);
+                               else if (cl.items & RIT_NAILS)
+                                       Sbar_DrawPic (224, 0, sb_ammo[1]);
+                               else if (cl.items & RIT_ROCKETS)
+                                       Sbar_DrawPic (224, 0, sb_ammo[2]);
+                               else if (cl.items & RIT_CELLS)
+                                       Sbar_DrawPic (224, 0, sb_ammo[3]);
+                               else if (cl.items & RIT_LAVA_NAILS)
+                                       Sbar_DrawPic (224, 0, rsb_ammo[0]);
+                               else if (cl.items & RIT_PLASMA_AMMO)
+                                       Sbar_DrawPic (224, 0, rsb_ammo[1]);
+                               else if (cl.items & RIT_MULTI_ROCKETS)
+                                       Sbar_DrawPic (224, 0, rsb_ammo[2]);
+                       }
+                       else
+                       {
+                               if (cl.items & IT_SHELLS)
+                                       Sbar_DrawPic (224, 0, sb_ammo[0]);
+                               else if (cl.items & IT_NAILS)
+                                       Sbar_DrawPic (224, 0, sb_ammo[1]);
+                               else if (cl.items & IT_ROCKETS)
+                                       Sbar_DrawPic (224, 0, sb_ammo[2]);
+                               else if (cl.items & IT_CELLS)
+                                       Sbar_DrawPic (224, 0, sb_ammo[3]);
+                       }
+
+                       Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
+
+               }
        }
 
        if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH)
@@ -921,54 +1052,39 @@ 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), 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), 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, 0);
+               return 8;
+       }
+       else
+               return 0;
+}
+
 void Sbar_DeathmatchOverlay (void)
 {
+       int i, x, y;
        cachepic_t *pic;
-       int i, k, l, x, y, total, n, minutes, tens, units, fph;
-       char num[128];
-       scoreboard_t *s;
-       qbyte *c;
 
        pic = Draw_CachePic ("gfx/ranking.lmp");
        DrawQ_Pic ((vid.conwidth - pic->width)/2, 8, "gfx/ranking.lmp", 0, 0, 1, 1, 1, 1, 0);
 
-// scores
+       // scores
        Sbar_SortFrags ();
-
-// draw the text
-       l = scoreboardlines;
-
-       x = (vid.conwidth - 280)>>1;
+       // draw the text
+       x = (vid.conwidth - (6 + 15) * 8) / 2;
        y = 40;
-       for (i = 0;i < l;i++)
-       {
-               k = fragsort[i];
-               s = &cl.scores[k];
-               if (!s->name[0])
-                       continue;
-
-       // draw background
-               c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8];
-               DrawQ_Fill ( x + 8, y+1, 88, 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), 0);
-               c = (qbyte *)&palette_complete[((s->colors & 15)<<4) + 8];
-               DrawQ_Fill ( x + 8, y+4, 88, 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), 0);
-
-               total = cl.time - s->entertime;
-               minutes = (int)total/60;
-               n = total - minutes*60;
-               tens = '0' + n/10;
-               units = '0' + n%10;
-
-               fph = total ? (int) ((float) s->frags * 3600.0 / total) : 0;
-               if (fph < -999) fph = -999;
-               if (fph > 9999) fph = 9999;
-
-               // put it together
-               sprintf (num, "%c %4i:%4i %4i:%c%c %s", k == cl.viewentity - 1 ? 12 : ' ', (int) s->frags, fph, minutes, tens, units, s->name);
-               DrawQ_String(x, y, num, 0, 8, 8, 1, 1, 1, 1, 0);
-
-               y += 8;
-       }
+       for (i = 0;i < scoreboardlines && y < vid.conheight;i++)
+               y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
 }
 
 /*
@@ -979,63 +1095,44 @@ Sbar_DeathmatchOverlay
 */
 void Sbar_MiniDeathmatchOverlay (void)
 {
-       int i, l, k, x, y, fph, numlines;
-       char num[128];
-       scoreboard_t *s;
-       qbyte *c;
+       int i, x, y, numlines;
 
-       if (vid.conwidth < 512 || !sb_lines)
+       // decide where to print
+       // AK Nex wants its scores on the upper left
+       if(gamemode == GAME_NEXUIZ)
+       {
+               x = 0;
+               y = 0;
+       }
+       else
+       {
+               x = 324;
+               y = vid.conheight - sb_lines;
+       }
+
+       numlines = (vid.conheight - y) / 8;
+       // give up if there isn't room
+       if (x + (6 + 15) * 8 > vid.conwidth || numlines < 1)
                return;
 
        // scores
        Sbar_SortFrags ();
 
-       // draw the text
-       l = scoreboardlines;
-       y = vid.conheight - sb_lines;
-       numlines = sb_lines/8;
-       if (numlines < 3)
-               return;
-
        //find us
        for (i = 0; i < scoreboardlines; i++)
-               if (fragsort[i] == cl.viewentity - 1)
+               if (fragsort[i] == cl.playerentity - 1)
                        break;
 
        if (i == scoreboardlines) // we're not there
                i = 0;
        else // figure out start
-               i = i - numlines/2;
-
-       if (i > scoreboardlines - numlines)
-               i = scoreboardlines - numlines;
-       if (i < 0)
-               i = 0;
-
-       x = 324;
-       for (;i < scoreboardlines && y < vid.conheight - 8;i++)
        {
-               k = fragsort[i];
-               s = &cl.scores[k];
-               if (!s->name[0])
-                       continue;
-
-               // draw background
-               c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8];
-               DrawQ_Fill ( x, y+1, 72, 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), 0);
-               c = (qbyte *)&palette_complete[((s->colors & 15)<<4) + 8];
-               DrawQ_Fill ( x, y+4, 72, 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), 0);
-
-               fph = (cl.time - s->entertime) ? (int) ((float) s->frags * 3600.0 / (cl.time - s->entertime)) : 0;
-               if (fph < -999) fph = -999;
-               if (fph > 9999) fph = 9999;
-
-               // put it together
-               sprintf (num, "%c%4i:%4i%c %s", k == cl.viewentity - 1 ? 16 : ' ', (int) s->frags, fph, k == cl.viewentity - 1 ? 17 : ' ', s->name);
-               DrawQ_String(x - 8, y, num, 0, 8, 8, 1, 1, 1, 1, 0);
-
-               y += 8;
+               i -= numlines/2;
+               i = bound(0, i, scoreboardlines - numlines);
        }
+
+       for (;i < scoreboardlines && y < vid.conheight;i++)
+               y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
 }
 
 /*