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

Remove roomtext from otherlevelclass

Browse source 
Since it's unused, it's better to just delete it because there's no way
to test it to see if it's buggy or not.
This commit is contained in:
Misa 2020-07-06 12:33:50 -07:00 committed by Ethan Lee
parent a698d3a6f8
commit ec960b0f95
3 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop_version/src/Map.cpp
View file

@ -1315,12 +1315,6 @@ void mapclass::loadlevel(int rx, int ry)
tileset = otherlevel.roomtileset; tileset = otherlevel.roomtileset;
//do the appear/remove roomname here //do the appear/remove roomname here
if (otherlevel.roomtexton)
{
roomtexton = true;
roomtext = std::vector<Roomtext>(otherlevel.roomtext);
}
if (game.roomx >= 102 && game.roomx <= 104 && game.roomy >= 110 && game.roomy <= 111) if (game.roomx >= 102 && game.roomx <= 104 && game.roomy >= 110 && game.roomy <= 111)
{ {
hiddenname = "The Ship"; hiddenname = "The Ship";

12
desktop_version/src/Otherlevel.cpp
View file

@ -2,15 +2,6 @@
#include "MakeAndPlay.h" #include "MakeAndPlay.h"
void otherlevelclass::addline(std::string t)
{
Roomtext text;
text.x = 0;
text.y = 0;
text.text = t;
roomtext.push_back(text);
}
const int* otherlevelclass::loadlevel(int rx, int ry) const int* otherlevelclass::loadlevel(int rx, int ry)
{ {
int t; int t;
@ -22,9 +13,6 @@ const int* otherlevelclass::loadlevel(int rx, int ry)
const int* result; const int* result;
roomname = ""; roomname = "";
roomtext.clear();
roomtexton = false;
switch(t) switch(t)
{ {
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)

5
desktop_version/src/Otherlevel.h
View file

@ -26,16 +26,11 @@ public:
ACTIVITY ACTIVITY
}; };
void addline(std::string t);
const int* loadlevel(int rx, int ry); const int* loadlevel(int rx, int ry);
std::string roomname; std::string roomname;
int roomtileset; int roomtileset;
// roomtext thing in other level
bool roomtexton;
std::vector<Roomtext> roomtext;
}; };
#endif /* OTHERLEVEL_H */ #endif /* OTHERLEVEL_H */