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

Merge pull request #4864 from daltomi/test 

fix bad name variable CCDirector
This commit is contained in:
James Chen 2014-01-03 21:44:42 -08:00
parent 98346474b8 d10992951b
commit 43cdf1713b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/2d/CCDirector.cpp
View File

@ -132,7 +132,7 @@ bool Director::init(void)
_paused = false; _paused = false;
// purge ? // purge ?
_purgeDirecotorInNextLoop = false; _purgeDirectorInNextLoop = false;
_winSizeInPoints = Size::ZERO; _winSizeInPoints = Size::ZERO;
@ -718,7 +718,7 @@ void Director::popToSceneStackLevel(int level)
void Director::end() void Director::end()
{ {
_purgeDirecotorInNextLoop = true; _purgeDirectorInNextLoop = true;
} }
void Director::purgeDirector() void Director::purgeDirector()
@ -1077,9 +1077,9 @@ void DisplayLinkDirector::startAnimation()
void DisplayLinkDirector::mainLoop() void DisplayLinkDirector::mainLoop()
{ {
if (_purgeDirecotorInNextLoop) if (_purgeDirectorInNextLoop)
{ {
_purgeDirecotorInNextLoop = false; _purgeDirectorInNextLoop = false;
purgeDirector(); purgeDirector();
} }
else if (! _invalid) else if (! _invalid)

2
cocos/2d/CCDirector.h
View File

@ -392,7 +392,7 @@ public:
protected: protected:
void purgeDirector(); void purgeDirector();
bool _purgeDirecotorInNextLoop; // this flag will be set to true in end() bool _purgeDirectorInNextLoop; // this flag will be set to true in end()
void setNextScene(); void setNextScene();