From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 18 Mar 2006 05:08:48 +0000 (+0000)
Subject: fixed an uninitialized variable warning (which was true)
X-Git-Tag: xonotic-v0.1.0preview~4186
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d7dc58ac2811c032a59852625bc2ca5edc245919;p=xonotic%2Fdarkplaces.git

fixed an uninitialized variable warning (which was true)


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

diff --git a/image.c b/image.c
index 7764305d..21e809ed 100644
--- a/image.c
+++ b/image.c
@@ -711,7 +711,6 @@ imageformat_t imageformats_other[] =
 
 unsigned char *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight)
 {
-	int i;
 	fs_offset_t filesize;
 	imageformat_t *firstformat, *format;
 	unsigned char *f, *data = NULL;
@@ -729,6 +728,7 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
 	name[0] = 0;
 	if (strchr(basename, '/'))
 	{
+		int i;
 		for (i = 0;i < (int)sizeof(name)-1 && basename[i] != '/';i++)
 			name[i] = basename[i];
 		name[i] = 0;
@@ -767,7 +767,7 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
 		for (format = firstformat;format->formatstring;format++)
 		{
 			sprintf (name, format->formatstring, basename);
-			Con_Printf(i == 0 ? "\"%s\"" : (format[1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), format->formatstring);
+			Con_Printf(format == firstformat ? "\"%s\"" : (format[1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), format->formatstring);
 		}
 	}
 	if (developer_memorydebug.integer)