mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 20:11:36 +00:00
Code Issues Releases Wiki Activity

removed the _freeSlot method which is now unneeded

Browse source
This commit is contained in:
scrawl 2012-05-15 22:01:09 +02:00
parent 0063387979
commit d3a53ae0b8
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -231,7 +231,7 @@ namespace MWGui
MWWorld::ContainerStoreIterator it = invStore.getSlot(slot); MWWorld::ContainerStoreIterator it = invStore.getSlot(slot);
if (it != invStore.end() && *it == item) if (it != invStore.end() && *it == item)
{ {
invStore._freeSlot(slot); invStore.equip(slot, invStore.end());
return; return;
} }
} }

7
apps/openmw/mwworld/inventorystore.cpp
View file

@ -97,13 +97,6 @@ void MWWorld::InventoryStore::equip (int slot, const ContainerStoreIterator& ite
flagAsModified(); flagAsModified();
} }
void MWWorld::InventoryStore::_freeSlot(int slot)
{
mSlots[slot] = end();
flagAsModified();
}
MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot) MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot)
{ {
if (slot<0 || slot>=static_cast<int> (mSlots.size())) if (slot<0 || slot>=static_cast<int> (mSlots.size()))

3
apps/openmw/mwworld/inventorystore.hpp
View file

@ -60,9 +60,6 @@ namespace MWWorld
void equip (int slot, const ContainerStoreIterator& iterator); void equip (int slot, const ContainerStoreIterator& iterator);
///< \note \a iteartor can be an end-iterator ///< \note \a iteartor can be an end-iterator
void _freeSlot(int slot);
///< this method is dangerous, as it doesn't do re-stacking items - you probably want to use equip()
ContainerStoreIterator getSlot (int slot); ContainerStoreIterator getSlot (int slot);
void autoEquip (const MWMechanics::NpcStats& stats); void autoEquip (const MWMechanics::NpcStats& stats);