diff options
author | Starla Insigna <starla4444@gmail.com> | 2011-08-23 09:35:16 -0400 |
---|---|---|
committer | Starla Insigna <starla4444@gmail.com> | 2011-08-23 09:35:16 -0400 |
commit | 887e595136e71f52ea585f17d73e5ac3baefb7eb (patch) | |
tree | cc097b2bb119456878687af6c757ee8bc12e09be /Classes | |
parent | 02d9a87417837ffda602b2d06c2c6897d15a1202 (diff) | |
parent | 3caffadb393cada7d9bbc433e0c96e6650ed873a (diff) | |
download | cartcollect-887e595136e71f52ea585f17d73e5ac3baefb7eb.tar.gz cartcollect-887e595136e71f52ea585f17d73e5ac3baefb7eb.tar.bz2 cartcollect-887e595136e71f52ea585f17d73e5ac3baefb7eb.zip |
Pulled in level selection screen (version 0.3) v0.3
Closes #207
Diffstat (limited to 'Classes')
-rwxr-xr-x | Classes/Cart_CollectAppDelegate.m | 4 | ||||
-rwxr-xr-x | Classes/MainMenuLayer.h | 1 | ||||
-rwxr-xr-x | Classes/MainMenuLayer.m | 11 |
3 files changed, 14 insertions, 2 deletions
diff --git a/Classes/Cart_CollectAppDelegate.m b/Classes/Cart_CollectAppDelegate.m index 158f660..0af3ac0 100755 --- a/Classes/Cart_CollectAppDelegate.m +++ b/Classes/Cart_CollectAppDelegate.m | |||
@@ -13,6 +13,7 @@ | |||
13 | #import "GameMode.h" | 13 | #import "GameMode.h" |
14 | #import "RootViewController.h" | 14 | #import "RootViewController.h" |
15 | #import "MainMenuLayer.h" | 15 | #import "MainMenuLayer.h" |
16 | #import "TestFlight.h" | ||
16 | 17 | ||
17 | @implementation Cart_CollectAppDelegate | 18 | @implementation Cart_CollectAppDelegate |
18 | 19 | ||
@@ -42,6 +43,9 @@ | |||
42 | 43 | ||
43 | - (void) applicationDidFinishLaunching:(UIApplication*)application | 44 | - (void) applicationDidFinishLaunching:(UIApplication*)application |
44 | { | 45 | { |
46 | // REMOVE THIS LINE FOR RELEASE BUILDS | ||
47 | [TestFlight takeOff:@"66a3925c85c93e7628c14d167ff6c1b7_MjM4MTEyMDExLTA4LTE3IDEzOjEyOjQ4Ljg2NDE2OQ"]; | ||
48 | |||
45 | [[UIApplication sharedApplication] setIdleTimerDisabled:YES]; | 49 | [[UIApplication sharedApplication] setIdleTimerDisabled:YES]; |
46 | 50 | ||
47 | NSMutableDictionary* registerDefaults = [NSMutableDictionary dictionaryWithObjectsAndKeys: | 51 | NSMutableDictionary* registerDefaults = [NSMutableDictionary dictionaryWithObjectsAndKeys: |
diff --git a/Classes/MainMenuLayer.h b/Classes/MainMenuLayer.h index d8483b3..439056c 100755 --- a/Classes/MainMenuLayer.h +++ b/Classes/MainMenuLayer.h | |||
@@ -17,5 +17,6 @@ | |||
17 | - (id)init; | 17 | - (id)init; |
18 | - (void)newgame; | 18 | - (void)newgame; |
19 | - (void)highscores; | 19 | - (void)highscores; |
20 | - (void)feedback; | ||
20 | 21 | ||
21 | @end | 22 | @end |
diff --git a/Classes/MainMenuLayer.m b/Classes/MainMenuLayer.m index 06a528c..d4a6331 100755 --- a/Classes/MainMenuLayer.m +++ b/Classes/MainMenuLayer.m | |||
@@ -10,6 +10,7 @@ | |||
10 | #import "HighscoreListController.h" | 10 | #import "HighscoreListController.h" |
11 | #import "GameModeSelectionLayer.h" | 11 | #import "GameModeSelectionLayer.h" |
12 | #import "Cart_CollectAppDelegate.h" | 12 | #import "Cart_CollectAppDelegate.h" |
13 | #import "TestFlight.h" | ||
13 | 14 | ||
14 | @implementation MainMenuLayer | 15 | @implementation MainMenuLayer |
15 | 16 | ||
@@ -45,8 +46,9 @@ | |||
45 | 46 | ||
46 | CCMenuItemImage* newgameMenuItem = [CCMenuItemImage itemFromNormalImage:@"newgame.png" selectedImage:@"newgame2.png" target:self selector:@selector(newgame)]; | 47 | CCMenuItemImage* newgameMenuItem = [CCMenuItemImage itemFromNormalImage:@"newgame.png" selectedImage:@"newgame2.png" target:self selector:@selector(newgame)]; |
47 | CCMenuItemImage* highscoresMenuItem = [CCMenuItemImage itemFromNormalImage:@"highscores.png" selectedImage:@"highscores2.png" target:self selector:@selector(highscores)]; | 48 | CCMenuItemImage* highscoresMenuItem = [CCMenuItemImage itemFromNormalImage:@"highscores.png" selectedImage:@"highscores2.png" target:self selector:@selector(highscores)]; |
48 | 49 | CCMenuItemImage* feedbackMenuItem = [CCMenuItemImage itemFromNormalImage:@"feedback.png" selectedImage:@"feedback2.png" target:self selector:@selector(feedback)]; | |
49 | CCMenu* menu = [CCMenu menuWithItems:newgameMenuItem, highscoresMenuItem, nil]; | 50 | |
51 | CCMenu* menu = [CCMenu menuWithItems:newgameMenuItem, highscoresMenuItem, feedbackMenuItem, nil]; | ||
50 | [menu alignItemsVertically]; | 52 | [menu alignItemsVertically]; |
51 | menu.position = ccp(240, 100); | 53 | menu.position = ccp(240, 100); |
52 | [self addChild:menu]; | 54 | [self addChild:menu]; |
@@ -68,4 +70,9 @@ | |||
68 | [listController release]; | 70 | [listController release]; |
69 | } | 71 | } |
70 | 72 | ||
73 | - (void)feedback | ||
74 | { | ||
75 | [TestFlight openFeedbackView]; | ||
76 | } | ||
77 | |||
71 | @end | 78 | @end |