Skip to content

Commit 582049b

Browse files
committed
Mac and Android match iOS.
1 parent 65a3394 commit 582049b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

cocos2d/Platforms/CCAppController.m

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ - (void)applyConfigurationToCocos:(NSDictionary*)config
133133
[CCDirector pushCurrentDirector:director];
134134

135135
if([config[CCSetupScreenMode] isEqual:CCScreenModeFixed]){
136-
[self setupFixedScreenMode:config director:director];
136+
[self setupFixedScreenMode:config director:(CCDirectorIOS *) director];
137137
} else {
138138
[self setupFlexibleScreenMode:config director:director];
139139
}
@@ -221,6 +221,8 @@ - (void)setFirstScene
221221

222222
- (NSDictionary*)androidConfig
223223
{
224+
[CCBReader configureCCFileUtils];
225+
224226
NSString* configPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Published-Android"];
225227

226228
configPath = [configPath stringByAppendingPathComponent:@"configCocos2d.plist"];
@@ -236,7 +238,6 @@ - (NSDictionary*)androidConfig
236238
- (void)setupAndroid
237239
{
238240
_cocosConfig = [self androidConfig];
239-
[CCBReader configureCCFileUtils];
240241

241242
[self performAndroidNonGLConfiguration:_cocosConfig];
242243

@@ -357,6 +358,8 @@ -(CGSize)defaultWindowSize
357358

358359
- (NSDictionary*)macConfig
359360
{
361+
[CCBReader configureCCFileUtils];
362+
360363
NSMutableDictionary *macConfig = [NSMutableDictionary dictionary];
361364

362365
macConfig[CCMacDefaultWindowSize] = [NSValue valueWithCGSize:[self defaultWindowSize]];
@@ -369,7 +372,6 @@ - (NSDictionary*)macConfig
369372
-(void)setupMac
370373
{
371374
_cocosConfig = [self macConfig];
372-
[CCBReader configureCCFileUtils];
373375
[self applyConfigurationToCocos:_cocosConfig];
374376
[self runStartSceneMac];
375377
}

0 commit comments

Comments
 (0)