[Performous-commit] Tapio Vierros : Prepare for release: hide keyboard icon in song browser.

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

Author: Tapio Vierros <tap...@gm...>
Date:   Sun Dec 18 14:49:40 2011 +0200

Prepare for release: hide keyboard icon in song browser.

---

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

diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 9d5176b..fc0c86e 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -388,7 +388,7 @@ void ScreenSongs::drawInstruments(Dimensions const& dim, float alpha) const {
 		va.Color(c).TexCoord(getIconTex(5), 1.0f).Vertex(x, dim.y2());
 		va.Draw();
 	}
-	{
+	/*{
 		// keyboard
 		float a = alpha * (have_keyboard ? 1.00f : 0.25f);
 		float m = !(typeFilter & 16);
@@ -401,17 +401,17 @@ void ScreenSongs::drawInstruments(Dimensions const& dim, float alpha) const {
 		va.Color(c).TexCoord(getIconTex(6), 0.0f).Vertex(x, dim.y1());
 		va.Color(c).TexCoord(getIconTex(6), 1.0f).Vertex(x, dim.y2());
 		va.Draw();
-	}
+	}*/
 	{
 		// dancing
 		float a = alpha * (have_dance ? 1.00f : 0.25f);
 		float m = !(typeFilter & 1);
 		glutil::VertexArray va;
 		glmath::vec4 c(m * 1.0f, 1.0f, m * 1.0f, a);
-		x = dim.x1()+5*xincr*(dim.x2()-dim.x1());
+		x = dim.x1()+4*xincr*(dim.x2()-dim.x1());
 		va.Color(c).TexCoord(getIconTex(6), 0.0f).Vertex(x, dim.y1());
 		va.Color(c).TexCoord(getIconTex(6), 1.0f).Vertex(x, dim.y2());
-		x = dim.x1()+6*xincr*(dim.x2()-dim.x1());
+		x = dim.x1()+5*xincr*(dim.x2()-dim.x1());
 		va.Color(c).TexCoord(getIconTex(7), 0.0f).Vertex(x, dim.y1());
 		va.Color(c).TexCoord(getIconTex(7), 1.0f).Vertex(x, dim.y2());
 		va.Draw();