Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 01:48:15 +03:00
Code Issues Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop_version/src/Map.cpp
View File

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