use TEXF_CLAMP on Draw_CachePic (except for the color control ditherpattern)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5397 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_draw.c b/gl_draw.c
index dd88ae6b665e2be4a0e0ad8372a97385ed4c2ce9..5c1fe52cea3a2bd1def73a7f64ada100c38a34d9 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -289,9 +289,9 @@ cachepic_t  *Draw_CachePic (const char *path, qboolean persistent)
        int i, crc, hashkey;
        cachepic_t *pic;
        qpic_t *p;
-       int persistentflag;
+       int flags;
 
-    if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
+       if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
                clvideo_t *video;
 
                video = CL_GetVideo(path);
@@ -299,12 +299,6 @@ cachepic_t *Draw_CachePic (const char *path, qboolean persistent)
                        return &video->cpif;
        }
 
-       if (persistent) {
-               persistentflag = TEXF_PRECACHE;
-       } else {
-               persistentflag = 0;
-       }
-
        crc = CRC_Block(path, strlen(path));
        hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
        for (pic = cachepichash[hashkey];pic;pic = pic->chain)
@@ -319,12 +313,18 @@ cachepic_t        *Draw_CachePic (const char *path, qboolean persistent)
        pic->chain = cachepichash[hashkey];
        cachepichash[hashkey] = pic;
 
+       flags = TEXF_ALPHA;
+       if (persistent)
+               flags |= TEXF_PRECACHE;
+       if (!strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+               flags |= TEXF_CLAMP;
+
        // load the pic from disk
-       pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, TEXF_ALPHA | persistentflag);
+       pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, flags);
        if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
        {
                // compatibility with older versions
-               pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, TEXF_ALPHA | persistentflag);
+               pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, flags);
                // failed to find gfx/whatever.tga or similar, try the wad
                if (pic->tex == NULL && (p = W_GetLumpName (path + 4)))
                {
@@ -336,10 +336,10 @@ cachepic_t        *Draw_CachePic (const char *path, qboolean persistent)
                                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, TEXF_ALPHA | persistentflag, palette_complete);
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, flags, palette_complete);
                        }
                        else
-                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | persistentflag, palette_complete);
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
                }
        }