setZOrder: in CCNode.m

kalo · kalo · commit c32543be2569 · 2014-02-19T04:33:45.000-05:00
setting the zOrder of the current node is redundant if parent is present and will directly interfere with if( z == child.zOrder ) check in reorderChild:z: from CCSprite, CCSpriteBatchNode and CCParticleBatchNode causing them to defer from reordering their children. this is related to issue 598. Former-commit-id: cbb643d
diff --git a/cocos2d/CCNode.m b/cocos2d/CCNode.m
@@ -593,10 +593,10 @@ -(void) setScale:(float) s
 
 - (void) setZOrder:(NSInteger)zOrder
 {
-	[self _setZOrder:zOrder];
-
     if (_parent)
         [_parent reorderChild:self z:zOrder];
+    else
+    	[self _setZOrder:zOrder]; // issue #598
 }
 
 #pragma mark CCNode Composition

Original file line number	Diff line number	Diff line change
`@@ -593,10 +593,10 @@ -(void) setScale:(float) s`
`593`	`593`
`594`	`594`	`- (void) setZOrder:(NSInteger)zOrder`
`595`	`595`	`{`
`596`		`- [self _setZOrder:zOrder];`
`597`		`-`
`598`	`596`	`if (_parent)`
`599`	`597`	`[_parent reorderChild:self z:zOrder];`
	`598`	`+ else`
	`599`	`+ [self _setZOrder:zOrder]; // issue #598`
`600`	`600`	`}`
`601`	`601`
`602`	`602`	`#pragma mark CCNode Composition`