mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:23:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2275 from elsid/fix_map_iteration

Browse source 
Use auto for map value_type in range-based for loops
This commit is contained in:
Bret Curtis 2019-03-22 11:13:58 +01:00 committed by GitHub
commit bbbdefce5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/esmtool/record.cpp
View file

@ -739,7 +739,7 @@ void Record<ESM::Faction>::print()
std::cout << " Faction Reaction: "
<< mData.mData.mRankData[i].mFactReaction << std::endl;
}
for (const std::pair<std::string, int> &reaction : mData.mReactions)
for (const auto &reaction : mData.mReactions)
std::cout << " Reaction: " << reaction.second << " = " << reaction.first << std::endl;
std::cout << " Deleted: " << mIsDeleted << std::endl;
}

4
apps/opencs/model/world/data.cpp
View file

@ -1006,7 +1006,7 @@ void CSMWorld::Data::loadFallbackEntries()
std::make_pair("PrisonMarker", "marker_prison.nif")
};
for (const std::pair<std::string, std::string> &marker : staticMarkers)
for (const auto &marker : staticMarkers)
{
if (mReferenceables.searchId (marker.first)==-1)
{
@ -1020,7 +1020,7 @@ void CSMWorld::Data::loadFallbackEntries()
}
}
for (const std::pair<std::string, std::string> &marker : doorMarkers)
for (const auto &marker : doorMarkers)
{
if (mReferenceables.searchId (marker.first)==-1)
{

2
apps/openmw/mwrender/npcanimation.cpp
View file

@ -790,7 +790,7 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
osg::Object* obj = node->getUserDataContainer()->getUserObject(i);
if (NifOsg::TextKeyMapHolder* keys = dynamic_cast<NifOsg::TextKeyMapHolder*>(obj))
{
for (const std::pair<float, std::string> &key : keys->mTextKeys)
for (const auto &key : keys->mTextKeys)
{
if (Misc::StringUtils::ciEqual(key.second, "talk: start"))
mHeadAnimationTime->setTalkStart(key.first);

8
apps/openmw/mwworld/worldimp.cpp
View file

@ -470,7 +470,7 @@ namespace MWWorld
gmst["iWereWolfBounty"] = ESM::Variant(1000);
gmst["fCombatDistanceWerewolfMod"] = ESM::Variant(0.3f);
for (const std::pair<std::string, ESM::Variant> &params : gmst)
for (const auto &params : gmst)
{
if (!mStore.get<ESM::GameSetting>().search(params.first))
{
@ -500,7 +500,7 @@ namespace MWWorld
globals["crimegoldturnin"] = ESM::Variant(0);
globals["pchasturnin"] = ESM::Variant(0);
for (const std::pair<std::string, ESM::Variant> &params : globals)
for (const auto &params : globals)
{
if (!mStore.get<ESM::Global>().search(params.first))
{
@ -519,7 +519,7 @@ namespace MWWorld
statics["templemarker"] = "marker_temple.nif";
statics["travelmarker"] = "marker_travel.nif";
for (const std::pair<std::string, std::string> &params : statics)
for (const auto &params : statics)
{
if (!mStore.get<ESM::Static>().search(params.first))
{
@ -533,7 +533,7 @@ namespace MWWorld
std::map<std::string, std::string> doors;
doors["prisonmarker"] = "marker_prison.nif";
for (const std::pair<std::string, std::string> &params : doors)
for (const auto &params : doors)
{
if (!mStore.get<ESM::Door>().search(params.first))
{