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

use getIndex to handle other windows, nullsafe fixes

Browse source
This commit is contained in:
lukago 2017-10-20 01:10:17 +02:00
parent a3225364ff
commit b6cb3b445c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,7 @@
#include "inventorywindow.hpp" #include "inventorywindow.hpp"
#include <stdexcept>
#include <MyGUI_Window.h> #include <MyGUI_Window.h>
#include <MyGUI_ImageBox.h> #include <MyGUI_ImageBox.h>
#include <MyGUI_RenderManager.h> #include <MyGUI_RenderManager.h>
@ -225,8 +227,8 @@ namespace MWGui
std::string sound = item.mBase.getClass().getDownSoundId(item.mBase); std::string sound = item.mBase.getClass().getDownSoundId(item.mBase);
MWWorld::Ptr object = item.mBase; MWWorld::Ptr object = item.mBase;
bool shift = MyGUI::InputManager::getInstance().isShiftPressed();
int count = item.mCount; int count = item.mCount;
bool shift = MyGUI::InputManager::getInstance().isShiftPressed();
if (MyGUI::InputManager::getInstance().isControlPressed()) if (MyGUI::InputManager::getInstance().isControlPressed())
count = 1; count = 1;
@ -525,7 +527,6 @@ namespace MWGui
if (mDragAndDrop->mIsOnDragAndDrop) if (mDragAndDrop->mIsOnDragAndDrop)
{ {
MWWorld::Ptr ptr = mDragAndDrop->mItem.mBase; MWWorld::Ptr ptr = mDragAndDrop->mItem.mBase;
int itemType = ptr.getContainerStore()->getType(ptr);
mDragAndDrop->finish(); mDragAndDrop->finish();
@ -538,13 +539,15 @@ namespace MWGui
useItem(ptr); useItem(ptr);
// If item is ingredient or potion don't stop drag and drop to simplify action of taking more than one 1 item // If item is ingredient or potion don't stop drag and drop to simplify action of taking more than one 1 item
if ((itemType == MWWorld::ContainerStore::Type_Ingredient if ((ptr.getTypeName() == typeid(ESM::Potion).name() ||
|| itemType == MWWorld::ContainerStore::Type_Potion) ptr.getTypeName() == typeid(ESM::Ingredient).name())
&& mDragAndDrop->mDraggedCount > 1) && mDragAndDrop->mDraggedCount > 1)
{ {
// Item can be provided from other window for example container.
// But after DragAndDrop::startDrag item automaticly always gets to player inventory.
mSelectedItem = getModel()->getIndex(mDragAndDrop->mItem);
dragItem(nullptr, mDragAndDrop->mDraggedCount - 1); dragItem(nullptr, mDragAndDrop->mDraggedCount - 1);
} }
} }
else else
{ {