FULLPIPE: Moved debug code to loadAllScenes()

4 files changed, 60 insertions, 55 deletions

diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 32ccbda78a..ddbae7ac07 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -121,6 +121,10 @@ Common::Error FullpipeEngine::run() {
 
 	sceneSwitcher(&ent);
 
+#if 1
+	loadAllScenes();
+#endif
+
 	_currentScene->draw();
 
 	while (!g_fullpipe->_needQuit) {
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index a0dba6a431..ba4b3171de 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -135,6 +135,7 @@ public:
 	void initObjectStates();
 	void setLevelStates();
 	void setSwallowedEggsState();
+	void loadAllScenes();
 
 	void initCursors();
 	void addCursor(CursorInfo *cursorInfo, Scene *inv, int pictureId, int hotspotX, int hotspotY, int itemPictureOffsX, int itemPictureOffsY);
diff --git a/engines/fullpipe/init.cpp b/engines/fullpipe/init.cpp
index 9892f55574..b1c9d6d0de 100644
--- a/engines/fullpipe/init.cpp
+++ b/engines/fullpipe/init.cpp
@@ -201,4 +201,59 @@ void FullpipeEngine::initMap() {
 	updateMapPiece(PIC_MAP_A13, 1u);
 }
 
+void FullpipeEngine::loadAllScenes() {
+	accessScene(301);
+	accessScene(302);
+	accessScene(303);
+	accessScene(304);
+	accessScene(305);
+	accessScene(321);
+	accessScene(635);
+	accessScene(649);
+	accessScene(650);
+	accessScene(651);
+	accessScene(652);
+	accessScene(653);
+	accessScene(654);
+	accessScene(655);
+	accessScene(726);
+	accessScene(858);
+	accessScene(903);
+	accessScene(1137);
+	accessScene(1138);
+	accessScene(1139);
+	accessScene(1140);
+	accessScene(1141);
+	accessScene(1142);
+	accessScene(1143);
+	accessScene(1144);
+	accessScene(1546);
+	accessScene(1547);
+	accessScene(1548);
+	accessScene(1549);
+	accessScene(1550);
+	accessScene(1551);
+	accessScene(1552);
+	accessScene(2062);
+	accessScene(2063);
+	accessScene(2064);
+	accessScene(2065);
+	accessScene(2066);
+	accessScene(2067);
+	accessScene(2068);
+	accessScene(2069);
+	accessScene(2070);
+	accessScene(2071);
+	accessScene(2072);
+	accessScene(2460);
+	accessScene(3896);
+	accessScene(3907);
+	accessScene(4620);
+	accessScene(4999);
+	accessScene(5000);
+	accessScene(5001);
+	accessScene(5166);
+	accessScene(5222);
+}
+
 } // End of namespace Fullpipe
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 6470b1c687..859e6eac15 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -48,61 +48,6 @@ bool FullpipeEngine::loadGam(const char *fname) {
 		_inventory->setItemFlags(ANI_INV_MAP, 0x10003);
 		_inventory->addItem(ANI_INV_MAP, 1);
 
-#if 0
-		g_fullpipe->accessScene(301);
-		g_fullpipe->accessScene(302);
-		g_fullpipe->accessScene(303);
-		g_fullpipe->accessScene(304);
-		g_fullpipe->accessScene(305);
-		g_fullpipe->accessScene(321);
-		g_fullpipe->accessScene(635);
-		g_fullpipe->accessScene(649);
-		g_fullpipe->accessScene(650);
-		g_fullpipe->accessScene(651);
-		g_fullpipe->accessScene(652);
-		g_fullpipe->accessScene(653);
-		g_fullpipe->accessScene(654);
-		g_fullpipe->accessScene(655);
-		g_fullpipe->accessScene(726);
-		g_fullpipe->accessScene(858);
-		g_fullpipe->accessScene(903);
-		g_fullpipe->accessScene(1137);
-		g_fullpipe->accessScene(1138);
-		g_fullpipe->accessScene(1139);
-		g_fullpipe->accessScene(1140);
-		g_fullpipe->accessScene(1141);
-		g_fullpipe->accessScene(1142);
-		g_fullpipe->accessScene(1143);
-		g_fullpipe->accessScene(1144);
-		g_fullpipe->accessScene(1546);
-		g_fullpipe->accessScene(1547);
-		g_fullpipe->accessScene(1548);
-		g_fullpipe->accessScene(1549);
-		g_fullpipe->accessScene(1550);
-		g_fullpipe->accessScene(1551);
-		g_fullpipe->accessScene(1552);
-		g_fullpipe->accessScene(2062);
-		g_fullpipe->accessScene(2063);
-		g_fullpipe->accessScene(2064);
-		g_fullpipe->accessScene(2065);
-		g_fullpipe->accessScene(2066);
-		g_fullpipe->accessScene(2067);
-		g_fullpipe->accessScene(2068);
-		g_fullpipe->accessScene(2069);
-		g_fullpipe->accessScene(2070);
-		g_fullpipe->accessScene(2071);
-		g_fullpipe->accessScene(2072);
-		g_fullpipe->accessScene(2460);
-		g_fullpipe->accessScene(3896);
-		g_fullpipe->accessScene(3907);
-		g_fullpipe->accessScene(4620);
-		g_fullpipe->accessScene(4999);
-		g_fullpipe->accessScene(5000);
-		g_fullpipe->accessScene(5001);
-		g_fullpipe->accessScene(5166);
-		g_fullpipe->accessScene(5222);
-#endif
-
 		_inventory->rebuildItemRects();
 
 		for (CPtrList::iterator p = _inventory->getScene()->_picObjList.begin(); p != _inventory->getScene()->_picObjList.end(); ++p) {