From 48b7b03453197ff5069aee6b9714838bc95085be Mon Sep 17 00:00:00 2001
From: Sebastian Wick <wick.sebastian@gmail.com>
Date: Wed, 4 Apr 2012 16:15:15 +0200
Subject: [PATCH] typo; World::getFallback(std::string key, std::string def)

---
 apps/openmw/main.cpp          | 2 +-
 apps/openmw/mwworld/world.cpp | 7 ++++++-
 apps/openmw/mwworld/world.hpp | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index cdc4af4b0..06b068621 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -71,7 +71,7 @@ void validate(boost::any &v, std::vector<std::string> const &tokens, FallbackMap
     for(std::vector<std::string>::const_iterator it=tokens.begin(); it != tokens.end(); it++)
     {
         int sep = it->find(",");
-        if(sep < 1 || sep = it->length()-1)
+        if(sep < 1 || sep == (it->length()-1))
             throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value);
 
         std::string key(it->substr(0,sep));
diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index 7f4169b9d..431a7a18c 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -158,11 +158,16 @@ namespace MWWorld
     }
 
     std::string World::getFallback(std::string key)
+    {
+        return getFallback(key, "");
+    }
+
+    std::string World::getFallback(std::string key, std::string def)
     {
         std::map<std::string,std::string>::iterator it;
         if((it = mFallback.find(key)) == mFallback.end())
         {
-            return std::string("");
+            return def;
         }
         return it->second;
     }
diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp
index 7f18762f5..799b0d094 100644
--- a/apps/openmw/mwworld/world.hpp
+++ b/apps/openmw/mwworld/world.hpp
@@ -130,6 +130,8 @@ namespace MWWorld
 
             std::string getFallback(std::string key);
 
+            std::string getFallback(std::string key, std::string def);
+
             MWWorld::Player& getPlayer();
 
             const ESMS::ESMStore& getStore() const;