Browse Source

- Added "onSelfEndCollision()" changes as well for the special-case collision callbacks.

MelvMay-GG 12 years ago
parent
commit
7ef34e5
1 changed files with 6 additions and 6 deletions
  1. 6 6
      engine/source/2d/scene/Scene.cc

+ 6 - 6
engine/source/2d/scene/Scene.cc

@@ -739,32 +739,32 @@ void Scene::dispatchEndContactCallbacks( void )
             pMiscInfoBuffer );
 
         // Does scene object A handle the collision?
-        if ( pSceneObjectA->isMethod("onEndCollision") )            
+        if ( pSceneObjectA->isMethod("onSelfEndCollision") )            
         {
             // Yes, so perform the script callback on it.
-            Con::executef( pSceneObjectA, 4, "onEndCollision",
+            Con::executef( pSceneObjectA, 3, "onSelfEndCollision",
                 pSceneObjectBBuffer,
                 pMiscInfoBuffer );
         }
         else
         {
             // No, so call it on its behaviors.
-            const char* args[3] = { "onEndCollision", pSceneObjectBBuffer, pMiscInfoBuffer };
+            const char* args[3] = { "onSelfEndCollision", pSceneObjectBBuffer, pMiscInfoBuffer };
             pSceneObjectA->callOnBehaviors( 3, args );
         }
 
         // Does scene object B handle the collision?
-        if ( pSceneObjectB->isMethod("onEndCollision") )            
+        if ( pSceneObjectB->isMethod("onSelfEndCollision") )            
         {
             // Yes, so perform the script callback on it.
-            Con::executef( pSceneObjectB, 4, "onEndCollision",
+            Con::executef( pSceneObjectB, 3, "onSelfEndCollision",
                 pSceneObjectABuffer,
                 pMiscInfoBuffer );
         }
         else
         {
             // No, so call it on its behaviors.
-            const char* args[3] = { "onEndCollision", pSceneObjectABuffer, pMiscInfoBuffer };
+            const char* args[3] = { "onSelfEndCollision", pSceneObjectABuffer, pMiscInfoBuffer };
             pSceneObjectB->callOnBehaviors( 3, args );
         }
     }