]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
hide warnings about missing gfx/crosshair* images
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 15 Sep 2006 02:07:09 +0000 (02:07 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 15 Sep 2006 02:07:09 +0000 (02:07 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6586 d7cf8633-e32d-0410-b094-e92efae38249

gl_draw.c

index 5f96691276dc60a90d527545702bd2328066406a..e918b8879aca3f49397f68aa36ffa9d3996e136c 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -267,7 +267,7 @@ static rtexture_t *draw_generatecrosshair(int num)
                        data[i][3] = 255;
                }
        }
-       return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+       return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num+1), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
 static rtexture_t *draw_generateditherpattern(void)
@@ -418,7 +418,9 @@ cachepic_t  *Draw_CachePic (const char *path, qboolean persistent)
                        pic->tex = draw_generateditherpattern();
                if (pic->tex == NULL)
                {
-                       Con_Printf("Draw_CachePic: failed to load %s\n", path);
+                       // don't complain about missing gfx/crosshair images
+                       if (strncmp(path, "gfx/crosshair", 13))
+                               Con_Printf("Draw_CachePic: failed to load %s\n", path);
                        pic->tex = r_texture_notexture;
                }
                pic->width = R_TextureWidth(pic->tex);