id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 07:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move worlspawn to first entry if map was read from Blender

Browse source
This commit is contained in:
Robert Beckebans 2016-06-19 17:19:24 +02:00
parent 45c96fa6bc
commit f3c8e0748e
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
neo/idlib/MapFile.cpp
View file

@ -1105,11 +1105,11 @@ unsigned int idMapEntity::GetGeometryCRC() const
class idSort_CompareMapEntity : public idSort_Quick< idMapEntity*, idSort_CompareMapEntity >
{
public:
int Compare( idMapEntity*& a, idMapEntity*& b ) const
int Compare( idMapEntity* const& a, idMapEntity* const& b ) const
{
if( idStr::Icmp( a->epairs.GetString( "name" ), "worldspawn" ) == 0 )
{
return -1;
return 1;
}
if( idStr::Icmp( b->epairs.GetString( "name" ), "worldspawn" ) == 0 )
@ -1224,7 +1224,22 @@ bool idMapFile::Parse( const char* filename, bool ignoreRegion, bool osPath )
}
}
entities.SortWithTemplate( idSort_CompareMapEntity() );
//entities.SortWithTemplate( idSort_CompareMapEntity() );
if( entities.Num() > 0 && ( idStr::Icmp( entities[0]->epairs.GetString( "name" ), "worldspawn" ) != 0 ) )
{
// move world spawn to first place
for( int i = 1; i < entities.Num(); i++ )
{
if( idStr::Icmp( entities[i]->epairs.GetString( "name" ), "worldspawn" ) == 0 )
{
idMapEntity* tmp = entities[0];
entities[0] = entities[i];
entities[i] = tmp;
break;
}
}
}
}
else
{