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, 8 insertions, 8 deletions

diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h
index 98135bd861..13818810f1 100644
--- a/engines/mohawk/riven.h
+++ b/engines/mohawk/riven.h
@@ -136,6 +136,7 @@ private:
 	uint16 _curCard;
 	uint16 _curStack;
 	void loadCard(uint16);
+	void handleEvents();
 
 	// Hotspot related functions and variables
 	uint16 _hotspotCount;
@@ -159,11 +160,11 @@ public:
 	void changeToStack(uint16);
 	void refreshCard();
 	Common::String getName(uint16 nameResource, uint16 nameID);
-	Common::String getStackName(uint16 stack);
+	Common::String getStackName(uint16 stack) const;
 	void runCardScript(uint16 scriptType);
 	void runUpdateScreenScript() { runCardScript(kCardUpdateScript); }
-	uint16 getCurCard() { return _curCard; }
-	uint16 getCurStack() { return _curStack; }
+	uint16 getCurCard() const { return _curCard; }
+	uint16 getCurStack() const { return _curStack; }
 	uint16 matchRMAPToCard(uint32);
 	uint32 getCurCardRMAP();
 
@@ -171,19 +172,18 @@ public:
 	RivenHotspot *_hotspots;
 	int32 _curHotspot;
 	Common::Array<ZipMode> _zipModeData;
-	uint16 getHotspotCount() { return _hotspotCount; }
+	uint16 getHotspotCount() const { return _hotspotCount; }
 	void runHotspotScript(uint16 hotspot, uint16 scriptType);
-	int32 getCurHotspot() { return _curHotspot; }
+	int32 getCurHotspot() const { return _curHotspot; }
 	Common::String getHotspotName(uint16 hotspot);
 
 	// Variable functions
 	void initVars();
-	uint32 getVarCount() { return _varCount; }
+	uint32 getVarCount() const { return _varCount; }
 	uint32 getGlobalVar(uint32 index);
 	Common::String getGlobalVarName(uint32 index);
 	uint32 *getLocalVar(uint32 index);
-	uint32 *matchVarToString(Common::String varName);
-	uint32 *matchVarToString(const char *varName);
+	uint32 *getVar(const Common::String &varName);
 
 	// Miscellaneous
 	void setGameOver() { _gameOver = true; }