diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-17 10:55:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-17 10:55:20 +0300 |
| commit | fd050698f74b5dc7a9867bc93ba6b7c65ef2462f (patch) | |
| tree | 246017e7d1b399e60a5d7b97a7106cd75587b88f /src/being | |
| parent | 4228763829f71ec4db50ed185483d7707c5e47eb (diff) | |
| download | mv-fd050698f74b5dc7a9867bc93ba6b7c65ef2462f.tar.gz mv-fd050698f74b5dc7a9867bc93ba6b7c65ef2462f.tar.bz2 mv-fd050698f74b5dc7a9867bc93ba6b7c65ef2462f.tar.xz mv-fd050698f74b5dc7a9867bc93ba6b7c65ef2462f.zip | |
Remove getter for inventoryHandler.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/localplayer.cpp | 2 | ||||
| -rw-r--r-- | src/being/playerinfo.cpp | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index aa92cf6d7..f01a3171a 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -2925,7 +2925,7 @@ void LocalPlayer::imitateOutfit(const Being *const player, else { // logger->log("have unequip %d", sprite); - const int equipmentSlot = Net::getInventoryHandler() + const int equipmentSlot = inventoryHandler ->convertFromServerSlot(sprite); // logger->log("equipmentSlot: " + toString(equipmentSlot)); if (equipmentSlot == ItemSlot::PROJECTILE_SLOT) diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp index b84fb72a9..3768b6e35 100644 --- a/src/being/playerinfo.cpp +++ b/src/being/playerinfo.cpp @@ -188,7 +188,7 @@ Inventory *getInventory() Inventory *getStorageInventory() { - return Net::getInventoryHandler()->getStorage(); + return inventoryHandler->getStorage(); } void clearInventory() @@ -233,21 +233,21 @@ void equipItem(const Item *const item, const bool sfx) { if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::EQUIP); - Net::getInventoryHandler()->equipItem(item); + inventoryHandler->equipItem(item); } void unequipItem(const Item *const item, const bool sfx) { if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::UNEQUIP); - Net::getInventoryHandler()->unequipItem(item); + inventoryHandler->unequipItem(item); } void useItem(const Item *const item, const bool sfx) { if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::USE); - Net::getInventoryHandler()->useItem(item); + inventoryHandler->useItem(item); } void useEquipItem(const Item *const item, const bool sfx) @@ -260,20 +260,20 @@ void useEquipItem(const Item *const item, const bool sfx) { if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::UNEQUIP); - Net::getInventoryHandler()->unequipItem(item); + inventoryHandler->unequipItem(item); } else { if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::EQUIP); - Net::getInventoryHandler()->equipItem(item); + inventoryHandler->equipItem(item); } } else { if (mProtectedItems.find(item->getId()) == mProtectedItems.end()) { - Net::getInventoryHandler()->useItem(item); + inventoryHandler->useItem(item); if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::USE); } @@ -291,13 +291,13 @@ void useEquipItem2(const Item *const item, const bool sfx) { if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::UNEQUIP); - Net::getInventoryHandler()->unequipItem(item); + inventoryHandler->unequipItem(item); } else { if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::EQUIP); - Net::getInventoryHandler()->equipItem(item); + inventoryHandler->equipItem(item); } } else @@ -306,7 +306,7 @@ void useEquipItem2(const Item *const item, const bool sfx) { if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::USE); - Net::getInventoryHandler()->useItem(item); + inventoryHandler->useItem(item); } } } @@ -318,7 +318,7 @@ void dropItem(const Item *const item, const int amount, const bool sfx) { if (sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::DROP); - Net::getInventoryHandler()->dropItem(item, amount); + inventoryHandler->dropItem(item, amount); } } |