fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix some warnings.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5249 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2018-04-27 17:11:14 +00:00
parent fdd903e0a3
commit 5c459e4eca
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
engine/gl/gl_shader.c
View file

@ -3976,7 +3976,7 @@ static void Shader_MakeCache(const char *path, unsigned int parseflags)
Q_strncpyz(cachefile->forcedshadername, token, sizeof(cachefile->forcedshadername)); Q_strncpyz(cachefile->forcedshadername, token, sizeof(cachefile->forcedshadername));
} }
else else
Con_DPrintf("unknown shader meta term \"%s\" in %s\n", token, name); Con_DPrintf("unknown shader meta term \"%s\" in %s\n", token, path);
while (*ptr == ' ' || *ptr == '\t') while (*ptr == ' ' || *ptr == '\t')
ptr++; ptr++;
@ -3984,7 +3984,7 @@ static void Shader_MakeCache(const char *path, unsigned int parseflags)
{ {
while (*ptr && (*ptr != '\r' && *ptr != '\n')) while (*ptr && (*ptr != '\r' && *ptr != '\n'))
ptr++; ptr++;
Con_DPrintf("junk after shader meta in %s\n", name); Con_DPrintf("junk after shader meta in %s\n", path);
} }
} }
ptr = e; ptr = e;
@ -6729,7 +6729,7 @@ static qboolean Shader_ReadShaderTerms(parsestate_t *ps, struct scondinfo_s *con
{ {
#define SHADER_MACRO_ARGS 6 #define SHADER_MACRO_ARGS 6
int argn = 0; int argn = 0;
char *body; char *oldptr;
char arg[SHADER_MACRO_ARGS][256]; char arg[SHADER_MACRO_ARGS][256];
//parse args until the end of the line //parse args until the end of the line
while (ps->ptr) while (ps->ptr)
@ -6745,8 +6745,10 @@ static qboolean Shader_ReadShaderTerms(parsestate_t *ps, struct scondinfo_s *con
argn++; argn++;
} }
} }
body = shadermacros[i].body; oldptr = ps->ptr;
ps->ptr = shadermacros[i].body;
Shader_ReadShaderTerms(ps, cond); Shader_ReadShaderTerms(ps, cond);
ps->ptr = oldptr;
return true; return true;
} }
} }