quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support "none" in the _celshader key

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@384 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-07-12 17:39:51 +00:00
parent d89df783c3
commit 12a8e70662
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/quake3/q3map2/map.c
View File

@ -1584,13 +1584,20 @@ static qboolean ParseMapEntity( qboolean onlyLights )
if( value[ 0 ] == '\0' ) if( value[ 0 ] == '\0' )
value = ValueForKey( &entities[ 0 ], "_celshader" ); value = ValueForKey( &entities[ 0 ], "_celshader" );
if( value[ 0 ] != '\0' ) if( value[ 0 ] != '\0' )
{
if(strcmp(value, "none"))
{ {
sprintf( shader, "textures/%s", value ); sprintf( shader, "textures/%s", value );
celShader = ShaderInfoForShader( shader ); celShader = ShaderInfoForShader( shader );
Sys_Printf( "Entity %d (%s) has cel shader %s\n", mapEnt->mapEntityNum, classname, celShader->shader ); Sys_Printf( "Entity %d (%s) has cel shader %s\n", mapEnt->mapEntityNum, classname, celShader->shader );
} }
else else
celShader = *globalCelShader ? ShaderInfoForShader(globalCelShader) : NULL; {
celShader = NULL;
}
}
else
celShader = (*globalCelShader ? ShaderInfoForShader(globalCelShader) : NULL);
/* jal : entity based _shadeangle */ /* jal : entity based _shadeangle */
shadeAngle = 0.0f; shadeAngle = 0.0f;