MOHAWK: Cleanup

- Split the main Riven event loop into a separate function for readability and for use in the sunner external functions eventually
- Some minor function signature changes (const!)
- Rename matchVarToString() to getVar() (I have no idea where that original name came from, considering it takes a string and returns a variable
- Use solely Common::String in getVar()

svn-id: r52538

1 files changed, 5 insertions, 5 deletions

diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp
index 446d957109..0116167df1 100644
--- a/engines/mohawk/console.cpp
+++ b/engines/mohawk/console.cpp
@@ -350,7 +350,7 @@ bool RivenConsole::Cmd_Var(int argc, const char **argv) {
 		return true;
 	}
 
-	uint32 *globalVar = _vm->matchVarToString(argv[1]);
+	uint32 *globalVar = _vm->getVar(argv[1]);
 
 	if (!globalVar) {
 		DebugPrintf("Unknown variable \'%s\'\n", argv[1]);
@@ -479,7 +479,7 @@ bool RivenConsole::Cmd_Hotspots(int argc, const char **argv) {
 }
 
 bool RivenConsole::Cmd_ZipMode(int argc, const char **argv) {
-	uint32 *zipModeActive = _vm->matchVarToString("azip");
+	uint32 *zipModeActive = _vm->getVar("azip");
 	*zipModeActive = !(*zipModeActive);
 
 	DebugPrintf("Zip Mode is ");
@@ -622,9 +622,9 @@ bool RivenConsole::Cmd_Combos(int argc, const char **argv) {
 	// You'll need to look up the Rebel Tunnel puzzle on your own; the
 	// solution is constant.
 
-	uint32 teleCombo = *_vm->matchVarToString("tcorrectorder");
-	uint32 prisonCombo = *_vm->matchVarToString("pcorrectorder");
-	uint32 domeCombo = *_vm->matchVarToString("adomecombo");
+	uint32 teleCombo = *_vm->getVar("tcorrectorder");
+	uint32 prisonCombo = *_vm->getVar("pcorrectorder");
+	uint32 domeCombo = *_vm->getVar("adomecombo");
 	
 	DebugPrintf("Telescope Combo:\n  ");
 	for (int i = 0; i < 5; i++)