diff options
Diffstat (limited to 'Stars45/Game.cpp')
| -rw-r--r-- | Stars45/Game.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Stars45/Game.cpp b/Stars45/Game.cpp index 04c84d0..93fd3dd 100644 --- a/Stars45/Game.cpp +++ b/Stars45/Game.cpp @@ -88,7 +88,7 @@ static LARGE_INTEGER perf_cnt2; Game::Game() : world(0), video_factory(0), video(0), video_settings(0), soundcard(0), - gamma(128), max_tex_size(2048), screen(0), totaltime(0), + gamma(128), max_tex_size(2048), screen(0), totaltime(0), hInst(0), hwnd(0), frame_rate(0), frame_count(0), frame_count0(0), frame_time(0), frame_time0(0), gui_seconds(0), content(0), status(Game::OK), exit_code(0), window_style(0), avi_file(0) @@ -195,7 +195,7 @@ Game::MaxTexSize() { if (game && game->video) { int max_vid_size = game->video->MaxTexSize(); - return max_vid_size < game->max_tex_size ? + return max_vid_size < game->max_tex_size ? max_vid_size : game->max_tex_size; } else if (Video::GetInstance()) { @@ -403,7 +403,7 @@ Game::InitInstance(HINSTANCE hInstance, int nCmdShow) rctmp.right = x_offset + s_width; rctmp.bottom = y_offset + s_height; - window_style = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | + window_style = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE; AdjustWindowRect(&rctmp, window_style, 1); @@ -622,7 +622,7 @@ Game::ToggleFullscreen() SetWindowPos(hwnd, HWND_NOTOPMOST, - bounds_rect.left, + bounds_rect.left, bounds_rect.top, bounds_rect.right - bounds_rect.left, bounds_rect.bottom - bounds_rect.top, @@ -647,7 +647,7 @@ Game::ToggleFullscreen() if (is_windowed) { SetWindowPos(hwnd, HWND_NOTOPMOST, - bounds_rect.left, + bounds_rect.left, bounds_rect.top, bounds_rect.right - bounds_rect.left, bounds_rect.bottom - bounds_rect.top, @@ -799,7 +799,7 @@ Game::SetupPalette() } return false; -} +} // +--------------------------------------------------------------------+ @@ -848,7 +848,7 @@ Game::LoadPalette(PALETTEENTRY* pal, BYTE* inv) // +--------------------------------------------------------------------+ -int +int Game::Run() { MSG msg; @@ -1366,9 +1366,9 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM uParam, LPARAM lParam) game->ResizeVideo(); } else { - // If we're neither maximized nor minimized, the window size - // is changing by the user dragging the window edges. In this - // case, we don't reset the device yet -- we wait until the + // If we're neither maximized nor minimized, the window size + // is changing by the user dragging the window edges. In this + // case, we don't reset the device yet -- we wait until the // user stops dragging, and a WM_EXITSIZEMOVE message comes. } } @@ -1510,7 +1510,7 @@ BufferKey(int vkey) vkext++; if (vkext >= MAX_KEY_BUF) vkext = 0; - } + } } int |