[Performous-commit] Tapio Vierros : Don't display 'GodMode ready' for drums.

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

Module: performous
Branch: master
Commit: 63fd4be66dfdd01e53e4309563b1fbdf843d41d6

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 13 15:41:54 2010 +0200

Don't display 'GodMode ready' for drums.

---

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

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 2098934..606d117 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -57,8 +57,6 @@ namespace {
 		c.b = blend(starpowerC.b, c.b, f);
 		return c;
 	}
-
-	bool canActivateStarpower(int meter) { return (meter > 6000); }
 }
 
 GuitarGraph::GuitarGraph(Audio& audio, Song const& song, std::string track):
@@ -257,7 +255,7 @@ bool GuitarGraph::dead() const {
 
 /// Attempt to activate GodMode
 void GuitarGraph::activateStarpower() {
-	if (canActivateStarpower(m_starmeter)) {
+	if (canActivateStarpower()) {
 		m_starmeter = 0;
 		m_starpower.setValue(1.0);
 		m_godmodePopup.setTarget(1.0);
@@ -752,7 +750,7 @@ void GuitarGraph::drawInfo(double time, double offsetX, Dimensions dimensions) {
 		  + boost::lexical_cast<std::string>(unsigned(m_longestStreak)));
 	}
 	// Is Starpower ready?
-	if (canActivateStarpower(m_starmeter)) {
+	if (canActivateStarpower()) {
 		float a = (int(time * 1000.0) % 1000) / 1000.0;
 		m_text.dimensions.screenBottom(-0.02).middle(-0.12 + offsetX);
 		m_text.draw("God Mode Ready!", a);
diff --git a/game/guitargraph.hh b/game/guitargraph.hh
index 0e57fbf..7d529d2 100644
--- a/game/guitargraph.hh
+++ b/game/guitargraph.hh
@@ -67,6 +67,7 @@ class GuitarGraph {
 	std::string getTrack() const { return m_track_index->first; }
 	std::string getDifficultyString() const;
   private:
+	bool canActivateStarpower() { return !m_drums && (m_starmeter > 6000); }
 	void activateStarpower();
 	void fail(double time, int fret);
 	void endHold(int fret, double time = 0.0);