Theme -> Localize

This commit is contained in:
Chris Danford
2006-01-29 22:13:36 +00:00
parent 220e204485
commit 49782b331b
4 changed files with 21 additions and 21 deletions
+1 -1
View File
@@ -46,7 +46,7 @@ void ActiveAttackList::Refresh()
PlayerOptions po;
po.FromString( attack.sModifiers, true );
po.GetThemedMods( vsThemedMods );
po.GetLocalizedMods( vsThemedMods );
}
RString s = join( "\n", vsThemedMods );
+7 -7
View File
@@ -131,15 +131,15 @@ void SaveCatalogXml( LoadingWindow *loading_window )
continue;
switch( e->m_Type )
{
case UnlockEntry::TYPE_SONG: iNumUnlockedSongs++; break;
case UnlockEntry::TYPE_STEPS: iNumUnlockedSteps++; break;
case UnlockEntry::TYPE_COURSE: iNumUnlockedCourses++; break;
case UnlockRewardType_Song: iNumUnlockedSongs++; break;
case UnlockRewardType_Steps: iNumUnlockedSteps++; break;
case UnlockRewardType_Course: iNumUnlockedCourses++; break;
}
}
pNode->AppendChild( "TotalSongs", iTotalSongs );
pNode->AppendChild( "TotalSteps", iTotalSteps );
pNode->AppendChild( "TotalCourses", iTotalCourses );
pNode->AppendChild( "TotalSongs", iTotalSongs );
pNode->AppendChild( "TotalSteps", iTotalSteps );
pNode->AppendChild( "TotalCourses", iTotalCourses );
pNode->AppendChild( "NumUnlockedSongs", iNumUnlockedSongs );
pNode->AppendChild( "NumUnlockedSteps", iNumUnlockedSteps );
pNode->AppendChild( "NumUnlockedCourses", iNumUnlockedCourses );
@@ -355,7 +355,7 @@ void SaveCatalogXml( LoadingWindow *loading_window )
RString s = *iter;
po.FromString( s, false );
vector<RString> v;
po.GetThemedMods( v );
po.GetLocalizedMods( v );
if( v.empty() )
continue;
XNode* pNode3 = pNode2->AppendChild( "Modifier", *iter );
+12 -12
View File
@@ -10,17 +10,17 @@
static RString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%dCommand",int(p+1)); }
ThemeMetric<RString> CommonMetrics::INITIAL_SCREEN ("Common","InitialScreen", true); // always reevaluate metric
ThemeMetric<RString> CommonMetrics::FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen");
ThemeMetric<RString> CommonMetrics::DEFAULT_MODIFIERS ("Common","DefaultModifiers" );
ThemeMetric<RString> CommonMetrics::DEFAULT_CPU_MODIFIERS ("Common","DefaultCpuModifiers" );
ThemeMetric1D<apActorCommands> CommonMetrics::PLAYER_COLOR ("Common",PLAYER_COLOR_NAME,NUM_PLAYERS);
LocalizedString CommonMetrics::WINDOW_TITLE ("Common","WindowTitle");
ThemeMetric<int> CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS("Common","MaxCourseEntriesBeforeShowVarious");
ThemeMetric<float> CommonMetrics::TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
ThemeMetricDifficultiesToShow CommonMetrics::DIFFICULTIES_TO_SHOW ("Common","DifficultiesToShow");
ThemeMetricCourseDifficultiesToShow CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW ("Common","CourseDifficultiesToShow");
ThemeMetricStepsTypesToShow CommonMetrics::STEPS_TYPES_TO_SHOW ("Common","StepsTypesToHide");
ThemeMetric<RString> CommonMetrics::INITIAL_SCREEN ("Common","InitialScreen", true); // always reevaluate metric
ThemeMetric<RString> CommonMetrics::FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen");
ThemeMetric<RString> CommonMetrics::DEFAULT_MODIFIERS ("Common","DefaultModifiers" );
ThemeMetric<RString> CommonMetrics::DEFAULT_CPU_MODIFIERS ("Common","DefaultCpuModifiers" );
ThemeMetric1D<apActorCommands> CommonMetrics::PLAYER_COLOR ("Common",PLAYER_COLOR_NAME,NUM_PLAYERS);
LocalizedString CommonMetrics::WINDOW_TITLE ("Common","WindowTitle");
ThemeMetric<int> CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS("Common","MaxCourseEntriesBeforeShowVarious");
ThemeMetric<float> CommonMetrics::TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
ThemeMetricDifficultiesToShow CommonMetrics::DIFFICULTIES_TO_SHOW ("Common","DifficultiesToShow");
ThemeMetricCourseDifficultiesToShow CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW ("Common","CourseDifficultiesToShow");
ThemeMetricStepsTypesToShow CommonMetrics::STEPS_TYPES_TO_SHOW ("Common","StepsTypesToHide");
ThemeMetricDifficultiesToShow::ThemeMetricDifficultiesToShow( const RString& sGroup, const RString& sName ) :
@@ -122,7 +122,7 @@ void ThemeMetricStepsTypesToShow::Read()
const vector<StepsType>& ThemeMetricStepsTypesToShow::GetValue() { return m_v; }
RString CommonMetrics::ThemeOptionItem( RString s, bool bOptional )
RString CommonMetrics::LocalizeOptionItem( const RString &s, bool bOptional )
{
if( bOptional && !THEME->HasMetric("OptionNames",s) )
return s;
+1 -1
View File
@@ -62,7 +62,7 @@ namespace CommonMetrics
extern ThemeMetricCourseDifficultiesToShow COURSE_DIFFICULTIES_TO_SHOW;
extern ThemeMetricStepsTypesToShow STEPS_TYPES_TO_SHOW;
RString ThemeOptionItem( RString s, bool bOptional );
RString LocalizeOptionItem( const RString &s, bool bOptional );
};
#endif