1 files changed, 30 insertions, 16 deletions

@@ -25,7 +25,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
 
@@ -141,10 +153,12 @@ static GameModeInfo* info;
         }
     }
     
+    [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)
             {
@@ -167,20 +181,14 @@ static GameModeInfo* info;
             }
         }
         
-        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)
@@ -205,6 +213,9 @@ static GameModeInfo* info;
     if ((cart.sprite.position.y < 86) && (cart.boundedByScreen))
     {
         cart.boundedByScreen = NO;
+    } else if ((cart.sprite.position.y >= 86) && (!cart.boundedByScreen))
+    {
+        cart.boundedByScreen = YES;
     }
     
     if (cart.sprite.position.y == (0-cart.sprite.boundingBox.size.height/2))
@@ -300,13 +311,6 @@ static GameModeInfo* info;
     isGesturing = NO;
 }
 
-- (void)accelerometer:(UIAccelerometer *)accelerometer didAccelerate:(UIAcceleration *)acceleration
-{
-    [super accelerometer:accelerometer didAccelerate:acceleration];
-    
-    expectedAngle = acceleration.y*M_PI_2;
-}
-
 - (int)cartShouldFall:(Cart *)m_cart
 {
     int bottom = 0-m_cart.sprite.boundingBox.size.height/2;
@@ -416,6 +420,7 @@ static GameModeInfo* info;
     object.delegate = self;
         object.sprite.position = ccp(objectX, 360);
         object.sprite.scale = 1;
+    object.fellDuringWave = waterTick > 0;
         [self addChild:object.sprite];
         
         [objects addObject:object];
@@ -450,6 +455,7 @@ static GameModeInfo* info;
             object.delegate = self;
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
+            object.fellDuringWave = waterTick > 0;
                         [self addChild:object.sprite];
                         
                         [objects addObject:object];
@@ -486,6 +492,7 @@ static GameModeInfo* info;
             object.delegate = self;
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
+            object.fellDuringWave = waterTick > 0;
                         [self addChild:object.sprite];
                         
                         [objects addObject:object];
@@ -528,6 +535,13 @@ static GameModeInfo* info;
     }
 }
 
+- (void)setPitch:(double)m_pitch
+{
+  [super setPitch:m_pitch];
+  
+  expectedAngle = pitch*M_PI_2;
+}
+
 @end
 
 @implementation LedgeFactory