diff options
| -rw-r--r-- | Stars45/Game.cpp | 30 | ||||
| -rw-r--r-- | Stars45/Game.h | 28 | ||||
| -rw-r--r-- | Stars45/StarServer.cpp | 6 |
3 files changed, 32 insertions, 32 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; diff --git a/Stars45/Game.h b/Stars45/Game.h index aade28b..d4042ec 100644 --- a/Stars45/Game.h +++ b/Stars45/Game.h @@ -186,20 +186,20 @@ protected: int exit_code; Color screen_color; - static bool active; - static bool paused; - static bool server; - static bool show_mouse; - static DWORD base_game_time; - static DWORD real_time; - static DWORD game_time; - static DWORD time_comp; - static DWORD frame_number; - - static double max_frame_length; - static double min_frame_length; - - static char panicbuf[256]; + bool active; + bool paused; + bool server; + bool show_mouse; + DWORD base_game_time; + DWORD real_time; + DWORD game_time; + DWORD time_comp; + DWORD frame_number; + + double max_frame_length; + double min_frame_length; + + char panicbuf[256]; }; // +--------------------------------------------------------------------+ diff --git a/Stars45/StarServer.cpp b/Stars45/StarServer.cpp index 3a1a3df..ee65e53 100644 --- a/Stars45/StarServer.cpp +++ b/Stars45/StarServer.cpp @@ -73,8 +73,8 @@ admin_server(0), lobby_server(0) title_text = "Starserver"; palette_name = "alpha"; - Game::server = true; - Game::show_mouse = true; + server = true; + show_mouse = true; DataLoader::Initialize(); loader = DataLoader::GetLoader(); @@ -128,7 +128,7 @@ StarServer::~StarServer() instance = 0; - Game::server = false; + server = false; } // +--------------------------------------------------------------------+ |