1 files changed, 12 insertions, 39 deletions

@@ -11,11 +11,10 @@
 #import <sqlite3.h>
 #import "Cart_CollectAppDelegate.h"
 #import "MainMenuLayer.h"
-#import "TutorialMode.h"
-#import "ClassicGameMode.h"
 #import "NMPanelMenu.h"
-#import "JumpGameMode.h"
 #import "ZoomFadeTransition.h"
+#import "GameModeInfo.h"
+#import "GameModeManager.h"
 
 @implementation GameModeSelectionLayer
 
@@ -44,31 +43,14 @@
         NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
         gameModes = [[NSMutableArray alloc] init];
         
-        GameModeSelection* tutorialSelection = [GameModeSelection selectionWithName:@"Tutorial" location:@"Florence" filename:@"florence" unlocked:YES];
-        [gameModes addObject:tutorialSelection];
-        
-        GameModeSelection* collectSelection;
-        
-        collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlocked:YES];
-/*        if ([defaults boolForKey:@"hasDoneTutorial"])
-        {
-            collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlocked:YES];
-        } else {
-            collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlockCondition:@"Beat the tutorial!"];
-        }*/
-        
-        [gameModes addObject:collectSelection];
-        
-        GameModeSelection* jumpSelection;
-        jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlocked:YES];
-/*        if ([defaults boolForKey:@"unlockedJumpMode"])
+        for (GameModeInfo* info in [[GameModeManager sharedInstance] gameModes])
         {
-            jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlocked:YES];
-        } else {
-            jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlockCondition:@"Get 3000 points in Collect!"];
-        }*/
-        
-        [gameModes addObject:jumpSelection];
+            if (info.unlocked)
+            {
+                GameModeSelection* selection = [GameModeSelection selectionWithGameModeInfo:info];
+                [gameModes addObject:selection];
+            }
+        }
         
         CCMenu* menu = [CCMenu menuWithItems:nil];
         float onePanelWide = 128;
@@ -132,24 +114,15 @@
     [[CCDirector sharedDirector] replaceScene:[MainMenuLayer scene]];
 }
 
-- (void)didSelectGameMode:(GameModeSelection *)gameMode
+- (void)didSelectGameMode:(GameModeSelection *)selection
 {
     [scrollView setScrollEnabled:NO];
     [pageControl removeFromSuperview];
     
-    CGPoint opp = [scrollView convertPoint:gameMode.position toView:[[CCDirector sharedDirector] openGLView]];
+    CGPoint opp = [scrollView convertPoint:selection.position toView:[[CCDirector sharedDirector] openGLView]];
     CGPoint endPosition = ccp(0-(opp.x+158), opp.y);
     
-    if ([gameMode.name isEqual:@"Tutorial"])
-    {
-        [[CCDirector sharedDirector] replaceScene:[ZoomFadeTransition transitionWithDuration:5.0f scene:[TutorialMode scene] position:endPosition]];
-    } else if ([gameMode.name isEqual:@"Collect"])
-    {
-        [[CCDirector sharedDirector] replaceScene:[ZoomFadeTransition transitionWithDuration:5.0f scene:[ClassicGameMode scene] position:endPosition]];
-    } else if ([gameMode.name isEqual:@"Jump"])
-    {
-        [[CCDirector sharedDirector] replaceScene:[ZoomFadeTransition transitionWithDuration:5.0f scene:[JumpGameMode scene] position:endPosition]];
-    }
+    [[CCDirector sharedDirector] replaceScene:[ZoomFadeTransition transitionWithDuration:5.0f scene:[selection.gameMode scene] position:endPosition]];
 }
 
 @end