[Performous-commit] Vincent Le Ligeour : Fixed alpha not resetted

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: 8d0e66481b7f199d9f0f10f3ad10c4740b422c83

Author: Vincent Le Ligeour <yo...@us...>
Date:   Tue Aug 18 14:27:42 2009 +0200

Fixed alpha not resetted
Added special color for karaoke versions (with vocals audio track)

---

 game/screen_songs.cc |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 1689062..07cdb27 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -227,8 +227,13 @@ void ScreenSongs::draw() {
 					{
 						// vocals
 						alpha = (song_display.notes.size()) ? 1.00 : 0.25;
+						bool karaoke = (song_display.music.find("vocals") != song_display.music.end());
 						glutil::Begin block(GL_TRIANGLE_STRIP);
-						glColor4f(1.0, 1.0, 1.0, alpha);
+						if(karaoke) {
+							glColor4f(1.0, 1.0, 0.25, alpha);
+						} else {
+							glColor4f(1.0, 1.0, 1.0, alpha);
+						}
 						x = dim.x1()+0.00*(dim.x2()-dim.x1());
 						glTexCoord2f(0.00f, 0.0f); glVertex2f(x, dim.y1());
 						glTexCoord2f(0.00f, 1.0f); glVertex2f(x, dim.y2());
@@ -272,6 +277,7 @@ void ScreenSongs::draw() {
 						glTexCoord2f(1.00f, 0.0f); glVertex2f(x, dim.y1());
 						glTexCoord2f(1.00f, 1.0f); glVertex2f(x, dim.y2());
 					}
+					glColor4f(1.0, 1.0, 1.0, 1.0);
 				}
 			}
 		}