From 2b15c9e89db3f99833c24206d3336f4ded01f162 Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Thu, 11 Nov 2021 16:41:28 -0500 Subject: [PATCH] * BugFix: Correct the vehicle types double-tapping their onAdd and onRemove callbacks - rigidShape handles dispatching the script callbacks. --- Engine/source/T3D/vehicles/flyingVehicle.cpp | 4 ---- Engine/source/T3D/vehicles/hoverVehicle.cpp | 5 ----- Engine/source/T3D/vehicles/wheeledVehicle.cpp | 3 --- 3 files changed, 12 deletions(-) diff --git a/Engine/source/T3D/vehicles/flyingVehicle.cpp b/Engine/source/T3D/vehicles/flyingVehicle.cpp index 8426da2c3..255dbc571 100644 --- a/Engine/source/T3D/vehicles/flyingVehicle.cpp +++ b/Engine/source/T3D/vehicles/flyingVehicle.cpp @@ -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(); } diff --git a/Engine/source/T3D/vehicles/hoverVehicle.cpp b/Engine/source/T3D/vehicles/hoverVehicle.cpp index dbaee9993..cdb080c93 100644 --- a/Engine/source/T3D/vehicles/hoverVehicle.cpp +++ b/Engine/source/T3D/vehicles/hoverVehicle.cpp @@ -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(); } diff --git a/Engine/source/T3D/vehicles/wheeledVehicle.cpp b/Engine/source/T3D/vehicles/wheeledVehicle.cpp index 258222847..9dd949bf3 100644 --- a/Engine/source/T3D/vehicles/wheeledVehicle.cpp +++ b/Engine/source/T3D/vehicles/wheeledVehicle.cpp @@ -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(); }