diff options
Diffstat (limited to 'Classes/FallingObject.m')
-rwxr-xr-x | Classes/FallingObject.m | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/Classes/FallingObject.m b/Classes/FallingObject.m index 86edd15..460372e 100755 --- a/Classes/FallingObject.m +++ b/Classes/FallingObject.m | |||
@@ -11,15 +11,17 @@ | |||
11 | 11 | ||
12 | @implementation FallingObject | 12 | @implementation FallingObject |
13 | 13 | ||
14 | @synthesize sprite, weight, delegate; | 14 | @synthesize sprite, weight, objectType, delegate; |
15 | 15 | ||
16 | - (id)init | 16 | - (id)initWithSpriteFilename:(NSString*)filename weight:(int)m_weight objectType:(int)m_objectType |
17 | { | 17 | { |
18 | self = [super init]; | 18 | self = [super init]; |
19 | 19 | ||
20 | if (nil != self) | 20 | if (nil != self) |
21 | { | 21 | { |
22 | 22 | sprite = [CCSprite spriteWithFile:filename]; | |
23 | weight = m_weight; | ||
24 | objectType = m_objectType; | ||
23 | } | 25 | } |
24 | 26 | ||
25 | return self; | 27 | return self; |
@@ -44,8 +46,6 @@ | |||
44 | { | 46 | { |
45 | if (gameLayer.cart.sprite.position.y < (sprite.position.y + second.height/2 + first.height/2)) | 47 | if (gameLayer.cart.sprite.position.y < (sprite.position.y + second.height/2 + first.height/2)) |
46 | { | 48 | { |
47 | [self collideWithCart]; | ||
48 | |||
49 | if ((delegate != nil) && ([delegate respondsToSelector:@selector(didCatchItem:)])) | 49 | if ((delegate != nil) && ([delegate respondsToSelector:@selector(didCatchItem:)])) |
50 | { | 50 | { |
51 | [delegate didCatchItem:self]; | 51 | [delegate didCatchItem:self]; |
@@ -65,8 +65,6 @@ | |||
65 | // Collision detection with floor | 65 | // Collision detection with floor |
66 | if (sprite.position.y - (sprite.contentSize.height/2) < 0) | 66 | if (sprite.position.y - (sprite.contentSize.height/2) < 0) |
67 | { | 67 | { |
68 | [self collideWithFloor]; | ||
69 | |||
70 | if ((delegate != nil) && ([delegate respondsToSelector:@selector(didMissItem:)])) | 68 | if ((delegate != nil) && ([delegate respondsToSelector:@selector(didMissItem:)])) |
71 | { | 69 | { |
72 | [delegate didMissItem:self]; | 70 | [delegate didMissItem:self]; |
@@ -83,16 +81,6 @@ | |||
83 | return NO; | 81 | return NO; |
84 | } | 82 | } |
85 | 83 | ||
86 | - (void)collideWithCart | ||
87 | { | ||
88 | |||
89 | } | ||
90 | |||
91 | - (void)collideWithFloor | ||
92 | { | ||
93 | |||
94 | } | ||
95 | |||
96 | - (BOOL)flag:(int)flag | 84 | - (BOOL)flag:(int)flag |
97 | { | 85 | { |
98 | return flags[flag]; | 86 | return flags[flag]; |