From 656b08f6209bb496bc158e7ae151b9288df57c08 Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 18 May 2012 22:32:06 +0200 Subject: [PATCH] removed the workaround for the ContainerStore bug. --- apps/openmw/mwgui/tradewindow.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp index b1beccc268..047d1da1e7 100644 --- a/apps/openmw/mwgui/tradewindow.cpp +++ b/apps/openmw/mwgui/tradewindow.cpp @@ -150,21 +150,7 @@ namespace MWGui // were there any items traded at all? MWWorld::ContainerStore& playerBought = mWindowManager.getInventoryWindow()->getBoughtItems(); MWWorld::ContainerStore& merchantBought = getBoughtItems(); - - 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) + if (playerBought.begin() == playerBought.end() && merchantBought.begin() == merchantBought.end()) { // user notification MWBase::Environment::get().getWindowManager()->