From ea7f386e7d5d28958f004e70820f5e125d32e766 Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Sun, 17 Mar 2013 13:50:15 +0100
Subject: [PATCH] Access to Fallback via getFallback

---
 apps/openmw/mwbase/world.hpp            |  3 ++-
 apps/openmw/mwgui/charactercreation.cpp | 12 ++++++------
 apps/openmw/mwgui/levelupdialog.cpp     |  5 +++--
 apps/openmw/mwworld/worldimp.cpp        | 10 +++++-----
 apps/openmw/mwworld/worldimp.hpp        |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 642291eef..1d6b290c8 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -46,6 +46,7 @@ namespace MWRender
 
 namespace MWWorld
 {
+    class Fallback;
     class CellStore;
     class Player;
     class LocalScripts;
@@ -103,7 +104,7 @@ namespace MWBase
 
             virtual void getTriangleBatchCount(unsigned int &triangles, unsigned int &batches) = 0;
 
-            virtual std::string getFallback (const std::string& key) const = 0;
+            virtual MWWorld::Fallback *getFallback () = 0;
 
             virtual MWWorld::Player& getPlayer() = 0;
 
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index b98fd2bd9..5bc89fbd1 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -12,6 +12,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwworld/fallback.hpp"
 
 namespace
 {
@@ -23,14 +24,13 @@ namespace
     };
 
     const ESM::Class::Specialization mSpecializations[3]={ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}; // The specialization for each answer
-
     Step sGenerateClassSteps(int number) {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
         number++;
-        Step step = {world->getFallback("Question_"+boost::lexical_cast<std::string>(number)+"_Question"),
-        {world->getFallback("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerOne"),
-        world->getFallback("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerTwo"),
-        world->getFallback("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerThree")},
+        MWWorld::Fallback* fallback=MWBase::Environment::get().getWorld()->getFallback();
+        Step step = {fallback->getFallbackString("Question_"+boost::lexical_cast<std::string>(number)+"_Question"),
+        {fallback->getFallbackString("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerOne"),
+        fallback->getFallbackString("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerTwo"),
+        fallback->getFallbackString("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerThree")},
         "vo\\misc\\chargen qa"+boost::lexical_cast<std::string>(number)+".wav"
         };
         return step;
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 9473f48b4..f0a385808 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -9,6 +9,7 @@
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/fallback.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
@@ -138,9 +139,9 @@ namespace MWGui
 
         std::string levelupdescription;
         if(level>20)
-            levelupdescription=world->getFallback("Level_Up_Default");
+            levelupdescription=world->getFallback()->getFallbackString("Level_Up_Default");
         else
-            levelupdescription=world->getFallback("Level_Up_Level"+boost::lexical_cast<std::string>(level));
+            levelupdescription=world->getFallback()->getFallbackString("Level_Up_Level"+boost::lexical_cast<std::string>(level));
 
         mLevelDescription->setCaption (levelupdescription);
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5a23aae97..ee41afc58 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -154,11 +154,6 @@ namespace MWWorld
             mRendering->skyDisable();
     }
 
-    std::string World::getFallback (const std::string& key) const
-    {
-        return mFallback.getFallbackString(key);
-    }
-
     World::World (OEngine::Render::OgreRenderer& renderer,
         const Files::Collections& fileCollections,
         const std::vector<std::string>& master, const std::vector<std::string>& plugins,
@@ -267,6 +262,11 @@ namespace MWWorld
         return 0;
     }
 
+    MWWorld::Fallback *World::getFallback ()
+    {
+        return &mFallback;
+    }
+
     Ptr::CellStore *World::getExterior (int x, int y)
     {
         return mCells.getExterior (x, y);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 526e68a77..d2db653db 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -133,7 +133,7 @@ namespace MWWorld
 
             virtual void getTriangleBatchCount(unsigned int &triangles, unsigned int &batches);
 
-            virtual std::string getFallback (const std::string& key) const;
+            virtual Fallback *getFallback ();
 
             virtual Player& getPlayer();