diff --git a/stepmania/src/CatalogXml.cpp b/stepmania/src/CatalogXml.cpp index 8cf24a26bb..0ae814558f 100644 --- a/stepmania/src/CatalogXml.cpp +++ b/stepmania/src/CatalogXml.cpp @@ -317,7 +317,7 @@ void CatalogXml::Save( LoadingWindow *loading_window ) { XNode* pNode2 = pNode->AppendChild( "Style" ); vector vpStyle; - GAMEMAN->GetStylesForGame( GAMESTATE->m_pCurGame, vpStyle ); + GameManager::GetStylesForGame( GAMESTATE->m_pCurGame, vpStyle ); FOREACH( const Style*, vpStyle, pStyle ) { if( !SHOW_STYLE(*pStyle) ) @@ -325,7 +325,7 @@ void CatalogXml::Save( LoadingWindow *loading_window ) StyleID sID; sID.FromStyle( (*pStyle) ); XNode* pNode3 = pNode2->AppendChild( sID.CreateNode() ); - pNode3->AppendAttr( "DisplayAs", GAMEMAN->StyleToLocalizedString(*pStyle) ); + pNode3->AppendAttr( "DisplayAs", GameManager::StyleToLocalizedString(*pStyle) ); } } diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp index 28f1c788b8..f0c262478a 100644 --- a/stepmania/src/CommonMetrics.cpp +++ b/stepmania/src/CommonMetrics.cpp @@ -120,7 +120,7 @@ void ThemeMetricStepsTypesToShow::Read() ThemeMetric::Read(); m_v.clear(); - GAMEMAN->GetStepsTypesForGame( GAMESTATE->m_pCurGame, m_v ); + GameManager::GetStepsTypesForGame( GAMESTATE->m_pCurGame, m_v ); RemoveStepsTypes( m_v, ThemeMetric::GetValue() ); } diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index 9ba5064204..3f3f014d41 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -682,7 +682,7 @@ void Course::GetTrails( vector &AddTo, StepsType st ) const void Course::GetAllTrails( vector &AddTo ) const { vector vStepsTypesToShow; - GAMEMAN->GetStepsTypesForGame( GAMESTATE->m_pCurGame, vStepsTypesToShow ); + GameManager::GetStepsTypesForGame( GAMESTATE->m_pCurGame, vStepsTypesToShow ); FOREACH( StepsType, vStepsTypesToShow, st ) { GetTrails( AddTo, *st ); @@ -734,7 +734,7 @@ bool Course::AllSongsAreFixed() const const Style *Course::GetCourseStyle( const Game *pGame, int iNumPlayers ) const { vector vpStyles; - GAMEMAN->GetCompatibleStyles( pGame, iNumPlayers, vpStyles ); + GameManager::GetCompatibleStyles( pGame, iNumPlayers, vpStyles ); for( int s=0; s < (int) vpStyles.size(); ++s ) { diff --git a/stepmania/src/DifficultyDisplay.cpp b/stepmania/src/DifficultyDisplay.cpp index fbd35d2066..421efef687 100644 --- a/stepmania/src/DifficultyDisplay.cpp +++ b/stepmania/src/DifficultyDisplay.cpp @@ -264,7 +264,7 @@ void DifficultyDisplay::SetInternal( const SetParams ¶ms ) // TODO: Make this an AutoActor, optimize graphic loading if( params.st != StepsType_Invalid ) { - RString sStepsType = GAMEMAN->GetStepsTypeInfo(params.st).szName; + RString sStepsType = GameManager::GetStepsTypeInfo(params.st).szName; m_sprStepsType.Load( THEME->GetPathG(m_sMetricsGroup,"StepsType "+sStepsType) ); } } diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index b9d3864b68..87af61736f 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -174,7 +174,7 @@ void GameCommand::LoadOne( const Command& cmd ) if( sName == "style" ) { - const Style* style = GAMEMAN->GameAndStringToStyle( GAMESTATE->m_pCurGame, sValue ); + const Style* style = GameManager::GameAndStringToStyle( GAMESTATE->m_pCurGame, sValue ); if( style ) m_pStyle = style; else diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index ea7eb4e93c..8ce5d8f72c 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -352,7 +352,7 @@ void GameState::JoinPlayer( PlayerNumber pn ) // Set the current style to something appropriate for the new number of joined players. if( ALLOW_LATE_JOIN && m_pCurStyle != NULL ) { - const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( m_pCurGame, GetNumSidesJoined(), m_pCurStyle->m_StepsType ); + const Style *pStyle = GameManager::GetFirstCompatibleStyle( m_pCurGame, GetNumSidesJoined(), m_pCurStyle->m_StepsType ); m_pCurStyle.Set( pStyle ); } @@ -591,7 +591,7 @@ int GameState::GetNumStagesForCurrentSongAndStepsOrCourse() const { /* If a style isn't set, use the style of the selected steps. */ StepsType st = pSteps->m_StepsType; - pStyle = GAMEMAN->GetFirstCompatibleStyle( m_pCurGame, GetNumSidesJoined(), st ); + pStyle = GameManager::GetFirstCompatibleStyle( m_pCurGame, GetNumSidesJoined(), st ); } else { @@ -599,7 +599,7 @@ int GameState::GetNumStagesForCurrentSongAndStepsOrCourse() const * joined players, or one player if no players are joined. */ vector vpStyles; int iJoined = max( GetNumSidesJoined(), 1 ); - GAMEMAN->GetCompatibleStyles( m_pCurGame, iJoined, vpStyles ); + GameManager::GetCompatibleStyles( m_pCurGame, iJoined, vpStyles ); ASSERT( !vpStyles.empty() ); pStyle = vpStyles[0]; } diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp index c3fb204527..22b17e6d17 100644 --- a/stepmania/src/LightsManager.cpp +++ b/stepmania/src/LightsManager.cpp @@ -69,7 +69,7 @@ static void GetUsedGameInputs( vector &vGameInputsOut ) set vGIs; vector vStyles; - GAMEMAN->GetStylesForGame( GAMESTATE->m_pCurGame, vStyles ); + GameManager::GetStylesForGame( GAMESTATE->m_pCurGame, vStyles ); FOREACH( const Style*, vStyles, style ) { bool bFound = find( CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue().begin(), CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue().end(), (*style)->m_StepsType ) != CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue().end(); diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 9a45fbed8b..1772c5a17b 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -1003,7 +1003,7 @@ void MusicWheel::SetOpenSection( RString group ) vector vpPossibleStyles; if( CommonMetrics::AUTO_SET_STYLE ) - GAMEMAN->GetCompatibleStyles( GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled(), vpPossibleStyles ); + GameManager::GetCompatibleStyles( GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled(), vpPossibleStyles ); m_CurWheelItemData.clear(); vector &from = m_WheelItemDatas[GAMESTATE->m_SortOrder]; diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index 99e73df1c2..2796d63894 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -662,8 +662,8 @@ void NetworkSyncManager::ProcessInput() GameName = m_packet.ReadNT(); StyleName = m_packet.ReadNT(); - GAMESTATE->SetCurGame( GAMEMAN->StringToGameType(GameName) ); - GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMESTATE->m_pCurGame,StyleName) ); + GAMESTATE->SetCurGame( GameManager::StringToGameType(GameName) ); + GAMESTATE->SetCurrentStyle( GameManager::GameAndStringToStyle(GAMESTATE->m_pCurGame,StyleName) ); SCREENMAN->SetNewScreen( "ScreenNetSelectMusic" ); //Should this be metric'd out? } diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp index b1da106218..35d7de8e57 100644 --- a/stepmania/src/OptionRowHandler.cpp +++ b/stepmania/src/OptionRowHandler.cpp @@ -676,11 +676,11 @@ class OptionRowHandlerListStyles: public OptionRowHandlerList m_Def.m_bAllowThemeItems = false; // we theme the text ourself vector vStyles; - GAMEMAN->GetStylesForGame( GAMESTATE->m_pCurGame, vStyles ); + GameManager::GetStylesForGame( GAMESTATE->m_pCurGame, vStyles ); ASSERT( vStyles.size() ); FOREACH_CONST( const Style*, vStyles, s ) { - m_Def.m_vsChoices.push_back( GAMEMAN->StyleToLocalizedString(*s) ); + m_Def.m_vsChoices.push_back( GameManager::StyleToLocalizedString(*s) ); GameCommand mc; mc.m_pStyle = *s; m_aListEntries.push_back( mc ); diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index 8b0903f60b..5990679ce5 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -1237,7 +1237,7 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode ) pNode->GetChildValue( "SortOrder", s ); m_SortOrder = StringToSortOrder( s ); pNode->GetChildValue( "LastDifficulty", s ); m_LastDifficulty = StringToDifficulty( s ); pNode->GetChildValue( "LastCourseDifficulty", s ); m_LastCourseDifficulty = StringToDifficulty( s ); - pNode->GetChildValue( "LastStepsType", s ); m_LastStepsType = GAMEMAN->StringToStepsType( s ); + pNode->GetChildValue( "LastStepsType", s ); m_LastStepsType = GameManager::StringToStepsType( s ); pTemp = pNode->GetChild( "Song" ); if( pTemp ) m_lastSong.LoadFromNode( pTemp ); pTemp = pNode->GetChild( "Course" ); if( pTemp ) m_lastCourse.LoadFromNode( pTemp ); pNode->GetChildValue( "TotalPlays", m_iTotalPlays ); diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index 3be32f0474..56aa38fb4e 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -40,7 +40,7 @@ void ScreenDemonstration::Init() } vector vStylePossible; - GAMEMAN->GetDemonstrationStylesForGame( GAMESTATE->m_pCurGame, vStylePossible ); + GameManager::GetDemonstrationStylesForGame( GAMESTATE->m_pCurGame, vStylePossible ); for( int i=(int)(vStylePossible.size())-1; i>=0; i-- ) { bool bAllowThis = find( vStyleTypeAllow.begin(), vStyleTypeAllow.end(), vStylePossible[i]->m_StyleType ) != vStyleTypeAllow.end(); diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 4ebdc52968..d37a1b7520 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -183,7 +183,7 @@ void ScreenEditMenu::MenuStart( const InputEventPlus &input ) GAMESTATE->m_pCurSong.Set( pSong ); GAMESTATE->m_pCurCourse.Set( NULL ); - GAMESTATE->SetCurrentStyle( GAMEMAN->GetEditorStyleForStepsType(st) ); + GAMESTATE->SetCurrentStyle( GameManager::GetEditorStyleForStepsType(st) ); GAMESTATE->m_pCurSteps[PLAYER_1].Set( pSteps ); // diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp index 33150172df..28e28e75da 100644 --- a/stepmania/src/ScreenEnding.cpp +++ b/stepmania/src/ScreenEnding.cpp @@ -30,7 +30,7 @@ ScreenEnding::ScreenEnding() PROFILEMAN->LoadFirstAvailableProfile(PLAYER_2); GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR ); - GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle( GAMEMAN->GetDefaultGame(),"versus") ); + GAMESTATE->SetCurrentStyle( GameManager::GameAndStringToStyle( GameManager::GetDefaultGame(),"versus") ); GAMESTATE->JoinPlayer( PLAYER_1 ); GAMESTATE->JoinPlayer( PLAYER_2 ); GAMESTATE->m_pCurSong.Set( SONGMAN->GetRandomSong() ); diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index bf0a274e06..c985270b30 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -96,7 +96,7 @@ void ScreenEvaluation::Init() StageStats &ss = STATSMAN->m_vPlayedStageStats.back(); GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR ); - GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMEMAN->GetDefaultGame(),"versus") ); + GAMESTATE->SetCurrentStyle( GameManager::GameAndStringToStyle(GameManager::GetDefaultGame(),"versus") ); ss.m_playMode = GAMESTATE->m_PlayMode; ss.m_pStyle = GAMESTATE->GetCurrentStyle(); ss.m_Stage = STAGE_NORMAL; diff --git a/stepmania/src/ScreenGameplaySyncMachine.cpp b/stepmania/src/ScreenGameplaySyncMachine.cpp index 17625d8aab..6d22854f5f 100644 --- a/stepmania/src/ScreenGameplaySyncMachine.cpp +++ b/stepmania/src/ScreenGameplaySyncMachine.cpp @@ -15,7 +15,7 @@ REGISTER_SCREEN_CLASS( ScreenGameplaySyncMachine ); void ScreenGameplaySyncMachine::Init() { GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR ); - GAMESTATE->SetCurrentStyle( GAMEMAN->GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) ); + GAMESTATE->SetCurrentStyle( GameManager::GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) ); AdjustSync::ResetOriginalSyncData(); RString sFile = THEME->GetPathO("ScreenGameplaySyncMachine","music.sm"); diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index a2f3eb775e..f6f23ed1fc 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -127,7 +127,7 @@ void ScreenHowToPlay::Init() m_pLifeMeterBar->FillForHowToPlay( NUM_W2S, NUM_MISSES ); } - GAMESTATE->SetCurrentStyle( GAMEMAN->GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) ); + GAMESTATE->SetCurrentStyle( GameManager::GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) ); if( USE_PLAYER ) { diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index f2dedec270..057bcff15a 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -125,7 +125,7 @@ ScreenNameEntry::ScreenNameEntry() GAMESTATE->m_bSideIsJoined[PLAYER_2] = true; GAMESTATE->m_MasterPlayerNumber = PLAYER_1; GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR ); - GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle( GAMEMAN->GetDefaultGame(),"versus") ); + GAMESTATE->SetCurrentStyle( GameManager::GameAndStringToStyle( GameManager::GetDefaultGame(),"versus") ); StageStats ss; for( int z = 0; z < 3; ++z ) { @@ -172,8 +172,8 @@ void ScreenNameEntry::Init() { #if 0 // DEBUGGING STUFF - GAMESTATE->m_pCurGame.Set( GAMEMAN->GetDefaultGame() ); - GAMESTATE->m_pCurStyle.Set( GAMEMAN->GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) ); + GAMESTATE->m_pCurGame.Set( GameManager::GetDefaultGame() ); + GAMESTATE->m_pCurStyle.Set( GameManager::GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) ); GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR ); GAMESTATE->m_bSideIsJoined[PLAYER_1] = true; GAMESTATE->m_MasterPlayerNumber = PLAYER_1; diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index ecb4b32e1b..fec8e9d939 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -24,7 +24,7 @@ void ScreenNameEntryTraditional::Init() GAMESTATE->m_bSideIsJoined[PLAYER_2] = true; GAMESTATE->m_MasterPlayerNumber = PLAYER_1; GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR ); - GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle( GAMEMAN->GetDefaultGame(),"versus") ); + GAMESTATE->SetCurrentStyle( GameManager::GameAndStringToStyle( GameManager::GetDefaultGame(),"versus") ); for( int z = 0; z < 3; ++z ) { StageStats ss; diff --git a/stepmania/src/ScreenOptionsEditCourseEntry.cpp b/stepmania/src/ScreenOptionsEditCourseEntry.cpp index 2e4f636b64..1ec4b51c99 100644 --- a/stepmania/src/ScreenOptionsEditCourseEntry.cpp +++ b/stepmania/src/ScreenOptionsEditCourseEntry.cpp @@ -282,7 +282,7 @@ void ScreenOptionsEditCourseEntry::HandleScreenMessage( const ScreenMessage SM ) ASSERT( pSteps ); // Set up for ScreenEdit - const Style *pStyle = GAMEMAN->GetEditorStyleForStepsType(pSteps->m_StepsType); + const Style *pStyle = GameManager::GetEditorStyleForStepsType(pSteps->m_StepsType); GAMESTATE->SetCurrentStyle( pStyle ); GAMESTATE->m_pCurSong.Set( pSong ); GAMESTATE->m_pCurSteps[PLAYER_1].Set( pSteps ); diff --git a/stepmania/src/ScreenOptionsManageEditSteps.cpp b/stepmania/src/ScreenOptionsManageEditSteps.cpp index 8b0aebf5a4..1e7154eeb0 100644 --- a/stepmania/src/ScreenOptionsManageEditSteps.cpp +++ b/stepmania/src/ScreenOptionsManageEditSteps.cpp @@ -140,7 +140,7 @@ void ScreenOptionsManageEditSteps::HandleScreenMessage( const ScreenMessage SM ) { Steps *pSteps = GAMESTATE->m_pCurSteps[PLAYER_1]; ASSERT( pSteps ); - const Style *pStyle = GAMEMAN->GetEditorStyleForStepsType( pSteps->m_StepsType ); + const Style *pStyle = GameManager::GetEditorStyleForStepsType( pSteps->m_StepsType ); GAMESTATE->SetCurrentStyle( pStyle ); // do base behavior } diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index a6aca57aa7..d083f9f135 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -156,7 +156,7 @@ static void MoveNop( int &iSel, bool bToSel, const ConfOption *pConfOption ) static void GameChoices( vector &out ) { vector aGames; - GAMEMAN->GetEnabledGames( aGames ); + GameManager::GetEnabledGames( aGames ); FOREACH( const Game*, aGames, g ) { RString sGameName = (*g)->m_szName; @@ -179,7 +179,7 @@ static void GameSel( int &sel, bool ToSel, const ConfOption *pConfOption ) sel = i; } else { vector aGames; - GAMEMAN->GetEnabledGames( aGames ); + GameManager::GetEnabledGames( aGames ); StepMania::ChangeCurrentGame( aGames[sel] ); } } diff --git a/stepmania/src/ScreenOptionsReviewWorkout.cpp b/stepmania/src/ScreenOptionsReviewWorkout.cpp index a8356a178f..f975976e2a 100644 --- a/stepmania/src/ScreenOptionsReviewWorkout.cpp +++ b/stepmania/src/ScreenOptionsReviewWorkout.cpp @@ -103,7 +103,7 @@ void ScreenOptionsReviewWorkout::HandleScreenMessage( const ScreenMessage SM ) pWorkout->GenerateCourse( *WORKOUTMAN->m_pTempCourse ); GAMESTATE->m_pCurSong.Set( NULL ); // CurSong will be set if we back out. Set it back to NULL so that ScreenStage won't show the last song. GAMESTATE->m_pCurCourse.Set( WORKOUTMAN->m_pTempCourse ); - const Style *pStyle = GAMEMAN->GameAndStringToStyle(GAMESTATE->m_pCurGame,"single"); + const Style *pStyle = GameManager::GameAndStringToStyle(GAMESTATE->m_pCurGame,"single"); StepsType st = pStyle->m_StepsType; Trail *pTrail = GAMESTATE->m_pCurCourse->GetTrail( st ); ASSERT( pTrail ); diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index e2c67e8cc6..781f2d8796 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -382,7 +382,7 @@ void ScreenRankingScroller::Init() StepsType st = STEPS_TYPES_TO_SHOW.GetValue()[i]; if( asBits.size() > 1 ) - st = GAMEMAN->StringToStepsType( asBits[1] ); + st = GameManager::StringToStepsType( asBits[1] ); pts.aTypes.push_back( make_pair(dc, st) ); } diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index cfc25d9c8c..abe333f324 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -60,7 +60,7 @@ void ScreenSelectMusic::Init() if( PREFSMAN->m_bScreenTestMode && CommonMetrics::INITIAL_SCREEN == m_sName ) { GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR ); - GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMEMAN->GetDefaultGame(),"versus") ); + GAMESTATE->SetCurrentStyle( GameManager::GameAndStringToStyle(GameManager::GetDefaultGame(),"versus") ); GAMESTATE->JoinPlayer( PLAYER_1 ); GAMESTATE->m_MasterPlayerNumber = PLAYER_1; } @@ -180,8 +180,8 @@ void ScreenSelectMusic::BeginScreen() if( CommonMetrics::AUTO_SET_STYLE ) { vector vst; - GAMEMAN->GetStepsTypesForGame( GAMESTATE->m_pCurGame, vst ); - const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), vst[0] ); + GameManager::GetStepsTypesForGame( GAMESTATE->m_pCurGame, vst ); + const Style *pStyle = GameManager::GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), vst[0] ); GAMESTATE->SetCurrentStyle( pStyle ); } @@ -932,7 +932,7 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input ) stCurrent = GAMESTATE->m_pCurSteps[pn]->m_StepsType; } vector vst; - pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), stCurrent ); + pStyle = GameManager::GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), stCurrent ); } GAMESTATE->SetCurrentStyle( pStyle ); } diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 96da894424..e5731f88c1 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -949,7 +949,7 @@ void Song::AddAutoGenNotes() void Song::AutoGen( StepsType ntTo, StepsType ntFrom ) { -// int iNumTracksOfTo = GAMEMAN->StepsTypeToNumTracks(ntTo); +// int iNumTracksOfTo = GameManager::StepsTypeToNumTracks(ntTo); for( unsigned int j=0; j &vOut ) { vector vpPossibleStyles; if( CommonMetrics::AUTO_SET_STYLE ) - GAMEMAN->GetCompatibleStyles( GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled(), vpPossibleStyles ); + GameManager::GetCompatibleStyles( GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled(), vpPossibleStyles ); else vpPossibleStyles.push_back( GAMESTATE->m_pCurStyle ); @@ -872,7 +872,7 @@ static void GetPlayableStepsTypes( const Song *pSong, set &vOut ) { bool bShowThisStepsType = find( vstToShow.begin(), vstToShow.end(), *st ) != vstToShow.end(); - const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled(), *st ); + const Style *pStyle = GameManager::GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled(), *st ); bool bEnoughStages = GAMESTATE->GetSmallestNumStagesLeftForAnyHumanPlayer() >= GAMESTATE->GetNumStagesForSongAndStyleType(pSong, pStyle->m_StyleType); if( bShowThisStepsType && bEnoughStages ) diff --git a/stepmania/src/StyleUtil.cpp b/stepmania/src/StyleUtil.cpp index 5c7ba289fa..6194603220 100644 --- a/stepmania/src/StyleUtil.cpp +++ b/stepmania/src/StyleUtil.cpp @@ -10,7 +10,7 @@ void StyleID::FromStyle( const Style *p ) { if( p ) { - sGame = GAMEMAN->GetGameForStyle(p)->m_szName; + sGame = GameManager::GetGameForStyle(p)->m_szName; sStyle = p->m_szName; } else @@ -26,7 +26,7 @@ const Style *StyleID::ToStyle() const if( pGame == NULL ) return NULL; - return GAMEMAN->GameAndStringToStyle( pGame, sStyle ); + return GameManager::GameAndStringToStyle( pGame, sStyle ); } XNode* StyleID::CreateNode() const