From ba2301a1566e0655cbcb0d57d658ca7d3c145d39 Mon Sep 17 00:00:00 2001 From: Tom Mason Date: Thu, 27 Dec 2012 00:49:39 +0000 Subject: [PATCH] removed redundant code thanks to scrawl --- apps/openmw/mwscript/containerextensions.cpp | 27 +------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp index 07cf3b9e3..813ac555f 100644 --- a/apps/openmw/mwscript/containerextensions.cpp +++ b/apps/openmw/mwscript/containerextensions.cpp @@ -115,32 +115,7 @@ namespace MWScript { if (toLower(iter->getCellRef().mRefID) == toLower(item)) { - switch(iter.getType()){ - case MWWorld::ContainerStore::Type_Potion: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Apparatus: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Armor: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Book: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Clothing: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Ingredient: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Light: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Lockpick: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Miscellaneous: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Probe: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Repair: - itemName = iter->get()->mBase->mName; break; - case MWWorld::ContainerStore::Type_Weapon: - itemName = iter->get()->mBase->mName; break; - } + itemName = MWWorld::Class::get(*iter).getName(*iter); if (iter->getRefData().getCount()<=count) {