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

Update editor_disabled more often, remove -enable-editor

Browse source
This commit is contained in:
AllyTally 2023-08-24 22:15:04 -03:00 committed by Misa Elizabeth Kai
parent 3ca28a5944
commit 03ee60aea6
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
desktop_version/src/Game.cpp
View file

@ -7282,6 +7282,7 @@ void Game::quittomenu(void)
else
{
//Returning from editor
editor_disabled = !BUTTONGLYPHS_keyboard_is_available();
returntomenu(Menu::playerworlds);
}
}

3
desktop_version/src/Input.cpp
View file

@ -1,6 +1,7 @@
#include <tinyxml2.h>
#include <vector>
#include "ButtonGlyphs.h"
#include "Credits.h"
#include "CustomLevels.h"
#include "Editor.h"
@ -426,6 +427,7 @@ static void menuactionpress(void)
case 1:
//Bring you to the normal playmenu
music.playef(Sound_VIRIDIAN);
game.editor_disabled = !BUTTONGLYPHS_keyboard_is_available();
game.createmenu(Menu::playerworlds);
map.nexttowercolour();
break;
@ -614,6 +616,7 @@ static void menuactionpress(void)
}
case Menu::showlevelspath:
music.playef(Sound_VIRIDIAN);
game.editor_disabled = !BUTTONGLYPHS_keyboard_is_available();
game.returntomenu(Menu::playerworlds);
map.nexttowercolour();
break;

6
desktop_version/src/main.cpp
View file

@ -368,7 +368,6 @@ int main(int argc, char *argv[])
char* langDir = NULL;
char* fontsDir = NULL;
bool seed_use_sdl_getticks = false;
bool editor_disabled = !BUTTONGLYPHS_keyboard_is_available();
#ifdef _WIN32
bool open_console = false;
#endif
@ -532,10 +531,6 @@ int main(int argc, char *argv[])
{
seed_use_sdl_getticks = true;
}
else if (ARG("-enable-editor"))
{
editor_disabled = false;
}
#undef ARG_INNER
#undef ARG
else
@ -609,7 +604,6 @@ int main(int argc, char *argv[])
game.init();
game.seed_use_sdl_getticks = seed_use_sdl_getticks;
game.editor_disabled = editor_disabled;
game.gamestate = PRELOADER;