Merge pull request #604 from kalo-/patch-1

slembcke · slembcke · commit 086d1b1df5cc · 2014-02-21T12:10:36.000-06:00
updated setZOrder: in CCNode.m Former-commit-id: 830223d
diff --git a/cocos2d/CCNode.m b/cocos2d/CCNode.m
@@ -600,10 +600,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
`@@ -600,10 +600,10 @@ -(void) setScale:(float) s`
`600`	`600`
`601`	`601`	`- (void) setZOrder:(NSInteger)zOrder`
`602`	`602`	`{`
`603`		`- [self _setZOrder:zOrder];`
`604`		`-`
`605`	`603`	`if (_parent)`
`606`	`604`	`[_parent reorderChild:self z:zOrder];`
	`605`	`+ else`
	`606`	`+ [self _setZOrder:zOrder]; // issue #598`
`607`	`607`	`}`
`608`	`608`
`609`	`609`	`#pragma mark CCNode Composition`