1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00

Refactor Finalclass.cpp to not use strings for tilemaps

Instead, they're all stored in a constant int array.

I made sure The Gravitron still has 30 rows just like Outer Space,
though I don't think it matters.
This commit is contained in:
Misa 2020-05-17 14:42:38 -07:00 committed by Ethan Lee
parent 5126c4dbc4
commit 781aa38e1f
3 changed files with 1848 additions and 1612 deletions

File diff suppressed because it is too large Load diff

View file

@ -10,7 +10,7 @@
class finalclass class finalclass
{ {
public: public:
std::vector<std::string> loadlevel(int rx, int ry); std::vector<int> loadlevel(int rx, int ry);
std::string roomname; std::string roomname;
int coin, rcol; int coin, rcol;

View file

@ -1385,8 +1385,7 @@ void mapclass::loadlevel(int rx, int ry)
tileset = 0; tileset = 0;
break; break;
case 6: //final level case 6: //final level
tmap = finallevel.loadlevel(finalx, finaly); contents = finallevel.loadlevel(finalx, finaly);
fillcontent(tmap);
roomname = finallevel.roomname; roomname = finallevel.roomname;
tileset = 1; tileset = 1;
background = 3; background = 3;
@ -1538,8 +1537,7 @@ void mapclass::loadlevel(int rx, int ry)
break; break;
case 11: //Tower Hallways //Content is held in final level routine case 11: //Tower Hallways //Content is held in final level routine
{ {
tmap = finallevel.loadlevel(rx, ry); contents = finallevel.loadlevel(rx, ry);
fillcontent(tmap);
roomname = finallevel.roomname; roomname = finallevel.roomname;
tileset = 2; tileset = 2;
if (rx == 108) if (rx == 108)