Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typo: destoryMark -> destroyMark

This commit is contained in:
mogemimi 2016-06-28 23:11:22 +09:00
parent c7af8e3e74
commit 2060b333ca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/physics/CCPhysicsJoint.cpp
View File

@ -39,7 +39,7 @@ PhysicsJoint::PhysicsJoint()
, _world(nullptr) , _world(nullptr)
, _enable(false) , _enable(false)
, _collisionEnable(true) , _collisionEnable(true)
, _destoryMark(false) , _destroyMark(false)
, _tag(0) , _tag(0)
, _maxForce(PHYSICS_INFINITY) , _maxForce(PHYSICS_INFINITY)
, _initDirty(true) , _initDirty(true)

2
cocos/physics/CCPhysicsJoint.h
View File

@ -115,7 +115,7 @@ protected:
bool _enable; bool _enable;
bool _collisionEnable; bool _collisionEnable;
bool _destoryMark; bool _destroyMark;
int _tag; int _tag;
float _maxForce; float _maxForce;

4
cocos/physics/CCPhysicsWorld.cpp
View File

@ -647,7 +647,7 @@ void PhysicsWorld::removeJoint(PhysicsJoint* joint, bool destroy)
return; return;
} }
joint->_destoryMark = destroy; joint->_destroyMark = destroy;
bool removedFromDelayAdd = false; bool removedFromDelayAdd = false;
auto it = std::find(_delayAddJoints.begin(), _delayAddJoints.end(), joint); auto it = std::find(_delayAddJoints.begin(), _delayAddJoints.end(), joint);
@ -792,7 +792,7 @@ void PhysicsWorld::doRemoveJoint(PhysicsJoint* joint)
joint->getBodyB()->removeJoint(joint); joint->getBodyB()->removeJoint(joint);
} }
if (joint->_destoryMark) if (joint->_destroyMark)
{ {
delete joint; delete joint;
} }