[Added] Start of player class, start of collision detection

include/screens/GameScreen.h

@@ -6,13 +6,13 @@
 
 class GameScreen: public Screen {
 
-private:
-    Game game;
-protected:
 public:
     GameScreen();
     void logic() override;
     void draw() override;
+
+private:
+    Game game;
 };
 
 #endif

include/screens/MainScreen.h

@@ -6,6 +6,12 @@
 #include "entities/Text.h"
 
 class MainScreen : public Screen {
+public:
+    MainScreen();
+
+    void logic() override;
+    void draw() override;
+
 private:
     int hoveredButton = 0;
     std::vector<Text> buttons;
@@ -13,12 +19,6 @@ private:
     void mouseLogic();
     void keyboardLogic();
     void clickLogic();
-
-public:
-    MainScreen();
-
-    void logic() override;
-    void draw() override;
 };
 
 #endif

include/screens/Screen.h

@@ -3,14 +3,6 @@
 
 class Screen
 {
-private:
-protected:
-    // std::optional<Map> map;
-    // std::optional<Camera2D> camera;
-    // std::optional<Map> map;
-    // std::optional<Background> background;
-    // std::vector<Text> text;
-
 public:
     Screen(){}
     ~Screen() {}
@@ -23,6 +15,9 @@ public:
      * Draw frame to the screen
      */
     virtual void draw() = 0;
+
+private:
+
 };
 
 #endif

include/screens/TitleScreen.h

@@ -6,15 +6,15 @@
 #include "entities/Text.h"
 
 class TitleScreen : public Screen {
-private:
-    Music bg;
-    std::vector<Text> text;
-
 public:
     TitleScreen();
 
     void logic() override;
     void draw() override;
+
+private:
+    Music bg;
+    std::vector<Text> text;
 };
 
 #endif

include/screens/TutorialScreen.h

@@ -7,17 +7,16 @@
 
 class TutorialScreen : public Screen
 {
-private:
-    std::vector<Text> text;
-    Background background;
-
-protected:
 public:
     TutorialScreen();
     ~TutorialScreen() {}
 
     void logic() override;
     void draw() override;
+
+private:
+    std::vector<Text> text;
+    Background background;
 };
 
 #endif