mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-09 05:34:34 +00:00
Merge branch 'development' into alpha41/damageModel-fix_followup
This commit is contained in:
commit
8c541f4c48
2 changed files with 12 additions and 0 deletions
|
|
@ -17,6 +17,11 @@ function PlayerData::damage(%this, %obj, %sourceObject, %position, %damage, %dam
|
|||
%damageLoc = "body";
|
||||
if (%damageType !$= "Suicide") {
|
||||
%getDamageLoc = %obj.getDamageLocation(%position);
|
||||
|
||||
%this.setDamageDirection(%rootObj, %sourceObject, %position);
|
||||
|
||||
if (%damageType !$= "Suicide") {
|
||||
%getDamageLoc = %rootObj.getDamageLocation(%position);
|
||||
%damageLoc = firstWord(%getDamageLoc);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue