3 files changed, 20 insertions, 21 deletions

@@ -24,7 +24,5 @@
 - (BOOL)tick;
 - (void)collideWithCart;
 - (void)collideWithFloor;
-- (BOOL)flag:(int)flag;
-- (void)setFlag:(int)flag withValue:(BOOL)value;
 
 @end
@@ -93,16 +93,6 @@
 
 }
 
-- (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,7 +30,19 @@
 
 @end
 
-// FallingObject flag 0 is whether the object is floating in water
+@implementation FallingObject (Flags)
+
+- (BOOL)fellDuringWave
+{
+    return flags[0];
+}
+
+- (void)setFellDuringWave:(BOOL)value
+{
+    flags[0] = value;
+}
+
+@end
 
 @implementation JumpGameMode
 
@@ -118,10 +130,12 @@
         }
     }
     
+    [ledges minusSet:discardedSet];
+    
     NSMutableSet* discardedObjects = [NSMutableSet set];
     for (FallingObject* object in objects)
     {
-        if ((object.sprite.position.y < 86) && (![object flag:0]))
+        if (object.sprite.position.y < (64+object.sprite.boundingBox.size.height/2))
         {
             for (CCSprite* ledge in ledges)
             {
@@ -144,20 +158,14 @@
             }
         }
         
-        if ((waterTick >= 180) || ((waterTick > 0) && ([object flag:0])))
+        if (object.fellDuringWave)
         {
             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)
@@ -396,6 +404,7 @@
     
         object.sprite.position = ccp(objectX, 360);
         object.sprite.scale = 1;
+    object.fellDuringWave = waterTick > 0;
         [self addChild:object.sprite];
         
         [objects addObject:object];
@@ -429,6 +438,7 @@
             
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
+            object.fellDuringWave = waterTick > 0;
                         [self addChild:object.sprite];
                         
                         [objects addObject:object];
@@ -464,6 +474,7 @@
             
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
+            object.fellDuringWave = waterTick > 0;
                         [self addChild:object.sprite];
                         
                         [objects addObject:object];