From 30bcc08becdf28de5b692a74ab7e09d9ab89aa97 Mon Sep 17 00:00:00 2001 From: Misa Date: Sat, 13 Jun 2020 11:44:01 -0700 Subject: [PATCH] Move gameScreen off of the stack and onto the heap Just so it can be properly used globally like all the other classes. --- desktop_version/src/Screen.cpp | 2 +- desktop_version/src/Screen.h | 4 ++-- desktop_version/src/main.cpp | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop_version/src/Screen.cpp b/desktop_version/src/Screen.cpp index 5f96c843..cd742de0 100644 --- a/desktop_version/src/Screen.cpp +++ b/desktop_version/src/Screen.cpp @@ -17,7 +17,7 @@ extern "C" ); } -Screen::Screen() +void Screen::init() { m_window = NULL; m_renderer = NULL; diff --git a/desktop_version/src/Screen.h b/desktop_version/src/Screen.h index e4d07e3b..b88ef528 100644 --- a/desktop_version/src/Screen.h +++ b/desktop_version/src/Screen.h @@ -6,7 +6,7 @@ class Screen { public: - Screen(); + void init(); void ResizeScreen(int x, int y); void GetWindowSize(int* x, int* y); @@ -33,6 +33,6 @@ public: SDL_Rect filterSubrect; }; - +extern Screen gameScreen; #endif /* SCREEN_H */ diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp index a2a9079c..47a3d43e 100644 --- a/desktop_version/src/main.cpp +++ b/desktop_version/src/main.cpp @@ -43,6 +43,7 @@ Game game; KeyPoll key; mapclass map; entityclass obj; +Screen gameScreen; bool startinplaytest = false; bool savefileplaytest = false; @@ -121,7 +122,7 @@ int main(int argc, char *argv[]) NETWORK_init(); - Screen gameScreen; + gameScreen.init(); printf("\t\t\n"); printf("\t\t\n");