mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-01-29 17:38:16 +03:00
Remove roomtext from otherlevelclass
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:
@@ -1315,12 +1315,6 @@ void mapclass::loadlevel(int rx, int ry)
|
||||
tileset = otherlevel.roomtileset;
|
||||
//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)
|
||||
{
|
||||
hiddenname = "The Ship";
|
||||
|
||||
@@ -2,15 +2,6 @@
|
||||
|
||||
#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)
|
||||
{
|
||||
int t;
|
||||
@@ -22,9 +13,6 @@ const int* otherlevelclass::loadlevel(int rx, int ry)
|
||||
const int* result;
|
||||
roomname = "";
|
||||
|
||||
roomtext.clear();
|
||||
roomtexton = false;
|
||||
|
||||
switch(t)
|
||||
{
|
||||
#if !defined(MAKEANDPLAY)
|
||||
|
||||
@@ -26,16 +26,11 @@ public:
|
||||
ACTIVITY
|
||||
};
|
||||
|
||||
void addline(std::string t);
|
||||
const int* loadlevel(int rx, int ry);
|
||||
|
||||
std::string roomname;
|
||||
|
||||
int roomtileset;
|
||||
|
||||
// roomtext thing in other level
|
||||
bool roomtexton;
|
||||
std::vector<Roomtext> roomtext;
|
||||
};
|
||||
|
||||
#endif /* OTHERLEVEL_H */
|
||||
|
||||
Reference in New Issue
Block a user