fix compile problems (operator<() must be const)
This commit is contained in:
@@ -81,7 +81,8 @@ bool Inventory::OnComboBroken( PlayerNumber pn, int iCombo )
|
||||
int* iItems = GAMESTATE->m_iItems[pn];
|
||||
|
||||
// search for the item acquired
|
||||
for( int item=0; item<(int)m_ItemDefs.size(); item++ )
|
||||
int item;
|
||||
for( item=0; item<(int)m_ItemDefs.size(); item++ )
|
||||
if( m_ItemDefs[item].comboLevel > iCombo )
|
||||
break;
|
||||
|
||||
@@ -177,4 +178,4 @@ void Inventory::RemoveAllActiveItems()
|
||||
{
|
||||
for( int p=0; p<NUM_PLAYERS; p++ )
|
||||
m_ActiveItems[p].clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
int comboLevel;
|
||||
CString effect;
|
||||
|
||||
bool operator<( const ItemDef& other ) { return comboLevel < other.comboLevel; }
|
||||
bool operator<( const ItemDef& other ) const { return comboLevel < other.comboLevel; }
|
||||
void Sort( vector<ItemDef>& items ) { sort( items.begin(), items.end() ); }
|
||||
};
|
||||
vector<ItemDef> m_ItemDefs;
|
||||
|
||||
Reference in New Issue
Block a user