diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index 6d71cd2aef..5f712d947b 100644 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -127,12 +127,12 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f //printf(">>>>>>> caught... handID:%d particle ID:%d _toyBallInHand[handID] = true\n", handID, closestParticle->getID()); _ballParticleEditHandles[handID] = caughtParticle; caughtParticle = NULL; - // Play a catch sound! + + // set the position of the catch sound to the new position of the ball _catchInjector.setPosition(targetPosition); // inject the catch sound to the mixer and play it locally _catchInjector.injectViaThread(app->getAudio()); - app->getAudio()->startDrumSound(1.0, 300, 0.75, 0.015); } } diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index cded2f7d4e..c763a52e05 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -294,9 +294,9 @@ void NodeList::clear() { Node* node = nodeBucket[i % NODES_PER_BUCKET]; node->lock(); - delete node; + notifyHooksOfKilledNode(&*node); - node = NULL; + delete node; } _numNodes = 0;