X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sbar.c;h=677a156b00918baf240a532cff496303dcdb2c62;hp=59941a5ffb7eb7f69ece142f2faeb1dfa38e2afb;hb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;hpb=2cadb08a5230c73be4599c7543fd02edfb350932 diff --git a/sbar.c b/sbar.c index 59941a5f..677a156b 100644 --- a/sbar.c +++ b/sbar.c @@ -724,7 +724,7 @@ void Sbar_DrawFrags (void) int i, k, l, x, f; char num[12]; scoreboard_t *s; - qbyte *c; + unsigned char *c; Sbar_SortFrags (); @@ -739,9 +739,9 @@ void Sbar_DrawFrags (void) s = &cl.scores[k]; // draw background - c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8]; + c = (unsigned char *)&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_fg.value, 0); - c = (qbyte *)&palette_complete[((s->colors & 15)<<4) + 8]; + c = (unsigned char *)&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_fg.value, 0); // draw number @@ -778,14 +778,14 @@ void Sbar_DrawFace (void) { char num[12]; scoreboard_t *s; - qbyte *c; + unsigned char *c; s = &cl.scores[cl.viewentity - 1]; // draw background Sbar_DrawPic (112, 0, rsb_teambord); - c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8]; + c = (unsigned char *)&palette_complete[(s->colors & 0xf0) + 8]; 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]; + c = (unsigned char *)&palette_complete[((s->colors & 15)<<4) + 8]; 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 @@ -1289,11 +1289,11 @@ Sbar_DeathmatchOverlay */ float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y) { - qbyte *c; + unsigned char *c; // draw colors behind score - c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8]; + c = (unsigned char *)&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]; + c = (unsigned char *)&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);