fixed some very ewww bugs (a few .c files made their way into the .o lists)

[xonotic/darkplaces.git] / sbar.c

diff --git a/sbar.c b/sbar.c
index 31fc000c4a312ecd75a7946474886c4b7028985a..77fd4586b532171963f8a9f74ef8d9088ac2ebcd 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -634,9 +634,9 @@ void Sbar_DrawFrags (void)
                        continue;
 
                // draw background
-               c = (qbyte *)&d_8to24table[(s->colors & 0xf0) + 8];
+               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), 0);
-               c = (qbyte *)&d_8to24table[((s->colors & 15)<<4) + 8];
+               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), 0);
 
                // draw number
@@ -679,9 +679,9 @@ void Sbar_DrawFace (void)
                s = &cl.scores[cl.viewentity - 1];
                // draw background
                Sbar_DrawPic (112, 0, rsb_teambord);
-               c = (qbyte *)&d_8to24table[(s->colors & 0xf0) + 8];
+               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), 0);
-               c = (qbyte *)&d_8to24table[((s->colors & 15)<<4) + 8];
+               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), 0);
 
                // draw number
@@ -789,7 +789,6 @@ void Sbar_ShowFPS(void)
 Sbar_Draw
 ===============
 */
-//void DrawCrosshair(int num);
 void Sbar_Draw (void)
 {
        if (scr_con_current == vid.conheight)
@@ -911,8 +910,7 @@ void Sbar_Draw (void)
 
        Sbar_ShowFPS();
 
-//     if (crosshair.integer >= 1)
-//             DrawCrosshair(crosshair.integer - 1);
+       R_Draw2DCrosshair();
 }
 
 //=============================================================================
@@ -950,9 +948,9 @@ void Sbar_DeathmatchOverlay (void)
                        continue;
 
        // draw background
-               c = (qbyte *)&d_8to24table[(s->colors & 0xf0) + 8];
+               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 *)&d_8to24table[((s->colors & 15)<<4) + 8];
+               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;
@@ -1023,9 +1021,9 @@ void Sbar_MiniDeathmatchOverlay (void)
                        continue;
 
                // draw background
-               c = (qbyte *)&d_8to24table[(s->colors & 0xf0) + 8];
+               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 *)&d_8to24table[((s->colors & 15)<<4) + 8];
+               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;