use GameState::SetCurrentStyle

This commit is contained in:
Chris Danford
2007-03-08 06:01:11 +00:00
parent 13231a31dc
commit 0678df9334
+2 -2
View File
@@ -111,7 +111,7 @@ void ScreenSelectMusic::Init()
vector<StepsType> vst; vector<StepsType> vst;
GAMEMAN->GetStepsTypesForGame( GAMESTATE->m_pCurGame, vst ); GAMEMAN->GetStepsTypesForGame( GAMESTATE->m_pCurGame, vst );
const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), vst[0] ); const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), vst[0] );
GAMESTATE->m_pCurStyle.Set( pStyle ); GAMESTATE->SetCurrentStyle( pStyle );
} }
if( GAMESTATE->GetCurrentStyle() == NULL ) if( GAMESTATE->GetCurrentStyle() == NULL )
RageException::Throw( "The Style has not been set. A theme must set the Style before loading ScreenSelectMusic." ); RageException::Throw( "The Style has not been set. A theme must set the Style before loading ScreenSelectMusic." );
@@ -869,7 +869,7 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input )
stCurrent = GAMESTATE->m_pCurSteps[pn]->m_StepsType; stCurrent = GAMESTATE->m_pCurSteps[pn]->m_StepsType;
vector<StepsType> vst; vector<StepsType> vst;
const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), stCurrent ); const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), stCurrent );
GAMESTATE->m_pCurStyle.Set( pStyle ); GAMESTATE->SetCurrentStyle( pStyle );
} }