[Performous-commit] Tapio Vierros : Tweak joinmenu delays.

[Johnny O. <js...@us...>]

Module: performous
Branch: opengl2
Commit: 8ef8c73afe9de6d6b7aeb69bf566140f88d52e8f

Author: Tapio Vierros <tap...@gm...>
Date:   Sun Oct 24 19:16:09 2010 +0300

Tweak joinmenu delays.

---

 game/guitargraph.cc |    2 +-
 game/screen_sing.cc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index e45da6b..5ec2f93 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -326,7 +326,7 @@ void GuitarGraph::engine() {
 			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) {
+		} else if (time < -2 && ev.type == input::Event::PRESS) {
 			setupJoinMenu();
 			m_menu.open();
 			break;
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index c9a214b..a50d0e8 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -137,7 +137,7 @@ void ScreenSing::enter() {
 	m_menu.add(MenuOption(_("Quit"), _("Exit to song browser"), "Songs"));
 	m_menu.close();
 	// Startup delay for instruments is longer than for singing only
-	double setup_delay = (m_instruments.empty() && m_dancers.empty() ? -1.0 : -3.0);
+	double setup_delay = (m_instruments.empty() && m_dancers.empty() ? -1.0 : -5.0);
 	sm->loading(_("Finalizing..."), 0.95);
 	m_audio.playMusic(m_song->music, false, 0.0, setup_delay);
 	m_engine.reset(new Engine(m_audio, m_song->getVocalTrack(m_selectedTrack), analyzers.begin(), analyzers.end(), m_database));