mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-28 23:48:30 +02: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 else
{ {
//Returning from editor //Returning from editor
editor_disabled = !BUTTONGLYPHS_keyboard_is_available();
returntomenu(Menu::playerworlds); returntomenu(Menu::playerworlds);
} }
} }

3
desktop_version/src/Input.cpp
View File

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

6
desktop_version/src/main.cpp
View File

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