From fa74cf0559b00b2b3fe495bd63f3d2591c5666e4 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 14 Feb 2023 20:37:29 +0000 Subject: [PATCH] Clean exit on Pico & Quest and gold tier patron credit screen --- source/common/platform/posix/nosdl/i_main.cpp | 3 +- source/common/startscreen/endoom.cpp | 20 ------------ wadsrc/static/menudef.txt | 31 +++++++++++++++++++ 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/source/common/platform/posix/nosdl/i_main.cpp b/source/common/platform/posix/nosdl/i_main.cpp index 845dbc024..56956c0e8 100644 --- a/source/common/platform/posix/nosdl/i_main.cpp +++ b/source/common/platform/posix/nosdl/i_main.cpp @@ -184,8 +184,7 @@ int raze_main (int argc, char **argv) const int result = GameMain(); #ifdef __ANDROID__ - usleep(500* 1000); - exit(0); + usleep(1000* 1000); #endif return result; diff --git a/source/common/startscreen/endoom.cpp b/source/common/startscreen/endoom.cpp index cc1e31a44..073d2b295 100644 --- a/source/common/startscreen/endoom.cpp +++ b/source/common/startscreen/endoom.cpp @@ -169,26 +169,6 @@ int RunEndoom() S_StopMusic(true); auto endoom = new FEndoomScreen(endoom_lump); endoom->Render(true); - -/* while(true) - { - I_GetEvent(); - endoom->Update(); - while (eventtail != eventhead) - { - event_t *ev = &events[eventtail]; - eventtail = (eventtail + 1) & (MAXEVENTS - 1); - - if (ev->type == EV_KeyDown || ev->type == EV_KeyUp) - { - return 0; - } - if (ev->type == EV_GUI_Event && (ev->subtype == EV_GUI_KeyDown || ev->subtype == EV_GUI_LButtonDown || ev->subtype == EV_GUI_RButtonDown || ev->subtype == EV_GUI_MButtonDown)) - { - return 0; - } - } - }*/ return 0; } diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 2b223ff17..5debb77e7 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -506,6 +506,9 @@ OptionMenu "OptionsMenu" protected Submenu "$OS_TITLE", "os_Menu" StaticText " " Submenu "$MNU_ENGINECREDITS", "EngineCredits" + StaticText " " + Submenu "Team Beef Gold-Tier Patrons", "GoldTierCredits" + StaticText " " SafeCommand "$OPTMNU_DEFAULTS", "reset2defaults" SafeCommand "$OPTMNU_RESETTOSAVED", "reset2saved" //Command "$OPTMNU_CONSOLE", "menuconsole" @@ -2108,6 +2111,34 @@ OptionMenu "MultiOptionsMenu" } */ +OptionMenu "GoldTierCredits" +{ + title "$MNU_CREDITS" + StaticText "" + StaticText "" + StaticText "" + StaticText "Team Beef Gold Tier Patrons", 1 + StaticText "" + StaticText "David Gohman Adam Luc Lowndes " + StaticText "Sign of the Beefcarver Naughtynate350 Mike Gummelt " + StaticText "CrashOrganism Russel Jones Joshua Vizanko " + StaticText "GD Dragon Saeed Al-Ali Gabe Miller " + StaticText "Jojo Mojo Andrew Remsen valedurandal " + StaticText "Brian Sifrar Dominik Studer Tommy Green " + StaticText "Cuttlersan Kalli Raya Lunar Stain " + StaticText "iS ken fountain Ben Otter " + StaticText "Emanuele Disco CharlieSayNo cranky_bum " + StaticText "Jamie S EDavey BMF " + StaticText "Jack Henaghan Loot Tester Charlie Bagwell " + StaticText "Braxus Ryan Milke Emile Tixeuil " + StaticText "Rex Keith Griffin Cole Edwards " + StaticText "Max Spellbound1998 mrpapa " + StaticText "Albert Valiev Duncan Mummery Stephen Sayles " + StaticText "Markus Dickmann HUSSEIN MOSTAFA Adam Davidek " + StaticText "Jack Henaghan Axis BayesianBroccoli " + StaticText "Montain Gral Markus Gunther " +} + OptionMenu "EngineCredits" { title "$MNU_CREDITS"