Merge branch 'LevelSystemAndSuch', and adjusted ball size.

2015-10-06 20:35:44 +02:00
parent b036357e3b 1f10d24448
commit b7696b8776
7 changed files with 42 additions and 40 deletions
@@ -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;