From 642653d10e12eeeb6cef02a63f62480687499bb6 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 6 Mar 2013 19:57:00 +0100
Subject: [PATCH] World constructor fixes
---
apps/openmw/mwworld/worldimp.cpp | 7 +++----
apps/openmw/mwworld/worldimp.hpp | 10 +++++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f9e4a743f..7d3efe3e8 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -178,10 +178,11 @@ namespace MWWorld
const Files::Collections& fileCollections,
const std::vector<std::string>& master, const std::vector<std::string>& plugins,
const boost::filesystem::path& resDir, const boost::filesystem::path& cacheDir, bool newGame,
- ToUTF8::Utf8Encoder* encoder, std::map<std::string,std::string> fallbackMap, int mActivationDistanceOverride)
+ ToUTF8::Utf8Encoder* encoder, const std::map<std::string,std::string>& fallbackMap, int mActivationDistanceOverride)
: mPlayer (0), mLocalScripts (mStore), mGlobalVariables (0),
mSky (true), mCells (mStore, mEsm),
- mNumFacing(0), mActivationDistanceOverride (mActivationDistanceOverride)
+ mNumFacing(0), mActivationDistanceOverride (mActivationDistanceOverride),
+ mFallback (fallbackMap)
{
mPhysics = new PhysicsSystem(renderer);
mPhysEngine = mPhysics->getEngine();
@@ -247,8 +248,6 @@ namespace MWWorld
mWorldScene = new Scene(*mRendering, mPhysics);
- setFallbackValues(fallbackMap);
-
lastTick = mTimer.getMilliseconds();
}
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 79d036e99..47088aa62 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -92,7 +92,7 @@ namespace MWWorld
bool moveObjectImp (const Ptr& ptr, float x, float y, float z);
///< @return true if the active cell (cell player is in) changed
-
+
Ptr copyObjectToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos);
void updateWindowManager ();
@@ -116,7 +116,7 @@ namespace MWWorld
const Files::Collections& fileCollections,
const std::vector<std::string>& master, const std::vector<std::string>& plugins,
const boost::filesystem::path& resDir, const boost::filesystem::path& cacheDir, bool newGame,
- ToUTF8::Utf8Encoder* encoder, std::map<std::string,std::string> fallbackMap, int mActivationDistanceOverride);
+ ToUTF8::Utf8Encoder* encoder, const std::map<std::string,std::string>& fallbackMap, int mActivationDistanceOverride);
virtual ~World();
@@ -174,11 +174,11 @@ namespace MWWorld
virtual char getGlobalVariableType (const std::string& name) const;
///< Return ' ', if there is no global variable with this name.
-
+
virtual std::vector<std::string> getGlobals () const;
-
+
virtual std::string getCurrentCellName () const;
-
+
virtual void removeRefScript (MWWorld::RefData *ref);
//< Remove the script attached to ref from mLocalScripts