actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added missing broadcasts

Browse Source
This commit is contained in:
Alberto Ramos
2010-07-26 16:43:38 -06:00
parent c0b9a55892
commit 6db282f98b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenSelectMusic.cpp
+6 -1
View File
@@ -710,6 +710,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
{ {
m_SelectionState = SelectionState_SelectingSong; m_SelectionState = SelectionState_SelectingSong;
MESSAGEMAN->Broadcast("TwoPartConfirmCanceled"); MESSAGEMAN->Broadcast("TwoPartConfirmCanceled");
MESSAGEMAN->Broadcast("PreviousSong");
m_MusicWheel.ChangeMusicUnlessLocked( -1 ); m_MusicWheel.ChangeMusicUnlessLocked( -1 );
} }
} }
@@ -721,6 +722,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
{ {
m_SelectionState = SelectionState_SelectingSong; m_SelectionState = SelectionState_SelectingSong;
MESSAGEMAN->Broadcast("TwoPartConfirmCanceled"); MESSAGEMAN->Broadcast("TwoPartConfirmCanceled");
MESSAGEMAN->Broadcast("NextSong");
m_MusicWheel.ChangeMusicUnlessLocked( +1 ); m_MusicWheel.ChangeMusicUnlessLocked( +1 );
} }
} }
@@ -757,6 +759,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
RString sNewGroup = m_MusicWheel.JumpToPrevGroup(); RString sNewGroup = m_MusicWheel.JumpToPrevGroup();
m_MusicWheel.SelectSection(sNewGroup); m_MusicWheel.SelectSection(sNewGroup);
m_MusicWheel.SetOpenSection(sNewGroup); m_MusicWheel.SetOpenSection(sNewGroup);
MESSAGEMAN->Broadcast("TwoPartConfirmCanceled");
MESSAGEMAN->Broadcast("PreviousGroup"); MESSAGEMAN->Broadcast("PreviousGroup");
AfterMusicChange(); AfterMusicChange();
} }
@@ -770,6 +773,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
RString sNewGroup = m_MusicWheel.JumpToNextGroup(); RString sNewGroup = m_MusicWheel.JumpToNextGroup();
m_MusicWheel.SelectSection(sNewGroup); m_MusicWheel.SelectSection(sNewGroup);
m_MusicWheel.SetOpenSection(sNewGroup); m_MusicWheel.SetOpenSection(sNewGroup);
MESSAGEMAN->Broadcast("TwoPartConfirmCanceled");
MESSAGEMAN->Broadcast("NextGroup"); MESSAGEMAN->Broadcast("NextGroup");
AfterMusicChange(); AfterMusicChange();
} }
@@ -803,10 +807,11 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
m_soundLocked.Play(); m_soundLocked.Play();
else else
{ {
// XXX: should this be called "TwoPartCancelled"?
Message msg("SongUnchosen"); Message msg("SongUnchosen");
msg.SetParam( "Player", input.pn ); msg.SetParam( "Player", input.pn );
MESSAGEMAN->Broadcast( msg ); MESSAGEMAN->Broadcast( msg );
//unset all steps // unset all steps
FOREACH_ENUM( PlayerNumber , p ) FOREACH_ENUM( PlayerNumber , p )
m_bStepsChosen[p] = false; m_bStepsChosen[p] = false;
m_SelectionState = SelectionState_SelectingSong; m_SelectionState = SelectionState_SelectingSong;