Third person animations and shoot effects base work

2016-02-11 00:08:50 +01:00
parent 6396925b68
commit 9d9c6bdf1e
13 changed files with 228 additions and 118 deletions
@@ -20,14 +20,14 @@ void WeaponSystem::Update(double dt)
 void WeaponSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt)
 {
    // Update potential weapon behaviour for player
-    //auto it = m_ActiveWeapons.find(entity);
-    //if (it != m_ActiveWeapons.end()) {
-    //    //if (it->first.Valid()) {
-    //        it->second->Update(dt);
-    //    //} else {
-    //    //    m_ActiveWeapons.erase(it);
-    //    //}
-    //}
+    auto it = m_ActiveWeapons.find(entity);
+    if (it != m_ActiveWeapons.end()) {
+        if (it->first.Valid()) {
+            it->second->Update(dt);
+        } else {
+            m_ActiveWeapons.erase(it);
+        }
+    }
 }

 bool WeaponSystem::OnInputCommand(Events::InputCommand& e)