Improved warnings for scheduler methods.

Former-commit-id: 3f29c8f

Author: slembcke

cocos2d-ui-tests/tests/CCSchedulerTest.m

@@ -23,33 +23,24 @@ -(id)initWithTexture:(CCTexture *)texture rect:(CGRect)rect rotated:(BOOL)rotate
 	return self;
 }
 
--(void)foo:(CCTime)delta
+-(void)before:(CCTime)delta
 {
-	NSLog(@"Foooo!");
+	NSLog(@"Before");
 }
 
--(void)fooSingle:(CCTime)delta
+-(void)after:(CCTime)delta
 {
-	NSLog(@"FooSingle!");
+	NSLog(@"After");
 }
 
 -(void)onEnter
 {
 	// Scheduling a method before calling [super onEnter] used to trigger a bug.
-//	[self schedule:@selector(foo:) interval:1.0];
-	
-	[self scheduleBlock:^(CCTimer *timer){
-		NSLog(@"Before");
-		[timer repeatOnceWithInterval:2.0];
-	} delay:0.0];
+	[self schedule:@selector(before:) interval:2.0];
 
 	[super onEnter];
 
-	[self scheduleBlock:^(CCTimer *timer){
-		NSLog(@"After");
-		[timer repeatOnceWithInterval:2.0];
-	} delay:0.0];
-	
+	[self schedule:@selector(after:) interval:2.0];
 }
 
 -(void)update:(CCTime)delta

cocos2d/CCNode.m

@@ -1148,13 +1148,29 @@ -(CCTimer *) schedule:(SEL)selector interval:(CCTime)interval
 	return [self schedule:selector interval:interval repeat:CCTimerRepeatForever delay:0];
 }
 
+-(BOOL)unschedule_private:(SEL)selector
+{
+	NSString *selectorName = NSStringFromSelector(selector);
+	
+	for(CCTimer *timer in [_scheduler timersForTarget:self]){
+		if([selectorName isEqual:timer.userData]){
+			[timer invalidate];
+			return YES;
+		}
+	}
+	
+	return NO;
+}
+
 -(CCTimer *) schedule:(SEL)selector interval:(CCTime)interval repeat: (uint) repeat delay:(CCTime) delay
 {
-	NSAssert( selector != nil, @"Argument must be non-nil");
-	NSAssert( selector != @selector(update:) && selector != @selector(fixedUpdate:), @"The update: and fixedUpdate: methods are scheduled automatically.");
-	NSAssert( interval >=0, @"Arguemnt must be positive");
+	NSAssert(selector != nil, @"Selector must be non-nil");
+	NSAssert(selector != @selector(update:) && selector != @selector(fixedUpdate:), @"The update: and fixedUpdate: methods are scheduled automatically.");
+	NSAssert(interval > 0.0, @"Scheduled method interval must be positive.");
 
-	[self unschedule:selector];
+	if([self unschedule_private:selector]){
+		CCLOGWARN(@"Selector '%@' was already scheduled on %@", NSStringFromSelector(selector), self);
+	}
 
 	void (*imp)(id, SEL, CCTime) = (__typeof(imp))[self methodForSelector:selector];
 	CCTimer *timer = [_scheduler scheduleBlock:^(CCTimer *t){
@@ -1175,10 +1191,8 @@ - (CCTimer *) scheduleOnce:(SEL) selector delay:(CCTime) delay
 
 -(void)unschedule:(SEL)selector
 {
-	NSString *selectorName = NSStringFromSelector(selector);
-	
-	for(CCTimer *timer in [_scheduler timersForTarget:self]){
-		if([selectorName isEqual:timer.userData]) [timer invalidate];
+	if(![self unschedule_private:selector]){
+		CCLOGWARN(@"Selector '%@' was never scheduled on %@", NSStringFromSelector(selector), self);
 	}
 }