Merge branch 'LevelSystemAndSuch', and adjusted ball size.

include/Game/BallSystem.h

@@ -77,8 +77,6 @@ public:
     void SetPastLives(const int& pastLives) { m_PastLives = pastLives; }
     bool ReplaceBall() const { return m_ReplaceBall; }
     void SetReplaceBall(const bool& replaceBall) { m_ReplaceBall = replaceBall; }
-    bool MultiBall() const { return m_MultiBall; }
-    void SetMultiBall(const bool& multiBall) { m_MultiBall = multiBall; }
     bool IsPaused() const { return m_Pause; }
     void SetPause(const bool& pause) { m_Pause = pause; }
 
@@ -90,7 +88,6 @@ private:
     int m_Lives = 3;
     int m_PastLives = 3;
     bool m_ReplaceBall = false;
-    bool m_MultiBall = false;
     bool m_Pause = false;
     EntityID m_LastCollision = 999999;
 

include/Game/CBrick.h

@@ -16,6 +16,7 @@ namespace Components
 struct Brick : Component
 {
     int Score = 50;
+    int Type = 0;
     bool Removed = false;
 };
 

include/Game/LevelSystem.h

@@ -120,6 +120,10 @@ private:
     glm::vec2 m_SpaceBetweenBricks = glm::vec2(1, 0.4);
     float m_NotResettingTheStage = 5.f;
 
+    const int EmptyBrickSpace = 0;
+    const int StandardBrick = 1;
+    const int MultiBallBrick = 2;
+
     EntityID m_BrickTemplate;
 
     std::array<int, 42> m_Bricks;