Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement

include/Game/Systems/BoostSystem.h

@@ -6,6 +6,7 @@
 #include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
+#include "SpawnerSystem.h"
 
 class BoostSystem : public System
 {
@@ -17,5 +18,7 @@ private:
     bool OnPlayerDamage(Events::PlayerDamage& e);
 
     std::string DetermineClass(EntityWrapper player);
+
+    void giveAmmo(EntityWrapper giver, EntityWrapper receiver);
 };
 #endif

include/Game/Systems/Weapon/SidearmWeaponBehaviour.h

@@ -37,7 +37,7 @@ private:
     bool playerInFirstPerson(EntityWrapper player);
 
     bool dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi);
-    void giveAmmo(ComponentWrapper cWeapon, WeaponInfo& wi, EntityWrapper receiver);
+   // void giveAmmo(ComponentWrapper cWeapon, WeaponInfo& wi, EntityWrapper receiver);
 
 
     void CheckAmmo(ComponentWrapper cWeapon, WeaponInfo& wi);

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -305,6 +305,8 @@ private:
         wi.ThirdPersonEntity = thirdPersonWeapon;
         wi.ThirdPersonPlayerModel = thirdPersonWeapon.FirstParentWithComponent("Model");
         
+        player["Player"]["CurrentWeapon"] = cWeapon.Info.Name;
+
         OnEquip(cWeapon, wi);
     }