[Performous-commit] Tapio Vierros : Longer selection time for dancing and prefer dance-single.

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

Module: performous
Branch: master
Commit: 0326b8f4ed8c57d20aa34acfe5978b305b4a5463

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Dec 30 10:46:30 2009 +0200

Longer selection time for dancing and prefer dance-single.

---

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

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index bbf125a..2113887 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -11,7 +11,7 @@ namespace {
 	const std::string diffv[] = { "Beginner", "Easy", "Medium", "Hard", "Challenge" };
 	const float death_delay = 20.0f; // Delay in seconds after which the player is hidden
 	const float not_joined = -100; // A value that indicates player hasn't joined
-	const float join_delay = 5.0f; // Time to select track/difficulty when joining mid-game
+	const float join_delay = 7.0f; // Time to select track/difficulty when joining mid-game
 	const float past = -0.4f;
 	const float future = 2.0f;
 	const float timescale = 7.0f;
@@ -97,7 +97,9 @@ void DanceGraph::gameMode(int direction) {
 	static int mapping10[max_panels]= {0, 3, 4, 7, 1, 6, 2, 5,-1,-1};
 	// Cycling
 	if (direction == 0) {
-		m_curTrackIt = m_song.danceTracks.begin();
+		m_curTrackIt = m_song.danceTracks.find("dance-single");
+		if (m_curTrackIt == m_song.danceTracks.end())
+			m_curTrackIt = m_song.danceTracks.begin();
 	} else if (direction > 0) {
 		m_curTrackIt++;
 		if (m_curTrackIt == m_song.danceTracks.end()) m_curTrackIt = m_song.danceTracks.begin();
@@ -193,7 +195,10 @@ void DanceGraph::engine() {
 	// Handle all events
 	for (input::Event ev; m_input.tryPoll(ev);) {
 		// Handle joining and keeping alive
-		if (m_jointime == not_joined) m_jointime = (time < 0.0 ? -join_delay : time); // join
+		if (m_jointime == not_joined) {
+			m_jointime = (time < 0.0 ? -join_delay : time); // join
+			break;
+		}
 		m_acttime = time;
 		// Difficulty / mode selection
 		if (time < m_jointime + join_delay) {
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 7ed89a1..7104127 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -91,8 +91,9 @@ void ScreenSing::enter() {
 			} catch (std::runtime_error&) { break; }
 		}
 	}
-	double setup_delay = m_dancers.size() != 0 ? -5.0 : (m_instruments.empty() ? -1.0 : -8.0);
-	m_audio.playMusic(m_song->music, false, 0.0, setup_delay); // Startup delay for instruments is longer than for singing only
+	// Startup delay for instruments is longer than for singing only
+	double setup_delay = (m_instruments.empty() && m_dancers.empty() ? -1.0 : -8.0);
+	m_audio.playMusic(m_song->music, false, 0.0, setup_delay);
 	m_engine.reset(new Engine(m_audio, *m_song, analyzers.begin(), analyzers.end(), m_database));
 }