- Modified toy behaviors to use "onCollision" rather than "handlesCollision" which is jusy confusing and inconsistent.

modules/AquariumToy/1/scripts/aquarium.cs

@@ -141,7 +141,7 @@ function buildAquarium()
 
 //-----------------------------------------------------------------------------
 
-function AquariumBoundary::handleCollision(%this, %object, %collisionDetails)
+function AquariumBoundary::onCollision(%this, %object, %collisionDetails)
 {
     if (%object.class $= "FishClass")
         %object.recycle(%this.side);

modules/DeathBallToy/1/scripts/dealsDamageBehavior.cs

@@ -61,7 +61,7 @@ function DealsDamageBehavior::explode(%this, %position)
 
 //-----------------------------------------------------------------------------
 
-function DealsDamageBehavior::handleCollision(%this, %object, %collisionDetails)
+function DealsDamageBehavior::onCollision(%this, %object, %collisionDetails)
 {
     %this.dealDamage(%this.strength, %object);
    

modules/Sandbox/1/scripts/scene.cs

@@ -153,18 +153,3 @@ function setCustomScene( %scene )
     // Set the scene to the window.
     setSceneToWindow();
 }
-
-//-----------------------------------------------------------------------------
-
-function SandboxScene::onCollision(%this, %sceneObjectA, %sceneObjectB, %collisionDetails)
-{
-    if (%sceneObjectA.isMethod(handleCollision))
-        %sceneObjectA.handleCollision(%sceneObjectB, %collisionDetails);
-    else
-        %sceneObjectA.callOnBehaviors(handleCollision, %sceneObjectB, %collisionDetails);
-
-    if (%sceneObjectB.isMethod(handleCollision))
-        %sceneObjectB.handleCollision(%sceneObjectA, %collisionDetails);
-    else
-        %sceneObjectB.callOnBehaviors(handleCollision, %sceneObjectA, %collisionDetails);
-}

modules/Sandbox/1/scripts/toolbox.cs

@@ -531,7 +531,7 @@ function ToyListArray::initialize(%this, %index)
     {
         // Fetch the toy module.
         %moduleDefinition = SandboxToys.getObject( %toyIndex );
-
+        
         // Skip the toy module if the "all" category is not selected and if the toy is not in the selected category.
         if ( %index != $toyAllCategoryIndex && %moduleDefinition.ToyCategoryIndex != %index )
             continue;

modules/TruckToy/1/main.cs

@@ -663,7 +663,7 @@ function TruckToy::createProjectile(%this)
 
 // -----------------------------------------------------------------------------
 
-function TruckProjectile::handleCollision(%this, %object, %collisionDetails)
+function TruckProjectile::onCollision(%this, %object, %collisionDetails)
 {   
     // Create an impact explosion at the projectiles position.
     %particlePlayer = new ParticlePlayer();