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

Remove #SELECTABLE:ROULETTE.

Browse Source
This commit is contained in:
Glenn Maynard
2007-04-10 23:09:28 +00:00
parent a9d8d0f405
commit 1de53984ad
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderSM.cpp
-2
View File
@@ -355,8 +355,6 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
out.m_SelectionDisplay = out.SHOW_ALWAYS; out.m_SelectionDisplay = out.SHOW_ALWAYS;
else if(!stricmp(sParams[1],"NO")) else if(!stricmp(sParams[1],"NO"))
out.m_SelectionDisplay = out.SHOW_NEVER; out.m_SelectionDisplay = out.SHOW_NEVER;
else if(!stricmp(sParams[1],"ROULETTE"))
out.m_SelectionDisplay = out.SHOW_ROULETTE;
else else
LOG->UserLog( "Song file", sPath, "has an unknown #SELECTABLE value, \"%s\"; ignored.", sParams[1].c_str() ); LOG->UserLog( "Song file", sPath, "has an unknown #SELECTABLE value, \"%s\"; ignored.", sParams[1].c_str() );
} }
stepmania/src/NotesWriterSM.cpp
-1
View File
@@ -63,7 +63,6 @@ static void WriteGlobalTags( RageFile &f, const Song &out )
default: ASSERT(0); /* fallthrough */ default: ASSERT(0); /* fallthrough */
case Song::SHOW_ALWAYS: f.Write( "YES" ); break; case Song::SHOW_ALWAYS: f.Write( "YES" ); break;
case Song::SHOW_NEVER: f.Write( "NO" ); break; case Song::SHOW_NEVER: f.Write( "NO" ); break;
case Song::SHOW_ROULETTE: f.Write( "ROULETTE" ); break;
} }
f.PutLine( ";" ); f.PutLine( ";" );
stepmania/src/Song.cpp
-1
View File
@@ -1027,7 +1027,6 @@ Song::SelectionDisplay Song::GetDisplayed() const
} }
bool Song::NormallyDisplayed() const { return GetDisplayed() == SHOW_ALWAYS; } bool Song::NormallyDisplayed() const { return GetDisplayed() == SHOW_ALWAYS; }
bool Song::NeverDisplayed() const { return GetDisplayed() == SHOW_NEVER; } bool Song::NeverDisplayed() const { return GetDisplayed() == SHOW_NEVER; }
bool Song::RouletteDisplayed() const { if(IsTutorial()) return false; return GetDisplayed() != SHOW_NEVER; }
bool Song::ShowInDemonstrationAndRanking() const { return !IsTutorial() && NormallyDisplayed(); } bool Song::ShowInDemonstrationAndRanking() const { return !IsTutorial() && NormallyDisplayed(); }
stepmania/src/song.h
+2 -4
View File
@@ -45,9 +45,8 @@ public:
/* Set when this song should be displayed in the music wheel: */ /* Set when this song should be displayed in the music wheel: */
enum SelectionDisplay enum SelectionDisplay
{ {
SHOW_ALWAYS, /* all the time */ SHOW_ALWAYS, /* always */
SHOW_ROULETTE, /* only when rouletting */ SHOW_NEVER /* never (unless song hiding is turned off) */
SHOW_NEVER /* never (unless song hiding is turned off) */
} m_SelectionDisplay; } m_SelectionDisplay;
Song(); Song();
@@ -193,7 +192,6 @@ public:
SelectionDisplay GetDisplayed() const; SelectionDisplay GetDisplayed() const;
bool NormallyDisplayed() const; bool NormallyDisplayed() const;
bool NeverDisplayed() const; bool NeverDisplayed() const;
bool RouletteDisplayed() const;
bool ShowInDemonstrationAndRanking() const; bool ShowInDemonstrationAndRanking() const;
void AddSteps( Steps* pSteps ); // we are responsible for deleting the memory pointed to by pSteps! void AddSteps( Steps* pSteps ); // we are responsible for deleting the memory pointed to by pSteps!