From 4b5f02f6447a6596640c155c5eaaab7318d43d20 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 22 May 2014 15:29:36 +0200
Subject: [PATCH] Remove useless throwing of exception

---
 apps/openmw/mwmechanics/levelledlist.hpp | 38 +++++++++++-------------
 apps/openmw/mwworld/esmstore.hpp         |  3 +-
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp
index 6888d88a6..5d9e29118 100644
--- a/apps/openmw/mwmechanics/levelledlist.hpp
+++ b/apps/openmw/mwmechanics/levelledlist.hpp
@@ -53,29 +53,27 @@ namespace MWMechanics
             return std::string();
         std::string item = candidates[std::rand()%candidates.size()];
 
-        // Is this another levelled item or a real item?
-        try
+        // Vanilla doesn't fail on nonexistent items in levelled lists
+        if (!MWBase::Environment::get().getWorld()->getStore().find(Misc::StringUtils::lowerCase(item)))
         {
-            MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), item, 1);
-            if (ref.getPtr().getTypeName() != typeid(ESM::ItemLevList).name()
-                    && ref.getPtr().getTypeName() != typeid(ESM::CreatureLevList).name())
-            {
-                return item;
-            }
-            else
-            {
-                if (ref.getPtr().getTypeName() == typeid(ESM::ItemLevList).name())
-                    return getLevelledItem(ref.getPtr().get<ESM::ItemLevList>()->mBase, failChance);
-                else
-                    return getLevelledItem(ref.getPtr().get<ESM::CreatureLevList>()->mBase, failChance);
-            }
-        }
-        catch (std::logic_error&)
-        {
-            // Vanilla doesn't fail on nonexistent items in levelled lists
-            std::cerr << "Warning: ignoring nonexistent item '" << item << "'" << std::endl;
+            std::cerr << "Warning: ignoring nonexistent item '" << item << "' in levelled list '" << levItem->mId << "'" << std::endl;
             return std::string();
         }
+
+        // Is this another levelled item or a real item?
+        MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), item, 1);
+        if (ref.getPtr().getTypeName() != typeid(ESM::ItemLevList).name()
+                && ref.getPtr().getTypeName() != typeid(ESM::CreatureLevList).name())
+        {
+            return item;
+        }
+        else
+        {
+            if (ref.getPtr().getTypeName() == typeid(ESM::ItemLevList).name())
+                return getLevelledItem(ref.getPtr().get<ESM::ItemLevList>()->mBase, failChance);
+            else
+                return getLevelledItem(ref.getPtr().get<ESM::CreatureLevList>()->mBase, failChance);
+        }
     }
 
 }
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index c6c9c1ffe..90786acd4 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -85,7 +85,8 @@ namespace MWWorld
             return mStores.end();
         }
 
-        // Look up the given ID in 'all'. Returns 0 if not found.
+        /// Look up the given ID in 'all'. Returns 0 if not found.
+        /// \note id must be in lower case.
         int find(const std::string &id) const
         {
             std::map<std::string, int>::const_iterator it = mIds.find(id);