Minor CCResponder design cleanup

Author: Birkemose

cocos2d/CCNode.h

@@ -393,28 +393,6 @@ A common user pattern in building a Cocos2d game is to subclass CCNode, add it t
 /** The z order of the node relative to its "siblings": children of the same parent. */
 @property(nonatomic,assign) NSInteger zOrder;
 
-
-/// -----------------------------------------------------------------------
-/// @name Hit tests
-/// -----------------------------------------------------------------------
-
-/**
- *  Check if a touch is inside the node.
- *  To allow for custom detection, override this method.
- *
- *  @param pos World position.
- *
- *  @return Returns true, if the position is inside the node.
- */
-- (BOOL)hitTestWithWorldPos:(CGPoint)pos;
-
-/** 
- *  Expands ( or contracts ) the hit area of the node.
- *  The expansion is calculated as a margin around the sprite, in points.
- */
-@property (nonatomic, assign) float hitAreaExpansion;
-
-
 /// -----------------------------------------------------------------------
 /// @name Scene Management
 /// -----------------------------------------------------------------------

cocos2d/CCNode.m

@@ -1618,7 +1618,7 @@ - (CGPoint)convertToWindowSpace:(CGPoint)nodePoint
 - (BOOL)hitTestWithWorldPos:(CGPoint)pos
 {
     pos = [self convertToNodeSpace:pos];
-    CGPoint offset = ccp(-_hitAreaExpansion, -_hitAreaExpansion);
+    CGPoint offset = ccp(-self.hitAreaExpansion, -self.hitAreaExpansion);
     CGSize size = CGSizeMake(self.contentSizeInPoints.width - offset.x, self.contentSizeInPoints.height - offset.y);
     if ((pos.y < offset.y) || (pos.y > size.height) || (pos.x < offset.x) || (pos.x > size.width)) return(NO);
 
@@ -1627,7 +1627,6 @@ - (BOOL)hitTestWithWorldPos:(CGPoint)pos
 
 // -----------------------------------------------------------------
 
-
 #pragma mark - CCColor methods
 
 @synthesize cascadeColorEnabled=_cascadeColorEnabled;

cocos2d/CCResponder.h

@@ -40,6 +40,9 @@
  */
 @interface CCResponder : NSObject
 
+/// -----------------------------------------------------------------------
+/// @name Basic responder control
+/// -----------------------------------------------------------------------
 
 /** Enables user interaction on a node. */
 @property ( nonatomic, assign, getter = isUserInteractionEnabled ) BOOL userInteractionEnabled;
@@ -61,6 +64,12 @@
  */
 @property (nonatomic, assign, getter = isExclusiveTouch) BOOL exclusiveTouch;
 
+/**
+ *  Expands ( or contracts ) the hit area of the node.
+ *  The expansion is calculated as a margin around the sprite, in points.
+ */
+@property (nonatomic, assign) float hitAreaExpansion;
+
 /// -----------------------------------------------------------------------
 /// @name Initializing a CCResponder Object
 /// -----------------------------------------------------------------------
@@ -72,8 +81,21 @@
  */
 - (id)init;
 
-#if ( TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR )
+/// -----------------------------------------------------------------------
+/// @name Hit tests
+/// -----------------------------------------------------------------------
 
+/**
+ *  Check if a touch is inside the node.
+ *  To allow for custom detection, override this method.
+ *
+ *  @param pos World position.
+ *
+ *  @return Returns true, if the position is inside the node.
+ */
+- (BOOL)hitTestWithWorldPos:(CGPoint)pos;
+
+#if ( TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR )
 
 #pragma mark -
 #pragma mark Touch Handling Methods

cocos2d/CCResponder.m

@@ -64,6 +64,14 @@ - (void)setUserInteractionEnabled:(BOOL)userInteractionEnabled
     [[[CCDirector sharedDirector] responderManager] markAsDirty];
 }
 
+// -----------------------------------------------------------------
+// override for touch and mouse functionality
+
+- (BOOL)hitTestWithWorldPos:(CGPoint)pos
+{
+    return(NO);
+}
+
 // -----------------------------------------------------------------
 #pragma mark - iOS
 // -----------------------------------------------------------------