fixup! Merge remote-tracking branch 'origin/master' into WeaponSystem

This commit is contained in:
2016-02-11 23:44:20 +01:00
parent 7cae84d4ee
commit 44a73ef883
4 changed files with 15 additions and 12 deletions
+1 -3
View File
@@ -93,6 +93,4 @@ bool WeaponSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
// Select primary weapon on player spawn
// TODO: Select the active one specified by player component
return true;
}
ePlayerDamage.PlayerShooter = eShoot.Player;
}