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

NextTheme -> GetNextTheme

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-20 23:10:15 +00:00
parent 65c9a8bd17
commit 41028ca167
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenTitleMenu.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ void ScreenTitleMenu::Input( const InputEventPlus &input )
if( CodeDetector::EnteredCode(input.GameI.controller,CODE_NEXT_THEME) || if( CodeDetector::EnteredCode(input.GameI.controller,CODE_NEXT_THEME) ||
CodeDetector::EnteredCode(input.GameI.controller,CODE_NEXT_THEME2) ) CodeDetector::EnteredCode(input.GameI.controller,CODE_NEXT_THEME2) )
{ {
THEME->NextTheme(); THEME->SwitchThemeAndLanguage( THEME->GetNextTheme(), THEME->GetCurLanguage(), PREFSMAN->m_bPseudoLocalize );
StepMania::ApplyGraphicOptions(); // update window title and icon StepMania::ApplyGraphicOptions(); // update window title and icon
SCREENMAN->SystemMessage( THEME_.GetValue()+": "+THEME->GetCurThemeName() ); SCREENMAN->SystemMessage( THEME_.GetValue()+": "+THEME->GetCurThemeName() );
SCREENMAN->SetNewScreen( m_sName ); SCREENMAN->SetNewScreen( m_sName );
stepmania/src/ThemeManager.cpp
+2 -2
View File
@@ -952,7 +952,7 @@ apActorCommands ThemeManager::GetMetricA( const RString &sClassName, const RStri
} }
#endif #endif
void ThemeManager::NextTheme() RString ThemeManager::GetNextTheme()
{ {
vector<RString> as; vector<RString> as;
GetThemeNames( as ); GetThemeNames( as );
@@ -961,7 +961,7 @@ void ThemeManager::NextTheme()
if( as[i].CompareNoCase(m_sCurThemeName)==0 ) if( as[i].CompareNoCase(m_sCurThemeName)==0 )
break; break;
int iNewIndex = (i+1)%as.size(); int iNewIndex = (i+1)%as.size();
SwitchThemeAndLanguage( as[iNewIndex], m_sCurLanguage, m_bPseudoLocalize ); return as[iNewIndex];
} }
void ThemeManager::GetLanguagesForTheme( const RString &sThemeName, vector<RString>& asLanguagesOut ) void ThemeManager::GetLanguagesForTheme( const RString &sThemeName, vector<RString>& asLanguagesOut )
stepmania/src/ThemeManager.h
+1 -1
View File
@@ -50,7 +50,7 @@ public:
bool IsThemeLoaded() const { return !m_sCurThemeName.empty(); }; bool IsThemeLoaded() const { return !m_sCurThemeName.empty(); };
RString GetCurLanguage() const { return m_sCurLanguage; }; RString GetCurLanguage() const { return m_sCurLanguage; };
RString GetCurThemeDir() const { return GetThemeDirFromName(m_sCurThemeName); }; RString GetCurThemeDir() const { return GetThemeDirFromName(m_sCurThemeName); };
void NextTheme(); RString GetNextTheme();
void ReloadMetrics(); void ReloadMetrics();
void ReloadSubscribers(); void ReloadSubscribers();
void ClearSubscribers(); void ClearSubscribers();