[Performous-commit] Vincent Le Ligeour : Fixed some typo

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

Module: performous
Branch: master
Commit: e07e05e8de8644e7ce280fe3d1e48b55d84fc65d

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Apr  3 12:46:39 2010 +0200

Fixed some typo

---

 game/screen.hh        |   11 ++++++-----
 game/screenmanager.cc |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/game/screen.hh b/game/screen.hh
index 08f8973..e74a15a 100644
--- a/game/screen.hh
+++ b/game/screen.hh
@@ -31,7 +31,7 @@ class Screen {
 
 /// Manager for screens
 /** manages screens
- * @see Singleton 
+ * @see Singleton
  */
 class ScreenManager: public Singleton <ScreenManager> {
   public:
@@ -49,7 +49,7 @@ class ScreenManager: public Singleton <ScreenManager> {
 	Screen* getScreen(std::string const& name);
 	/// returns a reference to the window
 	Window& getWindow() { return window; };
-	
+
 	/// Set a message to flash in current screen
 	void flashMessage(std::string const& name, float fadeIn=0.5f, float hold=1.5f, float fadeOut=1.0f);
 	/// Draw flash messages in current screen
@@ -63,13 +63,14 @@ class ScreenManager: public Singleton <ScreenManager> {
   private:
 	Window& window;
 	bool m_finished;
-	float m_timeToFadeIn;
-	float m_timeToFadeOut;
-	float m_timeToShow;
 	typedef boost::ptr_map<std::string, Screen> screenmap_t;
 	screenmap_t screens;
 	Screen* newScreen;
 	Screen* currentScreen;
+	// Flash messages members
+	float m_timeToFadeIn;
+	float m_timeToFadeOut;
+	float m_timeToShow;
 	AnimValue m_messagePopup;
 	SvgTxtTheme m_textMessage;
 	std::string m_message;
diff --git a/game/screenmanager.cc b/game/screenmanager.cc
index f4c2ca2..041c24c 100644
--- a/game/screenmanager.cc
+++ b/game/screenmanager.cc
@@ -37,7 +37,7 @@ void ScreenManager::drawFlashMessage() {
 	bool haveToFadeIn = time <= (m_timeToFadeIn); // Is this fade in?
 	bool haveToFadeOut = time >= (m_messagePopup.getTarget() - m_timeToFadeOut); // Is this fade out?
 	float fadeValue = 1.0f;
-	
+
 	if (haveToFadeIn) { // Fade in
 		fadeValue = float(time / m_timeToFadeIn); // Calculate animation value
 	} else if (haveToFadeOut) { // Fade out