1 files changed, 25 insertions, 10 deletions

@@ -7,17 +7,31 @@
 //
 
 #import "GameModeSelection.h"
-#import "TutorialMode.h"
-#import "ClassicGameMode.h"
 #import "UIImage+ColorMasking.h"
+#import "NMPanelMenu.h"
 
 @implementation GameModeSelection
 
-@synthesize name, location, unlocked;
+@synthesize name, location, unlocked, delegate;
+
++ (id)selectionWithName:(NSString*)name location:(NSString*)location filename:(NSString*)filename unlocked:(BOOL)unlocked
+{
+    return [[[GameModeSelection alloc] initWithName:name location:location filename:filename unlocked:unlocked] autorelease];
+}
+
++ (id)selectionWithName:(NSString *)name location:(NSString *)location filename:(NSString *)filename highscore:(int)highscore
+{
+    return [[[GameModeSelection alloc] initWithName:name location:location filename:filename highscore:highscore] autorelease];
+}
+
++ (id)selectionWithName:(NSString *)name location:(NSString *)location filename:(NSString *)filename unlockCondition:(NSString*)unlockCondition
+{
+    return [[[GameModeSelection alloc] initWithName:name location:location filename:filename unlockCondition:unlockCondition] autorelease];
+}
 
 - (id)initWithName:(NSString*)m_name location:(NSString*)m_location filename:(NSString*)filename unlocked:(BOOL)m_unlocked;
 {
-    self = [super init];
+    self = [super initWithTarget:nil selector:nil];
     
     if (nil != self)
     {
@@ -27,6 +41,8 @@
         location = m_location;
         unlocked = m_unlocked;
         
+        contentSize_ = CGSizeMake(128, 320);
+        
         NSString* filenameMod;
         
         if (unlocked)
@@ -124,7 +140,7 @@
         CCSprite* selectedButton = [CCSprite spriteWithCGImage:selectedButtonRef key:[NSString stringWithFormat:@"gms-%@-selected", filenameMod]];
         
         CCMenuItemSprite* pictureMenuItem = [CCMenuItemSprite itemFromNormalSprite:picture selectedSprite:selectedButton target:self selector:@selector(buttonTapped)];
-        CCMenu* theMenu = [CCMenu menuWithItems:pictureMenuItem, nil];
+        NMPanelMenu* theMenu = [NMPanelMenu menuWithItems:pictureMenuItem, nil];
         theMenu.position = ccp(-5, 0);
         [self addChild:theMenu];
         
@@ -196,12 +212,11 @@
 {
     if (unlocked)
     {
-        if ([name isEqual:@"Tutorial"])
-        {
-            [[CCDirector sharedDirector] replaceScene:[TutorialMode scene]];
-        } else if ([name isEqual:@"Collect"])
+        if (delegate != nil)
         {
-            [[CCDirector sharedDirector] replaceScene:[ClassicGameMode scene]];
+            [delegate didSelectGameMode:self];
+        } else {
+            NSLog(@"I don't have a GameModeSelectionDelegate to call for some reason...");
         }
     } else {
         UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:@"To unlock this game mode:" message:unlockCondition delegate:nil cancelButtonTitle:@"Cancel" otherButtonTitles:nil];