[Performous-commit] Jaakko Nikkola : dance file check enabled ( checks if DanceTracks container is empty)

[Jaakko N. <jni...@us...>]

Module: performous
Branch: dance
Commit: a3b90de1b56277defb82fa0db1b4b09fee76e9a3

Author: Jaakko Nikkola <jaa...@tk...>
Date:   Fri Nov 13 18:23:06 2009 +0200

dance file check enabled (checks if DanceTracks container is empty)

---

 game/screen_sing.cc |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 24e9a11..b6b1141 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -84,14 +84,15 @@ void ScreenSing::enter() {
 		}
 	}
 	// Load dance tracks
-	//if ( !m_song->danceTracks.empty() ) {
-	m_dancers.push_back(new DanceGraph(m_audio, *m_song));
-	if (true) {
-		while(true) {
-			try {
-				m_dancers.push_back(new DanceGraph(m_audio, *m_song));
-				break; // REMOVEME
-			} catch (std::runtime_error&) { break; }
+	if ( !m_song->danceTracks.empty() ) {
+		m_dancers.push_back(new DanceGraph(m_audio, *m_song));
+		if (true) {
+			while(true) {
+				try {
+					m_dancers.push_back(new DanceGraph(m_audio, *m_song));
+					break; // REMOVEME
+				} catch (std::runtime_error&) { break; }
+			}
 		}
 	}
 	m_audio.playMusic(m_song->music, false, 0.0, m_instruments.empty() ? -1.0 : -8.0); // Startup delay for instruments is longer than for singing only