From d910800423b34199e6beb85223747caced4cd58d Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 1 Apr 2020 15:05:34 -0700 Subject: [PATCH] Remove global args from main game loadlevel() functions This removes global args from Finalclass.cpp, Labclass.cpp, Otherlevel.cpp, Spacestation2.cpp, and WarpClass.cpp. --- desktop_version/src/Finalclass.cpp | 2 +- desktop_version/src/Finalclass.h | 2 +- desktop_version/src/Labclass.cpp | 2 +- desktop_version/src/Labclass.h | 2 +- desktop_version/src/Map.cpp | 12 ++++++------ desktop_version/src/Otherlevel.cpp | 2 +- desktop_version/src/Otherlevel.h | 2 +- desktop_version/src/Spacestation2.cpp | 2 +- desktop_version/src/Spacestation2.h | 2 +- desktop_version/src/WarpClass.cpp | 2 +- desktop_version/src/WarpClass.h | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/desktop_version/src/Finalclass.cpp b/desktop_version/src/Finalclass.cpp index 054c772a..bfb9c424 100644 --- a/desktop_version/src/Finalclass.cpp +++ b/desktop_version/src/Finalclass.cpp @@ -2,7 +2,7 @@ #include "MakeAndPlay.h" -std::vector finalclass::loadlevel(int rx, int ry, Game& game, entityclass& obj) +std::vector finalclass::loadlevel(int rx, int ry) { int t; diff --git a/desktop_version/src/Finalclass.h b/desktop_version/src/Finalclass.h index f498e345..1e32196a 100644 --- a/desktop_version/src/Finalclass.h +++ b/desktop_version/src/Finalclass.h @@ -10,7 +10,7 @@ class finalclass { public: - std::vector loadlevel(int rx, int ry, Game& game, entityclass& obj); + std::vector loadlevel(int rx, int ry); std::string roomname; int coin, rcol; diff --git a/desktop_version/src/Labclass.cpp b/desktop_version/src/Labclass.cpp index 31c6fc54..f96a0ac7 100644 --- a/desktop_version/src/Labclass.cpp +++ b/desktop_version/src/Labclass.cpp @@ -2,7 +2,7 @@ #include "MakeAndPlay.h" -std::vector labclass::loadlevel(int rx, int ry , Game& game, entityclass& obj) +std::vector labclass::loadlevel(int rx, int ry) { int t; diff --git a/desktop_version/src/Labclass.h b/desktop_version/src/Labclass.h index faeaf1a5..2717f1f0 100644 --- a/desktop_version/src/Labclass.h +++ b/desktop_version/src/Labclass.h @@ -10,7 +10,7 @@ class labclass { public: - std::vector loadlevel(int rx, int ry , Game& game, entityclass& obj); + std::vector loadlevel(int rx, int ry); std::string roomname; int coin, rcol; diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 0043680c..ad13c4a3 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -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; diff --git a/desktop_version/src/Otherlevel.cpp b/desktop_version/src/Otherlevel.cpp index be1ce9c5..561df9f1 100644 --- a/desktop_version/src/Otherlevel.cpp +++ b/desktop_version/src/Otherlevel.cpp @@ -11,7 +11,7 @@ void otherlevelclass::addline(std::string t) roomtext.push_back(text); } -std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, entityclass& obj) +std::vector otherlevelclass::loadlevel(int rx, int ry) { int t; roomtileset = 1; diff --git a/desktop_version/src/Otherlevel.h b/desktop_version/src/Otherlevel.h index c834734c..5611fc19 100644 --- a/desktop_version/src/Otherlevel.h +++ b/desktop_version/src/Otherlevel.h @@ -27,7 +27,7 @@ public: }; void addline(std::string t); - std::vector loadlevel(int rx, int ry , Game& game, entityclass& obj); + std::vector loadlevel(int rx, int ry); std::string roomname; diff --git a/desktop_version/src/Spacestation2.cpp b/desktop_version/src/Spacestation2.cpp index 478863c5..275fa5ee 100644 --- a/desktop_version/src/Spacestation2.cpp +++ b/desktop_version/src/Spacestation2.cpp @@ -2,7 +2,7 @@ #include "MakeAndPlay.h" -std::vector spacestation2class::loadlevel(int rx, int ry, Game& game, entityclass& obj) +std::vector spacestation2class::loadlevel(int rx, int ry) { int t; rx -= 100; diff --git a/desktop_version/src/Spacestation2.h b/desktop_version/src/Spacestation2.h index a4498a7c..ba457c1a 100644 --- a/desktop_version/src/Spacestation2.h +++ b/desktop_version/src/Spacestation2.h @@ -10,7 +10,7 @@ class spacestation2class { public: - std::vector loadlevel(int rx, int ry, Game& game, entityclass& obj); + std::vector loadlevel(int rx, int ry); std::string roomname; }; diff --git a/desktop_version/src/WarpClass.cpp b/desktop_version/src/WarpClass.cpp index 220f23b8..8bc8b9d6 100644 --- a/desktop_version/src/WarpClass.cpp +++ b/desktop_version/src/WarpClass.cpp @@ -2,7 +2,7 @@ #include "MakeAndPlay.h" -std::vector warpclass::loadlevel(int rx, int ry , Game& game, entityclass& obj) +std::vector warpclass::loadlevel(int rx, int ry) { int t; diff --git a/desktop_version/src/WarpClass.h b/desktop_version/src/WarpClass.h index 8ae5d71d..853d7032 100644 --- a/desktop_version/src/WarpClass.h +++ b/desktop_version/src/WarpClass.h @@ -10,7 +10,7 @@ class warpclass { public: - std::vector loadlevel(int rx, int ry , Game& game, entityclass& obj); + std::vector loadlevel(int rx, int ry); std::string roomname; int coin, rcol; bool warpx, warpy;