[Performous-commit] Tapio Vierros : Removed some temporary hacks, readded a dancetrack for all songs (for testing).

[Tapio V. <aa...@us...>]

Module: performous
Branch: dance
Commit: 39e00d7835b81b7709b2936ae30e5f9232548903

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Nov 14 09:56:07 2009 +0200

Removed some temporary hacks, readded a dancetrack for all songs (for testing).

---

 game/screen_sing.cc |   14 ++++++--------
 game/song.hh        |    3 ---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index b6b1141..e4f29b3 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -84,15 +84,13 @@ void ScreenSing::enter() {
 		}
 	}
 	// Load dance tracks
+	m_dancers.push_back(new DanceGraph(m_audio, *m_song)); // REMOVEME
 	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; }
-			}
+		while(1) {
+			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
diff --git a/game/song.hh b/game/song.hh
index a35103d..deb42d7 100644
--- a/game/song.hh
+++ b/game/song.hh
@@ -41,9 +41,6 @@ class Song: boost::noncopyable {
 	Notes notes; ///< notes for song (only used for singing)
 	TrackMap track_map; ///< guitar etc. notes for this song
 	DanceTracks danceTracks; ///< dance tracks
-	// TODO: TEMPORARY TO ALLOW COMPILING
-	std::vector<std::map<int, Note> > d_notes; ///< dance notes
-	// ^
 	typedef std::vector<double> Beats;
 	Beats beats;
 	int noteMin, ///< lowest note