From 2060b333ca1b848f3992870d07d41a73c9142112 Mon Sep 17 00:00:00 2001 From: mogemimi Date: Tue, 28 Jun 2016 23:11:22 +0900 Subject: [PATCH] Fix typo: destoryMark -> destroyMark --- cocos/physics/CCPhysicsJoint.cpp | 2 +- cocos/physics/CCPhysicsJoint.h | 2 +- cocos/physics/CCPhysicsWorld.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cocos/physics/CCPhysicsJoint.cpp b/cocos/physics/CCPhysicsJoint.cpp index 23c02f8828..87f27f7069 100644 --- a/cocos/physics/CCPhysicsJoint.cpp +++ b/cocos/physics/CCPhysicsJoint.cpp @@ -39,7 +39,7 @@ PhysicsJoint::PhysicsJoint() , _world(nullptr) , _enable(false) , _collisionEnable(true) -, _destoryMark(false) +, _destroyMark(false) , _tag(0) , _maxForce(PHYSICS_INFINITY) , _initDirty(true) diff --git a/cocos/physics/CCPhysicsJoint.h b/cocos/physics/CCPhysicsJoint.h index 7ca1c533a3..36f906cd6f 100644 --- a/cocos/physics/CCPhysicsJoint.h +++ b/cocos/physics/CCPhysicsJoint.h @@ -115,7 +115,7 @@ protected: bool _enable; bool _collisionEnable; - bool _destoryMark; + bool _destroyMark; int _tag; float _maxForce; diff --git a/cocos/physics/CCPhysicsWorld.cpp b/cocos/physics/CCPhysicsWorld.cpp index 6293a3e870..4634266869 100644 --- a/cocos/physics/CCPhysicsWorld.cpp +++ b/cocos/physics/CCPhysicsWorld.cpp @@ -647,7 +647,7 @@ void PhysicsWorld::removeJoint(PhysicsJoint* joint, bool destroy) return; } - joint->_destoryMark = destroy; + joint->_destroyMark = destroy; bool removedFromDelayAdd = false; auto it = std::find(_delayAddJoints.begin(), _delayAddJoints.end(), joint); @@ -792,7 +792,7 @@ void PhysicsWorld::doRemoveJoint(PhysicsJoint* joint) joint->getBodyB()->removeJoint(joint); } - if (joint->_destoryMark) + if (joint->_destroyMark) { delete joint; }