[Performous-commit] Jaakko Nikkola : Remaining compile problems fixed, parser is now ready to be tested.

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

Module: performous
Branch: dance
Commit: f818691cc5fff5ac26fa905d37138821838636d0

Author: Jaakko Nikkola <jaa...@tk...>
Date:   Fri Nov 13 15:38:04 2009 +0200

Remaining compile problems fixed, parser is now ready to be tested.

---

 game/songparser-sm.cc |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index 441edd8..b6f0d8d 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -91,8 +91,8 @@ bool SongParser::smParseField(std::string line) {
 	while (getline(line) && smParseNote(line, chords)) {}
 	
 	DanceTrack danceTrack(description, chords);
-//	danceDifficultyMap[danceDifficulty] = danceTrack;
-//	m_song.danceTracks[notestype] = danceDifficultyMap;	
+	danceDifficultyMap.insert(std::make_pair(danceDifficulty, danceTrack));
+	m_song.danceTracks.insert(std::make_pair(notestype, danceDifficultyMap));	
 	return true;
 	}
 
@@ -144,9 +144,11 @@ bool SongParser::smParseNote(std::string line, DanceChords chords){
 		dur = 4 * ( 1/(m_bpm/60) ) / lcount;	//counts one note duration in seconds;	
 		for(int j = count - lcount; j<count ; j++) {	
 			for(int i = 0; i<4; i++) {
-	//			if((chords[j])[i]) (chords[j])[i].begin = tm;
-	//			if((chords[j])[i]) (chords[j])[i].end = tm;		
-				
+				DanceChord _chord = chords.at(j);
+				if(_chord[i] != _chord.end()) {
+					_chord[i].begin = tm;
+					_chord[i].end = tm;
+				}				
 			}
 			tm += dur;
 		}