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

Remove global args from main game loadlevel() functions

Browse source 
This removes global args from Finalclass.cpp, Labclass.cpp,
Otherlevel.cpp, Spacestation2.cpp, and WarpClass.cpp.
This commit is contained in:
Misa 2020-04-01 15:05:34 -07:00 committed by Ethan Lee
parent cef111d35b
commit d910800423
11 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop_version/src/Finalclass.cpp
View file

@ -2,7 +2,7 @@
#include "MakeAndPlay.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)
{ {
int t; int t;

2
desktop_version/src/Finalclass.h
View file

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

2
desktop_version/src/Labclass.cpp
View file

@ -2,7 +2,7 @@
#include "MakeAndPlay.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)
{ {
int t; int t;

2
desktop_version/src/Labclass.h
View file

@ -10,7 +10,7 @@
class labclass class labclass
{ {
public: public:
std::vector<std::string> loadlevel(int rx, int ry , Game& game, entityclass& obj); std::vector<std::string> loadlevel(int rx, int ry);
std::string roomname; std::string roomname;
int coin, rcol; int coin, rcol;

12
desktop_version/src/Map.cpp
View file

@ -1316,7 +1316,7 @@ void mapclass::loadlevel(int rx, int ry)
case 1: //World Map case 1: //World Map
tileset = 1; tileset = 1;
extrarow = 1; extrarow = 1;
tmap = otherlevel.loadlevel(rx, ry, game, obj); tmap = otherlevel.loadlevel(rx, ry);
fillcontent(tmap); fillcontent(tmap);
roomname = otherlevel.roomname; roomname = otherlevel.roomname;
tileset = otherlevel.roomtileset; tileset = otherlevel.roomtileset;
@ -1329,7 +1329,7 @@ void mapclass::loadlevel(int rx, int ry)
} }
break; break;
case 2: //The Lab case 2: //The Lab
tmap = lablevel.loadlevel(rx, ry, game, obj); tmap = lablevel.loadlevel(rx, ry);
fillcontent(tmap); fillcontent(tmap);
roomname = lablevel.roomname; roomname = lablevel.roomname;
tileset = 1; tileset = 1;
@ -1375,7 +1375,7 @@ void mapclass::loadlevel(int rx, int ry)
obj.createentity(280, 3216, 9, 8); // (shiny trinket) obj.createentity(280, 3216, 9, 8); // (shiny trinket)
break; break;
case 4: //The Warpzone case 4: //The Warpzone
tmap = warplevel.loadlevel(rx, ry, game, obj); tmap = warplevel.loadlevel(rx, ry);
fillcontent(tmap); fillcontent(tmap);
roomname = warplevel.roomname; roomname = warplevel.roomname;
tileset = 1; tileset = 1;
@ -1391,13 +1391,13 @@ void mapclass::loadlevel(int rx, int ry)
if (warpx && warpy) background = 5; if (warpx && warpy) background = 5;
break; break;
case 5: //Space station case 5: //Space station
tmap = spacestation2.loadlevel(rx, ry, game, obj); tmap = spacestation2.loadlevel(rx, ry);
fillcontent(tmap); fillcontent(tmap);
roomname = spacestation2.roomname; roomname = spacestation2.roomname;
tileset = 0; tileset = 0;
break; break;
case 6: //final level case 6: //final level
tmap = finallevel.loadlevel(finalx, finaly, game, obj); tmap = finallevel.loadlevel(finalx, finaly);
fillcontent(tmap); fillcontent(tmap);
roomname = finallevel.roomname; roomname = finallevel.roomname;
tileset = 1; tileset = 1;
@ -1550,7 +1550,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, game, obj); tmap = finallevel.loadlevel(rx, ry);
fillcontent(tmap); fillcontent(tmap);
roomname = finallevel.roomname; roomname = finallevel.roomname;
tileset = 2; tileset = 2;

2
desktop_version/src/Otherlevel.cpp
View file

@ -11,7 +11,7 @@ void otherlevelclass::addline(std::string t)
roomtext.push_back(text); roomtext.push_back(text);
} }
std::vector<std::string> otherlevelclass::loadlevel(int rx, int ry , Game& game, entityclass& obj) std::vector<std::string> otherlevelclass::loadlevel(int rx, int ry)
{ {
int t; int t;
roomtileset = 1; roomtileset = 1;

2
desktop_version/src/Otherlevel.h
View file

@ -27,7 +27,7 @@ public:
}; };
void addline(std::string t); void addline(std::string t);
std::vector<std::string> loadlevel(int rx, int ry , Game& game, entityclass& obj); std::vector<std::string> loadlevel(int rx, int ry);
std::string roomname; std::string roomname;

2
desktop_version/src/Spacestation2.cpp
View file

@ -2,7 +2,7 @@
#include "MakeAndPlay.h" #include "MakeAndPlay.h"
std::vector<std::string> spacestation2class::loadlevel(int rx, int ry, Game& game, entityclass& obj) std::vector<std::string> spacestation2class::loadlevel(int rx, int ry)
{ {
int t; int t;
rx -= 100; rx -= 100;

2
desktop_version/src/Spacestation2.h
View file

@ -10,7 +10,7 @@
class spacestation2class class spacestation2class
{ {
public: public:
std::vector<std::string> loadlevel(int rx, int ry, Game& game, entityclass& obj); std::vector<std::string> loadlevel(int rx, int ry);
std::string roomname; std::string roomname;
}; };

2
desktop_version/src/WarpClass.cpp
View file

@ -2,7 +2,7 @@
#include "MakeAndPlay.h" #include "MakeAndPlay.h"
std::vector<std::string> warpclass::loadlevel(int rx, int ry , Game& game, entityclass& obj) std::vector<std::string> warpclass::loadlevel(int rx, int ry)
{ {
int t; int t;

2
desktop_version/src/WarpClass.h
View file

@ -10,7 +10,7 @@
class warpclass class warpclass
{ {
public: public:
std::vector<std::string> loadlevel(int rx, int ry , Game& game, entityclass& obj); std::vector<std::string> loadlevel(int rx, int ry);
std::string roomname; std::string roomname;
int coin, rcol; int coin, rcol;
bool warpx, warpy; bool warpx, warpy;