diff options
Diffstat (limited to 'libs/cocos2d')
-rwxr-xr-x | libs/cocos2d/Platforms/iOS/CCDirectorIOS.m | 3 | ||||
-rwxr-xr-x | libs/cocos2d/ccMacros.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libs/cocos2d/Platforms/iOS/CCDirectorIOS.m b/libs/cocos2d/Platforms/iOS/CCDirectorIOS.m index c483665..aee3853 100755 --- a/libs/cocos2d/Platforms/iOS/CCDirectorIOS.m +++ b/libs/cocos2d/Platforms/iOS/CCDirectorIOS.m | |||
@@ -486,8 +486,7 @@ CGFloat __ccContentScaleFactor = 1; | |||
486 | // uncomment this line to prevent 'freezing'. | 486 | // uncomment this line to prevent 'freezing'. |
487 | // It doesn't work on with the Fast Director | 487 | // It doesn't work on with the Fast Director |
488 | // | 488 | // |
489 | // [[NSRunLoop currentRunLoop] addTimer:animationTimer | 489 | [[NSRunLoop currentRunLoop] addTimer:animationTimer forMode:NSRunLoopCommonModes]; |
490 | // forMode:NSRunLoopCommonModes]; | ||
491 | } | 490 | } |
492 | 491 | ||
493 | -(void) mainLoop | 492 | -(void) mainLoop |
diff --git a/libs/cocos2d/ccMacros.h b/libs/cocos2d/ccMacros.h index 4e08725..a4c8821 100755 --- a/libs/cocos2d/ccMacros.h +++ b/libs/cocos2d/ccMacros.h | |||
@@ -156,7 +156,6 @@ default gl blend src function. Compatible with premultiplied alpha images. | |||
156 | #define CC_DIRECTOR_INIT() \ | 156 | #define CC_DIRECTOR_INIT() \ |
157 | do { \ | 157 | do { \ |
158 | window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; \ | 158 | window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; \ |
159 | if( ! [CCDirector setDirectorType:kCCDirectorTypeDisplayLink] ) \ | ||
160 | [CCDirector setDirectorType:kCCDirectorTypeNSTimer]; \ | 159 | [CCDirector setDirectorType:kCCDirectorTypeNSTimer]; \ |
161 | CCDirector *__director = [CCDirector sharedDirector]; \ | 160 | CCDirector *__director = [CCDirector sharedDirector]; \ |
162 | [__director setDeviceOrientation:kCCDeviceOrientationPortrait]; \ | 161 | [__director setDeviceOrientation:kCCDeviceOrientationPortrait]; \ |