NEVERHOOD: Move setting of debug variables to the GameModule

10 files changed, 30 insertions, 59 deletions

diff --git a/engines/neverhood/diskplayerscene.cpp b/engines/neverhood/diskplayerscene.cpp
index 0371903e31..0ffb0b0acd 100644
--- a/engines/neverhood/diskplayerscene.cpp
+++ b/engines/neverhood/diskplayerscene.cpp
@@ -342,12 +342,6 @@ DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int
 
 	_asKey = insertSprite<AsDiskplayerSceneKey>();
 
-	// DEBUG>>>: Give all disks
-	for (int i = 0; i < 20; i++) {
-		setSubVar(VA_IS_TAPE_INSERTED, i, 1);
-	}
-	// DEBUG<<<
-
 	for (int i = 0; i < 20; i++) {
 		_diskAvailable[i] = 0;
 		if (getSubVar(VA_IS_TAPE_INSERTED, i))
diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp
index ddbd4d9152..38d8b99c70 100644
--- a/engines/neverhood/gamemodule.cpp
+++ b/engines/neverhood/gamemodule.cpp
@@ -178,6 +178,21 @@ void GameModule::initMemoryPuzzle() {
 				tileSymbolIndex = 0;
 		}
 		setSubVar(VA_IS_PUZZLE_INIT, 0xC8606803, 1);
+
+		// DEBUG>>>
+		// TODO: Some debug code: Leave two matching tiles open
+		for (int i = 0; i < 48; i++)
+			setSubVar(VA_IS_TILE_MATCH, i, 1);
+		int debugIndex = 0;
+		setSubVar(VA_IS_TILE_MATCH, debugIndex, 0);
+		for (int i = 0; i < 48; i++) {
+			if (i != debugIndex && getSubVar(VA_TILE_SYMBOLS, i) == getSubVar(VA_TILE_SYMBOLS, debugIndex)) {
+				setSubVar(VA_IS_TILE_MATCH, i, 0);
+				break;
+			}
+		}
+		// <<<DEBUG
+
 	}
 }
 
@@ -274,6 +289,20 @@ void GameModule::startup() {
 	setGlobalVar(V_TNT_DUMMY_BUILT, 1);
 	setGlobalVar(V_FLYTRAP_RING_DOOR, 1);
 	setGlobalVar(V_TV_JOKE_TOLD, 1);
+	// Give all disks
+	for (int i = 0; i < 20; i++)
+		setSubVar(VA_IS_TAPE_INSERTED, i, 1);
+	setSubVar(VA_IS_KEY_INSERTED, 0, 1);
+	setSubVar(VA_IS_KEY_INSERTED, 1, 1);
+	setSubVar(VA_IS_KEY_INSERTED, 2, 1);
+	for (uint32 index = 0; index < 9; index++)
+		setSubVar(VA_CUBE_POSITIONS, index, 7 - index);
+	setGlobalVar(V_WALL_BROKEN, 0);
+	setGlobalVar(V_WORLDS_JOINED, 1);
+	setGlobalVar(V_RADIO_MOVE_DISH_VIDEO, 0);
+	// Enable all locations
+	for (int i = 0; i < 6; i++)
+		setSubVar(V_TELEPORTER_DEST_AVAILABLE, i, 1);
 	// <<<DEBUG
 
 #if 1
diff --git a/engines/neverhood/module1300.cpp b/engines/neverhood/module1300.cpp
index 79eda7f1b9..ab63c2961f 100644
--- a/engines/neverhood/module1300.cpp
+++ b/engines/neverhood/module1300.cpp
@@ -1254,12 +1254,6 @@ Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true), _countdown(0), _asCurrKey(NULL),
 	_isInsertingKey(false), _doLeaveScene(false), _isPuzzleSolved(false) {
 
-	//DEBUG>>>
-	setSubVar(VA_IS_KEY_INSERTED, 0, 1);
-	setSubVar(VA_IS_KEY_INSERTED, 1, 1);
-	setSubVar(VA_IS_KEY_INSERTED, 2, 1);
-	//DEBUG<<<
-
 	Sprite *tempSprite;
 	
 	_vm->gameModule()->initKeySlotsPuzzle();
diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/module1400.cpp
index cfa1614602..7373172083 100644
--- a/engines/neverhood/module1400.cpp
+++ b/engines/neverhood/module1400.cpp
@@ -1590,20 +1590,6 @@ Scene1405::Scene1405(NeverhoodEngine *vm, Module *parentModule, int which)
 	setPalette(0x0C0C007D);
 	insertMouse435(0xC00790C8, 20, 620);
 	
-	// DEBUG>>>
-	// TODO: Some debug code: Leave two matching tiles open
-	for (int i = 0; i < 48; i++)
-		setSubVar(VA_IS_TILE_MATCH, i, 1);
-	int debugIndex = 0;
-	setSubVar(VA_IS_TILE_MATCH, debugIndex, 0);
-	for (int i = 0; i < 48; i++) {
-		if (i != debugIndex && getSubVar(VA_TILE_SYMBOLS, i) == getSubVar(VA_TILE_SYMBOLS, debugIndex)) {
-			setSubVar(VA_IS_TILE_MATCH, i, 0);
-			break;
-		}
-	}
-	// <<<DEBUG
-	
 	for (uint32 tileIndex = 0; tileIndex < 48; tileIndex++) {
 		_tiles[tileIndex] = insertSprite<AsScene1405Tile>(this, tileIndex);
 		_vm->_collisionMan->addSprite(_tiles[tileIndex]);
diff --git a/engines/neverhood/module2200.cpp b/engines/neverhood/module2200.cpp
index d82bf8c1d9..b3798d2db9 100644
--- a/engines/neverhood/module2200.cpp
+++ b/engines/neverhood/module2200.cpp
@@ -896,11 +896,6 @@ Scene2202::Scene2202(NeverhoodEngine *vm, Module *parentModule, int which)
 	addEntity(_palette);
 	insertMouse435(0x00A08089, 20, 620);
 
-	//DEBUG>>>
-	for (uint32 index = 0; index < 9; index++)
-		setSubVar(VA_CUBE_POSITIONS, index, 7 - index);
-	//DEBUG<<<
-
 	for (uint32 index = 0; index < 9; index++) {
 		int16 value = (int16)getSubVar(VA_CUBE_POSITIONS, index);
 		if (value >= 0) {
@@ -1999,10 +1994,6 @@ SsScene2207Symbol::SsScene2207Symbol(NeverhoodEngine *vm, uint32 fileHash, int i
 Scene2207::Scene2207(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true), _klaymanAtElevator(true), _elevatorSurfacePriority(0) {
 
-	//DEBUG>>>
-	//setGlobalVar(V_LIGHTS_ON, 1);
-	//DEBUG<<<
-
 	_vm->gameModule()->initCannonSymbolsPuzzle();
 
 	if (!getSubVar(VA_IS_PUZZLE_INIT, 0x88460852))
diff --git a/engines/neverhood/module2300.cpp b/engines/neverhood/module2300.cpp
index c2cf0df133..9b1945a6e6 100644
--- a/engines/neverhood/module2300.cpp
+++ b/engines/neverhood/module2300.cpp
@@ -36,10 +36,6 @@ Module2300::Module2300(NeverhoodEngine *vm, Module *parentModule, int which)
 	_vm->_soundMan->addSoundList(0x1A214010, kModule2300SoundList);
 	_vm->_soundMan->setSoundListParams(kModule2300SoundList, true, 50, 600, 10, 150);
 
-	//DEBUG>>>
-	setGlobalVar(V_WALL_BROKEN, 0);
-	//DEBUG<<<
-
 	_flag = getGlobalVar(V_WALL_BROKEN) == 0;
 	
 	if (_flag) {
diff --git a/engines/neverhood/module2500.cpp b/engines/neverhood/module2500.cpp
index 19779c3234..f67d1a6910 100644
--- a/engines/neverhood/module2500.cpp
+++ b/engines/neverhood/module2500.cpp
@@ -92,9 +92,6 @@ void Module2500::createScene(int sceneNum, int which) {
 		createScene2704(which, 0x004B01B8, 220);
 		break;
 	case 2:
-		//DEBUG>>>Join the tracks.
-		setGlobalVar(V_WORLDS_JOINED, 1);
-		//DEBUG<<< 
 		_vm->gameState().which = which;
 		if (getGlobalVar(V_WORLDS_JOINED))
 			createScene2704(which, 0x004B01E0, 150);
diff --git a/engines/neverhood/module2800.cpp b/engines/neverhood/module2800.cpp
index 268b2c67a9..8712cc3f26 100644
--- a/engines/neverhood/module2800.cpp
+++ b/engines/neverhood/module2800.cpp
@@ -507,10 +507,6 @@ uint32 Scene2801::handleMessage(int messageNum, const MessageParam &param, Entit
 Scene2802::Scene2802(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true), _currTuneStatus(0), _countdown1(0), _countdown2(0) {
 
-	//DEBUG>>> Disable video
-	setGlobalVar(V_RADIO_MOVE_DISH_VIDEO, 0);
-	//DEBUG<<<
-		
 	SetMessageHandler(&Scene2802::handleMessage);
 	SetUpdateHandler(&Scene2802::update);
 	insertMouse435(0x008810A8, 20, 620);
@@ -2583,7 +2579,7 @@ uint32 Scene2808::handleMessage(int messageNum, const MessageParam &param, Entit
 
 void Scene2808::update() {
 
-	// DEBUG>>>: Show correct values
+	// DEBUG>>> Show correct values
 	debug("---------------");
 	debug("%03d %03d %03d", getSubVar(VA_GOOD_TEST_TUBES_LEVEL_1, 0), getSubVar(VA_GOOD_TEST_TUBES_LEVEL_1, 1), getSubVar(VA_GOOD_TEST_TUBES_LEVEL_1, 2));
 	debug("%03d %03d %03d", _asTestTubes[0]->getFillLevel(), _asTestTubes[1]->getFillLevel(), _asTestTubes[2]->getFillLevel());
diff --git a/engines/neverhood/module2900.cpp b/engines/neverhood/module2900.cpp
index 976cf5d9f6..7dc8a9cb95 100644
--- a/engines/neverhood/module2900.cpp
+++ b/engines/neverhood/module2900.cpp
@@ -389,11 +389,6 @@ Scene2901::Scene2901(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	_isButton2Broken = getGlobalVar(V_ENTRANCE_OPEN) != 0;
 
-	//DEBUG>>> Enable all locations
-	for (int i = 0; i < 6; i++)
-		setSubVar(V_TELEPORTER_DEST_AVAILABLE, i, 1);
-	//DEBUG<<<
-
 	setSubVar(V_TELEPORTER_DEST_AVAILABLE, which, 1);
 	setSubVar(V_TELEPORTER_DEST_AVAILABLE, 5, 1);
 	setSubVar(V_TELEPORTER_DEST_AVAILABLE, 4, 1);
diff --git a/engines/neverhood/navigationscene.cpp b/engines/neverhood/navigationscene.cpp
index 96d33c0ffd..8e167dd4d6 100644
--- a/engines/neverhood/navigationscene.cpp
+++ b/engines/neverhood/navigationscene.cpp
@@ -31,13 +31,6 @@ NavigationScene::NavigationScene(NeverhoodEngine *vm, Module *parentModule, uint
 
 	_navigationList = _vm->_staticData->getNavigationList(navigationListId);
 	
-	//DEBUG>>>
-	for (NavigationList::iterator it = _navigationList->begin(); it != _navigationList->end(); it++) {
-		debug("%08X %08X %08X %08X %d %d %08X",	(*it).fileHash,	(*it).leftSmackerFileHash, (*it).rightSmackerFileHash,
-		(*it).middleSmackerFileHash, (*it).interactive, (*it).middleFlag, (*it).mouseCursorFileHash);
-	}
-	//DEBUG<<<
-
 	if (_navigationIndex < 0) {
 		_navigationIndex = (int)getGlobalVar(V_NAVIGATION_INDEX);
 		if (_navigationIndex >= (int)_navigationList->size())