diff options
author | Nao Pross <naopross@thearcway.org> | 2019-01-28 23:01:27 +0100 |
---|---|---|
committer | Nao Pross <naopross@thearcway.org> | 2019-01-28 23:01:27 +0100 |
commit | 8699104339217cf6b7e9fe46332c73f4a0c7901f (patch) | |
tree | f699cd8c7a196034dd171e27ba504e56c2807215 /engine/include/window.hpp | |
parent | Remove bitfileds to remove a bazillion of warnings (diff) | |
download | flatland-8699104339217cf6b7e9fe46332c73f4a0c7901f.tar.gz flatland-8699104339217cf6b7e9fe46332c73f4a0c7901f.zip |
Remove almost every -Wshadow warning
Diffstat (limited to 'engine/include/window.hpp')
-rw-r--r-- | engine/include/window.hpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/engine/include/window.hpp b/engine/include/window.hpp index 586a6eb..ddc9472 100644 --- a/engine/include/window.hpp +++ b/engine/include/window.hpp @@ -13,17 +13,17 @@ namespace flat { struct window_status { - window_status( unsigned char fullscreen = 0, - unsigned char hidden = 0, - unsigned char borderless = 0, - unsigned char resizable = 1, - unsigned char minimized = 0, - unsigned char maximized = 0, - unsigned char focus = 1) - - : fullscreen(fullscreen), hidden(hidden), borderless(borderless), - resizable(resizable), minimized(minimized), maximized(maximized), - focus(focus) {} + window_status( unsigned char _fullscreen = 0, + unsigned char _hidden = 0, + unsigned char _borderless = 0, + unsigned char _resizable = 1, + unsigned char _minimized = 0, + unsigned char _maximized = 0, + unsigned char _focus = 1) + + : fullscreen(_fullscreen), hidden(_hidden), borderless(_borderless), + resizable(_resizable), minimized(_minimized), maximized(_maximized), + focus(_focus) {} unsigned char fullscreen; unsigned char hidden; @@ -39,14 +39,15 @@ class FlatLayer; class FlatWindow : virtual public object, public KeyFocusable { - std::string title; - window_status status; +private: + std::string m_title; + window_status m_status; - SDL_Rect * bounds; - SDL_Window * sdl_window; - SDL_Surface * screen; + SDL_Rect * m_bounds; + SDL_Window * m_sdl_window; + SDL_Surface * m_screen; - FlatLayer * main_layer; + FlatLayer * m_main_layer; void key_cb(const SDL_KeyboardEvent*) override; |