BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed third person animations over network

Browse Source
This commit is contained in:
sippeangelo
2016-03-09 18:01:32 +01:00
parent 3ea1177425
commit 0b58f32f32
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/Systems/Weapon/WeaponBehaviour.h
+2 -4
View File
@@ -293,10 +293,8 @@ private:
firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment); firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
} }
} }
if (IsServer) { if (thirdPersonAttachment.Valid()) {
if (thirdPersonAttachment.Valid()) { thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
}
} }
WeaponInfo& wi = m_ActiveWeapons[player]; WeaponInfo& wi = m_ActiveWeapons[player];
src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
-10
View File
@@ -133,11 +133,6 @@ void AssaultWeaponBehaviour::OnReload(ComponentWrapper cWeapon, WeaponInfo& wi)
b1.Restart = true; b1.Restart = true;
b1.Start = true; b1.Start = true;
m_EventBroker->Publish(b1); m_EventBroker->Publish(b1);
Events::AutoAnimationBlend b2;
b2.RootNode = wi.ThirdPersonPlayerModel;
b2.NodeName = "MovementBlend";
b2.AnimationEntity = wi.ThirdPersonPlayerModel.FirstChildByName("AssaultWeaponBlend").FirstChildByName("Reload");
m_EventBroker->Publish(b2);
// Spawn explosion effect // Spawn explosion effect
if (wi.FirstPersonEntity.Valid()) { if (wi.FirstPersonEntity.Valid()) {
@@ -254,11 +249,6 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
b1.Restart = true; b1.Restart = true;
b1.Start = true; b1.Start = true;
m_EventBroker->Publish(b1); m_EventBroker->Publish(b1);
Events::AutoAnimationBlend b2;
b2.RootNode = wi.ThirdPersonPlayerModel;
b2.NodeName = "MovementBlend";
b2.AnimationEntity = wi.ThirdPersonPlayerModel.FirstChildByName("AssaultWeaponBlend").FirstChildByName("Fire");
m_EventBroker->Publish(b2);
// Sound // Sound
Events::PlaySoundOnEntity e; Events::PlaySoundOnEntity e;