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

Remove remnants of screen recording stuff

Browse Source 
Most of the code was already commented out, and those comments were
removed in earlier commits, but this removes all recording variables
from Game and simplifies the game-gamestate handling in main.cpp a
little bit.
This commit is contained in:
Misa 2020-04-02 19:26:16 -07:00 committed by Ethan Lee
parent fd21fbb341
commit 134510d26a
3 changed files with 20 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desktop_version/src/Game.cpp
View File

@ -148,11 +148,6 @@ void Game::init(void)
press_left = 0;
recording = 0;
recordinit = false;
playbackfinished = false;
recordstring = "";
advancetext = false;
pausescript = false;
completestop = false;

16
desktop_version/src/Game.h
View File

@ -284,22 +284,6 @@ public:
int stretchMode;
int controllerSensitivity;
//Screenrecording stuff, for beta/trailer
int recording;
std::string recordstring;
bool combomode;
int combolen;
std::string comboaction;
std::string currentaction;
bool recordinit;
std::vector<int> playback;
int playbackpos;
int playbacksize;
int playmove;
int playcombo;
bool playbackfinished;
bool menukludge;
bool quickrestartkludge;

58
desktop_version/src/main.cpp
View File

@ -348,8 +348,27 @@ int main(int argc, char *argv[])
else
{
if (game.recording == 1)
if (script.running)
{
script.run();
}
gameinput();
gamerender();
gamelogic();
break;
case MAPMODE:
maprender();
mapinput();
maplogic();
break;
case TELEPORTERMODE:
teleporterrender();
if(game.useteleporter)
{
teleporterinput();
}
else
{
@ -357,44 +376,7 @@ int main(int argc, char *argv[])
{
script.run();
}
gameinput();
gamerender();
gamelogic();
}
break;
case MAPMODE:
maprender();
if (game.recording == 1)
{
}
else
{
mapinput();
}
maplogic();
break;
case TELEPORTERMODE:
teleporterrender();
if (game.recording == 1)
{
}
else
{
if(game.useteleporter)
{
teleporterinput();
}
else
{
if (script.running)
{
script.run();
}
gameinput();
}
}
maplogic();
break;