send input for every client frame in singleplayer

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 164eebdde647be6130efa63466537a931122c757..251009ef0ef141c3841d287f32f543e63579fb32 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -671,7 +671,7 @@ static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g,
 
 float DrawQ_String(float startx, float starty, const char *text, int maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes)
 {
-       int i, num, shadow, colorindex;
+       int i, num, shadow, colorindex = STRING_COLOR_DEFAULT;
        float x = startx, y, s, t, u, v;
        float *av, *at, *ac;
        float color[4];
@@ -711,8 +711,6 @@ float DrawQ_String(float startx, float starty, const char *text, int maxlen, flo
                        x += r_textshadow.value;
                        y += r_textshadow.value;
                }
-               // because this loop increments x before it draws, we must bias x first
-               x -= w;
                for (i = 0;i < maxlen && text[i];i++, x += w)
                {
                        if (text[i] == ' ')
@@ -779,6 +777,10 @@ float DrawQ_String(float startx, float starty, const char *text, int maxlen, flo
                        GL_LockArrays(0, 0);
                }
        }
+
+       if (outcolor)
+               *outcolor = colorindex;
+
        // note: this relies on the proper text (not shadow) being drawn last
        return x;
 }