[Performous-commit] Tapio Vierros : Guitar join menu key hints change to alt mapping (Z, X) when in lefty-mode.

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

Module: performous
Branch: master
Commit: f86db16a756ada97b8b6d6392d9e244ec34f7875

Author: Tapio Vierros <tap...@gm...>
Date:   Mon Sep 27 17:52:45 2010 +0300

Guitar join menu key hints change to alt mapping (Z,X) when in lefty-mode.

---

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

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index cf76e00..fdbbcc2 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -71,7 +71,6 @@ GuitarGraph::GuitarGraph(Audio& audio, Song const& song, bool drums, int number,
   m_neckglowColor(),
   m_drums(drums),
   m_use3d(config["graphic/3d_notes"].b()),
-  m_leftymode(false),
   m_practmode(practmode),
   m_level(),
   m_track_index(m_instrumentTracks.end()),
diff --git a/game/guitargraph.hh b/game/guitargraph.hh
index f5a79cd..a9c5e10 100644
--- a/game/guitargraph.hh
+++ b/game/guitargraph.hh
@@ -91,7 +91,6 @@ class GuitarGraph: public InstrumentGraph {
 	// Flags
 	bool m_drums; /// are we using drums?
 	bool m_use3d; /// are we using 3d?
-	ConfigItem m_leftymode; /// switch guitar notes to right-to-left direction
 	bool m_practmode; /// switch to enable practice mode
 
 	// Track stuff
diff --git a/game/instrumentgraph.cc b/game/instrumentgraph.cc
index e17c014..607843a 100644
--- a/game/instrumentgraph.cc
+++ b/game/instrumentgraph.cc
@@ -16,6 +16,7 @@ InstrumentGraph::InstrumentGraph(Audio& audio, Song const& song, input::DevType
   m_selectedTrack(""),
   m_selectedDifficulty(0),
   m_rejoin(false),
+  m_leftymode(false),
   m_pads(),
   m_correctness(0.0, 5.0),
   m_score(),
@@ -96,9 +97,9 @@ void InstrumentGraph::drawMenu() {
 			if (getGraphType() != input::DANCEPAD) {
 				if (m_input.isKeyboard()) { // Key letters for keyboard
 					txt->dimensions.middle(x - button_margin - m_button.dimensions.w()*0.5f).center(y);
-					txt->draw(getGraphType() == input::GUITAR ? "1" : "U");
+					txt->draw(getGraphType() == input::GUITAR ? (m_leftymode.b() ? "Z" : "1") : "U");
 					txt->dimensions.middle(xx + button_margin - m_button.dimensions.w()*0.5f).center(y);
-					txt->draw(getGraphType() == input::GUITAR ? "2" : "P");
+					txt->draw(getGraphType() == input::GUITAR ? (m_leftymode.b() ? "X" : "2") : "P");
 				} else { // Colored icons for real instruments
 					{
 						glutil::Color c(color(getGraphType() == input::GUITAR ? 0 : 1));
diff --git a/game/instrumentgraph.hh b/game/instrumentgraph.hh
index 948c707..72661ab 100644
--- a/game/instrumentgraph.hh
+++ b/game/instrumentgraph.hh
@@ -135,6 +135,7 @@ class InstrumentGraph {
 	ConfigItem m_selectedTrack; /// menu modifies this to select track
 	ConfigItem m_selectedDifficulty; /// menu modifies this to select difficulty
 	ConfigItem m_rejoin; /// menu sets this if we want to re-join
+	ConfigItem m_leftymode; /// switch guitar notes to right-to-left direction
 	std::string m_trackOpt;
 	std::string m_difficultyOpt;
 	std::string m_leftyOpt;