Loop and goodie.

This commit is contained in:
Jason Felds
2013-04-28 23:09:45 -04:00
parent 02b409e374
commit bebfd47b26
+10 -6
View File
@@ -90,23 +90,27 @@ int Attack::GetNumAttacks() const
bool AttackArray::ContainsTransformOrTurn() const bool AttackArray::ContainsTransformOrTurn() const
{ {
FOREACH_CONST( Attack, *this, a ) #ifdef MACOSX
for (Attack const &a : *this)
{ {
if( a->ContainsTransformOrTurn() ) if( a.ContainsTransformOrTurn() )
return true; return true;
} }
return false; return false;
#else
return std::any_of((*this).begin(), (*this).end(), [](Attack const &a) { return a.ContainsTransformOrTurn(); });
#endif
} }
vector<RString> AttackArray::ToVectorString() const vector<RString> AttackArray::ToVectorString() const
{ {
vector<RString> ret; vector<RString> ret;
FOREACH_CONST( Attack, *this, a ) for (Attack const &a : *this)
{ {
ret.push_back(ssprintf("TIME=%f:LEN=%f:MODS=%s", ret.push_back(ssprintf("TIME=%f:LEN=%f:MODS=%s",
a->fStartSecond, a.fStartSecond,
a->fSecsRemaining, a.fSecsRemaining,
a->sModifiers.c_str())); a.sModifiers.c_str()));
} }
return ret; return ret;
} }