ScoreKeeperNormal double shot.

1) convert toasty trigger from a single number to a Lua table. Only problem is, the toasty only triggers on the first one. Since this makes it equivalent to how it was set up before, I'm okay with this.
2) FSX submitted a patch that supposedly fixes the broken combo problem. I can't fully test this, so I'm committing it in the hopes that someone else tests it too.
----
Various theme fixes/changes as well.
This commit is contained in:
AJ Kelly
2010-03-14 19:24:17 -05:00
parent 04317c14ae
commit 5ef1c42e3b
8 changed files with 105 additions and 60 deletions
+2 -2
View File
@@ -2543,7 +2543,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
{
if( pi->m_pLifeMeter )
pi->m_pLifeMeter->OnSongEnded();
pi->m_pLifeMeter->OnSongEnded();
}
GAMESTATE->m_bLoadingNextSong = true;
@@ -2571,7 +2571,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
}
else if( SM == SM_PlayToasty )
{
// todo: make multiple toasties a theme option -aj
// todo: make multiple toasties work -aj
if( g_bEasterEggs )
if( !m_Toasty.IsTransitioning() && !m_Toasty.IsFinished() ) // don't play if we've already played it once
m_Toasty.StartTransitioning();