From 9af1e9d9b09a35535af6fcfdb3965feeb5ba7511 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Fri, 5 Apr 2013 16:24:08 +0200 Subject: [PATCH] Added asserts. --- spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m b/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m index 8b1b80e3d..a568e7c56 100644 --- a/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m +++ b/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m @@ -73,9 +73,12 @@ Skeleton* _Cocos2dSkeleton_create (SkeletonData* data, CCSkeleton* node) { } + (CCSkeleton*) create:(NSString*)skeletonDataFile atlas:(Atlas*)atlas scale:(float)scale { + NSAssert(skeletonDataFile, @"skeletonDataFile cannot be nil."); + NSAssert(atlas, @"atlas cannot be nil."); SkeletonJson* json = SkeletonJson_create(atlas); json->scale = scale; SkeletonData* skeletonData = SkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]); + NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error])); SkeletonJson_dispose(json); CCSkeleton* node = skeletonData ? [CCSkeleton create:skeletonData] : 0; node->ownsSkeleton = true; @@ -87,11 +90,15 @@ Skeleton* _Cocos2dSkeleton_create (SkeletonData* data, CCSkeleton* node) { } + (CCSkeleton*) create:(NSString*)skeletonDataFile atlasFile:(NSString*)atlasFile scale:(float)scale { + NSAssert(skeletonDataFile, @"skeletonDataFile cannot be nil."); + NSAssert(atlasFile, @"atlasFile cannot be nil."); Atlas* atlas = Atlas_readAtlasFile([atlasFile UTF8String]); + NSAssert(atlas, ([NSString stringWithFormat:@"Error reading atlas file: %@", atlasFile])); if (!atlas) return 0; SkeletonJson* json = SkeletonJson_create(atlas); json->scale = scale; SkeletonData* skeletonData = SkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]); + NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error])); SkeletonJson_dispose(json); if (!skeletonData) { Atlas_dispose(atlas); @@ -116,6 +123,8 @@ Skeleton* _Cocos2dSkeleton_create (SkeletonData* data, CCSkeleton* node) { } - (id) init:(SkeletonData*)skeletonData stateData:(AnimationStateData*)stateData { + NSAssert(skeletonData, @"skeletonData cannot be nil."); + self = [super init]; if (!self) return nil;