krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

moved call to Globalscripts::addStartup out of the constructor because at the time of construction the environment may not be set up yet to perform this operation

Browse source
This commit is contained in:
Marc Zinnschlag 2014-07-25 09:36:02 +02:00
parent 87c54adb24
commit a3c4000198
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.cpp
View file

@ -421,6 +421,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
mOgre->getRoot()->addFrameListener (this); mOgre->getRoot()->addFrameListener (this);
// scripts // scripts
mEnvironment.getScriptManager()->getGlobalScripts().addStartup();
if (mCompileAll) if (mCompileAll)
{ {
std::pair<int, int> result = MWBase::Environment::get().getScriptManager()->compileAll(); std::pair<int, int> result = MWBase::Environment::get().getScriptManager()->compileAll();

4
apps/openmw/mwscript/globalscripts.cpp
View file

@ -20,9 +20,7 @@ namespace MWScript
GlobalScripts::GlobalScripts (const MWWorld::ESMStore& store) GlobalScripts::GlobalScripts (const MWWorld::ESMStore& store)
: mStore (store) : mStore (store)
{ {}
addStartup();
}
void GlobalScripts::addScript (const std::string& name, const std::string& targetId) void GlobalScripts::addScript (const std::string& name, const std::string& targetId)
{ {