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

removed the workaround for the ContainerStore bug.

Browse source
This commit is contained in:
scrawl 2012-05-18 22:32:06 +02:00
parent 8a0c859c16
commit 656b08f620
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/openmw/mwgui/tradewindow.cpp
View file

@ -150,21 +150,7 @@ namespace MWGui
// were there any items traded at all? // were there any items traded at all?
MWWorld::ContainerStore& playerBought = mWindowManager.getInventoryWindow()->getBoughtItems(); MWWorld::ContainerStore& playerBought = mWindowManager.getInventoryWindow()->getBoughtItems();
MWWorld::ContainerStore& merchantBought = getBoughtItems(); MWWorld::ContainerStore& merchantBought = getBoughtItems();
if (playerBought.begin() == playerBought.end() && merchantBought.begin() == merchantBought.end())
bool traded=false;
for (MWWorld::ContainerStoreIterator it = playerBought.begin();
it != playerBought.end(); ++it)
{
if (it->getRefData().getCount() > 0)
traded = true;
}
for (MWWorld::ContainerStoreIterator it = merchantBought.begin();
it != merchantBought.end(); ++it)
{
if (it->getRefData().getCount() > 0)
traded = true;
}
if (!traded)
{ {
// user notification // user notification
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->