mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Remove from M&P the room data of Final Level/Lab/Overworld/Tower

Browse source 
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).
This commit is contained in:
Info Teddy 2020-01-26 08:37:12 -08:00 committed by Ethan Lee
parent 3697487f47
commit 7f3d16801c
4 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop_version/src/Finalclass.cpp
View file

@ -1,5 +1,7 @@
#include "Finalclass.h" #include "Finalclass.h"
#include "MakeAndPlay.h"
std::vector<std::string> finalclass::loadlevel(int rx, int ry, Game& game, entityclass& obj) std::vector<std::string> finalclass::loadlevel(int rx, int ry, Game& game, entityclass& obj)
{ {
int t; int t;
@ -15,6 +17,7 @@ std::vector<std::string> finalclass::loadlevel(int rx, int ry, Game& game, entit
switch(t) switch(t)
{ {
#if !defined(MAKEANDPLAY)
case rn(50,52): 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"); 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.test = true;
//game.teststring = "ERROR: Map not found in Final Area"; //game.teststring = "ERROR: Map not found in Final Area";
break; break;
#endif
} }
return tmap; return tmap;

4
desktop_version/src/Labclass.cpp
View file

@ -1,5 +1,7 @@
#include "Labclass.h" #include "Labclass.h"
#include "MakeAndPlay.h"
std::vector<std::string> labclass::loadlevel(int rx, int ry , Game& game, entityclass& obj) std::vector<std::string> labclass::loadlevel(int rx, int ry , Game& game, entityclass& obj)
{ {
int t; int t;
@ -26,6 +28,7 @@ std::vector<std::string> labclass::loadlevel(int rx, int ry , Game& game, entity
switch(t) switch(t)
{ {
#if !defined(MAKEANDPLAY)
case rn(50,50): 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"); 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.test = true;
game.teststring = "ERROR: Map not found in Lab Area"; game.teststring = "ERROR: Map not found in Lab Area";
break; break;
#endif
} }
return tmap; return tmap;

4
desktop_version/src/Otherlevel.cpp
View file

@ -1,5 +1,7 @@
#include "Otherlevel.h" #include "Otherlevel.h"
#include "MakeAndPlay.h"
otherlevelclass::otherlevelclass() otherlevelclass::otherlevelclass()
{ {
for (i = 0; i < 50; i++) for (i = 0; i < 50; i++)
@ -32,6 +34,7 @@ std::vector<std::string> otherlevelclass::loadlevel(int rx, int ry , Game& game,
switch(t) switch(t)
{ {
#if !defined(MAKEANDPLAY)
case rn(0,0): 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"); 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"); 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(); //obj.fatal_bottom();
break; break;
#endif
} }
return tmap; return tmap;

8
desktop_version/src/Tower.cpp
View file

@ -1,5 +1,7 @@
#include "Tower.h" #include "Tower.h"
#include "MakeAndPlay.h"
#include "UtilityClass.h" #include "UtilityClass.h"
towerclass::towerclass() towerclass::towerclass()
@ -132,6 +134,7 @@ void towerclass::loadminitower1()
{ {
std::vector<std::string> tmap; std::vector<std::string> tmap;
//Loads the first minitower into the array. //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"); 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,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");
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); fillminitower(tmap);
} }
@ -239,6 +243,7 @@ void towerclass::loadminitower1()
void towerclass::loadminitower2() void towerclass::loadminitower2()
{ {
std::vector<std::string> tmap; 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"); 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"); 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); fillminitower(tmap);
} }
@ -487,6 +493,7 @@ void towerclass::loadmap()
{ {
std::vector<std::string> tmap; std::vector<std::string> tmap;
//Loads the map into the array. //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"); 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"); 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); fillcontents(tmap);
} }