From 66e7740ee7512e66c1bca4d1f66368e262a93086 Mon Sep 17 00:00:00 2001 From: Brandon Bensel Date: Thu, 24 Oct 2024 13:27:10 -0400 Subject: [PATCH] clear auto /DIE options on return to main menu --- gameSource/ExistingAccountPage.cpp | 4 ++++ gameSource/yumRebirthComponent.h | 1 + 2 files changed, 5 insertions(+) diff --git a/gameSource/ExistingAccountPage.cpp b/gameSource/ExistingAccountPage.cpp index e50fa842..4d670acc 100644 --- a/gameSource/ExistingAccountPage.cpp +++ b/gameSource/ExistingAccountPage.cpp @@ -25,6 +25,8 @@ #include "minorGems/formats/encodingUtils.h" +#include "yumRebirthComponent.h" + static JenkinsRandomSource randSource; @@ -251,6 +253,8 @@ void ExistingAccountPage::makeActive( char inFresh ) { SettingsManager::getIntSetting( "tutorialEnabled", 0 ); useMainSettings(); + + yumRebirthComponent::clearSelectedOptions(); if( tutorialEnabled && diff --git a/gameSource/yumRebirthComponent.h b/gameSource/yumRebirthComponent.h index 5047a55a..85e2dabe 100644 --- a/gameSource/yumRebirthComponent.h +++ b/gameSource/yumRebirthComponent.h @@ -34,6 +34,7 @@ class yumRebirthComponent : public PageComponent, public ActionListener { virtual void actionPerformed(GUIComponent *inTarget); static Options getSelectedOptions(void) { return currentOptions; } + static void clearSelectedOptions(void) { currentOptions = 0; } static bool evaluateLife(char race, bool isFemale, bool isDonkeyTown);