Merge branch 'master' of github.com:teamfisk/TacticalZ

src/Game/Systems/SoundSystem.cpp

@@ -87,6 +87,9 @@ bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
     if (!e.Victim.Valid() || !e.Inflictor.Valid()) {
         return false;
     }
+    if (e.Victim.ID != LocalPlayer.ID) {
+        return false;
+    }
     auto victimTeam = m_World->GetComponent(e.Victim.ID, "Team");
     auto inflictorTeam = m_World->GetComponent(e.Inflictor.ID, "Team");
     if ((int)victimTeam["Team"] == (int)inflictorTeam["Team"]) {

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

@@ -14,7 +14,19 @@ void AssaultWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
     // Start reloading automatically if at 0 mag ammo
     Field<int> magAmmo = cWeapon["MagazineAmmo"];
     if (m_ConfigAutoReload && magAmmo <= 0) {
-        OnReload(cWeapon, wi);
+        //OnReload(cWeapon, wi);
+        // Send an input command instead of reloading immediately so the server
+        // has a chance to catch up.
+        if (IsClient) {
+            Events::InputCommand e;
+            e.Player = wi.Player;
+            e.PlayerID = -1;
+            e.Command = "Reload";
+            e.Value = 1;
+            m_EventBroker->Publish(e);
+            e.Value = 0;
+            m_EventBroker->Publish(e);
+        }
     }
 
     // Only start reloading once we're done firing
@@ -235,7 +247,8 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
         float distance = traceRayDistance(origin, direction);
         EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner);
         if (ray.Valid()) {
-            ((Field<glm::vec3>)ray["Transform"]["Scale"]).z(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Scale"]).x(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Position"]).z(-distance/2.f);
         }
     }
     //MuzzleFlash

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -395,9 +395,12 @@ void DefenderWeaponBehaviour::spawnTracers(ComponentWrapper cWeapon, WeaponInfo&
                 glm::vec3 muzzlePosition = TransformSystem::AbsolutePosition(muzzle);
                 glm::quat muzzleOrientation = TransformSystem::AbsoluteOrientation(muzzle);
 
-                rayOrigin = muzzlePosition;
 
                 glm::vec3 muzzleToHit = hitPosition - muzzlePosition;
+
+                rayOrigin = muzzlePosition + (muzzleToHit/2.f);
+
+
                 glm::vec3 lookVector = glm::normalize(-muzzleToHit);
                 float pitch = std::asin(-lookVector.y);
                 float yaw = std::atan2(lookVector.x, lookVector.z);
@@ -459,8 +462,8 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
         }
 
         // Temp hit decal
-        EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World);
-        (Field<glm::vec3>)hit["Transform"]["Position"] = pick.Position;
+//         EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World);
+//         (Field<glm::vec3>)hit["Transform"]["Position"] = pick.Position;
 
         // Don't let us shoot ourselves in the foot somehow
         if (victim == LocalPlayer) {
@@ -477,12 +480,17 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
 
         // Check for friendly fire
         if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)wi.Player["Team"]["Team"]) {
-            // TODO: Ammo sharing
+            // Give boost
+            Events::PlayerDamage ePlayerDamage;
+            ePlayerDamage.Inflictor = wi.Player;
+            ePlayerDamage.Victim = victim;
+            ePlayerDamage.Damage = 0;
+            m_EventBroker->Publish(ePlayerDamage);
             continue;
         }
 
         damageSum[victim] += pelletDamage;
-        ((Field<glm::vec4>)hit["Model"]["Color"]).z(1.f);
+       // ((Field<glm::vec4>)hit["Model"]["Color"]).z(1.f);
     }
 
     // Deal damage!
@@ -493,7 +501,6 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
         ePlayerDamage.Victim = kv.first;
         ePlayerDamage.Damage = kv.second;
         m_EventBroker->Publish(ePlayerDamage);
-        LOG_DEBUG("Dealt %f damage to #%i", kv.second, kv.first.ID);
     }
 }
 

src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp

@@ -223,15 +223,16 @@ void SidearmWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
         return;
     }
 
-    //Tracer
+    // Tracer
     EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleRay");
     if (tracerSpawner.Valid()) {
         glm::vec3 origin = TransformSystem::AbsolutePosition(tracerSpawner);
-        glm::vec3 direction = TransformSystem::AbsoluteOrientation(tracerSpawner) * glm::vec3(0, 0, -1);
+        glm::vec3 direction = glm::quat(TransformSystem::AbsoluteOrientationEuler(tracerSpawner)) * glm::vec3(0, 0, -1);
         float distance = traceRayDistance(origin, direction);
         EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner);
         if (ray.Valid()) {
-            ((Field<glm::vec3>)ray["Transform"]["Scale"]).z(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Scale"]).x(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Position"]).z(-distance/2.f);
         }
     }