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

move HandleMessage near HandleScreenMessage

Browse Source
This commit is contained in:
Glenn Maynard
2008-05-28 00:49:02 +00:00
parent 7e86936af7
commit a4b30a4cb0
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+40 -40
View File
@@ -326,46 +326,6 @@ void ScreenSelectMusic::Update( float fDeltaTime )
CheckBackgroundRequests( false );
}
void ScreenSelectMusic::HandleMessage( const Message &msg )
{
if( msg == Message_PlayerJoined )
{
// The current steps may no longer be playable. If one player has double steps
// selected, they are no longer playable now that P2 has joined.
// TODO: Invalidate the CurSteps only if they are no longer playable. That way,
// after music change will clamp to the nearest in the DifficultyList.
GAMESTATE->m_pCurSteps[GAMESTATE->m_MasterPlayerNumber].SetWithoutBroadcast( NULL );
FOREACH_ENUM( PlayerNumber, p )
GAMESTATE->m_pCurSteps[p].SetWithoutBroadcast( NULL );
/* If a course is selected, it may no longer be playable. Let MusicWheel know
* about the late join. */
m_MusicWheel.PlayerJoined();
AfterMusicChange();
int iSel = 0;
PlayerNumber pn;
bool b = msg.GetParam( "Player", pn );
ASSERT( b );
m_iSelection[pn] = iSel;
if( GAMESTATE->IsCourseMode() )
{
Trail* pTrail = m_vpTrails.empty()? NULL: m_vpTrails[m_iSelection[pn]];
GAMESTATE->m_pCurTrail[pn].Set( pTrail );
}
else
{
Steps* pSteps = m_vpSteps.empty()? NULL: m_vpSteps[m_iSelection[pn]];
GAMESTATE->m_pCurSteps[pn].Set( pSteps );
}
}
ScreenWithMenuElements::HandleMessage( msg );
}
void ScreenSelectMusic::Input( const InputEventPlus &input )
{
// LOG->Trace( "ScreenSelectMusic::Input()" );
@@ -713,6 +673,46 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
}
void ScreenSelectMusic::HandleMessage( const Message &msg )
{
if( msg == Message_PlayerJoined )
{
// The current steps may no longer be playable. If one player has double steps
// selected, they are no longer playable now that P2 has joined.
// TODO: Invalidate the CurSteps only if they are no longer playable. That way,
// after music change will clamp to the nearest in the DifficultyList.
GAMESTATE->m_pCurSteps[GAMESTATE->m_MasterPlayerNumber].SetWithoutBroadcast( NULL );
FOREACH_ENUM( PlayerNumber, p )
GAMESTATE->m_pCurSteps[p].SetWithoutBroadcast( NULL );
/* If a course is selected, it may no longer be playable. Let MusicWheel know
* about the late join. */
m_MusicWheel.PlayerJoined();
AfterMusicChange();
int iSel = 0;
PlayerNumber pn;
bool b = msg.GetParam( "Player", pn );
ASSERT( b );
m_iSelection[pn] = iSel;
if( GAMESTATE->IsCourseMode() )
{
Trail* pTrail = m_vpTrails.empty()? NULL: m_vpTrails[m_iSelection[pn]];
GAMESTATE->m_pCurTrail[pn].Set( pTrail );
}
else
{
Steps* pSteps = m_vpSteps.empty()? NULL: m_vpSteps[m_iSelection[pn]];
GAMESTATE->m_pCurSteps[pn].Set( pSteps );
}
}
ScreenWithMenuElements::HandleMessage( msg );
}
void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
{
if( SM == SM_AllowOptionsMenuRepeat )