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

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

Browse Source 
# Conflicts:
#	assets
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
This commit is contained in:
sippeangelo
2016-03-04 08:56:58 +01:00
parent 2b55450c18 e2674d915e
commit 42cccfbac0
42 changed files with 16860 additions and 1572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/Systems/Weapon/WeaponBehaviour.h
+4 -2
View File
@@ -268,8 +268,10 @@ private:
// Spawn the weapon(s)
EntityWrapper firstPersonWeapon;
EntityWrapper thirdPersonWeapon;
if (firstPersonAttachment.Valid()) {
firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
if (IsClient) {
if (firstPersonAttachment.Valid()) {
firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
}
}
if (thirdPersonAttachment.Valid()) {
thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);