Pulled in trunk changes because the iOS 6 bug was making it impossible to test

1 files changed, 7 insertions, 8 deletions

@@ -54,7 +54,7 @@
             if ((delegate != nil) && ([delegate respondsToSelector:@selector(cartShouldFall:)]))
             {
                 int bottom = [delegate cartShouldFall:self];
-                sprite.position = ccp(sprite.position.x, MAX(bottom, sprite.position.y-6));
+                sprite.position = ccp(sprite.position.x, MAX(bottom, sprite.position.y-8));
             } else {
                 NSLog(@"Falling is set on a cart without a compatible game mode.");
             }
@@ -62,15 +62,14 @@
     }
 }
 
-- (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)acceleration
+#define kFilterFactor 0.05f
+
+- (void)deviceDidRotate:(double)pitch
 {
     static float prevY=0;
-        
-#define kFilterFactor 0.05f
-        
-        float accelY = -((float) acceleration.y * kFilterFactor + (1- kFilterFactor)*prevY);
-        
-        prevY = accelY;
+    float accelY = -((float) pitch * kFilterFactor + (1- kFilterFactor)*prevY);
+    
+    prevY = accelY;
         accelX = accelY * 750;
 }