diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-02 22:25:24 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-02 22:28:24 +0200 |
| commit | 4a8080dcf73dab2b6e62b8500fec3bb996bcbf17 (patch) | |
| tree | 67ef51dbb1b360f9a3e7c38cf0dbeb2b5f001bfd /src/game-server/inventory.cpp | |
| parent | ad3958701136ff8ae4a4fc749ef616cc8917d2af (diff) | |
| download | manaserv-4a8080dcf73dab2b6e62b8500fec3bb996bcbf17.tar.gz manaserv-4a8080dcf73dab2b6e62b8500fec3bb996bcbf17.tar.bz2 manaserv-4a8080dcf73dab2b6e62b8500fec3bb996bcbf17.tar.xz manaserv-4a8080dcf73dab2b6e62b8500fec3bb996bcbf17.zip | |
Fixed multiple warnings and errors that blocked c++0x
This allows the server to compile with c++0x (and enables it).
This also includes some coding style / readabillity fixes.
Diffstat (limited to 'src/game-server/inventory.cpp')
| -rw-r--r-- | src/game-server/inventory.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game-server/inventory.cpp b/src/game-server/inventory.cpp index 1fe09001..e14a36af 100644 --- a/src/game-server/inventory.cpp +++ b/src/game-server/inventory.cpp @@ -715,8 +715,7 @@ bool Inventory::equip(int inventorySlot) { EquipmentItem equipItem(it->second.itemId, itemInstance); mPoss->equipSlots.insert( - std::make_pair<unsigned, EquipmentItem> - (equipReq.equipSlotId, equipItem)); + std::make_pair(equipReq.equipSlotId, equipItem)); --capacityLeft; } } |