1 files changed, 65 insertions, 3 deletions

@@ -328,7 +328,31 @@
                 }
         }
         
-        int objectX = arc4random()%448+16;
+        int objectX;
+    
+    CGSize first = [cart.sprite boundingBox].size;
+    CGSize second = [object.sprite boundingBox].size;
+    
+    for (;;)
+    {
+        objectX = arc4random()%448+16;
+        
+        if (waterTick == 0)
+        {
+            break;
+        }
+        
+        if (cart.sprite.position.x > (objectX - second.width/2 - first.width/2))
+        {
+            if (cart.sprite.position.x < (objectX + second.width/2 + first.width/2))
+            {
+                continue;
+            }
+        }
+        
+        break;
+    }
+    
         object.sprite.position = ccp(objectX, 360);
         object.sprite.scale = 1;
         [self addChild:object.sprite];
@@ -342,7 +366,26 @@
                 {
                         object = [[Rock alloc] init];
                         
-                        objectX = arc4random()%448+16;
+                        for (;;)
+            {
+                objectX = arc4random()%448+16;
+                
+                if (waterTick == 0)
+                {
+                    break;
+                }
+                
+                if (cart.sprite.position.x > (objectX - second.width/2 - first.width/2))
+                {
+                    if (cart.sprite.position.x < (objectX + second.width/2 + first.width/2))
+                    {
+                        continue;
+                    }
+                }
+                
+                break;
+            }
+            
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
                         [self addChild:object.sprite];
@@ -358,7 +401,26 @@
                 {
                         object = [[Rock alloc] init];
                         
-                        objectX = arc4random()%448+16;
+                        for (;;)
+            {
+                objectX = arc4random()%448+16;
+                
+                if (waterTick == 0)
+                {
+                    break;
+                }
+                
+                if (cart.sprite.position.x > (objectX - second.width/2 - first.width/2))
+                {
+                    if (cart.sprite.position.x < (objectX + second.width/2 + first.width/2))
+                    {
+                        continue;
+                    }
+                }
+                
+                break;
+            }
+            
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
                         [self addChild:object.sprite];