[Performous-commit] Tapio Vierros : Don't count dead notes while joining.

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

Module: performous
Branch: master
Commit: 8a999e625df40e530d7410d6ab9e081a981dbae7

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jan 30 19:55:49 2010 +0200

Don't count dead notes while joining.

---

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

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 6551dd7..52cfe65 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -199,7 +199,7 @@ void DanceGraph::engine() {
 		if (time < it->first + it->second) { time = it->first; break; } // Inside stop
 		time -= it->second;
 	}
-
+	if (time < m_jointime) m_dead = 0; // Disable dead counting while joining
 	bool difficulty_changed = false;
 	// Handle all events
 	for (input::Event ev; m_input.tryPoll(ev);) {
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 492f0c2..de5c2bf 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -191,6 +191,7 @@ void GuitarGraph::engine() {
 	}
 	if (!m_drumfills.empty()) updateDrumFill(time); // Drum Fills / BREs
 	if (m_starpower.get() > 0.001) m_correctness.setTarget(1.0, true);
+	if (time < m_jointime) m_dead = 0; // Disable dead counting while joining
 	double whammy = 0;
 	bool difficulty_changed = false;
 	// Handle all events