From 3830ddbadfe66cea486b49743f4b2a752f67b3cc Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 27 Jun 2011 11:09:31 -0400 Subject: [PATCH] Use Step Author instead of Chart Style on right. --- Docs/Changelog_sm5.txt | 2 ++ Themes/_fallback/Languages/en.ini | 1 + Themes/_fallback/metrics.ini | 1 + src/ScreenEdit.cpp | 5 ++++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 63b47d5b0c..ba9638fb85 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -11,6 +11,8 @@ StepMania 5.0 Preview 2 | 201106?? 2011/06/27 ---------- * [Steps] Make sure #ATTACKS are copied when requested. [Wolfman2000] +* [ScreenEdit] Have Step Author up front instead of Chart Style. This is + probably going to be better overall. [Wolfman2000] 2011/06/26 ---------- diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 2706ab81b6..6a4b0a5287 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1286,6 +1286,7 @@ Selection beat=Selection beat Difficulty=Difficulty Description=Description Chart Style=Chart Style +Step Author=Step Author Main title=Main title Subtitle=Subtitle Tap Note=Tap Note diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 1632ddae96..e1e5812d24 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -3658,6 +3658,7 @@ SelectionBeatEndFormat="-%.5f\n" DifficultyFormat="%s:\n %s\n" RoutinePlayerFormat="%s:\n %d\n" DescriptionFormat="%s:\n %s\n" +StepAuthorFormat="%s:\n %s\n" ChartStyleFormat="%s:\n %s\n" MainTitleFormat="%s:\n %s\n" SubtitleFormat="%s:\n %s\n" diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index ed8a79261e..868c40bb71 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -1110,6 +1110,7 @@ static LocalizedString DIFFICULTY("ScreenEdit", "Difficulty"); static LocalizedString ROUTINE_PLAYER("ScreenEdit", "Routine Player"); static LocalizedString DESCRIPTION("ScreenEdit", "Description"); static LocalizedString CHART_STYLE("ScreenEdit", "Chart Style"); +static LocalizedString STEP_AUTHOR("ScreenEdit", "Step Author"); static LocalizedString MAIN_TITLE("ScreenEdit", "Main title"); static LocalizedString SUBTITLE("ScreenEdit", "Subtitle"); static LocalizedString TAP_NOTE_TYPE("ScreenEdit", "Tap Note"); @@ -1139,6 +1140,7 @@ static ThemeMetric DIFFICULTY_FORMAT("ScreenEdit", "DifficultyFormat"); static ThemeMetric ROUTINE_PLAYER_FORMAT("ScreenEdit", "RoutinePlayerFormat"); static ThemeMetric DESCRIPTION_FORMAT("ScreenEdit", "DescriptionFormat"); static ThemeMetric CHART_STYLE_FORMAT("ScreenEdit", "ChartStyleFormat"); +static ThemeMetric STEP_AUTHOR_FORMAT("ScreenEdit", "StepAuthorFormat"); static ThemeMetric MAIN_TITLE_FORMAT("ScreenEdit", "MainTitleFormat"); static ThemeMetric SUBTITLE_FORMAT("ScreenEdit", "SubtitleFormat"); static ThemeMetric TAP_NOTE_TYPE_FORMAT("ScreenEdit", "TapNoteTypeFormat"); @@ -1208,7 +1210,8 @@ void ScreenEdit::UpdateTextInfo() if ( m_InputPlayerNumber != PLAYER_INVALID ) sText += ssprintf( ROUTINE_PLAYER_FORMAT.GetValue(), ROUTINE_PLAYER.GetValue().c_str(), m_InputPlayerNumber + 1 ); sText += ssprintf( DESCRIPTION_FORMAT.GetValue(), DESCRIPTION.GetValue().c_str(), m_pSteps->GetDescription().c_str() ); - sText += ssprintf( CHART_STYLE_FORMAT.GetValue(), CHART_STYLE.GetValue().c_str(), m_pSteps->GetChartStyle().c_str() ); + sText += ssprintf( STEP_AUTHOR_FORMAT.GetValue(), STEP_AUTHOR.GetValue().c_str(), m_pSteps->GetCredit().c_str() ); + //sText += ssprintf( CHART_STYLE_FORMAT.GetValue(), CHART_STYLE.GetValue().c_str(), m_pSteps->GetChartStyle().c_str() ); sText += ssprintf( MAIN_TITLE_FORMAT.GetValue(), MAIN_TITLE.GetValue().c_str(), m_pSong->m_sMainTitle.c_str() ); if( m_pSong->m_sSubTitle.size() ) sText += ssprintf( SUBTITLE_FORMAT.GetValue(), SUBTITLE.GetValue().c_str(), m_pSong->m_sSubTitle.c_str() );