cleanup more playlist related logic in screen gameplay, and don't att…

…ach scores to a course if the course doesn't get completed
etternagame · Jun 13, 2017 · a1ac458 · a1ac458
1 parent 96947c5
commit a1ac458
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/AdjustSync.cpp b/src/AdjustSync.cpp
@@ -85,7 +85,7 @@ void AdjustSync::ResetAutosync()
 bool AdjustSync::IsSyncDataChanged()
 {
 	// Can't sync in course mode :joy_cat: -mina
-	if(!GAMESTATE->IsPlaylistCourse())
+	if(GAMESTATE->IsPlaylistCourse())
 		return false;
 
 	vector<RString> vs;
@@ -169,7 +169,7 @@ void AdjustSync::HandleAutosync( float fNoteOffBySeconds, float fStepTime )
 
 void AdjustSync::HandleSongEnd()
 {
-	if (!GAMESTATE->IsPlaylistCourse())
+	if (GAMESTATE->IsPlaylistCourse())
 		return;
 
 	if( GAMESTATE->m_SongOptions.GetCurrent().m_AutosyncType == AutosyncType_Tempo )

diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
@@ -782,7 +782,7 @@ void ScreenGameplay::InitSongQueues()
 		const PlayerOptions &p = pi->GetPlayerState()->m_PlayerOptions.GetCurrent();
 	}
 
-	if (SONGMAN->playlistcourse != "") {
+	if (GAMESTATE->IsPlaylistCourse()) {
 
 		m_apSongsQueue.clear();
 		FOREACH_EnabledPlayerInfo(m_vPlayerInfo, pi)
@@ -1818,7 +1818,6 @@ void ScreenGameplay::BeginBackingOutFromGameplay()
 	m_GameplayAssist.StopPlaying(); // Stop any queued assist ticks.
 
 	if (GAMESTATE->IsPlaylistCourse()) {
-		SONGMAN->allplaylists[SONGMAN->playlistcourse].courseruns.emplace_back(playlistscorekeys);
 		GAMESTATE->isplaylistcourse = false;
 		SONGMAN->playlistcourse = "";
 	}
@@ -2347,7 +2346,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 
 		m_sNextScreen = GetPrevScreen();
 
-		if( AdjustSync::IsSyncDataChanged() && GAMESTATE->IsPlaylistCourse())
+		if(!GAMESTATE->IsPlaylistCourse() && AdjustSync::IsSyncDataChanged())
 			ScreenSaveSync::PromptSaveSync( SM_GoToPrevScreen );
 		else
 			HandleScreenMessage( SM_GoToPrevScreen );
@@ -2360,7 +2359,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 		if( GAMESTATE->m_SongOptions.GetCurrent().m_bSaveReplay )
 			SaveReplay();
 
-		if( AdjustSync::IsSyncDataChanged() && GAMESTATE->IsPlaylistCourse())
+		if(!GAMESTATE->IsPlaylistCourse() && AdjustSync::IsSyncDataChanged())
 			ScreenSaveSync::PromptSaveSync( SM_GoToNextScreen );
 		else
 			HandleScreenMessage( SM_GoToNextScreen );