From 1227a795d791b30d5fcfca8dd720249633e97302 Mon Sep 17 00:00:00 2001
From: stiffly <adambylehn@hotmail.com>
Date: Thu, 3 Mar 2016 21:23:53 +0100
Subject: [PATCH] WIP

---
 include/Game/Systems/PlayerMovementSystem.h |  2 +-
 src/Game/Systems/PlayerMovementSystem.cpp   | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/Game/Systems/PlayerMovementSystem.h b/include/Game/Systems/PlayerMovementSystem.h
index bf7b4718..f84aed96 100644
--- a/include/Game/Systems/PlayerMovementSystem.h
+++ b/include/Game/Systems/PlayerMovementSystem.h
@@ -31,7 +31,7 @@ private:
     // To get a difference when calculating the walking state.
     glm::vec3 m_LastPosition = glm::vec3();
     // The logic for making the sound play when player is moving
-    void playerStep(double dt);
+    void playerStep(double dt, EntityWrapper player);
     // Spawn a hexagon at origin of an Entity
     void spawnHexagon(EntityWrapper target);
 
diff --git a/src/Game/Systems/PlayerMovementSystem.cpp b/src/Game/Systems/PlayerMovementSystem.cpp
index 31e5aacf..1d176146 100644
--- a/src/Game/Systems/PlayerMovementSystem.cpp
+++ b/src/Game/Systems/PlayerMovementSystem.cpp
@@ -242,10 +242,9 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
                 }
             }
         }
-
+        playerStep(dt, player);
         controller->Reset();
     }
-    playerStep(dt);
 }
 
 
@@ -281,11 +280,8 @@ void PlayerMovementSystem::updateVelocity(EntityWrapper player, double dt)
     position += velocity * (float)dt;
 }
 
-void PlayerMovementSystem::playerStep(double dt)
+void PlayerMovementSystem::playerStep(double dt, EntityWrapper player)
 {
-    if (!m_LocalPlayer.Valid()) {
-        return;
-    }
     // Position of the local player, used see how far a player has moved.
     glm::vec3 pos = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Transform")["Position"];
     // Used to see if a player is airborne.
@@ -298,7 +294,7 @@ void PlayerMovementSystem::playerStep(double dt)
         // Create footstep sound
         Events::PlaySoundOnEntity e;
         e.Emitter = m_LocalPlayer;
-        e.FilePath = m_LeftFoot ? "Audio/footstep/footstep2.wav" : "Audio/footstep/footstep3.wav";
+        e.FilePath = m_LeftFoot ? "Audio/Footstep/Footstep2.wav" : "Audio/Footstep/Footstep3.wav";
         m_LeftFoot = !m_LeftFoot;
         m_EventBroker->Publish(e);
         m_DistanceMoved = 0.f;