From 893cac5d9a8a525b08c890350916372471f017aa Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Fri, 2 Nov 2012 23:28:26 -0400
Subject: [PATCH] break up Client::run() into multiple methods

---
 src/client/Client-gl.cc |  1 -
 src/client/Client.cc    | 12 ++++++++++++
 src/client/Client.h     |  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/client/Client-gl.cc b/src/client/Client-gl.cc
index cd282c0..a575d13 100644
--- a/src/client/Client-gl.cc
+++ b/src/client/Client-gl.cc
@@ -74,7 +74,6 @@ bool Client::create_window(bool fullscreen, int width, int height)
     sf::ContextSettings cs = sf::ContextSettings(0, 0, 0,
             OPENGL_CONTEXT_MAJOR, OPENGL_CONTEXT_MINOR);
     m_window = new sf::RenderWindow(mode, "Treacherous Terrain", style, cs);
-    m_window->setMouseCursorVisible(false);
     grab_mouse(true);
     if (!initgl())
         return false;
diff --git a/src/client/Client.cc b/src/client/Client.cc
index a98c4f4..7bcc8be 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -94,6 +94,12 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
     m_clock.restart();
     recenter_cursor();
 
+    run_main_menu();
+}
+
+void Client::run_main_menu()
+{
+    m_window->setMouseCursorVisible(true);
     sfg::SFGUI sfgui;
     sfg::Label::Ptr label = sfg::Label::Create("Label Test");
     sfg::Window::Ptr window(sfg::Window::Create());
@@ -139,6 +145,12 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
         m_window->display();
     }
 
+    run_client();
+}
+
+void Client::run_client()
+{
+    m_window->setMouseCursorVisible(false);
     double last_time = 0.0;
     while (m_window->isOpen())
     {
diff --git a/src/client/Client.h b/src/client/Client.h
index d983e6b..3db6a54 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -24,6 +24,8 @@ class Client
         ~Client();
         void run(bool fullscreen, int width, int height, std::string pname);
     protected:
+        void run_main_menu();
+        void run_client();
         void connect(int port, const char *host);
         void disconnect();
         bool create_window(bool fullscreen, int width, int height);