1 files changed, 49 insertions, 1 deletions

@@ -7,7 +7,7 @@
 //
 
 #import "FallingObject.h"
-
+#import "GameMode.h"
 
 @implementation FallingObject
 
@@ -25,6 +25,54 @@
         return self;
 }
 
+- (BOOL)tick
+{
+    GameMode* gameLayer = ((GameMode*) sprite.parent);
+    
+    // Move objects down
+    sprite.position = ccp(sprite.position.x, sprite.position.y-weight);
+        
+    // Cart collision detection
+    CGSize first = [gameLayer.cart.sprite boundingBox].size;
+    CGSize second = [sprite boundingBox].size;
+    
+    if (gameLayer.cart.sprite.position.x > (sprite.position.x - second.width/2 - first.width/2))
+    {
+        if (gameLayer.cart.sprite.position.x < (sprite.position.x + second.width/2 + first.width/2))
+        {
+            if (gameLayer.cart.sprite.position.y > (sprite.position.y - second.height/2 - first.height/2))
+            {
+                if (gameLayer.cart.sprite.position.y < (sprite.position.y + second.height/2 + first.height/2))
+                {
+                    [self collideWithCart];
+                    
+                    return YES;
+                }
+            }
+        }
+    }
+    
+    // Collision detection with floor
+    if (sprite.position.y - (sprite.contentSize.height/2) < 0)
+    {
+        [self collideWithFloor];
+        
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (void)collideWithCart
+{
+
+}
+
+- (void)collideWithFloor
+{
+
+}
+
 - (void)dealloc
 {
     [sprite release];