Merge pull request #971 from jtwigg/develop

vlidholt · vlidholt · commit 4964238531c4 · 2014-09-05T15:16:34.000-07:00
don't pull UUID's Zero.
diff --git a/cocos2d-ui/CCBReader/CCBReader.m b/cocos2d-ui/CCBReader/CCBReader.m
@@ -1146,10 +1146,13 @@ -(void)postDeserialization
 		NSString * name = task[1];
 		int uuid = (int)[task[2] integerValue];
 		
+		if(uuid == 0)
+			return;
+		
 		CCNode * mappedNode = nodeMapping[@(uuid)];
 		NSAssert(mappedNode != nil, @"CCBReader: Failed to find node UUID:%i", uuid);
 		[node setValue:mappedNode forKey:name];
-
+		
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1146,10 +1146,13 @@ -(void)postDeserialization`
`1146`	`1146`	`NSString * name = task[1];`
`1147`	`1147`	`int uuid = (int)[task[2] integerValue];`
`1148`	`1148`
	`1149`	`+ if(uuid == 0)`
	`1150`	`+ return;`
	`1151`	`+`
`1149`	`1152`	`CCNode * mappedNode = nodeMapping[@(uuid)];`
`1150`	`1153`	`NSAssert(mappedNode != nil, @"CCBReader: Failed to find node UUID:%i", uuid);`
`1151`	`1154`	`[node setValue:mappedNode forKey:name];`
`1152`		`-`
	`1155`	`+`
`1153`	`1156`	`}`
`1154`	`1157`	`}`
`1155`	`1158`