MOHAWK: Merge classes MystVariables and MystSaveLoad to form MystGameState

svn-id: r55041

1 files changed, 2 insertions, 8 deletions

diff --git a/engines/mohawk/myst_stacks/stoneship.cpp b/engines/mohawk/myst_stacks/stoneship.cpp
index 7bd2ee1021..eb281d14e1 100644
--- a/engines/mohawk/myst_stacks/stoneship.cpp
+++ b/engines/mohawk/myst_stacks/stoneship.cpp
@@ -35,7 +35,8 @@
 
 namespace Mohawk {
 
-MystScriptParser_Stoneship::MystScriptParser_Stoneship(MohawkEngine_Myst *vm) : MystScriptParser(vm) {
+MystScriptParser_Stoneship::MystScriptParser_Stoneship(MohawkEngine_Myst *vm) :
+		MystScriptParser(vm), _state(vm->_gameState->_stoneship) {
 	setupOpcodes();
 }
 
@@ -92,9 +93,6 @@ void MystScriptParser_Stoneship::runPersistentScripts() {
 }
 
 uint16 MystScriptParser_Stoneship::getVar(uint16 var) {
-//	MystVariables::Globals &globals = _vm->_saveLoad->_v->globals;
-//	MystVariables::Stoneship &stoneship = _vm->_saveLoad->_v->stoneship;
-
 	switch(var) {
 //case 0: // Water Drained From Lighthouse / Right Button Of Pump
 //	return 0; // Water Present / Button Dark
@@ -152,9 +150,6 @@ uint16 MystScriptParser_Stoneship::getVar(uint16 var) {
 }
 
 void MystScriptParser_Stoneship::toggleVar(uint16 var) {
-//	MystVariables::Globals &globals = _vm->_saveLoad->_v->globals;
-//	MystVariables::Stoneship &stoneship = _vm->_saveLoad->_v->stoneship;
-
 	switch(var) {
 	default:
 		MystScriptParser::toggleVar(var);
@@ -163,7 +158,6 @@ void MystScriptParser_Stoneship::toggleVar(uint16 var) {
 }
 
 bool MystScriptParser_Stoneship::setVarValue(uint16 var, uint16 value) {
-//	MystVariables::Stoneship &stoneship = _vm->_saveLoad->_v->stoneship;
 	bool refresh = false;
 
 	switch (var) {