From 7f3d16801ca8004684828271417535d341813aad Mon Sep 17 00:00:00 2001
From: Info Teddy <infoteddyatgitgud@cock.li>
Date: Sun, 26 Jan 2020 08:37:12 -0800
Subject: [PATCH] Remove from M&P the room data of Final
 Level/Lab/Overworld/Tower

This is to make sure that the room data of those areas are not
distributed with the M&P binary, even if they are already inaccessible
because of other M&P ifdefs (I tested).
---
 desktop_version/src/Finalclass.cpp | 4 ++++
 desktop_version/src/Labclass.cpp   | 4 ++++
 desktop_version/src/Otherlevel.cpp | 4 ++++
 desktop_version/src/Tower.cpp      | 8 ++++++++
 4 files changed, 20 insertions(+)

diff --git a/desktop_version/src/Finalclass.cpp b/desktop_version/src/Finalclass.cpp
index 2d5aad62..b38a8603 100644
--- a/desktop_version/src/Finalclass.cpp
+++ b/desktop_version/src/Finalclass.cpp
@@ -1,5 +1,7 @@
 #include "Finalclass.h"
 
+#include "MakeAndPlay.h"
+
 std::vector<std::string> finalclass::loadlevel(int rx, int ry, Game& game, entityclass& obj)
 {
 	int t;
@@ -15,6 +17,7 @@ std::vector<std::string> finalclass::loadlevel(int rx, int ry, Game& game, entit
 
 	switch(t)
 	{
+#if !defined(MAKEANDPLAY)
 	case rn(50,52):
 
 		tmap.push_back("98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,98,98,98");
@@ -2311,6 +2314,7 @@ 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;
+#endif
 	}
 
 	return tmap;
diff --git a/desktop_version/src/Labclass.cpp b/desktop_version/src/Labclass.cpp
index cac194df..88fe6e6f 100644
--- a/desktop_version/src/Labclass.cpp
+++ b/desktop_version/src/Labclass.cpp
@@ -1,5 +1,7 @@
 #include "Labclass.h"
 
+#include "MakeAndPlay.h"
+
 std::vector<std::string> labclass::loadlevel(int rx, int ry , Game& game, entityclass& obj)
 {
 	int t;
@@ -26,6 +28,7 @@ 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");
@@ -1856,6 +1859,7 @@ 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;
+#endif
 	}
 
 	return tmap;
diff --git a/desktop_version/src/Otherlevel.cpp b/desktop_version/src/Otherlevel.cpp
index 9188f6bc..ef52d66a 100644
--- a/desktop_version/src/Otherlevel.cpp
+++ b/desktop_version/src/Otherlevel.cpp
@@ -1,5 +1,7 @@
 #include "Otherlevel.h"
 
+#include "MakeAndPlay.h"
+
 otherlevelclass::otherlevelclass()
 {
 	for (i = 0; i < 50; i++)
@@ -32,6 +34,7 @@ std::vector<std::string> otherlevelclass::loadlevel(int rx, int ry , Game& game,
 
 	switch(t)
 	{
+#if !defined(MAKEANDPLAY)
 	case rn(0,0):
 
 		tmap.push_back("201,201,201,201,200,80,80,202,200,80,80,80,80,80,80,80,80,80,80,80,80,80,202,200,80,202,201,201,201,201,200,80,202,606,486,486,486,486,486,486");
@@ -8093,6 +8096,7 @@ 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;
+#endif
 	}
 
 	return tmap;
diff --git a/desktop_version/src/Tower.cpp b/desktop_version/src/Tower.cpp
index fd5f7240..cf6df121 100644
--- a/desktop_version/src/Tower.cpp
+++ b/desktop_version/src/Tower.cpp
@@ -1,5 +1,7 @@
 #include "Tower.h"
 
+#include "MakeAndPlay.h"
+
 #include "UtilityClass.h"
 
 towerclass::towerclass()
@@ -132,6 +134,7 @@ void towerclass::loadminitower1()
 {
 	std::vector<std::string> tmap;
 	//Loads the first minitower into the array.
+#if !defined(MAKEANDPLAY)
 	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");
@@ -232,6 +235,7 @@ 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");
+#endif
 
 	fillminitower(tmap);
 }
@@ -239,6 +243,7 @@ void towerclass::loadminitower1()
 void towerclass::loadminitower2()
 {
 	std::vector<std::string> tmap;
+#if !defined(MAKEANDPLAY)
 	tmap.push_back("12,12,21,10,0,0,0,0,0,0,0,0,0,0,0,0,11,20,21,10,0,20,21,28,28,20,21,28,28,20,12,12,12,12,12,12,12,12,12,12");
 	tmap.push_back("12,12,21,10,0,0,0,0,0,0,0,0,0,0,0,0,11,20,21,10,0,20,21,28,28,20,21,28,28,20,12,12,12,12,12,12,12,12,12,12");
 	tmap.push_back("12,12,21,10,0,0,0,0,0,0,0,0,0,0,0,0,11,20,21,10,0,20,21,28,28,20,21,28,28,20,12,12,12,12,12,12,12,12,12,12");
@@ -339,6 +344,7 @@ 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");
+#endif
 
 	fillminitower(tmap);
 }
@@ -487,6 +493,7 @@ void towerclass::loadmap()
 {
 	std::vector<std::string> tmap;
 	//Loads the map into the array.
+#if !defined(MAKEANDPLAY)
 	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");
@@ -1187,6 +1194,7 @@ 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");
+#endif
 
 	fillcontents(tmap);
 }