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

Fixed regression caused by not understanding my code

Browse Source 
This was SVN commit r2457.
This commit is contained in:
Ykkrosh
2005-07-03 01:37:49 +00:00
parent 580d0c7892
commit e84b8bd017
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ObjectEntry.cpp
+6 -2
View File
@@ -36,8 +36,12 @@ CObjectEntry::~CObjectEntry()
delete m_Model;
}
bool CObjectEntry::BuildRandomVariant(const CObjectBase::variation_key& vars, CObjectBase::variation_key::const_iterator vars_it)
bool CObjectEntry::BuildRandomVariant(const CObjectBase::variation_key& vars, CObjectBase::variation_key::const_iterator& vars_it)
{
// vars_it is passed by reference so that the caller's iterator
// can be incremented by the appropriate amount, to point to the
// next object's set of variant choices (for propped models).
CStr chosenTexture;
CStr chosenModel;
CStr chosenColor;
@@ -62,7 +66,7 @@ bool CObjectEntry::BuildRandomVariant(const CObjectBase::variation_key& vars, CO
u8 var_id = *vars_it++;
if (var_id < 0 || var_id >= grp->size())
{
LOG(ERROR, LOG_CATEGORY, "Internal error (BuildRandomVariant: %d not in 0..%d", var_id, grp->size()-1);
LOG(ERROR, LOG_CATEGORY, "Internal error (BuildRandomVariant: %d not in 0..%d)", var_id, grp->size()-1);
continue;
}
CObjectBase::Variant& var ((*grp)[var_id]);