MOHAWK: Remove Myst's var store from the build since it is not used

anymore.

Keep the files are to be kept around for reference until Mechanical is
finished.
This commit is contained in:
Bastien Bouclet 2011-02-13 13:27:01 +01:00
parent e5783d9c27
commit 3cc86aedac
4 changed files with 1 additions and 10 deletions

View File

@ -18,7 +18,6 @@ MODULE_OBJS = \
mohawk.o \
myst.o \
myst_areas.o \
myst_vars.o \
myst_scripts.o \
myst_state.o \
resource.o \

View File

@ -83,7 +83,6 @@ MohawkEngine_Myst::MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription
_gfx = NULL;
_console = NULL;
_scriptParser = NULL;
_varStore = NULL;
_gameState = NULL;
_loadDialog = NULL;
_optionsDialog = NULL;
@ -112,7 +111,6 @@ MohawkEngine_Myst::~MohawkEngine_Myst() {
delete _gfx;
delete _console;
delete _scriptParser;
delete _varStore;
delete _gameState;
delete _loadDialog;
delete _optionsDialog;
@ -253,7 +251,6 @@ Common::Error MohawkEngine_Myst::run() {
_gfx = new MystGraphics(this);
_console = new MystConsole(this);
_varStore = new MystVar(this);
_gameState = new MystGameState(this, _saveFileMan);
_loadDialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"));
_loadDialog->setSaveMode(false);

View File

@ -29,7 +29,6 @@
#include "mohawk/console.h"
#include "mohawk/mohawk.h"
#include "mohawk/resource_cache.h"
#include "mohawk/myst_vars.h"
#include "mohawk/myst_scripts.h"
#include "common/random.h"
@ -169,8 +168,6 @@ public:
MystResource *updateCurrentResource();
bool skippableWait(uint32 duration);
MystVar *_varStore;
bool _tweaksEnabled;
bool _needsUpdate;

View File

@ -233,13 +233,12 @@ uint16 MystScriptParser::getVar(uint16 var) {
return _globals.ending;
default:
warning("Unimplemented var getter 0x%02x (%d)", var, var);
return _vm->_varStore->getVar(var);
return 0;
}
}
void MystScriptParser::toggleVar(uint16 var) {
warning("Unimplemented var toggle 0x%02x (%d)", var, var);
_vm->_varStore->setVar(var, (_vm->_varStore->getVar(var) + 1) % 2);
}
bool MystScriptParser::setVarValue(uint16 var, uint16 value) {
@ -248,7 +247,6 @@ bool MystScriptParser::setVarValue(uint16 var, uint16 value) {
_tempVar = value;
} else {
warning("Unimplemented var setter 0x%02x (%d)", var, var);
_vm->_varStore->setVar(var, value);
}
return false;