From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 15 Sep 2006 02:07:09 +0000 (+0000)
Subject: hide warnings about missing gfx/crosshair* images
X-Git-Tag: xonotic-v0.1.0preview~3803
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=46039550393a443358ae5c6ea78b5047a559970b;p=xonotic%2Fdarkplaces.git

hide warnings about missing gfx/crosshair* images


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

diff --git a/gl_draw.c b/gl_draw.c
index 5f966912..e918b887 100644
--- 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);