mirror of
https://github.com/UberGames/GtkRadiant.git
synced 2024-11-26 05:41:43 +00:00
* fixed missing string for error output
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@314 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
parent
0e5c89d2c0
commit
2c4c4aead7
1 changed files with 7 additions and 7 deletions
|
@ -124,7 +124,7 @@ static char* strlwr (char* string)
|
||||||
if ('A' <= *cp && *cp <= 'Z')
|
if ('A' <= *cp && *cp <= 'Z')
|
||||||
*cp += 'a' - 'A';
|
*cp += 'a' - 'A';
|
||||||
}
|
}
|
||||||
|
|
||||||
return string;
|
return string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -159,7 +159,7 @@ void ASE_Load( const char *filename, qboolean verbose, qboolean grabAnims )
|
||||||
fclose( fp );
|
fclose( fp );
|
||||||
|
|
||||||
strcpy(gl_filename, filename);
|
strcpy(gl_filename, filename);
|
||||||
|
|
||||||
ASE_Process();
|
ASE_Process();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -217,7 +217,7 @@ polyset_t *ASE_GetSurfaceAnimation( int which, int *pNumFrames, int skipFrameSta
|
||||||
{
|
{
|
||||||
numFramesInAnimation = maxFrames;
|
numFramesInAnimation = maxFrames;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
numFramesInAnimation = pObject->anim.numFrames;
|
numFramesInAnimation = pObject->anim.numFrames;
|
||||||
if ( maxFrames != -1 )
|
if ( maxFrames != -1 )
|
||||||
|
@ -436,7 +436,7 @@ static void ASE_KeyMAP_DIFFUSE( const char *token )
|
||||||
|
|
||||||
// the purpose of this whole chunk of code below is to extract the relative path
|
// the purpose of this whole chunk of code below is to extract the relative path
|
||||||
// from a full path in the ASE
|
// from a full path in the ASE
|
||||||
|
|
||||||
strcpy( bitmap, s_token + 1 );
|
strcpy( bitmap, s_token + 1 );
|
||||||
if ( strchr( bitmap, '"' ) )
|
if ( strchr( bitmap, '"' ) )
|
||||||
*strchr( bitmap, '"' ) = 0;
|
*strchr( bitmap, '"' ) = 0;
|
||||||
|
@ -659,7 +659,7 @@ static void ASE_KeyMESH_TVERTLIST( const char *token )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Error( "Unknown token '%s' while parsing MESH_TVERTLIST" );
|
Error( "Unknown token '%s' while parsing MESH_TVERTLIST", token );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -803,7 +803,7 @@ static void ASE_KeyGEOMOBJECT( const char *token )
|
||||||
else if ( !strcmp( token, "*MESH" ) && !ase.grabAnims )
|
else if ( !strcmp( token, "*MESH" ) && !ase.grabAnims )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
if ( strstr( ase.objects[ase.currentObject].name, "tag_" ) == ase.objects[ase.currentObject].name )
|
if ( strstr( ase.objects[ase.currentObject].name, "tag_" ) == ase.objects[ase.currentObject].name )
|
||||||
{
|
{
|
||||||
s_forceStaticMesh = true;
|
s_forceStaticMesh = true;
|
||||||
ASE_ParseBracedBlock( ASE_KeyMESH );
|
ASE_ParseBracedBlock( ASE_KeyMESH );
|
||||||
|
@ -818,7 +818,7 @@ static void ASE_KeyGEOMOBJECT( const char *token )
|
||||||
ase.objects[ase.currentObject].anim.numFrames = ase.objects[ase.currentObject].anim.currentFrame;
|
ase.objects[ase.currentObject].anim.numFrames = ase.objects[ase.currentObject].anim.currentFrame;
|
||||||
ase.objects[ase.currentObject].numAnimations++;
|
ase.objects[ase.currentObject].numAnimations++;
|
||||||
/*
|
/*
|
||||||
// ignore meshes that aren't part of animations if this object isn't a
|
// ignore meshes that aren't part of animations if this object isn't a
|
||||||
// a tag
|
// a tag
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue