diff options
Diffstat (limited to 'src/remoteplayer.cpp')
| -rw-r--r-- | src/remoteplayer.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp index c276062c2..20c18ee15 100644 --- a/src/remoteplayer.cpp +++ b/src/remoteplayer.cpp @@ -72,8 +72,8 @@ void RemotePlayer::serializeExtraAttributes(std::string &output) assert(m_sao); Json::Value json_root; const PlayerAttributes &attrs = m_sao->getExtendedAttributes(); - for (PlayerAttributes::const_iterator it = attrs.begin(); it != attrs.end(); ++it) { - json_root[(*it).first] = (*it).second; + for (const auto &attr : attrs) { + json_root[attr.first] = attr.second; } Json::FastWriter writer; @@ -125,10 +125,9 @@ void RemotePlayer::deSerialize(std::istream &is, const std::string &playername, reader.parse(extended_attributes, attr_root); const Json::Value::Members attr_list = attr_root.getMemberNames(); - for (Json::Value::Members::const_iterator it = attr_list.begin(); - it != attr_list.end(); ++it) { - Json::Value attr_value = attr_root[*it]; - sao->setExtendedAttribute(*it, attr_value.asString()); + for (const auto &it : attr_list) { + Json::Value attr_value = attr_root[it]; + sao->setExtendedAttribute(it, attr_value.asString()); } } catch (SettingNotFoundException &e) {} } @@ -165,7 +164,7 @@ void RemotePlayer::serialize(std::ostream &os) args.setFloat("yaw", m_sao->getYaw()); args.setS32("breath", m_sao->getBreath()); - std::string extended_attrs = ""; + std::string extended_attrs; serializeExtraAttributes(extended_attrs); args.set("extended_attributes", extended_attrs); |