gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: [SDL2] Don't use globals if we can do with locals

Browse Source
This commit is contained in:
Patric Stout 2021-02-11 11:19:05 +01:00 committed by Patric Stout
parent 2bbef6b5cf
commit 2e1535389a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/sdl2_v.cpp
View File

@ -58,10 +58,6 @@ static bool _cursor_new_in_window = false;
static SDL_Rect _dirty_rects[MAX_DIRTY_RECTS]; static SDL_Rect _dirty_rects[MAX_DIRTY_RECTS];
static int _num_dirty_rects; static int _num_dirty_rects;
/* Size of window */
static int _window_size_w;
static int _window_size_h;
void VideoDriver_SDL::MakeDirty(int left, int top, int width, int height) void VideoDriver_SDL::MakeDirty(int left, int top, int width, int height)
{ {
if (_num_dirty_rects < MAX_DIRTY_RECTS) { if (_num_dirty_rects < MAX_DIRTY_RECTS) {
@ -929,9 +925,11 @@ bool VideoDriver_SDL::ToggleFullscreen(bool fullscreen)
std::unique_lock<std::recursive_mutex> lock; std::unique_lock<std::recursive_mutex> lock;
if (_draw_mutex != nullptr) lock = std::unique_lock<std::recursive_mutex>(*_draw_mutex); if (_draw_mutex != nullptr) lock = std::unique_lock<std::recursive_mutex>(*_draw_mutex);
int w, h;
/* Remember current window size */ /* Remember current window size */
if (fullscreen) { if (fullscreen) {
SDL_GetWindowSize(_sdl_window, &_window_size_w, &_window_size_h); SDL_GetWindowSize(_sdl_window, &w, &h);
/* Find fullscreen window size */ /* Find fullscreen window size */
SDL_DisplayMode dm; SDL_DisplayMode dm;
@ -947,7 +945,7 @@ bool VideoDriver_SDL::ToggleFullscreen(bool fullscreen)
if (ret == 0) { if (ret == 0) {
/* Switching resolution succeeded, set fullscreen value of window. */ /* Switching resolution succeeded, set fullscreen value of window. */
_fullscreen = fullscreen; _fullscreen = fullscreen;
if (!fullscreen) SDL_SetWindowSize(_sdl_window, _window_size_w, _window_size_h); if (!fullscreen) SDL_SetWindowSize(_sdl_window, w, h);
} else { } else {
DEBUG(driver, 0, "SDL_SetWindowFullscreen() failed: %s", SDL_GetError()); DEBUG(driver, 0, "SDL_SetWindowFullscreen() failed: %s", SDL_GetError());
} }