mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-25 07:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combat code, some scripting, broken network, and fixed some bugs.

Browse Source 
This was SVN commit r1301.
This commit is contained in:
MarkT
2004-11-11 07:09:32 +00:00
parent 9b47d446d2
commit 793794649f
55 changed files with 1836 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/BaseEntityCollection.cpp
+37 -13
View File
@@ -48,22 +48,46 @@ void CBaseEntityCollection::loadTemplates()
// Fix up parent links in the templates.
std::vector<CBaseEntity*>::iterator it;
for( it = m_templates.begin(); it != m_templates.end(); it++ )
std::vector<CBaseEntity*>::iterator it, it_done;
std::vector<CBaseEntity*> done;
// TODO: MT: Circular references check.
while( done.size() < m_templates.size() )
{
if( !( (*it)->m_Base_Name.Length() ) )
continue;
CBaseEntity* Base = getTemplate( (*it)->m_Base_Name );
if( Base )
for( it = m_templates.begin(); it != m_templates.end(); it++ )
{
(*it)->m_base = Base;
(*it)->loadBase();
}
else
LOG( WARNING, LOG_CATEGORY, "Parent template %s does not exist in template %s", CStr8( (*it)->m_Base_Name ).c_str(), CStr8( (*it)->m_Tag ).c_str() );
}
if( !( (*it)->m_Base_Name.Length() ) )
{
done.push_back( *it );
continue;
}
CBaseEntity* Base = getTemplate( (*it)->m_Base_Name );
if( Base )
{
// Check whether it's been loaded yet.
for( it_done = done.begin(); it_done != done.end(); it_done++ )
{
if( *it_done == Base )
{
(*it)->m_base = Base;
(*it)->loadBase();
Base = NULL;
break;
}
}
if( !Base )
{
// Done
done.push_back( *it );
continue;
}
}
else
LOG( WARNING, LOG_CATEGORY, "Parent template %s does not exist in template %s", CStr8( (*it)->m_Base_Name ).c_str(), CStr8( (*it)->m_Tag ).c_str() );
}
}
}
void CBaseEntityCollection::LoadDirectory( Handle directory, CStr pathname )