[Performous-commit] Tapio Vierros : Enabled 5-7 panel dance game modes after correcting their arrow mappings.

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

Module: performous
Branch: master
Commit: 957e8da426ca2b3867ba08e12865dd8ccb0274cd

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 13 02:08:49 2010 +0200

Enabled 5-7 panel dance game modes after correcting their arrow mappings.

---

 game/dancegraph.cc    |    6 +++---
 game/songparser-sm.cc |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 7c08a2d..20afdcb 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -106,9 +106,9 @@ DanceGraph::DanceGraph(Audio& audio, Song const& song):
 void DanceGraph::gameMode(int direction) {
 	// Position mappings for panels
 	static const int mapping4[max_panels] = {0, 1, 2, 3,-1,-1,-1,-1,-1,-1};
-	static const int mapping5[max_panels] = {0, 1, 2, 4, 3,-1,-1,-1,-1,-1};
+	static const int mapping5[max_panels] = {0, 1, 3, 4, 2,-1,-1,-1,-1,-1};
 	static const int mapping6[max_panels] = {0, 2, 3, 5, 1, 4,-1,-1,-1,-1};
-	static const int mapping7[max_panels] = {0, 3, 4, 7, 1, 6, 2,-1,-1,-1};
+	static const int mapping7[max_panels] = {0, 2, 4, 6, 1, 5, 3,-1,-1,-1};
 	static const int mapping8[max_panels] = {0, 3, 4, 7, 1, 6, 2, 5,-1,-1};
 	static const int mapping10[max_panels]= {0, 3, 4, 7, 1, 6, 2, 5,-1,-1};
 	// Cycling
@@ -135,7 +135,7 @@ void DanceGraph::gameMode(int direction) {
 	else if (gm == "pump-couple") { m_pads = 10; std::copy(mapping10, mapping10+max_panels, m_arrow_map); }
 	else if (gm == "ez2-single") { m_pads = 5; std::copy(mapping5, mapping5+max_panels, m_arrow_map); }
 	else if (gm == "ez2-double") { m_pads = 10; std::copy(mapping10, mapping10+max_panels, m_arrow_map); }
-	else if (gm == "ex2-real") { m_pads = 7; std::copy(mapping7, mapping7+max_panels, m_arrow_map); }
+	else if (gm == "ez2-real") { m_pads = 7; std::copy(mapping7, mapping7+max_panels, m_arrow_map); }
 	else if (gm == "para-single") { m_pads = 5; std::copy(mapping5, mapping5+max_panels, m_arrow_map); }
 	else throw std::runtime_error("Unknown track " + gm);
 	
diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index 03ec824..a9140de 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -116,7 +116,8 @@ bool SongParser::smParseField(std::string line) {
 
 			//Here all note data from the current track is inserted into containers 
 			// TODO: support other track types. For now all others are simply ignored.
-			if (notestype == "dance-single" || notestype == "dance-double") {
+			if (notestype == "dance-single" || notestype == "dance-double" || "dance-solo"
+			  || "pump-single" || "ez2-single" || "ez2-real" || "para-single") {
 				DanceTrack danceTrack(description, notes);
 				if (m_song.danceTracks.find(notestype) == m_song.danceTracks.end() ) {
 					DanceDifficultyMap danceDifficultyMap;