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

Initialize level data with 0s in M&P

Browse source 
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.
This commit is contained in:
Info Teddy 2020-02-08 11:32:32 -08:00 committed by Ethan Lee
parent dd7170dc59
commit 9642921a64
7 changed files with 51 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop_version/src/Finalclass.cpp
View file

@ -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
}

8
desktop_version/src/Labclass.cpp
View file

@ -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
}

2
desktop_version/src/MakeAndPlay.h
View file

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

6
desktop_version/src/Otherlevel.cpp
View file

@ -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
}

6
desktop_version/src/Spacestation2.cpp
View file

@ -3213,6 +3213,12 @@ std::vector<std::string> spacestation2class::loadlevel(int rx, int ry, Game& gam
roomname = "Outer Space";
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
}

15
desktop_version/src/Tower.cpp
View file

@ -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);

6
desktop_version/src/WarpClass.cpp
View file

@ -1026,6 +1026,12 @@ 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;
#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
}