From bc0424bdcf8768c977959b891a3bde6423da011f Mon Sep 17 00:00:00 2001 From: Barinade Date: Mon, 17 May 2021 17:49:59 -0500 Subject: [PATCH] add multi toasty back new preference name, defaulted off i have a miku toasty and i really really just want to see miku more please --- src/Etterna/Screen/Gameplay/ScreenGameplay.cpp | 2 +- src/Etterna/Singletons/PrefsManager.cpp | 1 + src/Etterna/Singletons/PrefsManager.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp b/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp index cb1b4a2614..246d5faa6a 100644 --- a/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp +++ b/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp @@ -1673,7 +1673,7 @@ ScreenGameplay::HandleScreenMessage(const ScreenMessage& SM) StartPlayingSong(MIN_SECONDS_TO_STEP_NEXT_SONG, 0); } else if (SM == SM_PlayToasty) { if (PREFSMAN->m_bEasterEggs) { - if (m_Toasty.IsWaiting()) { + if (m_Toasty.IsWaiting() || PREFSMAN->m_AllowMultipleToasties) { m_Toasty.Reset(); m_Toasty.StartTransitioning(); } diff --git a/src/Etterna/Singletons/PrefsManager.cpp b/src/Etterna/Singletons/PrefsManager.cpp index 881954faaa..74037033ba 100644 --- a/src/Etterna/Singletons/PrefsManager.cpp +++ b/src/Etterna/Singletons/PrefsManager.cpp @@ -148,6 +148,7 @@ PrefsManager::PrefsManager() , m_bDelayedModelDelete("DelayedModelDelete", false) , m_bDelayedTextureDelete("DelayedTextureDeletion", true) , m_bEasterEggs("EasterEggs", true) + , m_AllowMultipleToasties("MultiToasty", false) , EnablePitchRates("EnablePitchRates", true) , m_bEnableScoreboard("EnableScoreboard", true) , m_bEventMode("EventMode", true) diff --git a/src/Etterna/Singletons/PrefsManager.h b/src/Etterna/Singletons/PrefsManager.h index 2d30b75d8a..ab60a8285d 100644 --- a/src/Etterna/Singletons/PrefsManager.h +++ b/src/Etterna/Singletons/PrefsManager.h @@ -189,6 +189,7 @@ class PrefsManager Preference EnablePitchRates; Preference LiftsOnOsuHolds; Preference m_bEasterEggs; + Preference m_AllowMultipleToasties; Preference m_bUseMidGrades; // Number of seconds it takes for a button on the controller to release