mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-20 01:21:15 +00:00
Code Issues Projects Releases Wiki Activity

Use range-based for loop

Browse Source
This commit is contained in:
elsid 2022-07-04 21:51:53 +02:00
parent 5e8df40718
commit 0132b6e19c
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/openmw/mwmechanics/actors.cpp
View File

@ -713,11 +713,10 @@ namespace MWMechanics
std::set<MWWorld::Ptr> playerFollowers; std::set<MWWorld::Ptr> playerFollowers;
getActorsSidingWith(player, playerFollowers); getActorsSidingWith(player, playerFollowers);
for (ActiveSpells::TIterator it = spells.begin(); it != spells.end(); ++it) for (const ActiveSpells::ActiveSpellParams& spell : spells)
{ {
bool actorKilled = false; bool actorKilled = false;
const ActiveSpells::ActiveSpellParams& spell = *it;
MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spell.getCasterActorId()); MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spell.getCasterActorId());
for (const auto& effect : spell.getEffects()) for (const auto& effect : spell.getEffects())
{ {
@ -2152,16 +2151,17 @@ namespace MWMechanics
std::set<MWWorld::Ptr> followers; std::set<MWWorld::Ptr> followers;
getActorsFollowing(actor, followers); getActorsFollowing(actor, followers);
for (auto neighbor = neighbors.begin(); neighbor != neighbors.end(); ++neighbor) for (const MWWorld::Ptr& neighbor : neighbors)
{ {
const CreatureStats &stats = neighbor->getClass().getCreatureStats(*neighbor); const CreatureStats &stats = neighbor.getClass().getCreatureStats(neighbor);
if (stats.isDead() || *neighbor == actor || neighbor->getClass().isPureWaterCreature(*neighbor)) if (stats.isDead() || neighbor == actor || neighbor.getClass().isPureWaterCreature(neighbor))
continue; continue;
const bool isFollower = followers.find(*neighbor) != followers.end(); const bool isFollower = followers.find(neighbor) != followers.end();
if (stats.getAiSequence().isInCombat(actor) || (MWBase::Environment::get().getMechanicsManager()->isAggressive(*neighbor, actor) && !isFollower)) if (stats.getAiSequence().isInCombat(actor)
list.push_back(*neighbor); || (MWBase::Environment::get().getMechanicsManager()->isAggressive(neighbor, actor) && !isFollower))
list.push_back(neighbor);
} }
return list; return list;
} }
@ -2170,10 +2170,10 @@ namespace MWMechanics
void Actors::write (ESM::ESMWriter& writer, Loading::Listener& listener) const void Actors::write (ESM::ESMWriter& writer, Loading::Listener& listener) const
{ {
writer.startRecord(ESM::REC_DCOU); writer.startRecord(ESM::REC_DCOU);
for (std::map<std::string, int>::const_iterator it = mDeathCount.begin(); it != mDeathCount.end(); ++it) for (const auto& [id, count] : mDeathCount)
{ {
writer.writeHNString("ID__", it->first); writer.writeHNString("ID__", id);
writer.writeHNT ("COUN", it->second); writer.writeHNT ("COUN", count);
} }
writer.endRecord(ESM::REC_DCOU); writer.endRecord(ESM::REC_DCOU);
} }