fix importing after continue unjoins players
This commit is contained in:
@@ -241,7 +241,10 @@ void OptionsList::Load( RString sType, PlayerNumber pn )
|
|||||||
|
|
||||||
this->PlayCommand( "TweenOff" );
|
this->PlayCommand( "TweenOff" );
|
||||||
this->FinishTweening();
|
this->FinishTweening();
|
||||||
|
}
|
||||||
|
|
||||||
|
void OptionsList::Reset()
|
||||||
|
{
|
||||||
/* Import options. */
|
/* Import options. */
|
||||||
FOREACHM( RString, OptionRowHandler *, m_Rows, hand )
|
FOREACHM( RString, OptionRowHandler *, m_Rows, hand )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ public:
|
|||||||
~OptionsList();
|
~OptionsList();
|
||||||
|
|
||||||
void Load( RString sType, PlayerNumber pn );
|
void Load( RString sType, PlayerNumber pn );
|
||||||
|
void Reset();
|
||||||
|
|
||||||
void Link( OptionsList *pLink ) { m_pLinked = pLink; }
|
void Link( OptionsList *pLink ) { m_pLinked = pLink; }
|
||||||
|
|
||||||
|
|||||||
@@ -200,6 +200,10 @@ void ScreenSelectMusic::BeginScreen()
|
|||||||
m_bAllowOptionsMenu = m_bAllowOptionsMenuRepeat = false;
|
m_bAllowOptionsMenu = m_bAllowOptionsMenuRepeat = false;
|
||||||
ZERO( m_iSelection );
|
ZERO( m_iSelection );
|
||||||
|
|
||||||
|
if( USE_OPTIONS_LIST )
|
||||||
|
FOREACH_HumanPlayer( pn )
|
||||||
|
m_OptionsList[pn].Reset();
|
||||||
|
|
||||||
AfterMusicChange();
|
AfterMusicChange();
|
||||||
|
|
||||||
SOUND->PlayOnceFromAnnouncer( "select music intro" );
|
SOUND->PlayOnceFromAnnouncer( "select music intro" );
|
||||||
|
|||||||
Reference in New Issue
Block a user