[Performous-commit] Markus Raab : activate next screen in ScreenPlayers

[Markus R. <god...@us...>]

Module: performous
Branch: master
Commit: 138ab3f1ab2804311936eaf02ee79b2d962f3f7d

Author: Markus Raab <un...@ma...>
Date:   Thu Jul 30 10:26:43 2009 +0200

activate next screen in ScreenPlayers

some docu
better name

---

 game/screen_sing.cc |    6 +++---
 game/screen_sing.hh |    8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 6fbc735..d1e4fa0 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -46,7 +46,7 @@ void ScreenSing::exit() {
 	theme.reset();
 }
 
-void ScreenSing::activatePlayerScreen()
+void ScreenSing::activateNextScreen()
 {
 	ScreenManager* sm = ScreenManager::getSingletonPtr();
 
@@ -97,7 +97,7 @@ void ScreenSing::manageEvent(SDL_Event event) {
 			return;
 		}
 		else if (key == SDLK_RETURN) {
-			if (m_score_window.get()) { activatePlayerScreen(); return; } // Score window visible -> Enter quits
+			if (m_score_window.get()) { activateNextScreen(); return; } // Score window visible -> Enter quits
 			else if (status == Song::FINISHED) m_score_window.reset(new ScoreWindow(*m_engine, m_players)); // Song finished, but no score window -> show it
 		}
 		else if (key == SDLK_SPACE || key == SDLK_PAUSE) m_audio.togglePause();
@@ -201,7 +201,7 @@ void ScreenSing::draw() {
 		}
 	} else {
 		if (m_score_window.get()) {
-			if (m_quitTimer.get() == 0.0 && !m_audio.isPaused()) { activatePlayerScreen(); return; }
+			if (m_quitTimer.get() == 0.0 && !m_audio.isPaused()) { activateNextScreen(); return; }
 			m_score_window->draw();
 		}
 		else if (!m_audio.isPlaying() || (status == Song::FINISHED && m_audio.getLength() - time < 3.0)) {
diff --git a/game/screen_sing.hh b/game/screen_sing.hh
index 927ee1c..07e3668 100644
--- a/game/screen_sing.hh
+++ b/game/screen_sing.hh
@@ -53,7 +53,13 @@ class ScreenSing: public Screen {
 	}
 
   private:
-	void activatePlayerScreen();
+	/**Activates Songs Screen or Players Screen.
+	  This depends on
+	  - the configuration (is Hiscore enabled)
+	  - did a player reach a new hiscore
+	  - is the hiscore file writable
+	  */
+	void activateNextScreen();
 	Audio& m_audio;
 	Capture& m_capture;
 	Players& m_players;