diff options
author | aap <aap@papnet.eu> | 2020-05-01 17:31:29 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-05-01 17:31:29 +0200 |
commit | 59bfbaddfb7a53995043710e729e3f062bab0e39 (patch) | |
tree | 5ba99020e9afdea8a635138e8c7cc4d7f3cc7376 | |
parent | update librw (diff) | |
download | re3-59bfbaddfb7a53995043710e729e3f062bab0e39.tar re3-59bfbaddfb7a53995043710e729e3f062bab0e39.tar.gz re3-59bfbaddfb7a53995043710e729e3f062bab0e39.tar.bz2 re3-59bfbaddfb7a53995043710e729e3f062bab0e39.tar.lz re3-59bfbaddfb7a53995043710e729e3f062bab0e39.tar.xz re3-59bfbaddfb7a53995043710e729e3f062bab0e39.tar.zst re3-59bfbaddfb7a53995043710e729e3f062bab0e39.zip |
Diffstat (limited to '')
-rw-r--r-- | src/extras/debugmenu.cpp | 23 | ||||
-rw-r--r-- | src/extras/debugmenu.h | 1 |
2 files changed, 23 insertions, 1 deletions
diff --git a/src/extras/debugmenu.cpp b/src/extras/debugmenu.cpp index 1c5e26ee..bb0ed55e 100644 --- a/src/extras/debugmenu.cpp +++ b/src/extras/debugmenu.cpp @@ -6,6 +6,7 @@ #include "rtcharse.h" #include "inttypes.h" #include "debugmenu.h" +#include <new> #define snprintf _snprintf @@ -152,6 +153,7 @@ struct Menu void update(void); void draw(void); Menu(void){ memset(this, 0, sizeof(Menu)); } + ~Menu(void); }; extern Menu toplevel; @@ -160,6 +162,7 @@ struct MenuEntry_Sub : MenuEntry Menu *submenu; MenuEntry_Sub(const char *name, Menu *menu); + ~MenuEntry_Sub(void) { delete submenu; } }; struct MenuEntry_Var : MenuEntry @@ -705,6 +708,16 @@ Menu::draw(void) ((MenuEntry_Sub*)this->selectedEntry)->submenu->draw(); } +Menu::~Menu(void) +{ + MenuEntry *e, *next; + for(e = entries; e; e = next){ + next = e->next; + delete e; + } + memset(this, 0, sizeof(Menu)); +} + Menu* findMenu(const char *name) { @@ -792,6 +805,7 @@ DebugMenuInit(void) assert(arrow); RwImageDestroy(img); + menuInitialized = true; } @@ -804,7 +818,14 @@ DebugMenuShutdown(void) cursor = nil; RwRasterDestroy(arrow); arrow = nil; - // TODO: the menus ... + + toplevel.~Menu(); + new (&toplevel) Menu(); + + activeMenu = &toplevel; + deepestMenu = &toplevel; + mouseOverMenu = nil; + mouseOverEntry = nil; } menuInitialized = false; } diff --git a/src/extras/debugmenu.h b/src/extras/debugmenu.h index 462b59c4..ae595c1f 100644 --- a/src/extras/debugmenu.h +++ b/src/extras/debugmenu.h @@ -13,6 +13,7 @@ struct MenuEntry Menu *menu; MenuEntry(const char *name); + virtual ~MenuEntry(void) {} }; typedef MenuEntry DebugMenuEntry; |