[Performous-commit] Lasse Karkkainen : Extra second added before song start to allow playing the very first note of a song properly .

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

Module: performous
Branch: master
Commit: 9a9624edfdb8fb75a8cc909ad45ddc7b8df3c91e

Author: Lasse Karkkainen <tro...@tr...>
Date:   Mon Jan 18 01:11:41 2010 +0200

Extra second added before song start to allow playing the very first note of a song properly.

---

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

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index ad78a3b..3969dae 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -209,7 +209,7 @@ void DanceGraph::engine() {
 	for (input::Event ev; m_input.tryPoll(ev);) {
 		m_dead = 0; // Keep alive
 		if (m_jointime == not_joined) { // Handle joining
-			m_jointime = (time < 0.0 ? -join_delay : time);
+			m_jointime = (time < -1.0 ? -1.0 - join_delay : time);
 			break;
 		}
 		// Difficulty / mode selection
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index eb5b040..a94875e 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -207,7 +207,7 @@ void GuitarGraph::engine() {
 		// breaks to be usable with FoF songs.
 		if (dead() && m_input.isKeyboard() && ev.type == input::Event::PICK) continue;
 		m_dead = 0; // Keep alive
-		if (m_jointime == not_joined) m_jointime = (time < 0.0 ? -join_delay : time); // Handle joining
+		if (m_jointime == not_joined) m_jointime = (time < -1.0 ? -1.0 - join_delay : time); // Handle joining
 		// Handle Start/Select keypresses
 		if (ev.type == input::Event::PRESS && ev.button > input::STARPOWER_BUTTON) {
 			if (ev.button == 9) ev.button = input::STARPOWER_BUTTON; // Start works for GodMode
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 966b485..e4220a7 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -101,8 +101,8 @@ bool ScreenSing::instrumentLayout(double time) {
 			++i;
 		}
 	}
-	if (time < -0.5) {
-		glColor4f(1.0f, 1.0f, 1.0f, clamp(-1.0 - 2.0 * time));
+	if (time < -1.0) {
+		glColor4f(1.0f, 1.0f, 1.0f, clamp(-2.0 - 2.0 * time));
 		m_help->draw();
 		glColor3f(1.0f, 1.0f, 1.0f);
 	}