Added preference for showing multiple toasties in one song. Added IsWaiting to Transition.

2015-04-18 08:52:57 -06:00
parent 862eba8f7d
commit 9314555e6d
8 changed files with 17 additions and 5 deletions
@@ -2874,10 +2874,14 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 	}
 	else if( SM == SM_PlayToasty )
 	{
-		if( g_bEasterEggs )
+		if(g_bEasterEggs)
 		{
-			m_Toasty.Reset();
-			m_Toasty.StartTransitioning();
+			if(PREFSMAN->m_AllowMultipleToasties ||
+				m_Toasty.IsWaiting())
+			{
+				m_Toasty.Reset();
+				m_Toasty.StartTransitioning();
+			}
 		}
 	}
 	else if( ScreenMessageHelpers::ScreenMessageToString(SM).find("0Combo") != string::npos )