Added NoteSkinManager::GetDefaultNoteSkinName so that PlayerOptions can avoid clearing the noteskin when the clearall mod is used.

2014-08-07 18:36:42 -06:00
parent ab61c11606
commit bdb2b373bc
3 changed files with 40 additions and 5 deletions
@@ -200,14 +200,23 @@ void NoteSkinManager::GetNoteSkinNames( const Game* pGame, vector<RString> &AddT
 	GetAllNoteSkinNamesForGame( pGame, AddTo );
 }

+bool NoteSkinManager::NoteSkinNameInList(const RString name, vector<RString> name_list)
+{
+	for(size_t i= 0; i < name_list.size(); ++i)
+	{
+		if(0 == stricmp(name, name_list[i]))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
 bool NoteSkinManager::DoesNoteSkinExist( const RString &sSkinName )
 {
 	vector<RString> asSkinNames;
 	GetAllNoteSkinNamesForGame( GAMESTATE->m_pCurGame, asSkinNames );
-	for( unsigned i=0; i<asSkinNames.size(); i++ )
-		if( 0==stricmp(sSkinName, asSkinNames[i]) )
-			return true;
-	return false;
+	return NoteSkinNameInList(sSkinName, asSkinNames);
 }

 bool NoteSkinManager::DoNoteSkinsExistForGame( const Game *pGame )
@@ -217,6 +226,26 @@ bool NoteSkinManager::DoNoteSkinsExistForGame( const Game *pGame )
 	return !asSkinNames.empty();
 }

+RString NoteSkinManager::GetDefaultNoteSkinName()
+{
+	RString name= THEME->GetMetric("Common", "DefaultNoteSkinName");
+	vector<RString> all_names;
+	GetAllNoteSkinNamesForGame(GAMESTATE->m_pCurGame, all_names);
+	if(all_names.empty())
+	{
+		return "";
+	}
+	if(!NoteSkinNameInList(name, all_names))
+	{
+		name= "default";
+		if(!NoteSkinNameInList(name, all_names))
+		{
+			name= all_names[1];
+		}
+	}
+	return name;
+}
+
 void NoteSkinManager::GetAllNoteSkinNamesForGame( const Game *pGame, vector<RString> &AddTo )
 {
 	if( pGame == m_pCurGame )