From ec960b0f956d8675eba0173a6040d417599b58aa Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 6 Jul 2020 12:33:50 -0700 Subject: [PATCH] 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. --- desktop_version/src/Map.cpp | 6 ------ desktop_version/src/Otherlevel.cpp | 12 ------------ desktop_version/src/Otherlevel.h | 5 ----- 3 files changed, 23 deletions(-) diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 545cca9d..9d729450 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -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(otherlevel.roomtext); - } - if (game.roomx >= 102 && game.roomx <= 104 && game.roomy >= 110 && game.roomy <= 111) { hiddenname = "The Ship"; diff --git a/desktop_version/src/Otherlevel.cpp b/desktop_version/src/Otherlevel.cpp index 65395ae0..f94b762f 100644 --- a/desktop_version/src/Otherlevel.cpp +++ b/desktop_version/src/Otherlevel.cpp @@ -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) diff --git a/desktop_version/src/Otherlevel.h b/desktop_version/src/Otherlevel.h index 8fd36322..d8161c89 100644 --- a/desktop_version/src/Otherlevel.h +++ b/desktop_version/src/Otherlevel.h @@ -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; }; #endif /* OTHERLEVEL_H */