[ScreenSelectMusic] Fixed Rave difficulties not being synced on late join. Fixes issue 577.
This commit is contained in:
@@ -12,6 +12,8 @@ StepMania 5.0 $next | 2011xxxx
|
|||||||
----------
|
----------
|
||||||
* [GameState] Add the RefreshNoteSkinData lua binding. This will only
|
* [GameState] Add the RefreshNoteSkinData lua binding. This will only
|
||||||
refresh the NS data for the present game, not all games. [Wolfman2000]
|
refresh the NS data for the present game, not all games. [Wolfman2000]
|
||||||
|
* [ScreenSelectMusic] Fixed Rave difficulties not being synced on late join.
|
||||||
|
Fixes issue 577. [AJ]
|
||||||
|
|
||||||
2011/11/04
|
2011/11/04
|
||||||
* [ScoreKeeperRave] Revert fix from 2011/10/28. [AJ]
|
* [ScoreKeeperRave] Revert fix from 2011/10/28. [AJ]
|
||||||
|
|||||||
@@ -1044,12 +1044,13 @@ void ScreenSelectMusic::HandleMessage( const Message &msg )
|
|||||||
{
|
{
|
||||||
if( m_bRunning && msg == Message_PlayerJoined )
|
if( m_bRunning && msg == Message_PlayerJoined )
|
||||||
{
|
{
|
||||||
|
PlayerNumber master_pn = GAMESTATE->GetMasterPlayerNumber();
|
||||||
// The current steps may no longer be playable. If one player has double
|
// 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.
|
// steps selected, they are no longer playable now that P2 has joined.
|
||||||
|
|
||||||
// TODO: Invalidate the CurSteps only if they are no longer playable.
|
// TODO: Invalidate the CurSteps only if they are no longer playable.
|
||||||
// That way, after music change will clamp to the nearest in the StepsDisplayList.
|
// That way, after music change will clamp to the nearest in the StepsDisplayList.
|
||||||
GAMESTATE->m_pCurSteps[GAMESTATE->GetMasterPlayerNumber()].SetWithoutBroadcast( NULL );
|
GAMESTATE->m_pCurSteps[master_pn].SetWithoutBroadcast( NULL );
|
||||||
FOREACH_ENUM( PlayerNumber, p )
|
FOREACH_ENUM( PlayerNumber, p )
|
||||||
GAMESTATE->m_pCurSteps[p].SetWithoutBroadcast( NULL );
|
GAMESTATE->m_pCurSteps[p].SetWithoutBroadcast( NULL );
|
||||||
|
|
||||||
@@ -1079,9 +1080,12 @@ void ScreenSelectMusic::HandleMessage( const Message &msg )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// todo: handle changing rave difficulty on join -aj
|
|
||||||
|
|
||||||
Steps* pSteps = m_vpSteps.empty()? NULL: m_vpSteps[m_iSelection[pn]];
|
Steps* pSteps = m_vpSteps.empty()? NULL: m_vpSteps[m_iSelection[pn]];
|
||||||
|
|
||||||
|
// handle changing rave difficulty on join
|
||||||
|
if(GAMESTATE->m_PlayMode == PLAY_MODE_RAVE)
|
||||||
|
pSteps = m_vpSteps[m_iSelection[master_pn]];
|
||||||
|
|
||||||
GAMESTATE->m_pCurSteps[pn].Set( pSteps );
|
GAMESTATE->m_pCurSteps[pn].Set( pSteps );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user