@@ -94,20 +94,12 @@ + (void) configureCCFileUtils
94
94
@" resources-phonehd" , CCFileUtilsSuffixMacHD,
95
95
@" " , CCFileUtilsSuffixDefault,
96
96
nil ];
97
-
98
- #if __CC_PLATFORM_ANDROID
99
- sharedFileUtils.searchPath =
100
- [NSArray arrayWithObjects:
101
- [[[NSBundle mainBundle ] resourcePath ] stringByAppendingPathComponent: @" Published-Android" ],
102
- [[NSBundle mainBundle ] resourcePath ],
103
- nil ];
104
- #else
97
+
105
98
sharedFileUtils.searchPath =
106
99
[NSArray arrayWithObjects:
107
100
[[[NSBundle mainBundle ] resourcePath ] stringByAppendingPathComponent: @" Published-iOS" ],
108
101
[[NSBundle mainBundle ] resourcePath ],
109
102
nil ];
110
- #endif
111
103
112
104
sharedFileUtils.enableiPhoneResourcesOniPad = YES ;
113
105
sharedFileUtils.searchMode = CCFileUtilsSearchModeDirectory;
@@ -419,7 +411,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
419
411
420
412
if (setProp)
421
413
{
422
- #if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
414
+ #if __CC_PLATFORM_IOS
423
415
[node setValue: [NSValue valueWithCGPoint: ccp (x,y)] forKey: name];
424
416
#elif __CC_PLATFORM_MAC
425
417
[node setValue: [NSValue valueWithPoint: ccp (x,y)] forKey: name];
@@ -454,7 +446,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
454
446
if (setProp)
455
447
{
456
448
CGPoint pt = ccp (x,y);
457
- #if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
449
+ #if __CC_PLATFORM_IOS
458
450
[node setValue: [NSValue valueWithCGPoint: pt] forKey: name];
459
451
#else
460
452
[node setValue: [NSValue valueWithPoint: NSPointFromCGPoint (pt)] forKey: name];
@@ -475,7 +467,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
475
467
if (setProp)
476
468
{
477
469
CGSize size = CGSizeMake (w, h);
478
- #if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
470
+ #if __CC_PLATFORM_IOS
479
471
[node setValue: [NSValue valueWithCGSize: size] forKey: name];
480
472
#elif __CC_PLATFORM_MAC
481
473
[node setValue: [NSValue valueWithSize: size] forKey: name];
0 commit comments