[Performous-commit] Vincent Le Ligeour : Used Window object from within screen manager ( used elsewhere, either totally remove or use it when we can)

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

Module: performous
Branch: master
Commit: 8899bc3c6c28d30a79f54f9729359989e42c1467

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

Used Window object from within screen manager (used elsewhere, either totally remove or use it when we can)

---

 game/main.cc          |   10 +++++-----
 game/screen.hh        |    4 ++--
 game/screen_sing.cc   |    2 +-
 game/screenmanager.cc |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/game/main.cc b/game/main.cc
index 19b2f83..fea8426 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -51,7 +51,7 @@ static void signalSetup() {
 /// can be thrown as an exception to quit the game
 struct QuitNow {};
 
-static void checkEvents_SDL(ScreenManager& sm, Window& window) {
+static void checkEvents_SDL(ScreenManager& sm) {
 	if (g_quit) {
 		std::cout << "Terminating, please wait... (or kill the process)" << std::endl;
 		throw QuitNow();
@@ -63,7 +63,7 @@ static void checkEvents_SDL(ScreenManager& sm, Window& window) {
 			sm.finished();
 			break;
 		  case SDL_VIDEORESIZE:
-			window.resize(event.resize.w, event.resize.h);
+			sm.window().resize(event.resize.w, event.resize.h);
 			break;
 		  case SDL_KEYDOWN:
 			int keypressed  = event.key.keysym.sym;
@@ -108,8 +108,8 @@ static void checkEvents_SDL(ScreenManager& sm, Window& window) {
 			case GL_OUT_OF_MEMORY: std::cerr << "OpenGL error: out of memory" << std::endl; break;
 		}
 	}
-	if( config["graphic/fullscreen"].b() != window.getFullscreen() )
-		window.setFullscreen(config["graphic/fullscreen"].b());
+	if( config["graphic/fullscreen"].b() != sm.window().getFullscreen() )
+		sm.window().setFullscreen(config["graphic/fullscreen"].b());
 }
 
 void audioSetup(Capture& capture, Audio& audio) {
@@ -220,7 +220,7 @@ void mainLoop(std::string const& songlist) {
 				}
 				// Process events for the next frame
 				if (midiDrums) midiDrums->process();
-				checkEvents_SDL(sm, window);
+				checkEvents_SDL(sm);
 			} catch (std::runtime_error& e) {
 				std::cerr << "ERROR: " << e.what() << std::endl;
 				sm.flashMessage(std::string("ERROR: ") + e.what());
diff --git a/game/screen.hh b/game/screen.hh
index e74a15a..ba7da69 100644
--- a/game/screen.hh
+++ b/game/screen.hh
@@ -48,7 +48,7 @@ class ScreenManager: public Singleton <ScreenManager> {
 	/// returns pointer to Screen for given name
 	Screen* getScreen(std::string const& name);
 	/// returns a reference to the window
-	Window& getWindow() { return window; };
+	Window& window() { return m_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);
@@ -61,7 +61,7 @@ class ScreenManager: public Singleton <ScreenManager> {
 	bool isFinished() { return m_finished; };
 
   private:
-	Window& window;
+	Window& m_window;
 	bool m_finished;
 	typedef boost::ptr_map<std::string, Screen> screenmap_t;
 	screenmap_t screens;
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 57ac1f9..1994b18 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -32,7 +32,7 @@ namespace {
 void ScreenSing::enter() {
 	ScreenManager* sm = ScreenManager::getSingletonPtr();
 	sm->flashMessage(_("Loading song..."), 0.0, 1.0, 0.5);
-	sm->drawFlashMessage(); sm->getWindow().swap(); // Make loading message show
+	sm->drawFlashMessage(); sm->window().swap(); // Make loading message show
 	theme.reset(new ThemeSing());
 	// Load the rest of the song
 	if (m_song->loadStatus != Song::FULL) {
diff --git a/game/screenmanager.cc b/game/screenmanager.cc
index 041c24c..8cd9506 100644
--- a/game/screenmanager.cc
+++ b/game/screenmanager.cc
@@ -6,7 +6,7 @@
 
 template<> ScreenManager* Singleton<ScreenManager>::ms_Singleton = NULL;
 
-ScreenManager::ScreenManager(Window& window): window(window), m_finished(false), currentScreen(), m_messagePopup(0.0, 1.0), m_textMessage(getThemePath("message_text.svg"), config["graphic/text_lod"].f()) {
+ScreenManager::ScreenManager(Window& _window): m_window(_window), m_finished(false), currentScreen(), m_messagePopup(0.0, 1.0), m_textMessage(getThemePath("message_text.svg"), config["graphic/text_lod"].f()) {
 	m_textMessage.dimensions.middle().screenTop(0.05);
 }