[Performous-commit] Tapio Vierros : Pressing any key after 'ready' but before t= 0 brings back instrument join menu.

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

Module: performous
Branch: menuvideo
Commit: e451ba3c7d6a18114699c5c36486bbe14b9c6842

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Sep 21 23:20:34 2010 +0300

Pressing any key after 'ready' but before t=0 brings back instrument join menu.

This is to make it easy to recover from accidental 'readiness'.

---

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

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index bb77221..cf88be0 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -323,11 +323,19 @@ void GuitarGraph::engine() {
 			// Sync menu items & captions
 			updateJoinMenu();
 			break;
+
+		// If the songs hasn't yet started, we want key presses to bring join menu back (not pause menu)
+		} else if (time < 0 && ev.type == input::Event::PRESS) {
+			setupJoinMenu();
+			m_menu.open();
+			break;
+
 		} else if (!m_input.isKeyboard()) {
 			// Handle Start/Select keypresses
 			if (ev.nav == input::CANCEL) ev.button = input::GODMODE_BUTTON; // Select = GodMode
 			if (ev.nav == input::START) { m_menu.open(); continue; }
 		}
+
 		// Guitar specific actions
 		if (!m_drums) {
 			if ((ev.type == input::Event::PRESS || ev.type == input::Event::RELEASE) && ev.button == input::GODMODE_BUTTON) {