Initialize level data with 0s in M&P

Following discussion on TerryCavanagh/VVVVVV#153, I suggested that
instead of reverting my M&P guards from TerryCavanagh/VVVVVV#124 (which
would only revert it for The Final Level, The Lab, Overworld, and The
Tower, leaving Space Station 1 & 2 and The Warp Zone alone which could
potentially cause the same problem that motivated
TerryCavanagh/VVVVVV#153), we should initialize the map data with 0s
instead.

desktop_version/src/Finalclass.cpp

@@ -2314,6 +2314,12 @@ std::vector<std::string> finalclass::loadlevel(int rx, int ry, Game& game, entit
 		//game.test = true;
 		//game.teststring = "ERROR: Map not found in Final Area";
 		break;
+#else
+	default:
+		for (int j = 0; j < 30; j++)
+		{
+			tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
+		}
 #endif
 	}
 

desktop_version/src/Labclass.cpp

@@ -27,8 +27,8 @@ std::vector<std::string> labclass::loadlevel(int rx, int ry , Game& game, entity
 
 	switch(t)
 	{
-
 #if !defined(MAKEANDPLAY)
+
 	case rn(50,50):
 
 		tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283");
@@ -1859,6 +1859,12 @@ std::vector<std::string> labclass::loadlevel(int rx, int ry , Game& game, entity
 		game.test = true;
 		game.teststring = "ERROR: Map not found in Lab Area";
 		break;
+#else
+	default:
+		for (int j = 0; j < 30; j++)
+		{
+			tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
+		}
 #endif
 	}
 

desktop_version/src/MakeAndPlay.h

@@ -5,6 +5,6 @@
  * It's heaps faster than rebuilding everything, so here we are.
  * -flibit
  */
-// #define MAKEANDPLAY
+#define MAKEANDPLAY
 
 #endif /* MAKEANDPLAY_H */

desktop_version/src/Otherlevel.cpp

@@ -8096,6 +8096,12 @@ std::vector<std::string> otherlevelclass::loadlevel(int rx, int ry , Game& game,
 		tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
 		//obj.fatal_bottom();
 		break;
+#else
+	default:
+		for (int j = 0; j < 30; j++)
+		{
+			tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
+		}
 #endif
 	}
 

desktop_version/src/Spacestation2.cpp

@@ -18,7 +18,7 @@ std::vector<std::string> spacestation2class::loadlevel(int rx, int ry, Game& gam
 
 	switch(t)
 	{
-			#if !defined(MAKEANDPLAY)
+#if !defined(MAKEANDPLAY)
 	case rn(50,50):
 
 		tmap.push_back("492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492");
@@ -3213,7 +3213,13 @@ std::vector<std::string> spacestation2class::loadlevel(int rx, int ry, Game& gam
 		roomname = "Outer Space";
 		obj.fatal_bottom();
 		break;
-					#endif
+#else
+	default:
+		for (int j = 0; j < 30; j++)
+		{
+			tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
+		}
+#endif
 	}
 
 	return tmap;

desktop_version/src/Tower.cpp

@@ -235,6 +235,11 @@ void towerclass::loadminitower1()
 	tmap.push_back("12,12,12,12,12,12,12,12,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,15,18,18,18,18");
 	tmap.push_back("12,12,12,12,12,12,12,12,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,12,12,12,12,12");
 	tmap.push_back("12,12,12,12,12,12,12,12,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,12,12,12,12,12");
+#else
+	for (int j = 0; j < 100; j++)
+	{
+		tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
+	}
 #endif
 
 	fillminitower(tmap);
@@ -344,6 +349,11 @@ void towerclass::loadminitower2()
 	tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,21,28,28,0,0,0,0,0,0,0,0,0,20,12,12,12,12,12");
 	tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,21,28,28,0,0,0,0,0,0,0,0,0,20,12,12,12,12,12");
 	tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,21,28,28,0,0,0,0,0,0,0,0,0,20,12,12,12,12,12");
+#else
+	for (int j = 0; j < 100; j++)
+	{
+		tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
+	}
 #endif
 
 	fillminitower(tmap);
@@ -1194,6 +1204,11 @@ void towerclass::loadmap()
 	tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12");
 	tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12");
 	tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12");
+#else
+	for (int j = 0; j < 700; j++)
+	{
+		tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
+	}
 #endif
 
 	fillcontents(tmap);

desktop_version/src/WarpClass.cpp

@@ -22,7 +22,7 @@ std::vector<std::string> warpclass::loadlevel(int rx, int ry , Game& game, entit
 
 	switch(t)
 	{
-			#if !defined(MAKEANDPLAY)
+#if !defined(MAKEANDPLAY)
 	case rn(50,50):
 
 		tmap.push_back("120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120");
@@ -1026,7 +1026,13 @@ std::vector<std::string> warpclass::loadlevel(int rx, int ry , Game& game, entit
 		game.test = true;
 		game.teststring = "ERROR: Map not found in Warp Area";
 		break;
-					#endif
+#else
+	default:
+		for (int j = 0; j < 30; j++)
+		{
+			tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
+		}
+#endif
 	}
 
 	return tmap;