diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2022-08-19 17:34:12 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2022-08-19 17:34:55 +0200 |
| commit | 2effe9775db423d61d8a2bdd15c40e6015bac6f5 (patch) | |
| tree | c39246dbbd85c66987dd8c2c071648f2da7eaede /src/game-server/charactercomponent.cpp | |
| parent | 109b602701578b9f2b29282f84bf2757544f8d32 (diff) | |
| download | manaserv-2effe9775db423d61d8a2bdd15c40e6015bac6f5.tar.gz manaserv-2effe9775db423d61d8a2bdd15c40e6015bac6f5.tar.bz2 manaserv-2effe9775db423d61d8a2bdd15c40e6015bac6f5.tar.xz manaserv-2effe9775db423d61d8a2bdd15c40e6015bac6f5.zip | |
Apply C++11 fixits
modernize-loop-convert
modernize-deprecated-headers
Diffstat (limited to 'src/game-server/charactercomponent.cpp')
| -rw-r--r-- | src/game-server/charactercomponent.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/game-server/charactercomponent.cpp b/src/game-server/charactercomponent.cpp index 0248bbe9..68ecc792 100644 --- a/src/game-server/charactercomponent.cpp +++ b/src/game-server/charactercomponent.cpp @@ -41,8 +41,8 @@ #include <algorithm> #include <cassert> +#include <climits> #include <cmath> -#include <limits.h> Script::Ref CharacterComponent::mDeathCallback; Script::Ref CharacterComponent::mDeathAcceptedCallback; @@ -280,13 +280,12 @@ void CharacterComponent::serialize(Entity &entity, MessageOut &msg) const Possessions &poss = getPossessions(); const InventoryData &inventoryData = poss.getInventory(); - for (auto itemIt = inventoryData.begin(), - itemIt_end = inventoryData.end(); itemIt != itemIt_end; ++itemIt) + for (const auto &itemIt : inventoryData) { - msg.writeInt16(itemIt->first); // slot id - msg.writeInt16(itemIt->second.itemId); - msg.writeInt16(itemIt->second.amount); - msg.writeInt8(itemIt->second.equipmentSlot); + msg.writeInt16(itemIt.first); // slot id + msg.writeInt16(itemIt.second.itemId); + msg.writeInt16(itemIt.second.amount); + msg.writeInt8(itemIt.second.equipmentSlot); } } |