summary refs log tree commit diff stats
path: root/Classes/JumpGameMode.m
diff options
context:
space:
mode:
authorStarla Insigna <starla4444@gmail.com>2011-09-10 14:02:17 -0400
committerStarla Insigna <starla4444@gmail.com>2011-09-10 14:02:17 -0400
commit24e46564c3534d0283190c4a8afc1cfe3e74e851 (patch)
treec48e63e4cbc7f4aa7eea80c389eb313bf0016648 /Classes/JumpGameMode.m
parentc5edc8808e9f9dbb1daeda760ba74ef0cf2e9dce (diff)
downloadcartcollect-24e46564c3534d0283190c4a8afc1cfe3e74e851.tar.gz
cartcollect-24e46564c3534d0283190c4a8afc1cfe3e74e851.tar.bz2
cartcollect-24e46564c3534d0283190c4a8afc1cfe3e74e851.zip
Fixed behavior of falling objects as wave ends
Fixes #224
Diffstat (limited to 'Classes/JumpGameMode.m')
-rw-r--r--Classes/JumpGameMode.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/Classes/JumpGameMode.m b/Classes/JumpGameMode.m index 14cd365..2bc69d8 100644 --- a/Classes/JumpGameMode.m +++ b/Classes/JumpGameMode.m
@@ -144,7 +144,7 @@
144 } 144 }
145 } 145 }
146 146
147 if ((waterTick >= 180) || ([object flag:0])) 147 if ((waterTick >= 180) || ((waterTick > 0) && ([object flag:0])))
148 { 148 {
149 object.sprite.position = ccp(object.sprite.position.x, MAX(object.sprite.position.y, water.position.y+80+11)); 149 object.sprite.position = ccp(object.sprite.position.x, MAX(object.sprite.position.y, water.position.y+80+11));
150 } else { 150 } else {