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

moved installOpcodes function from scriptmanager to extensions

Browse source
This commit is contained in:
Marc Zinnschlag 2010-07-18 19:54:56 +02:00
parent f3b70e05a9
commit a9825f92ee
4 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwscript/extensions.cpp
View file

@ -1,6 +1,9 @@
#include "extensions.hpp"
#include <components/interpreter/interpreter.hpp>
#include <components/interpreter/installopcodes.hpp>
#include "soundextensions.hpp"
#include "cellextensions.hpp"
#include "miscextensions.hpp"
@ -17,5 +20,15 @@ namespace MWScript
Sound::registerExtensions (extensions);
Sky::registerExtensions (extensions);
}
void installOpcodes (Interpreter::Interpreter& interpreter)
{
Interpreter::installOpcodes (interpreter);
Cell::installOpcodes (interpreter);
Misc::installOpcodes (interpreter);
Gui::installOpcodes (interpreter);
Sound::installOpcodes (interpreter);
Sky::installOpcodes (interpreter);
}
}

7
apps/openmw/mwscript/extensions.hpp
View file

@ -6,9 +6,16 @@ namespace Compiler
class Extensions;
}
namespace Interpreter
{
class Interpreter;
}
namespace MWScript
{
void registerExtensions (Compiler::Extensions& extensions);
void installOpcodes (Interpreter::Interpreter& interpreter);
}
#endif

17
apps/openmw/mwscript/scriptmanager.cpp
View file

@ -12,14 +12,9 @@
#include <components/compiler/scanner.hpp>
#include <components/compiler/context.hpp>
#include <components/interpreter/installopcodes.hpp>
#include <components/interpreter/interpreter.hpp>
#include "soundextensions.hpp"
#include "cellextensions.hpp"
#include "miscextensions.hpp"
#include "guiextensions.hpp"
#include "skyextensions.hpp"
#include "extensions.hpp"
namespace MWScript
{
@ -118,15 +113,5 @@ namespace MWScript
iter->second.clear(); // don't execute again.
}
}
void ScriptManager::installOpcodes (Interpreter::Interpreter& interpreter)
{
Interpreter::installOpcodes (interpreter);
Cell::installOpcodes (interpreter);
Misc::installOpcodes (interpreter);
Gui::installOpcodes (interpreter);
Sound::installOpcodes (interpreter);
Sky::installOpcodes (interpreter);
}
}

2
apps/openmw/mwscript/scriptmanager.hpp
View file

@ -46,8 +46,6 @@ namespace MWScript
Compiler::Context& compilerContext);
void run (const std::string& name, Interpreter::Context& interpreterContext);
static void installOpcodes (Interpreter::Interpreter& interpreter);
};
};