mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-18 10:38:31 +02:00
Code Issues Releases Wiki Activity

Remove game.test and game.teststring

Browse Source 
It looks like this may have been used earlier in development, judging
from the name, obviously, but right now it seems like it's used as an
error message if a main game level is asked for an invalid room (well,
only two of them - the Lab and Warp Zone). It should probably be
formalized into an error system, if we want to keep teststring, and also
people would never see it anyway because I don't think there's a
reliable and consistent way to trigger loading a non-existent room.

I have seen someone manage to load a non-existent Warp Zone room only
one time, but even then this teststring didn't pop up. So this
teststring doesn't even trigger in the right circumstances.

Also, when it does pop up, as far as I can tell it will stay onscreen,
which is kinda annoying. So I'm just removing this ancient relic from
the code.
This commit is contained in:
Misa 2020-04-02 14:52:14 -07:00 committed by Ethan Lee
parent 9a3a8bf2be
commit ff449a2c3a
7 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop_version/src/Game.cpp
View File

@ -384,8 +384,6 @@ void Game::init(void)
stat_trinkets = 0;
test = false;
teststring = "TEST = True";
state = 1;
statedelay = 0;
//updatestate();

3
desktop_version/src/Game.h
View File

@ -243,8 +243,7 @@ public:
int mx, my;
int screenshake, flashlight;
bool test;
std::string teststring, tempstring;
std::string tempstring;
bool advancetext, pausescript;
int deathseq, lifeseq;

3
desktop_version/src/Labclass.cpp
View File

@ -1855,9 +1855,6 @@ std::vector<std::string> labclass::loadlevel(int rx, int ry)
tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
roomname = "Outer Space";
game.test = true;
game.teststring = "ERROR: Map not found in Lab Area";
break;
#else
default:

3
desktop_version/src/WarpClass.cpp
View File

@ -1022,9 +1022,6 @@ std::vector<std::string> warpclass::loadlevel(int rx, int ry)
tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
//roomname = "Outer Space";
game.test = true;
game.teststring = "ERROR: Map not found in Warp Area";
break;
#else
default:

5
desktop_version/src/editor.cpp
View File

@ -3486,11 +3486,6 @@ void editorrender()
graphics.Print(0,121, ed.note,196-((45-ed.notedelay)*4), 196-((45-ed.notedelay)*4), 196-((45-ed.notedelay)*4), true);
}
if (game.test)
{
graphics.bprint(5, 5, game.teststring, 196, 196, 255 - help.glow, false);
}
graphics.drawfade();
if (game.flashlight > 0 && !game.noflashingmode)

5
desktop_version/src/preloader.cpp
View File

@ -100,11 +100,6 @@ void preloaderrender()
graphics.Print(282-(15*8), 204, "LOADING... 100%", 124, 112, 218, false);
}
if (game.test)
{
graphics.Print(5, 5, game.teststring, 196, 196, 255 - help.glow, false);
}
graphics.drawfade();
if (game.flashlight > 0 && !game.noflashingmode)

35
desktop_version/src/titlerender.cpp
View File

@ -1207,11 +1207,6 @@ void titlerender()
//graphics.Print(5, 228, "Left/Right to Choose, V to Select", tr, tg, tb, true);
}
if (game.test)
{
graphics.Print(5, 5, game.teststring, 196, 196, 255, false);
}
graphics.drawfade();
if (game.flashlight > 0 && !game.noflashingmode)
@ -1385,11 +1380,6 @@ void gamecompleterender()
creditOffset += 140;
if (graphics.onscreen(creditOffset + game.creditposition)) graphics.bigprint( -1, creditOffset + game.creditposition, "Thanks for playing!", tr, tg, tb, true, 2);
if (game.test)
{
graphics.Print(5, 5, game.teststring, 196, 196, 255, false);
}
graphics.drawfade();
if (game.flashlight > 0 && !game.noflashingmode)
@ -1436,11 +1426,6 @@ void gamecompleterender2()
}
}
if (game.test)
{
graphics.Print(5, 5, game.teststring, 196, 196, 255, false);
}
graphics.drawfade();
if (game.flashlight > 0 && !game.noflashingmode)
@ -1845,11 +1830,6 @@ void gamerender()
*/
if (game.test)
{
graphics.Print(5, 5, game.teststring, 196, 196, 255, false);
}
if (game.flashlight > 0 && !game.noflashingmode)
{
game.flashlight--;
@ -2673,11 +2653,6 @@ void maprender()
graphics.drawfade();
if (game.test)
{
graphics.Print(5, 5, game.teststring, 196, 196, 255, false);
}
if (game.flashlight > 0 && !game.noflashingmode)
{
game.flashlight--;
@ -2882,11 +2857,6 @@ void towerrender()
graphics.drawfade();
if (game.test)
{
graphics.Print(5, 5, game.teststring, 196, 196, 255, false);
}
if (game.flashlight > 0 && !game.noflashingmode)
{
game.flashlight--;
@ -3032,11 +3002,6 @@ void teleporterrender()
}
if (game.test)
{
graphics.Print(5, 5, game.teststring, 196, 196, 255, false);
}
if (game.flashlight > 0 && !game.noflashingmode)
{
game.flashlight--;