1
0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-28 15:38:30 +02:00
VVVVVV/desktop_version/src
Misa 15b085b326 Fix duplicating ed_settings when opening editor menu second time
This fixes a bug where after loading in to the level editor, pressing
Esc and then switching your option to something other than the first
option, then pressing Esc again to close the menu, then pressing Esc
once more would not keep your menu option.

This is because the code that checks if Menu::ed_settings is already in
the stack doesn't account for if ed_settings is the current menu - the
current menu doesn't get put in to the stack.

In hindsight, maybe I could have designed the new menu system better so
the current menu IS on the stack, and/or should have used a
statically-allocated linked list for each menu name for the stack frames
(instead of an std::vector) and asserted if a menu that already existed
in the stack was created instead... that'll have to be done later,
though.
2021-04-18 13:13:04 -04:00
..
BinaryBlob.cpp Abstract binary blob loading to FileSystemUtils 2021-04-13 10:02:40 -04:00
BinaryBlob.h Abstract binary blob loading to FileSystemUtils 2021-04-13 10:02:40 -04:00
BlockV.cpp Remove unused x and y attributes of blockclass 2021-02-27 18:27:28 -05:00
BlockV.h Remove unused x and y attributes of blockclass 2021-02-27 18:27:28 -05:00
Credits.h Remove extra semicolon from end of Credits namespace 2021-04-17 00:50:04 -04:00
DeferCallbacks.c Add deferred callbacks to game loop 2021-03-21 02:55:42 -04:00
DeferCallbacks.h Add deferred callbacks to game loop 2021-03-21 02:55:42 -04:00
editor.cpp Fix duplicating ed_settings when opening editor menu second time 2021-04-18 13:13:04 -04:00
editor.h Refactor room properties to use setter and getter funcs 2021-03-24 15:55:34 -04:00
Ent.cpp Split onground/onroof into visual and logical variables 2021-03-21 02:55:42 -04:00
Ent.h Split onground/onroof into visual and logical variables 2021-03-21 02:55:42 -04:00
Entity.cpp Rename vx/vy createentity args to meta1/meta2 2021-04-17 18:29:17 -04:00
Entity.h Rename vx/vy createentity args to meta1/meta2 2021-04-17 18:29:17 -04:00
Enums.h Hello WWWWWWorld! 2020-01-08 10:37:50 -05:00
Exit.h Add VVV_exit() 2021-02-15 23:07:35 -05:00
FileSystemUtils.cpp Fix music files not using virtual mount path 2021-04-13 10:02:40 -04:00
FileSystemUtils.h Abstract binary blob loading to FileSystemUtils 2021-04-13 10:02:40 -04:00
Finalclass.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Finalclass.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Game.cpp Remove customlevelstatsloaded from Game 2021-04-17 09:53:17 -04:00
Game.h Remove customlevelstatsloaded from Game 2021-04-17 09:53:17 -04:00
GOGNetwork.c Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Graphics.cpp Axe mouse cursor config option 2021-04-16 22:00:33 -07:00
Graphics.h Axe mouse cursor config option 2021-04-16 22:00:33 -07:00
GraphicsResources.cpp Replace asset load calls with loadAssetToMemory() 2021-04-05 16:39:37 -04:00
GraphicsResources.h Consistently use angle brackets for SDL.h includes 2020-07-19 21:37:40 -04:00
GraphicsUtil.cpp Use SDL_floor() instead of libc floor() 2021-03-06 16:01:29 -05:00
GraphicsUtil.h Add ClearSurface() 2021-02-25 19:38:25 -05:00
Input.cpp Consistently play Viridian squeak for pause menu inputs 2021-04-18 06:52:58 -04:00
Input.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
KeyPoll.cpp Show and hide mouse cursor based on user input 2021-04-16 22:58:45 -07:00
KeyPoll.h Only do focus fullscreen toggling on X11. 2021-04-05 11:07:32 -04:00
Labclass.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Labclass.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Logic.cpp Add bounds check to use of edteleportent 2021-04-14 07:15:14 -04:00
Logic.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
main.cpp Don't process music, fades, or timer when unfocused 2021-04-13 17:51:24 -04:00
MakeAndPlay.h Use multiline comments in C files 2021-04-17 00:50:04 -04:00
Map.cpp Add bounds checks to room explored getter and setter 2021-03-24 15:55:34 -04:00
Map.h Make map.[old]ypos ints instead of floats 2021-04-17 09:52:30 -04:00
Maths.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Music.cpp Fix playing same track after it has faded out 2021-04-14 13:02:00 -04:00
Music.h Implement music and sound volume sliders 2021-04-11 20:56:16 -04:00
Network.c Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Network.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Otherlevel.cpp Bounds check all entity getters that can return 0 2020-09-25 13:51:47 -04:00
Otherlevel.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
preloader.cpp Change all surface-clearing FillRect()s to use ClearSurface() 2021-02-25 19:38:25 -05:00
preloader.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Render.cpp Axe mouse cursor config option 2021-04-16 22:00:33 -07:00
Render.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
RenderFixed.cpp Remove game.gametimer in favor of game.frames 2021-03-21 20:53:11 -04:00
RenderFixed.h Remove now-unneeded deltaframe fix when going to in-game settings 2021-03-21 02:55:42 -04:00
Screen.cpp Replace asset load calls with loadAssetToMemory() 2021-04-05 16:39:37 -04:00
Screen.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
ScreenSettings.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Script.cpp Revert part of "Fix music stopping when restarting time trial" 2021-04-14 13:02:00 -04:00
Script.h Remove script.dontrunnextframe kludge 2021-03-21 02:55:42 -04:00
Scripts.cpp Don't restart music in trinket cutscenes 2021-04-12 16:17:31 -04:00
SoundSystem.cpp Replace asset load calls with loadAssetToMemory() 2021-04-05 16:39:37 -04:00
SoundSystem.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Spacestation2.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Spacestation2.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
SteamNetwork.c Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
TerminalScripts.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Textbox.cpp Add flipme attribute to textboxclass 2021-03-21 02:53:25 -04:00
Textbox.h Add flipme attribute to textboxclass 2021-03-21 02:53:25 -04:00
ThirdPartyDeps.c Use multiline comments in C files 2021-04-17 00:50:04 -04:00
Tower.cpp Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
Tower.h Explicitly declare void for all void parameter functions (#628) 2021-02-25 17:23:59 -05:00
TowerBG.h Move mapclass r/g/b variables off onto TowerBG 2021-01-07 21:15:34 -05:00
UtilityClass.cpp Add VVV_fillstring() 2021-04-11 20:56:16 -04:00
UtilityClass.h Add VVV_fillstring() 2021-04-11 20:56:16 -04:00
Version.h Don't recompile all files when the commit hash is changed 2020-12-25 20:17:01 -05:00
Version.h.in Don't recompile all files when the commit hash is changed 2020-12-25 20:17:01 -05:00
WarpClass.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
WarpClass.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
XMLUtils.cpp Move all settings to settings.vvv 2020-11-04 12:06:57 -05:00
XMLUtils.h Move all settings to settings.vvv 2020-11-04 12:06:57 -05:00