From 8b64e1e6fdd411446a237afddbce755daa670a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hatvani=20Tam=C3=A1s?= Date: Mon, 9 Mar 2026 21:45:23 +0100 Subject: [PATCH] made windowdata non static with isrunning --- SakuraVNE/src/Application.cpp | 5 +---- SakuraVNE/src/Application.h | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/SakuraVNE/src/Application.cpp b/SakuraVNE/src/Application.cpp index 3d1144b..4d3fb37 100644 --- a/SakuraVNE/src/Application.cpp +++ b/SakuraVNE/src/Application.cpp @@ -5,10 +5,7 @@ #include "imgui_impl_sdl3.h" #include "imgui_impl_sdlrenderer3.h" -WindowData Application::m_WindowData; -bool Application::m_isRunning = false; - -Application::Application() : m_Renderer(nullptr) {} +Application::Application() : m_Window(nullptr), m_Renderer(nullptr), m_Surface(nullptr), m_isRunning(false) {} Application::~Application() { Shutdown(); } bool Application::Init() { diff --git a/SakuraVNE/src/Application.h b/SakuraVNE/src/Application.h index 1a8e175..23a86cc 100644 --- a/SakuraVNE/src/Application.h +++ b/SakuraVNE/src/Application.h @@ -19,20 +19,20 @@ public: void Run(); void Shutdown(); - static inline WindowData &GetWindowData() { return m_WindowData; } + inline WindowData &GetWindowData() { return m_WindowData; } inline SDL_Window *GetSDLWindow() { return m_Window; } inline SDL_Surface *GetSDLWindowSurface() { return m_Surface; } inline void SetSDLWindowSurface(SDL_Surface *newSurface) { m_Surface = newSurface; } - static bool &GetRunningState() { return m_isRunning; } - static void SetRunningState(bool isRunning) { m_isRunning = isRunning; } + bool &GetRunningState() { return m_isRunning; } + void SetRunningState(bool isRunning) { m_isRunning = isRunning; } private: SDL_Window *m_Window; SDL_Surface *m_Surface; SDL_Renderer *m_Renderer; - static WindowData m_WindowData; + WindowData m_WindowData; - static bool m_isRunning; + bool m_isRunning; };