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

src/game/Game/BallSystem.cpp

@@ -71,15 +71,34 @@ void dd::Systems::BallSystem::Update(double dt)
 
 void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID parent)
 {
+    auto ballComponent = m_World->GetComponent<Components::Ball>(entity);
     if (IsPaused()) {
+        if (ballComponent != nullptr) {
+            auto transform = m_World->GetComponent<Components::Transform>(entity);
+
+            if (!ballComponent->Paused) {
+                ballComponent->Paused = true;
+                ballComponent->SavedSpeed = transform->Velocity;
+                transform->Velocity = glm::vec3(0, 0, 0);
+            }
+        }
         return;
+    } else {
+        if (ballComponent != nullptr) {
+            auto transform = m_World->GetComponent<Components::Transform>(entity);
+
+            if (ballComponent->Paused) {
+                transform->Velocity = ballComponent->SavedSpeed;
+                ballComponent->Paused = false;
+            }
+        }
     }
 
     auto templateCheck = m_World->GetComponent<Components::Template>(entity);
     if (templateCheck != nullptr){ return; }
-    auto ballComponent = m_World->GetComponent<Components::Ball>(entity);
+
     if (ballComponent != nullptr) {
-        if (ReplaceBall() == true) {
+        if (ReplaceBall()) {
             SetReplaceBall(false);
 
             auto transform = m_World->GetComponent<Components::Transform>(entity);
@@ -153,6 +172,10 @@ void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID
 
 bool dd::Systems::BallSystem::OnPause(const dd::Events::Pause &event)
 {
+    if (event.Type != "BallSystem" && event.Type != "All") {
+        return false;
+    }
+
     if (IsPaused()) {
         SetPause(false);
     } else {

src/game/Game/HitLagSystem.cpp

@@ -15,19 +15,25 @@ void dd::Systems::HitLagSystem::Update(double dt)
 {
     if (IsPaused()) {
         if (HitLag()) {
-            m_HitLagTimer += dt;
-            std::cout << m_HitLagTimer << std::endl;
-            if (m_HitLagDuration < m_HitLagTimer) {
-                m_HitLagTimer = 0;
+            SetHitLagTimer(HitLagTimer() += dt);
+            std::cout << HitLagTimer() << std::endl;
+            if (HitLagDuration() < HitLagTimer()) {
+                SetHitLagTimer(0);
                 SetHitLag(false);
-                Events::Pause e;
-                EventBroker->Publish(e);
+                FlipPause();
             }
         }
         return;
     }
 }
 
+void dd::Systems::HitLagSystem::FlipPause()
+{
+    Events::Pause e;
+    e.Type = CurrentType();
+    EventBroker->Publish(e);
+}
+
 bool dd::Systems::HitLagSystem::OnPause(const dd::Events::Pause &event)
 {
     if (IsPaused()) {
@@ -40,9 +46,12 @@ bool dd::Systems::HitLagSystem::OnPause(const dd::Events::Pause &event)
 
 bool dd::Systems::HitLagSystem::OnHitLag(const dd::Events::HitLag &event)
 {
+    if (HitLag()) {
+        FlipPause();
+    }
     SetHitLag(true);
-    Events::Pause e;
-    EventBroker->Publish(e);
-    m_HitLagDuration = event.Time;
+    SetCurrentType(event.Type);
+    FlipPause();
+    SetHitLagDuration(event.Time);
     return true;
 }

src/game/Game/LevelSystem.cpp

@@ -77,6 +77,10 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
 
 bool dd::Systems::LevelSystem::OnPause(const dd::Events::Pause &event)
 {
+    if (event.Type != "LevelSystem" && event.Type != "All") {
+        return false;
+    }
+
     if (IsPaused()) {
         SetPause(false);
     } else {

src/game/Game/PadSystem.cpp

@@ -111,6 +111,10 @@ void dd::Systems::PadSystem::Update(double dt)
 
 bool dd::Systems::PadSystem::OnPause(const dd::Events::Pause &event)
 {
+    if (event.Type != "PadSystem" && event.Type != "All") {
+        return false;
+    }
+
     if (IsPaused()) {
         SetPause(false);
     } else {
@@ -143,10 +147,11 @@ bool dd::Systems::PadSystem::OnKeyDown(const dd::Events::KeyDown &event)
         EventBroker->Publish(e);
     } else if (val == GLFW_KEY_P) {
         Events::Pause e;
+        e.Type = "All";
         EventBroker->Publish(e);
     } else if (val == GLFW_KEY_H) {
         Events::HitLag e;
-        e.Time = 0.3;
+        e.Time = 0.2;
         e.Type = "All";
         EventBroker->Publish(e);
     } else if (val == GLFW_KEY_D) {

src/game/Physics/PhysicsSystem.cpp

@@ -179,6 +179,10 @@ void dd::Systems::PhysicsSystem::UpdateEntity(double dt, EntityID entity, Entity
 
 bool dd::Systems::PhysicsSystem::OnPause(const dd::Events::Pause &event)
 {
+    if (event.Type != "PhysicsSystem" && event.Type != "All") {
+        return false;
+    }
+
     if (IsPaused()) {
         SetPause(false);
     } else {