[Performous-commit] Vincent Le Ligeour : Fixed horrible copy paste a bit

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: 507876f933b5cd59070104928a32236bbc891c92

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Dec 23 21:10:56 2009 +0100

Fixed horrible copy paste a bit

---

 game/screen_sing.cc |   35 ++++++++++++++---------------------
 1 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index aecdbfb..27899b7 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -59,28 +59,21 @@ void ScreenSing::enter() {
 	if( !m_song->track_map.empty() ) {
 		// Here we load alternatively guitar/bass tracks until no guitar controler is available
 		// then we load all the drums tracks until no drum controler is available (and place them in second position)
-		bool no_guitar = false;
-		bool no_guitar2 = false;
-		bool no_guitar3 = false;
-		bool no_bass = false;
+		std::vector<std::string> instrument_tracks;
+		instrument_tracks.push_back("guitar");
+		instrument_tracks.push_back("coop guitar");
+		instrument_tracks.push_back("bass");
+		instrument_tracks.push_back("rhythm guitar");
 		while (1) {
-			try {
-				Instruments::iterator it = m_instruments.end();
-				m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "guitar"));
-			} catch (std::runtime_error&) {no_guitar = true;}
-			try {
-				Instruments::iterator it = m_instruments.end();
-				m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "coop guitar"));
-			} catch (std::runtime_error&) {no_guitar2 = true;}
-			try {
-				Instruments::iterator it = m_instruments.end();
-				m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "bass"));
-			} catch (std::runtime_error&) {no_bass = true;}
-			try {
-				Instruments::iterator it = m_instruments.end();
-				m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "rhythm guitar"));
-			} catch (std::runtime_error&) {no_guitar3 = true;}
-			if( no_guitar && no_guitar2 && no_guitar3 && no_bass ) break;
+			bool assigned = false;
+			for (std::vector<std::string>::const_iterator it = instrument_tracks.begin(); it != instrument_tracks.end(); ++it) {
+				try {
+					Instruments::iterator ite = m_instruments.end();
+					m_instruments.insert(ite, new GuitarGraph(m_audio, *m_song, *it));
+					assigned = true;
+				} catch (std::runtime_error&) {}
+			}
+			if( !assigned ) break;
 		}
 		while(1) {
 			try {