TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-08 13:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into alpha41/damageModel-fix_followup

Browse source
This commit is contained in:
Sir-Skurpsalot 2026-05-13 10:56:55 -06:00 • committed by GitHub
commit 8c541f4c48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Templates/BaseGame/game/data/DamageModel/DamageModel.tscript
View file

@ -10,6 +10,13 @@ function DamageModel::onDestroy(%this)
function DamageModel::initServer(%this)
{
%this.queueExec("./scripts/server/player");
}
//This is called when the server is created for an actual game/map to be played
function DamageModel::onCreateGameServer(%this)
{
%this.registerDatablock("./scripts/managedData/managedParticleData");
%this.registerDatablock("./scripts/managedData/managedParticleEmitterData");
%this.queueExec("./scripts/server/utility");
%this.queueExec("./scripts/server/radiusDamage");
%this.queueExec("./scripts/server/projectile");

5
Templates/BaseGame/game/data/DamageModel/scripts/server/player.tscript
View file

@ -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);
}