Better match with -x version

Author: Birkemose

cocos2d-demo.xcodeproj/project.xcworkspace/xcuserdata/Birkemose.xcuserdatad/UserInterfaceState.xcuserstate

@@ -10,6 +10,9 @@
 //
 // -----------------------------------------------------------------
 
+#define kGameLoadColor                  [CCColor colorWithRed:0.25 green:0.125 blue:0.0]
+#define kGameContrastColor              [CCColor colorWithRed:0.5 green:0.25 blue:0.0]
+
 #define kGrossiniJumpTime               1.0
 #define kGrossiniJumps                  5
 

templates/cocos2d iOS demo.xctemplate/Classes/GameTypes.h

@@ -38,7 +38,7 @@ typedef NS_ENUM(NSUInteger, PaddleSide)
 
 + (instancetype)paddleWithSide:(PaddleSide)side;
 
-- (BOOL)validPosition:(CGPoint)position;
+- (BOOL)validTouchPosition:(CGPoint)position;
 
 // -----------------------------------------------------------------
 

templates/cocos2d iOS demo.xctemplate/Classes/Paddle.h

@@ -47,7 +47,7 @@ - (instancetype)initWithSide:(PaddleSide)side
 
 // -----------------------------------------------------------------
 
-- (BOOL)validPosition:(CGPoint)position
+- (BOOL)validTouchPosition:(CGPoint)position
 {
     if (_side == PaddleSideLeft) return (position.x < kGamePaddleTouchArea);
     return (position.x > (_gameSize.width - kGamePaddleTouchArea));

templates/cocos2d iOS demo.xctemplate/Classes/Paddle.m

@@ -106,8 +106,8 @@ - (void)touchBegan:(CCTouch *)touch withEvent:(CCTouchEvent *)event
 {
     // find out what paddle is being touched
     Paddle *paddle = nil;
-    if ([_paddleA validPosition:touch.locationInWorld]) paddle = _paddleA;
-    else if ([_paddleB validPosition:touch.locationInWorld]) paddle = _paddleB;
+    if ([_paddleA validTouchPosition:touch.locationInWorld]) paddle = _paddleA;
+    else if ([_paddleB validTouchPosition:touch.locationInWorld]) paddle = _paddleB;
 
     // if the touch is not for a paddle, just pass the touch on, and exit
     if (paddle == nil)
@@ -144,7 +144,7 @@ - (void)touchMoved:(CCTouch *)touch withEvent:(CCTouchEvent *)event
     }
 
     // check for valid position
-    if ([paddle validPosition:touch.locationInWorld])
+    if ([paddle validTouchPosition:touch.locationInWorld])
     {
         paddle.destination = touch.locationInWorld.y;
     }

templates/cocos2d iOS demo.xctemplate/Classes/gameScene.m

@@ -12,6 +12,7 @@
 
 #import "LoadScene.h"
 #import "MainScene.h"
+#import "GameTypes.h"
 
 // -----------------------------------------------------------------------
 
@@ -46,7 +47,7 @@ - (id)init
     background.anchorPoint = CGPointZero;
     background.position = CGPointZero;
     background.contentSize = size;
-    background.color = [CCColor grayColor];
+    background.color = kGameLoadColor;
     [self addChild:background];
 
     // loading text

templates/cocos2d iOS demo.xctemplate/Classes/loadScene.m

@@ -54,7 +54,7 @@ - (id)init
     CCSprite9Slice *background = [CCSprite9Slice spriteWithImageNamed:@"white_square.png"];
     background.anchorPoint = CGPointZero;
     background.contentSize = size;
-    background.color = [CCColor orangeColor];
+    background.color = kGameContrastColor;
     [self addChild:background];
 
     // add grossini (we have missed him)