1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-08 06:40:08 +00:00

mild cleanup

This commit is contained in:
Alex 2013-08-07 13:16:20 -04:00
parent de1f423bd7
commit c3ca5b7c32
6 changed files with 8 additions and 12 deletions

View File

@ -7,7 +7,7 @@
#include <MyGUI_WidgetManager.h> #include <MyGUI_WidgetManager.h>
#include <components/compiler/registerextensions.hpp> #include <components/compiler/extensions0.hpp>
#include <components/bsa/bsa_archive.hpp> #include <components/bsa/bsa_archive.hpp>
#include <components/files/configurationmanager.hpp> #include <components/files/configurationmanager.hpp>
@ -397,8 +397,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[i]); mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[i]);
// Create window manager - this manages all the MW-specific GUI windows // Create window manager - this manages all the MW-specific GUI windows
// MWScript::registerExtensions (mExtensions); // WHY DOES THIS NOT HAVE THE BOOL PARAMETER? // before compiler reorganization the following line was "MWScript::registerExtensions (mExtensions);"
Compiler::registerExtensions (mExtensions, false); Compiler::registerExtensions (mExtensions, false);
mEnvironment.setWindowManager (new MWGui::WindowManager( mEnvironment.setWindowManager (new MWGui::WindowManager(
mExtensions, mFpsLevel, mOgre, mCfgMgr.getLogPath().string() + std::string("/"), mExtensions, mFpsLevel, mOgre, mCfgMgr.getLogPath().string() + std::string("/"),

View File

@ -1,7 +1,7 @@
#include "console.hpp" #include "console.hpp"
#include <components/compiler/exception.hpp> #include <components/compiler/exception.hpp>
#include <components/compiler/registerextensions.hpp> #include <components/compiler/extensions0.hpp>
#include "../mwscript/extensions.hpp" #include "../mwscript/extensions.hpp"

View File

@ -54,7 +54,7 @@ add_component_dir (files
add_component_dir (compiler add_component_dir (compiler
context controlparser errorhandler exception exprparser extensions fileparser generator context controlparser errorhandler exception exprparser extensions fileparser generator
lineparser literals locals output parser scanner scriptparser skipparser streamerrorhandler lineparser literals locals output parser scanner scriptparser skipparser streamerrorhandler
stringparser tokenloc nullerrorhandler opcodes registerextensions stringparser tokenloc nullerrorhandler opcodes extensions0
) )
add_component_dir (interpreter add_component_dir (interpreter

View File

@ -1,4 +1,4 @@
#include "registerextensions.hpp" #include "extensions0.hpp"
#include "opcodes.hpp" #include "opcodes.hpp"
#include "extensions.hpp" #include "extensions.hpp"

View File

@ -1,5 +1,5 @@
#ifndef COMPILER_REGISTEREXTENSIONS_H #ifndef COMPILER_EXTENSIONS0_H
#define COMPILER_REGISTEREXTENSIONS_H #define COMPILER_EXTENSIONS0_H
namespace Compiler namespace Compiler
{ {

View File

@ -100,8 +100,6 @@ namespace Compiler
namespace Control namespace Control
{ {
// not opcodes, but are required by apps/openmw and components/compiler
// do they belong here?
const int numberOfControls = 7; const int numberOfControls = 7;
extern const char *controls[numberOfControls]; extern const char *controls[numberOfControls];
@ -261,8 +259,6 @@ namespace Compiler
namespace Stats namespace Stats
{ {
// not opcodes, but are required by apps/openmw and components/compiler
// do they belong here?
const int numberOfAttributes = 8; const int numberOfAttributes = 8;
const int numberOfDynamics = 3; const int numberOfDynamics = 3;
const int numberOfSkills = 27; const int numberOfSkills = 27;