Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into MiscFixes2021114

This commit is contained in:
Areloch 2021-11-14 01:26:16 -06:00
commit f14375983b
4 changed files with 39 additions and 13 deletions

View file

@ -348,9 +348,6 @@ bool FlyingVehicle::onAdd()
return false;
addToScene();
if (isServerObject())
scriptOnAdd();
return true;
}
@ -400,7 +397,6 @@ void FlyingVehicle::onRemove()
SFX_DELETE( mJetSound );
SFX_DELETE( mEngineSound );
scriptOnRemove();
removeFromScene();
Parent::onRemove();
}

View file

@ -512,10 +512,6 @@ bool HoverVehicle::onAdd()
}
}
if (isServerObject())
scriptOnAdd();
return true;
}
@ -526,7 +522,6 @@ void HoverVehicle::onRemove()
SFX_DELETE( mEngineSound );
SFX_DELETE( mFloatSound );
scriptOnRemove();
removeFromScene();
Parent::onRemove();
}

View file

@ -565,8 +565,6 @@ bool WheeledVehicle::onAdd()
return false;
addToScene();
if (isServerObject())
scriptOnAdd();
return true;
}
@ -588,7 +586,6 @@ void WheeledVehicle::onRemove()
SFX_DELETE( mSquealSound );
//
scriptOnRemove();
removeFromScene();
Parent::onRemove();
}