[Performous-commit] Tapio Vierros : Disable joining with keyboard starpower since CTRL is used for e.g. seeking.

[rainbyte <rai...@us...>]

Author: Tapio Vierros <tap...@gm...>
Date:   Sun Dec 18 19:37:53 2011 +0200

Disable joining with keyboard starpower since CTRL is used for e.g. seeking.

---

 game/guitargraph.cc |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index aeb9d30..20883b3 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -316,9 +316,10 @@ void GuitarGraph::engine() {
 	bool difficulty_changed = false;
 	// Handle all events
 	for (input::Event ev; m_input.tryPoll(ev);) {
-		// This hack disallows joining with Enter-key for skipping instrumental
-		// breaks to be usable with FoF songs.
-		if (dead() && m_input.isKeyboard() && ev.type == input::Event::PICK) continue;
+		// This hack disallows joining with Enter and CTRL-key
+		// since they cause issues due to also being used in other places
+		if (dead() && m_input.isKeyboard()
+		  && (ev.type == input::Event::PICK || ev.button == input::GODMODE_BUTTON)) continue;
 		m_dead = 0; // Keep alive
 		// Handle joining
 		if (m_jointime != m_jointime) {