NEVERHOOD: Implement Scene1403, Scene1404 and Scene1405 (memory minigame)

- Move GameModule::startup call into engine instead of the game module constructor
- Reduce debug output

1 files changed, 15 insertions, 18 deletions

diff --git a/engines/neverhood/gamevars.cpp b/engines/neverhood/gamevars.cpp
index caf79b2ad9..e0cae80105 100644
--- a/engines/neverhood/gamevars.cpp
+++ b/engines/neverhood/gamevars.cpp
@@ -32,18 +32,18 @@ GameVars::~GameVars() {
 }
 
 uint32 GameVars::getGlobalVar(uint32 nameHash) {
-	debug("GameVars::getGlobalVar(%08X)", nameHash);
+	//debug("GameVars::getGlobalVar(%08X)", nameHash);
 	int16 varIndex = findSubVarIndex(0, nameHash);
 	return varIndex != -1 ? _vars[varIndex].value : 0;
 }
 
 void GameVars::setGlobalVar(uint32 nameHash, uint32 value) {
-	debug("GameVars::setGlobalVar(%08X, %d)", nameHash, value);
+	//debug("GameVars::setGlobalVar(%08X, %d)", nameHash, value);
 	_vars[getSubVarIndex(0, nameHash)].value = value;
 }
 
 uint32 GameVars::getSubVar(uint32 nameHash, uint32 subNameHash) {
-	debug("GameVars::getSubVar(%08X, %08X)", nameHash, subNameHash);
+	//debug("GameVars::getSubVar(%08X, %08X)", nameHash, subNameHash);
 	uint32 value = 0;
 	int16 varIndex = findSubVarIndex(0, nameHash);
 	if (varIndex != -1) {
@@ -56,21 +56,17 @@ uint32 GameVars::getSubVar(uint32 nameHash, uint32 subNameHash) {
 }
 
 void GameVars::setSubVar(uint32 nameHash, uint32 subNameHash, uint32 value) {
-	debug("GameVars::setSubVar(%08X, %08X, %d)", nameHash, subNameHash, value);
-	
+	//debug("GameVars::setSubVar(%08X, %08X, %d)", nameHash, subNameHash, value);
 	int16 varIndex = getSubVarIndex(0, nameHash);
-	debug("  varIndex = %d", varIndex);
-	
+	//debug("  varIndex = %d", varIndex);
 	int16 subVarIndex = getSubVarIndex(varIndex, subNameHash);
-	debug("  subVarIndex = %d", subVarIndex);
-	
+	//debug("  subVarIndex = %d", subVarIndex);
 	_vars[subVarIndex].value = value;
-	
 	//_vars[getSubVarIndex(getSubVarIndex(0, nameHash), subNameHash)].value = value;
 }
 
 int16 GameVars::addVar(uint32 nameHash, uint32 value) {
-	debug("GameVars::addVar(%08X, %d)", nameHash, value);
+	//debug("GameVars::addVar(%08X, %d)", nameHash, value);
 	GameVar gameVar;
 	gameVar.nameHash = nameHash;
 	gameVar.value = value;
@@ -81,7 +77,7 @@ int16 GameVars::addVar(uint32 nameHash, uint32 value) {
 }
 
 int16 GameVars::findSubVarIndex(int16 varIndex, uint32 subNameHash) {
-	debug("GameVars::findSubVarIndex(%d, %08X)", varIndex, subNameHash);
+	//debug("GameVars::findSubVarIndex(%d, %08X)", varIndex, subNameHash);
 	for (int16 nextIndex = _vars[varIndex].firstIndex; nextIndex != -1; nextIndex = _vars[nextIndex].nextIndex) {
 		if (_vars[nextIndex].nameHash == subNameHash)
 			return nextIndex;
@@ -90,18 +86,19 @@ int16 GameVars::findSubVarIndex(int16 varIndex, uint32 subNameHash) {
 }
 
 int16 GameVars::addSubVar(int16 varIndex, uint32 subNameHash, uint32 value) {
-	debug("GameVars::addSubVar(%d, %08X, %d)", varIndex, subNameHash, value);
+	//debug("GameVars::addSubVar(%d, %08X, %d)", varIndex, subNameHash, value);
 	int16 nextIndex = _vars[varIndex].firstIndex;
+	int16 subVarIndex;
 	if (nextIndex == -1) {
-		_vars[varIndex].firstIndex = addVar(subNameHash, value);
-		return _vars[varIndex].firstIndex;
+		subVarIndex = addVar(subNameHash, value);
+		_vars[varIndex].firstIndex = subVarIndex;
 	} else {
 		while (_vars[nextIndex].nextIndex != -1)
 			nextIndex = _vars[nextIndex].nextIndex;
-		int16 index = addVar(subNameHash, value);	
-		_vars[nextIndex].nextIndex = index;
-		return index;
+		subVarIndex = addVar(subNameHash, value);
+		_vars[nextIndex].nextIndex = subVarIndex;
 	}
+	return subVarIndex;
 }
 
 int16 GameVars::getSubVarIndex(int16 varIndex, uint32 subNameHash) {