[Performous-commit] Lasse Karkkainen : Avoid rejoining between -1 and 0 seconds ( no idea why that was possible, anyway).

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

Module: performous
Branch: master
Commit: 3310d47a7a17c2cf556e1fde84386f7ba208782e

Author: Lasse Karkkainen <tro...@tr...>
Date:   Tue Jan 19 04:10:16 2010 +0200

Avoid rejoining between -1 and 0 seconds (no idea why that was possible, anyway).

---

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

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 20ce556..baa27e1 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -205,7 +205,7 @@ void DanceGraph::engine() {
 	for (input::Event ev; m_input.tryPoll(ev);) {
 		m_dead = 0; // Keep alive
 		if (m_jointime != m_jointime) { // Handle joining
-			m_jointime = time < -1.0 ? -1.0 : time + join_delay;
+			m_jointime = time < 0.0 ? -1.0 : time + join_delay;
 			break;
 		}
 		// Difficulty / mode selection
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index a65ebb3..9cc0163 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -201,7 +201,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 != m_jointime) m_jointime = time < -1.0 ? -1.0 : time + join_delay; // Handle joining
+		if (m_jointime != m_jointime) m_jointime = time < 0.0 ? -1.0 : time + join_delay; // 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