[Performous-commit] Vincent Le Ligeour : Fixed broken merge

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

Module: performous
Branch: opengl2
Commit: 39fdb034507efe7d99dd0229b3810cc9b4a5bd0a

Author: Vincent Le Ligeour <yo...@us...>
Date:   Thu Jan 27 14:05:00 2011 +0100

Fixed broken merge

---

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

diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index e05d8ab..458d32d 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -397,12 +397,12 @@ void ScreenSongs::drawInstruments(Dimensions const& dim, float alpha) const {
 		float m = !(typeFilter & 1);
 		glutil::VertexArray va;
 		glutil::Color c(Color(m * 1.0f, 1.0f, m * 1.0f, a));
-		x = dim.x1()+4*xincr*(dim.x2()-dim.x1());
-		va.Color(c).TexCoord(getIconTex(5), 0.0f).Vertex(x, dim.y1());
-		va.Color(c).TexCoord(getIconTex(5), 1.0f).Vertex(x, dim.y2());
 		x = dim.x1()+5*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());
+		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();
 	}
 }