Changed static members to instance for a Game singleton

1 files changed, 15 insertions, 15 deletions

diff --git a/Stars45/Game.cpp b/Stars45/Game.cpp
index ad364d7..9632d6a 100644
--- a/Stars45/Game.cpp
+++ b/Stars45/Game.cpp
@@ -29,25 +29,11 @@
 
 Game*    game           = 0;
 
-bool     Game::active         = false;
-bool     Game::paused         = false;
-bool     Game::server         = false;
-bool     Game::show_mouse     = false;
-DWORD    Game::base_game_time = 0;
-DWORD    Game::real_time      = 0;
-DWORD    Game::game_time      = 0;
-DWORD    Game::time_comp      = 1;
-DWORD    Game::frame_number   = 0;
-
 const int    VIDEO_FPS              = 30;
 const double MAX_FRAME_TIME_VIDEO   = 1.0 / (double) VIDEO_FPS;
 const double MAX_FRAME_TIME_NORMAL  = 1.0 / 5.0;
 const double MIN_FRAME_TIME_NORMAL  = 1.0 / 60.0;
 
-double   Game::max_frame_length = MAX_FRAME_TIME_NORMAL;
-double   Game::min_frame_length = MIN_FRAME_TIME_NORMAL;
-
-char     Game::panicbuf[256];
 
 static LARGE_INTEGER  perf_freq;
 static LARGE_INTEGER  perf_cnt1;
@@ -63,9 +49,23 @@ Game::Game()
       status(Game::OK), exit_code(0), window_style(0)
 {
     if (!game) {
-        panicbuf[0] = 0;
         game = this;
 
+        active         = false;
+        paused         = false;
+        server         = false;
+        show_mouse     = false;
+        base_game_time = 0;
+        real_time      = 0;
+        game_time      = 0;
+        time_comp      = 1;
+        frame_number   = 0;
+
+        max_frame_length = MAX_FRAME_TIME_NORMAL;
+        min_frame_length = MIN_FRAME_TIME_NORMAL;
+
+        panicbuf[0] = 0;
+
         video_settings = new(__FILE__,__LINE__) VideoSettings;
 
         is_windowed             = false;