fixed pogostick/doublejump bug when running id1 qc with a client sending input packet...

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 7509ea46e907ee13011d656d526cbf21cd7f0a47..f618099724e9c68bfe6df50a66c8e1765254ef13 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 static rtexture_t *char_texture;
+cachepic_t *r_crosshairs[NUMCROSSHAIRS];
 
 //=============================================================================
 /* Support Routines */
@@ -139,9 +140,6 @@ static rtexture_t *draw_generatemousepointer(void)
        return R_LoadTexture2D(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
-// must match NUMCROSSHAIRS in r_crosshairs.c
-#define NUMCROSSHAIRS 6
-
 static char *crosshairtexdata[NUMCROSSHAIRS] =
 {
        "................"
@@ -303,17 +301,16 @@ Draw_CachePic
 // FIXME: move this to client somehow
 cachepic_t     *Draw_CachePic (const char *path, qboolean persistent)
 {
-       int i, crc, hashkey;
+       int crc, hashkey;
        cachepic_t *pic;
        qpic_t *p;
        int flags;
 
        if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
-
        {
                clvideo_t *video;
 
-               video = CL_GetVideo(path);
+               video = CL_GetVideoByName(path);
                if( video )
                        return &video->cpif;
        }
@@ -353,16 +350,11 @@ cachepic_t        *Draw_CachePic (const char *path, qboolean persistent)
                {
                        if (!strcmp(path, "gfx/conchars"))
                        {
-                               unsigned char *pix;
-                               // conchars is a raw image and with the wrong transparent color
-                               pix = (unsigned char *)p;
-                               for (i = 0;i < 128 * 128;i++)
-                                       if (pix[i] == 0)
-                                               pix[i] = 255;
-                               pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, flags, palette_complete);
+                               // conchars is a raw image and with color 0 as transparent instead of 255
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, (unsigned char *)p, TEXTYPE_PALETTE, flags, palette_font);
                        }
                        else
-                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_transparent);
                }
        }
 
@@ -469,12 +461,15 @@ Draw_Init
 */
 static void gl_draw_start(void)
 {
+       int i;
        drawtexturepool = R_AllocTexturePool();
 
        numcachepics = 0;
        memset(cachepichash, 0, sizeof(cachepichash));
 
        char_texture = Draw_CachePic("gfx/conchars", true)->tex;
+       for (i = 0;i < NUMCROSSHAIRS;i++)
+               r_crosshairs[i] = Draw_CachePic(va("gfx/crosshair%i", i), false);
 }
 
 static void gl_draw_shutdown(void)
@@ -541,7 +536,7 @@ void R_DrawQueue(void)
        qglViewport(r_view_x, vid.height - (r_view_y + r_view_height), r_view_width, r_view_height);
        GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
        qglDepthFunc(GL_LEQUAL);
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
 
        chartexnum = R_GetTexture(char_texture);
 
@@ -662,6 +657,17 @@ void R_DrawQueue(void)
                case DRAWQUEUE_RESETCLIP:
                        GL_ScissorTest(false);
                        break;
+               case DRAWQUEUE_LINEWIDTH:
+                       qglLineWidth(x);
+                       break;
+               case DRAWQUEUE_LINES:
+                       mesh = (drawqueuemesh_t *)(dq + 1);
+                       GL_Color(c[0], c[1], c[2], c[3]);
+                       qglBegin(GL_LINE_LOOP);
+                       for (num = 0;num < mesh->num_vertices;num++)
+                               qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
+                       qglEnd();
+                       break;
                }
        }