Update cgame_classic for recent removal of SetAlpha(), SetColor()

Keep track of the color internally.

Author: res2k

src/client/cgame.c

@@ -40,25 +40,9 @@ static color_t apply_scr_alpha(color_t color)
     return color;
 }
 
-static void CGX_ClearColor(void)
+static void CGX_DrawCharEx(int x, int y, int flags, int ch, color_t color)
 {
-    color_t clear_color;
-    clear_color.r = clear_color.g = clear_color.b = 255;
-    clear_color.a = 255 * Cvar_ClampValue(scr_alpha, 0, 1);
-    //R_SetColor(clear_color.u32);
-}
-
-static void CGX_SetAlpha(float alpha)
-{
-    //R_SetAlpha(alpha * Cvar_ClampValue(scr_alpha, 0, 1));
-}
-
-static void CGX_SetColor(color_t color)
-{
-    color_t new_color;
-    new_color = color;
-    new_color.a *= Cvar_ClampValue(scr_alpha, 0, 1);
-    //R_SetColor(new_color.u32);
+    R_DrawChar(x, y, flags, ch, apply_scr_alpha(color), scr.font_pic);
 }
 
 static const pmoveParams_t* CGX_GetPmoveParams(void)
@@ -67,12 +51,10 @@ static const pmoveParams_t* CGX_GetPmoveParams(void)
 }
 
 static cgame_q2pro_extended_support_ext_t cgame_q2pro_extended_support = {
-    .api_version = 1,
+    .api_version = 2,
 
     .IsExtendedServer = CGX_IsExtendedServer,
-    .ClearColor = CGX_ClearColor,
-    .SetAlpha = CGX_SetAlpha,
-    .SetColor = CGX_SetColor,
+    .DrawCharEx = CGX_DrawCharEx,
     .GetPmoveParams = CGX_GetPmoveParams,
 };
 

src/client/cgame_classic.c

@@ -60,6 +60,8 @@ static char     scr_centerstring[MAX_STRING_CHARS];
 static unsigned scr_centertime_start;   // for slow victory printing
 static int      scr_center_lines;
 
+static color_t  ui_color;
+
 static void CGC_Init(void)
 {
     /* We don't consider rerelease servers here and assume the appropriate
@@ -72,6 +74,8 @@ static void CGC_Init(void)
     ch_scale = cgi.cvar("ch_scale", "1", 0);
     ch_x = cgi.cvar("ch_x", "0", 0);
     ch_y = cgi.cvar("ch_y", "0", 0);
+
+    ui_color = COLOR_WHITE;
 }
 
 static void CGC_Shutdown(void)
@@ -91,22 +95,11 @@ static void DrawPic(int x, int y, const char* pic)
     cgi.SCR_DrawPic(x, y, w, h, pic);
 }
 
-static void CG_DrawString(int x, int y, int flags, size_t maxlen, const char *s)
+static void CG_DrawString(int x, int y, int flags, size_t maxlen, const char *s, color_t color)
 {
-    const char *write_str = s;
-    if (flags & UI_XORCOLOR) {
-        size_t new_str_len = min(strlen(s), maxlen);
-        char *new_str = alloca(new_str_len + 1);
-        for (size_t i = 0; i < new_str_len; i++) {
-            new_str[i] = s[i] ^ 0x80;
-        }
-        new_str[new_str_len] = 0;
-        write_str = new_str;
-    }
-
-    while (maxlen-- && *write_str) {
-        byte c = *write_str++;
-        cgi.SCR_DrawChar(x, y, 1, c, flags & UI_DROPSHADOW);
+    while (maxlen-- && *s) {
+        byte c = *s++;
+        cgix.DrawCharEx(x, y, flags, c, color);
         x += CHAR_WIDTH;
     }
 }
@@ -116,7 +109,7 @@ static void CG_DrawString(int x, int y, int flags, size_t maxlen, const char *s)
 DrawStringEx
 ==============
 */
-static void CG_DrawStringEx(int x, int y, int flags, size_t maxlen, const char *s)
+static void CG_DrawStringEx(int x, int y, int flags, size_t maxlen, const char *s, color_t color)
 {
     size_t len = strlen(s);
 
@@ -130,54 +123,54 @@ static void CG_DrawStringEx(int x, int y, int flags, size_t maxlen, const char *
         x -= len * CHAR_WIDTH;
     }
 
-    CG_DrawString(x, y, flags, maxlen, s);
+    CG_DrawString(x, y, flags, maxlen, s, color);
 }
 
 /*
 ==============
 DrawStringMulti
 ==============
 */
-static void CG_DrawStringMulti(int x, int y, int flags, size_t maxlen, const char *s)
+static void CG_DrawStringMulti(int x, int y, int flags, size_t maxlen, const char *s, color_t color)
 {
     char    *p;
     size_t  len;
 
     while (*s) {
         p = strchr(s, '\n');
         if (!p) {
-            CG_DrawStringEx(x, y, flags, maxlen, s);
+            CG_DrawStringEx(x, y, flags, maxlen, s, color);
             break;
         }
 
         len = p - s;
         if (len > maxlen) {
             len = maxlen;
         }
-        CG_DrawStringEx(x, y, flags, len, s);
+        CG_DrawStringEx(x, y, flags, len, s, color);
 
         y += CHAR_HEIGHT;
         s = p + 1;
     }
 }
 
 #define HUD_DrawString(x, y, string) \
-    CG_DrawString(x, y, 0, MAX_STRING_CHARS, string)
+    CG_DrawString(x, y, 0, MAX_STRING_CHARS, string, ui_color)
 
 #define HUD_DrawAltString(x, y, string) \
-    CG_DrawString(x, y, UI_XORCOLOR, MAX_STRING_CHARS, string)
+    CG_DrawString(x, y, UI_XORCOLOR, MAX_STRING_CHARS, string, ui_color)
 
 #define HUD_DrawCenterString(x, y, string) \
-    CG_DrawStringMulti(x, y, UI_CENTER, MAX_STRING_CHARS, string)
+    CG_DrawStringMulti(x, y, UI_CENTER, MAX_STRING_CHARS, string, ui_color)
 
 #define HUD_DrawAltCenterString(x, y, string) \
-    CG_DrawStringMulti(x, y, UI_CENTER | UI_XORCOLOR, MAX_STRING_CHARS, string)
+    CG_DrawStringMulti(x, y, UI_CENTER | UI_XORCOLOR, MAX_STRING_CHARS, string, ui_color)
 
 #define HUD_DrawRightString(x, y, string) \
-    CG_DrawStringEx(x, y, UI_RIGHT, MAX_STRING_CHARS, string)
+    CG_DrawStringEx(x, y, UI_RIGHT, MAX_STRING_CHARS, string, ui_color)
 
 #define HUD_DrawAltRightString(x, y, string) \
-    CG_DrawStringEx(x, y, UI_RIGHT | UI_XORCOLOR, MAX_STRING_CHARS, string)
+    CG_DrawStringEx(x, y, UI_RIGHT | UI_XORCOLOR, MAX_STRING_CHARS, string, ui_color)
 
 static const char field_pic[] = "field_3";
 static const char inven_pic[] = "inventory";
@@ -708,7 +701,7 @@ static void SCR_ExecuteLayoutString(vrect_t hud_vrect, const char *s, int32_t pl
 
             token = COM_Parse(&s);
             if (SCR_ParseColor(token, &color)) {
-                cgix.SetColor(color);
+                ui_color = color;
             }
             continue;
         }
@@ -734,7 +727,7 @@ static void SCR_ExecuteLayoutString(vrect_t hud_vrect, const char *s, int32_t pl
         }
     }
 
-    cgix.ClearColor();
+    ui_color = COLOR_WHITE;
 }
 
 // The status bar is a small layout program that is based on the stats array
@@ -849,14 +842,13 @@ static void SCR_DrawCenterString(vrect_t hud_vrect)
         return;
     }
 
-    cgix.SetAlpha(alpha);
+    color_t color = ui_color;
+    color.a *= alpha;
 
     y = hud_vrect.height / 4 - scr_center_lines * 8 / 2;
 
     CG_DrawStringMulti(hud_vrect.width / 2, y, UI_CENTER,
-                       MAX_STRING_CHARS, scr_centerstring);
-
-    cgix.ClearColor();
+                       MAX_STRING_CHARS, scr_centerstring, color);
 }
 
 static void CGC_DrawHUD (int32_t isplit, const cg_server_data_t *data, vrect_t hud_vrect, vrect_t hud_safe, int32_t scale, int32_t playernum, const player_state_t *ps)

src/client/cgame_classic.h

@@ -26,10 +26,8 @@ typedef struct {
     // Whether server is using "extended" protocol
     bool (*IsExtendedServer)(void);
 
-    // Drawing color support
-    void (*ClearColor)(void);
-    void (*SetAlpha)(float alpha);
-    void (*SetColor)(color_t color);
+    // Draw single character, colorized & w/ flags
+    void (*DrawCharEx)(int x, int y, int flags, int ch, color_t color);
 
     // Return pmove parameters for server
     const pmoveParams_t *(*GetPmoveParams)(void);