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

# Updates to actor prop-switching system

Browse Source 
Forced variant names to lowercase. Allowed empty prop model names to
remove inherited props. Removed a little code duplication.
Entity: Changed confusing (and probably incorrect) loop/STL logic, to
use slightly more confusing syntax instead.

This was SVN commit r3761.
This commit is contained in:
Ykkrosh
2006-04-14 03:14:43 +00:00
parent 8b1b11c0c6
commit c41248b585
8 changed files with 158 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ObjectManager.cpp
+5 -1
View File
@@ -109,7 +109,11 @@ CObjectEntry* CObjectManager::FindObjectVariation(CObjectBase* base, const std::
CObjectEntry* obj = new CObjectEntry(0, base); // TODO: type ?
if (! obj->BuildVariation(selections))
// TODO (for some efficiency): use the pre-calculated choices for this object,
// which has already worked out what to do for props, instead of passing the
// selections into BuildVariation and having it recalculate the props' choices.
if (! obj->BuildVariation(selections, choices))
{
DeleteObject(obj);
return NULL;