[Performous-commit] Lasse Karkkainen : Revert "Removed godmode and solo color from fret ( reported as disturbing)"

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

Module: performous
Branch: joinmenu
Commit: 7b6b24cc896d1d9ec5fb311e66b0527aeab78df4

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jul 14 03:34:21 2010 +0300

Revert "Removed godmode and solo color from fret (reported as disturbing)"

This reverts commit 000f681de62ce7a75528f192d8c79b65ec772d07.

---

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

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 29ef04a..0be7a41 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -725,7 +725,7 @@ void GuitarGraph::draw(double time) {
 			float x = getFretX(fret);
 			float l = m_pressed_anim[fret + !m_drums].get();
 			// Get a color for the fret and adjust it if GodMode is on
-			glColor4fv(color(fret));
+			glColor4fv(colorize(color(fret), time));
 			m_button.dimensions.center(time2y(0.0)).middle(x);
 			m_button.draw();
 			glColor3f(l, l, l);
@@ -782,7 +782,7 @@ void GuitarGraph::draw(double time) {
 					glutil::Color c(0.5f, 0.5f, 0.5f);
 					if (!joining(time)) {
 						// Get a color for the fret and adjust it if GodMode is on
-						c = color(fret);
+						c = colorize(color(fret), it->begin);
 						if (glow > 0.1f) { ng_r+=c.r; ng_g+=c.g; ng_b+=c.b; ng_ccnt++; } // neck glow
 						// Further adjust the color if the note is hit
 						c.r += glow * 0.2f;