[Performous-commit] Tapio Vierros : Display difficulty and game mode at start of dance song.

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

Module: performous
Branch: dance
Commit: b7f51cdd60545e036dbb3d2c3ea4dae6bbdc6181

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Dec  1 12:34:11 2009 +0200

Display difficulty and game mode at start of dance song.

---

 game/dancegraph.cc  |    5 +++++
 game/screen_sing.cc |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 51009ea..fcd6752 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -202,6 +202,11 @@ void DanceGraph::draw(double time) {
 		m_text.dimensions.screenBottom(-0.27).middle(0.32 * dimensions.w() + offsetX);
 		m_text.draw(boost::lexical_cast<std::string>(unsigned(m_streak)) + "/" 
 		  + boost::lexical_cast<std::string>(unsigned(m_longestStreak)));
+	} else {
+		m_text.dimensions.screenBottom(-0.041).middle(-0.09 + offsetX);
+		m_text.draw(getDifficultyString());
+		m_text.dimensions.screenBottom(-0.015).middle(-0.09 + offsetX);
+		m_text.draw(getGameMode());
 	}
 	glutil::PushMatrixMode pmm(GL_PROJECTION);
 	glTranslatef(frac * 2.0 * offsetX, 0.0f, 0.0f);
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 2e490e8..1b7fafa 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -150,6 +150,7 @@ void ScreenSing::danceLayout(double time) {
 	if (time < -0.5) {
 		glColor4f(1.0f, 1.0f, 1.0f, clamp(-1.0 - 2.0 * time));
 		// TODO: help?
+		//m_help->draw();
 		glColor3f(1.0f, 1.0f, 1.0f);
 	}
 }