forked from mirror/openmw-tes3mp
World constructor fixes
This commit is contained in:
parent
7e100c36b5
commit
642653d10e
2 changed files with 8 additions and 9 deletions
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue