4 files changed, 49 insertions, 3 deletions

@@ -14,6 +14,7 @@
         CCSprite* sprite;
     int weight;
     id<FallingObjectDelegate> delegate;
+    BOOL flags[4];
 }
 
 @property (readonly) CCSprite* sprite;
@@ -23,5 +24,7 @@
 - (BOOL)tick;
 - (void)collideWithCart;
 - (void)collideWithFloor;
+- (BOOL)flag:(int)flag;
+- (void)setFlag:(int)flag withValue:(BOOL)value;
 
 @end
@@ -93,6 +93,16 @@
 
 }
 
+- (BOOL)flag:(int)flag
+{
+    return flags[flag];
+}
+
+- (void)setFlag:(int)flag withValue:(BOOL)value
+{
+    flags[flag] = value;
+}
+
 - (void)dealloc
 {
     [sprite.parent removeChild:sprite cleanup:YES];
@@ -30,6 +30,8 @@
 
 @end
 
+// FallingObject flag 0 is whether the object is floating in water
+
 @implementation JumpGameMode
 
 - (id)init
@@ -116,24 +118,55 @@
         }
     }
     
+    NSMutableSet* discardedObjects = [NSMutableSet set];
     for (FallingObject* object in objects)
     {
-        if (waterTick > 0)
+        if ((object.sprite.position.y < 86) && (![object flag:0]))
+        {
+            for (CCSprite* ledge in ledges)
+            {
+                CGSize first = [object.sprite boundingBox].size;
+                CGSize second = [ledge boundingBox].size;
+                
+                if (object.sprite.position.x > (ledge.position.x - second.width/2 - first.width/2))
+                {
+                    if (object.sprite.position.x < (ledge.position.x + second.width/2 + first.width/2))
+                    {
+                        if (object.sprite.position.y > (ledge.position.y - second.height/2 - first.height/2))
+                        {
+                            if (object.sprite.position.y < (ledge.position.y + second.height/2 + first.height/2))
+                            {
+                                [discardedObjects addObject:object];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        if ((waterTick >= 180) || ([object flag:0]))
         {
             object.sprite.position = ccp(object.sprite.position.x, MAX(object.sprite.position.y, water.position.y+80+11));
         } else {
             object.sprite.position = ccp(object.sprite.position.x-ledgeScrollSpeed, object.sprite.position.y);
         }
+        
+        if ((waterTick > 0) && (object.sprite.position.y <= (water.position.y+80+11)))
+        {
+            [object setFlag:0 withValue:YES];
+        }
     }
     
     [ledges minusSet:discardedSet];
+    [objects minusSet:discardedObjects];
     
     if (rightmost <= 480)
     {
         int ledgeWidth = arc4random() % 9 + 1;
+        int ledgeDistance = arc4random() % (ledgeScrollSpeed*ledgeScrollSpeed+1)*3/2;
         CCTexture2D* texture = [[CCTexture2D alloc] initWithImage:[factory createLedgeWithWidth:ledgeWidth height:2]];
         CCSprite* ledge = [CCSprite spriteWithTexture:texture];
-        ledge.position = ccp(rightmost + rightwidth + ledge.boundingBox.size.width/2+64, 32);
+        ledge.position = ccp(rightmost + rightwidth + ledge.boundingBox.size.width/2+64+ledgeDistance, 32);
         [self addChild:ledge];
         [ledges addObject:ledge];
         [texture release];
@@ -30,7 +30,7 @@
     GameMode* gameLayer = ((GameMode*) sprite.parent);
     [gameLayer setPointMultiplier:gameLayer.pointMultiplier+1];
     
-    [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Item1" ofType:@"wav"]];
+    [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Absorption2" ofType:@"wav"]];
 }
 
 @end