From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 30 Apr 2007 05:28:29 +0000 (+0000)
Subject: fix a bug in texture path identification (the nopath case was occurring
X-Git-Tag: xonotic-v0.1.0preview~3234
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=b0afb5e6cc1803a3c899bb33297169c5004d1d9a;p=xonotic%2Fdarkplaces.git

fix a bug in texture path identification (the nopath case was occurring
even when there was a path, because it was checking the wrong variable)


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

diff --git a/image.c b/image.c
index 7f5ed1fc..be151e78 100644
--- a/image.c
+++ b/image.c
@@ -865,7 +865,7 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
 		firstformat = imageformats_textures;
 	else if (!strcasecmp(name, "gfx"))
 		firstformat = imageformats_gfx;
-	else if (!strchr(name, '/'))
+	else if (!strchr(basename, '/'))
 		firstformat = imageformats_nopath;
 	else
 		firstformat = imageformats_other;