Skip to content

Commit 154e427

Browse files
committed
CCPackageManager's baseURL must be set in order to use the convenience download methods.
Otherwise an error is returned thru the delegate method downloadFailed and nil is returned instead of a package.
1 parent e0cefa8 commit 154e427

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

cocos2d/CCPackageConstants.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ extern NSUInteger const PACKAGE_ERROR_MANAGER_CANNOT_ENABLE_NON_DISABLED_PACKAGE
1313

1414
extern NSUInteger const PACKAGE_ERROR_MANAGER_CANNOT_DISABLE_NON_ENABLED_PACKAGE;
1515

16+
extern NSUInteger const PACKAGE_ERROR_MANAGER_NO_BASE_URL_SET;
17+
18+
1619

1720
// Misc
1821
extern NSString *const PACKAGE_REL_DOWNLOAD_FOLDER;

cocos2d/CCPackageConstants.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
NSUInteger const PACKAGE_ERROR_MANAGER_CANNOT_DISABLE_NON_ENABLED_PACKAGE = 10021;
1818

19+
NSUInteger const PACKAGE_ERROR_MANAGER_NO_BASE_URL_SET = 10022;
1920

2021
// Misc
2122
NSString *const PACKAGE_REL_DOWNLOAD_FOLDER = @"com.cocos2d/Packages/Downloads";

cocos2d/CCPackageManager.m

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,12 @@ - (CCPackage *)downloadPackageWithName:(NSString *)name resolution:(NSString *)r
238238
NSString *packageName = [NSString stringWithFormat:@"%@-%@-%@.zip", name, [CCPackageHelper currentOS], resolution];
239239
NSURL *remoteURL = [_baseURL URLByAppendingPathComponent:packageName];
240240

241+
if (!_baseURL)
242+
{
243+
[_delegate packageDownloadFailed:nil error:[NSError errorWithDomain:@"cocos2d" code:PACKAGE_ERROR_MANAGER_NO_BASE_URL_SET userInfo:nil]];
244+
return nil;
245+
}
246+
241247
return [self downloadPackageWithName:name resolution:resolution remoteURL:remoteURL enableAfterDownload:enableAfterDownload];
242248
}
243249

0 commit comments

Comments
 (0)