krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Barter: Leave unsold projectiles equipped.

Browse source
This commit is contained in:
Jordan Ayers 2016-01-18 20:00:18 -06:00
parent 1ff49cc637
commit 5699cf7f09
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,18 +265,20 @@ namespace MWGui
} }
} }
void InventoryWindow::ensureSelectedItemUnequipped() void InventoryWindow::ensureSelectedItemUnequipped(int count)
{ {
const ItemStack& item = mTradeModel->getItem(mSelectedItem); const ItemStack& item = mTradeModel->getItem(mSelectedItem);
if (item.mType == ItemStack::Type_Equipped) if (item.mType == ItemStack::Type_Equipped)
{ {
MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr); MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr);
MWWorld::Ptr newStack = *invStore.unequipItem(item.mBase, mPtr); MWWorld::Ptr newStack = *invStore.unequipItemQuantity(item.mBase, mPtr, count);
// The unequipped item was re-stacked. We have to update the index // The unequipped item was re-stacked. We have to update the index
// since the item pointed does not exist anymore. // since the item pointed does not exist anymore.
if (item.mBase != newStack) if (item.mBase != newStack)
{ {
updateItemView(); // Unequipping can produce a new stack, not yet in the window...
// newIndex will store the index of the ItemStack the item was stacked on // newIndex will store the index of the ItemStack the item was stacked on
int newIndex = -1; int newIndex = -1;
for (size_t i=0; i < mTradeModel->getItemCount(); ++i) for (size_t i=0; i < mTradeModel->getItemCount(); ++i)
@ -298,14 +300,14 @@ namespace MWGui
void InventoryWindow::dragItem(MyGUI::Widget* sender, int count) void InventoryWindow::dragItem(MyGUI::Widget* sender, int count)
{ {
ensureSelectedItemUnequipped(); ensureSelectedItemUnequipped(count);
mDragAndDrop->startDrag(mSelectedItem, mSortModel, mTradeModel, mItemView, count); mDragAndDrop->startDrag(mSelectedItem, mSortModel, mTradeModel, mItemView, count);
notifyContentChanged(); notifyContentChanged();
} }
void InventoryWindow::sellItem(MyGUI::Widget* sender, int count) void InventoryWindow::sellItem(MyGUI::Widget* sender, int count)
{ {
ensureSelectedItemUnequipped(); ensureSelectedItemUnequipped(count);
const ItemStack& item = mTradeModel->getItem(mSelectedItem); const ItemStack& item = mTradeModel->getItem(mSelectedItem);
std::string sound = item.mBase.getClass().getDownSoundId(item.mBase); std::string sound = item.mBase.getClass().getDownSoundId(item.mBase);
MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0); MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);

4
apps/openmw/mwgui/inventorywindow.hpp
View file

@ -126,8 +126,8 @@ namespace MWGui
void adjustPanes(); void adjustPanes();
/// Unequips mSelectedItem, if it is equipped, and then updates mSelectedItem in case it was re-stacked /// Unequips count items from mSelectedItem, if it is equipped, and then updates mSelectedItem in case the items were re-stacked
void ensureSelectedItemUnequipped(); void ensureSelectedItemUnequipped(int count);
}; };
} }