[Performous-commit] Lasse Karkkainen : Remember difficulty level on instrument change ( if possible).

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 9b9c0c8f7e2a04fe163974f26d8b1153ac68f68b

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sun Jul 26 14:43:53 2009 +0300

Remember difficulty level on instrument change (if possible).
Allow setting the difficulty and choosing an instrument simultaneously.

---

 game/guitargraph.cc |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index be09e32..48e1acc 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -50,11 +50,14 @@ void GuitarGraph::inputProcess() {
 
 void GuitarGraph::engine(double time) {
 	if (picked && time < -0.5) {
+		if (fretPressed[4]) {
+			m_instrument = (m_instrument + 1) % m_song.tracks.size();
+			if (!difficulty(m_level)) difficultyAuto();
+		}
 		if (fretPressed[0]) difficulty(DIFFICULTY_SUPAEASY);
 		else if (fretPressed[1]) difficulty(DIFFICULTY_EASY);
 		else if (fretPressed[2]) difficulty(DIFFICULTY_MEDIUM);
 		else if (fretPressed[3]) difficulty(DIFFICULTY_AMAZING);
-		if (fretPressed[4]) { m_instrument = (m_instrument + 1) % m_song.tracks.size(); difficultyAuto(); }
 	}
 	if (picked) { m_pickValue.setValue(1.0); }
 	picked = false;