]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix a warning
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 25 Jun 2010 14:05:05 +0000 (14:05 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 27 Jun 2010 19:55:38 +0000 (21:55 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10252 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0f0b19b509e71e991001841570e71cf5ef243470

model_shared.c

index 57803adee9bee67ccde11e5dc546d844084af87f..a4417c9a2a21b3329aaa75cda27609daf58edc90 100644 (file)
@@ -1578,7 +1578,7 @@ void Mod_LoadQ3Shaders(void)
 
        // parse custinfoparms.txt
        numcustsurfaceparms = 0;
-       if (text = f = (char *)FS_LoadFile("scripts/custinfoparms.txt", tempmempool, false, NULL))
+       if ((text = f = (char *)FS_LoadFile("scripts/custinfoparms.txt", tempmempool, false, NULL)) != NULL)
        {
                if (!COM_ParseToken_QuakeC(&text, false) || strcasecmp(com_token, "{"))
                        Con_DPrintf("scripts/custinfoparms.txt: contentflags section parsing error - expected \"{\", found \"%s\"\n", com_token);