diff options
| -rw-r--r-- | engines/mohawk/module.mk | 1 | ||||
| -rw-r--r-- | engines/mohawk/myst.cpp | 3 | ||||
| -rw-r--r-- | engines/mohawk/myst.h | 3 | ||||
| -rw-r--r-- | engines/mohawk/myst_scripts.cpp | 4 |
4 files changed, 1 insertions, 10 deletions
diff --git a/engines/mohawk/module.mk b/engines/mohawk/module.mk index 858a5d35bb..8c4453e155 100644 --- a/engines/mohawk/module.mk +++ b/engines/mohawk/module.mk @@ -18,7 +18,6 @@ MODULE_OBJS = \ mohawk.o \ myst.o \ myst_areas.o \ - myst_vars.o \ myst_scripts.o \ myst_state.o \ resource.o \ diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 91fa779eb9..d8c9786fcf 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -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); diff --git a/engines/mohawk/myst.h b/engines/mohawk/myst.h index 5fd405434d..919509384b 100644 --- a/engines/mohawk/myst.h +++ b/engines/mohawk/myst.h @@ -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; diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index 2e6e921ad8..25eeac0a6c 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -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; |