HitLag has types in strings to send along to affect what systems lag.

include/Core/Engine.h

@@ -183,10 +183,12 @@ public:
 
 		//Water test
 		{
+			float amount = 1.5f;
+
 			auto t_waterBody = m_World->CreateEntity();
 			auto transform = m_World->AddComponent<Components::Transform>(t_waterBody);
-			transform->Position = glm::vec3(0.f, -5.5f, -10.f);
-			transform->Scale = glm::vec3(7.f, 1.5f, 1.f);
+			transform->Position = glm::vec3(0.f, -6.25f + (amount / 2), -10.f);
+			transform->Scale = glm::vec3(7.f, amount, 1.f);
 			auto water = m_World->AddComponent<Components::WaterVolume>(t_waterBody);
 			auto body = m_World->AddComponent<Components::RectangleShape>(t_waterBody);
 			m_World->CommitEntity(t_waterBody);
@@ -235,7 +237,7 @@ public:
 //			m_World->CommitEntity(topWall);
 //		}
 
-		{
+		/*{
 			auto topWall = m_World->CreateEntity();
 			std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(
 					topWall);
@@ -254,14 +256,14 @@ public:
 			physics->Mask = CollisionLayer::Type::Ball | CollisionLayer::Type::Brick;
 
 			m_World->CommitEntity(topWall);
-		}
+		}*/
 
 		{
 			auto leftWall = m_World->CreateEntity();
 			std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(
 					leftWall);
 			transform->Position = glm::vec3(-4.f, 1.f, -10.f);
-			transform->Scale = glm::vec3(0.5f, 20.f, 1.f);
+			transform->Scale = glm::vec3(0.5f, 35.f, 1.f);
 
 			std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(leftWall);
 			sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
@@ -282,7 +284,7 @@ public:
 			std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(
 					rightWall);
 			transform->Position = glm::vec3(4.f, 1.f, -10.f);
-			transform->Scale = glm::vec3(0.5f, 20.f, 1.f);
+			transform->Scale = glm::vec3(0.5f, 35.f, 1.f);
 
 			std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(rightWall);
 			sprite->SpriteFile = "Textures/Core/ErrorTexture.png";

include/Game/BallSystem.h

@@ -90,6 +90,9 @@ private:
     bool m_MultiBall = false;
     bool m_Pause = false;
 
+    glm::vec3 m_SavedSpeed;
+    bool m_InitializePause = false;
+
     EntityID m_Ball;
 
     dd::EventRelay<BallSystem, dd::Events::LifeLost> m_ELifeLost;

include/Game/CBall.h

@@ -18,6 +18,8 @@ struct Ball : Component
     int Number = 0;
     float Speed = 5.f;
     int Combo = 0;
+    bool Paused = false;
+    glm::vec3 SavedSpeed = glm::vec3(0, 0, 0);
 };
 
 }

include/Game/EPause.h

@@ -15,7 +15,7 @@ namespace Events
 
 struct Pause : Event
 {
-
+    std::string Type;
 };
 
 }

include/Game/HitLagSystem.h

@@ -57,16 +57,24 @@ public:
     void Initialize() override;
 
     void Update(double dt) override;
+    void FlipPause();
 
     bool IsPaused() const { return m_Pause; }
     void SetPause(const bool& pause) { m_Pause = pause; }
     bool HitLag() const { return m_HitLag; }
     void SetHitLag(const bool& hitLag) { m_HitLag = hitLag; }
+    float& HitLagDuration() { return m_HitLagDuration; }
+    void SetHitLagDuration(const float& hitLagDuration) { m_HitLagDuration = hitLagDuration; }
+    float& HitLagTimer() { return m_HitLagTimer; }
+    void SetHitLagTimer(const float& hitLagTimer) { m_HitLagTimer = hitLagTimer; }
+    std::string& CurrentType() { return m_CurrentType; }
+    void SetCurrentType(const std::string& currentType) { m_CurrentType = currentType; }
 private:
     bool m_Pause;
     bool m_HitLag;
     float m_HitLagDuration;
     float m_HitLagTimer;
+    std::string m_CurrentType;
 
     dd::EventRelay<HitLagSystem, dd::Events::Pause> m_EPause;
     dd::EventRelay<HitLagSystem, dd::Events::HitLag> m_EHitLag;