4 files changed, 62 insertions, 31 deletions

@@ -15,7 +15,7 @@
 #define GAME_SCENE 436
 #define GAME_LAYER 437
 
-@interface GameMode : CCLayer <UIAlertViewDelegate, CartDelegate> {
+@interface GameMode : CCLayer <UIAlertViewDelegate, CartDelegate, CCStandardTouchDelegate> {
     NSMutableSet* objects;
         int score;
         int lives;
@@ -23,19 +23,23 @@
     Cart* cart;
     FallingObjectFactory* objectFactory;
     
+    CCLayerColor* willPauseLayer;
     CCLayerColor* shadedLayer;
     CCLayer* pauseLayer;
+    BOOL isPaused;
+    BOOL isPausing;
     
     CCLabelBMFont* scoreLabel;
         CCLabelBMFont* livesLabel;
     
     void (^delayedAction)(void);
     
-    BOOL isPaused;
-    
     BOOL hasGyroscope;
     double pitch;
     CMMotionManager* motionManager;
+    
+    BOOL isGesturing;
+    CGPoint gestureStartPoint;
 }
 
 @property (readonly) Cart* cart;
@@ -42,14 +42,6 @@
         
         objectFactory = [[FallingObjectFactory alloc] init];
                 
-        if ([self canPause])
-        {
-            CCMenuItemImage* pauseButton = [CCMenuItemImage itemFromNormalImage:@"pause2.png" selectedImage:@"pause.png" target:self selector:@selector(pause)];
-            CCMenu* pauseMenu = [CCMenu menuWithItems:pauseButton, nil];
-            [pauseMenu setPosition:ccp(480-8-16, 320-8-16)];
-            [self addChild:pauseMenu];
-        }
-        
         isPaused = NO;
 
         Class cmClass = (NSClassFromString(@"CMMotionManager"));
@@ -71,6 +63,8 @@
             isAccelerometerEnabled_ = YES;
             hasGyroscope = NO;
         }
+        
+        self.isTouchEnabled = YES;
     }
     
     return self;
@@ -262,6 +256,56 @@
     [cart deviceDidRotate:pitch];
 }
 
+- (void)ccTouchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    if ((!isPaused) && (!isGesturing) && ([self canPause]))
+    {
+        UITouch* touch = [touches anyObject];
+        gestureStartPoint = [touch locationInView:nil];
+        isGesturing = YES;
+        
+        if (gestureStartPoint.x > 160)
+        {
+            isPausing = YES;
+            
+            willPauseLayer = [CCLayerColor layerWithColor:ccc4(0, 0, 0, 63) width:480 height:160];
+            willPauseLayer.position = ccp(0, 160);
+            [[[CCDirector sharedDirector] runningScene] addChild:willPauseLayer];
+        }
+    }
+}
+
+- (void)ccTouchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    if (isGesturing && isPausing)
+    {
+        UITouch* touch = [touches anyObject];
+        CGPoint gestureCurrentPosition = [touch locationInView:nil];
+        CGFloat distance = sqrt(powf((gestureCurrentPosition.x - gestureStartPoint.x),2) + powf((gestureCurrentPosition.y - gestureStartPoint.y),2));
+        
+        if (distance > 2)
+        {
+            [[[CCDirector sharedDirector] runningScene] removeChild:willPauseLayer cleanup:YES];
+            willPauseLayer = nil;
+            isPausing = NO;
+        }
+    }
+}
+
+- (void)ccTouchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    if (isPausing)
+    {
+        [[[CCDirector sharedDirector] runningScene] removeChild:willPauseLayer cleanup:YES];
+        willPauseLayer = nil;
+        isPausing = NO;
+        
+        [self pause];
+    }
+    
+    isGesturing = NO;
+}
+
 - (void)dealloc
 {
     [objects release];
@@ -11,12 +11,10 @@
 
 @class LedgeFactory;
 
-@interface JumpGameMode : GameMode <CCStandardTouchDelegate, FallingObjectDelegate> {
+@interface JumpGameMode : GameMode <FallingObjectDelegate> {
     CCSprite* water;
     int waterTick;
     BOOL wave;
-    BOOL isGesturing;
-    CGPoint gestureStartPoint;
     int jumpTick;
     BOOL jump;
     float expectedAngle;
@@ -83,8 +83,6 @@ static GameModeInfo* info;
         cart.falling = YES;
         cart.delegate = self;
         
-        self.isTouchEnabled = YES;
-        
         waterTick = 0;
         wave = NO;
         
@@ -279,18 +277,10 @@ static GameModeInfo* info;
     }
 }
 
-- (void)ccTouchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    if ((!isPaused) && (!isGesturing))
-    {
-        UITouch* touch = [touches anyObject];
-        gestureStartPoint = [touch locationInView:nil];
-        isGesturing = YES;
-    }
-}
-
 - (void)ccTouchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
 {
+    [super ccTouchesMoved:touches withEvent:event];
+    
     if (isGesturing)
     {
         UITouch* touch = [touches anyObject];
@@ -306,11 +296,6 @@ static GameModeInfo* info;
     }
 }
 
-- (void)ccTouchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    isGesturing = NO;
-}
-
 - (int)cartShouldFall:(Cart *)m_cart
 {
     int bottom = 0-m_cart.sprite.boundingBox.size.height/2;