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

GAME_BASE_NOTESKIN_NAME -> DEFAULT_NOTESKIN_NAME.

Browse Source 
(This isn't the base noteskin that other noteskins derive from, just
the default preference.)
This commit is contained in:
Glenn Maynard
2007-02-04 04:07:14 +00:00
parent a5f71e3cca
commit 2d0bb7955a
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CommonMetrics.cpp
+1
View File
@@ -19,6 +19,7 @@ ThemeMetric1D<apActorCommands> CommonMetrics::PLAYER_COLOR ("Common",PLAYER_C
LocalizedString CommonMetrics::WINDOW_TITLE ("Common","WindowTitle"); LocalizedString CommonMetrics::WINDOW_TITLE ("Common","WindowTitle");
ThemeMetric<int> CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS("Common","MaxCourseEntriesBeforeShowVarious"); ThemeMetric<int> CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS("Common","MaxCourseEntriesBeforeShowVarious");
ThemeMetric<float> CommonMetrics::TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds"); ThemeMetric<float> CommonMetrics::TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
ThemeMetric<RString> CommonMetrics::DEFAULT_NOTESKIN_NAME ("Common","DefaultNoteSkinName");
ThemeMetricDifficultiesToShow CommonMetrics::DIFFICULTIES_TO_SHOW ("Common","DifficultiesToShow"); ThemeMetricDifficultiesToShow CommonMetrics::DIFFICULTIES_TO_SHOW ("Common","DifficultiesToShow");
ThemeMetricCourseDifficultiesToShow CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW ("Common","CourseDifficultiesToShow"); ThemeMetricCourseDifficultiesToShow CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW ("Common","CourseDifficultiesToShow");
ThemeMetricStepsTypesToShow CommonMetrics::STEPS_TYPES_TO_SHOW ("Common","StepsTypesToHide"); ThemeMetricStepsTypesToShow CommonMetrics::STEPS_TYPES_TO_SHOW ("Common","StepsTypesToHide");
stepmania/src/CommonMetrics.h
+1
View File
@@ -58,6 +58,7 @@ namespace CommonMetrics
extern LocalizedString WINDOW_TITLE; extern LocalizedString WINDOW_TITLE;
extern ThemeMetric<int> MAX_COURSE_ENTRIES_BEFORE_VARIOUS; extern ThemeMetric<int> MAX_COURSE_ENTRIES_BEFORE_VARIOUS;
extern ThemeMetric<float> TICK_EARLY_SECONDS; extern ThemeMetric<float> TICK_EARLY_SECONDS;
extern ThemeMetric<RString> DEFAULT_NOTESKIN_NAME;
extern ThemeMetricDifficultiesToShow DIFFICULTIES_TO_SHOW; extern ThemeMetricDifficultiesToShow DIFFICULTIES_TO_SHOW;
extern ThemeMetricCourseDifficultiesToShow COURSE_DIFFICULTIES_TO_SHOW; extern ThemeMetricCourseDifficultiesToShow COURSE_DIFFICULTIES_TO_SHOW;
extern ThemeMetricStepsTypesToShow STEPS_TYPES_TO_SHOW; extern ThemeMetricStepsTypesToShow STEPS_TYPES_TO_SHOW;
stepmania/src/GameState.cpp
+1 -1
View File
@@ -1127,7 +1127,7 @@ void GameState::GetDefaultPlayerOptions( PlayerOptions &po )
po.FromString( PREFSMAN->m_sDefaultModifiers ); po.FromString( PREFSMAN->m_sDefaultModifiers );
po.FromString( CommonMetrics::DEFAULT_MODIFIERS ); po.FromString( CommonMetrics::DEFAULT_MODIFIERS );
if( po.m_sNoteSkin.empty() ) if( po.m_sNoteSkin.empty() )
po.m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME; po.m_sNoteSkin = CommonMetrics::DEFAULT_NOTESKIN_NAME;
} }
void GameState::GetDefaultSongOptions( SongOptions &so ) void GameState::GetDefaultSongOptions( SongOptions &so )
stepmania/src/PlayerOptions.cpp
+2 -2
View File
@@ -198,7 +198,7 @@ void PlayerOptions::GetMods( vector<RString> &AddTo, bool bForceNoteSkin ) const
} }
// Don't display a string if using the default NoteSkin unless we force it. // Don't display a string if using the default NoteSkin unless we force it.
if( bForceNoteSkin || (!m_sNoteSkin.empty() && m_sNoteSkin != NOTESKIN->GAME_BASE_NOTESKIN_NAME.GetValue()) ) if( bForceNoteSkin || (!m_sNoteSkin.empty() && m_sNoteSkin != CommonMetrics::DEFAULT_NOTESKIN_NAME.GetValue()) )
{ {
RString s = m_sNoteSkin; RString s = m_sNoteSkin;
Capitalize( s ); Capitalize( s );
@@ -352,7 +352,7 @@ void PlayerOptions::FromString( const RString &sOptions, bool bWarnOnInvalid )
else if( sBit == "hallway" ) { m_bSetTiltOrSkew = true; m_fSkew = 0; m_fPerspectiveTilt = -level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; } else if( sBit == "hallway" ) { m_bSetTiltOrSkew = true; m_fSkew = 0; m_fPerspectiveTilt = -level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
else if( sBit == "distant" ) { m_bSetTiltOrSkew = true; m_fSkew = 0; m_fPerspectiveTilt = +level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; } else if( sBit == "distant" ) { m_bSetTiltOrSkew = true; m_fSkew = 0; m_fPerspectiveTilt = +level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
else if( NOTESKIN && NOTESKIN->DoesNoteSkinExist(sBit) ) m_sNoteSkin = sBit; else if( NOTESKIN && NOTESKIN->DoesNoteSkinExist(sBit) ) m_sNoteSkin = sBit;
else if( sBit == "noteskin" && !on ) /* "no noteskin" */ m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME; else if( sBit == "noteskin" && !on ) /* "no noteskin" */ m_sNoteSkin = CommonMetrics::DEFAULT_NOTESKIN_NAME;
else if( sBit == "randomspeed" ) SET_FLOAT( fRandomSpeed ) else if( sBit == "randomspeed" ) SET_FLOAT( fRandomSpeed )
else if( sBit == "addscore" ) m_ScoreDisplay = SCORING_ADD; else if( sBit == "addscore" ) m_ScoreDisplay = SCORING_ADD;
else if( sBit == "subtractscore" ) m_ScoreDisplay = SCORING_SUBTRACT; else if( sBit == "subtractscore" ) m_ScoreDisplay = SCORING_SUBTRACT;
stepmania/src/SongManager.cpp
+3 -2
View File
@@ -5,6 +5,7 @@
#include "BackgroundUtil.h" #include "BackgroundUtil.h"
#include "BannerCache.h" #include "BannerCache.h"
#include "CatalogXml.h" #include "CatalogXml.h"
#include "CommonMetrics.h"
#include "Course.h" #include "Course.h"
#include "CourseLoaderCRS.h" #include "CourseLoaderCRS.h"
#include "CourseUtil.h" #include "CourseUtil.h"
@@ -1011,7 +1012,7 @@ bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, RString sPreferredG
if( pPlayerOptionsOut != NULL ) if( pPlayerOptionsOut != NULL )
{ {
pPlayerOptionsOut->Init(); pPlayerOptionsOut->Init();
pPlayerOptionsOut->m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME; pPlayerOptionsOut->m_sNoteSkin = CommonMetrics::DEFAULT_NOTESKIN_NAME;
pPlayerOptionsOut->FromString( pTrail->m_vEntries[0].Modifiers ); pPlayerOptionsOut->FromString( pTrail->m_vEntries[0].Modifiers );
} }
if( pSongOptionsOut != NULL ) if( pSongOptionsOut != NULL )
@@ -1119,7 +1120,7 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, Song*& pSong
if( pPlayerOptionsOut != NULL ) if( pPlayerOptionsOut != NULL )
{ {
pPlayerOptionsOut->Init(); pPlayerOptionsOut->Init();
pPlayerOptionsOut->m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME; pPlayerOptionsOut->m_sNoteSkin = CommonMetrics::DEFAULT_NOTESKIN_NAME;
pPlayerOptionsOut->FromString( bExtra2 ? EXTRA_STAGE2_PLAYER_OPTIONS : EXTRA_STAGE_PLAYER_OPTIONS, true ); pPlayerOptionsOut->FromString( bExtra2 ? EXTRA_STAGE2_PLAYER_OPTIONS : EXTRA_STAGE_PLAYER_OPTIONS, true );
} }