4 files changed, 13 insertions, 33 deletions

@@ -16,6 +16,7 @@
 + (CCScene*)scene;
 - (id)init;
 - (void)newgame;
+- (void)tutorial;
 - (void)highscores;
 
 @end
@@ -44,10 +44,11 @@
                 //CCLabelBMFont* menuItemLabel2 = [CCLabelBMFont labelWithString:@"Highscores" fntFile:@"getoffthatboatrightnowyounglady.fnt"];
                 //CCMenuItemLabel* menuItem2 = [CCMenuItemLabel itemWithLabel:menuItemLabel2 target:self selector:@selector(highscores)];
                 
-                CCMenuItemImage* menuItem1 = [CCMenuItemImage itemFromNormalImage:@"newgame.png" selectedImage:@"newgame2.png" target:self selector:@selector(newgame)];
-                CCMenuItemImage* menuItem2 = [CCMenuItemImage itemFromNormalImage:@"highscores.png" selectedImage:@"highscores2.png" target:self selector:@selector(highscores)];
+                CCMenuItemImage* newgameMenuItem = [CCMenuItemImage itemFromNormalImage:@"newgame.png" selectedImage:@"newgame2.png" target:self selector:@selector(newgame)];
+        CCMenuItemImage* tutorialMenuItem = [CCMenuItemImage itemFromNormalImage:@"tutorial.png" selectedImage:@"tutorial2.png" target:self selector:@selector(tutorial)];
+                CCMenuItemImage* highscoresMenuItem = [CCMenuItemImage itemFromNormalImage:@"highscores.png" selectedImage:@"highscores2.png" target:self selector:@selector(highscores)];
                 
-                CCMenu* menu = [CCMenu menuWithItems:menuItem1, menuItem2, nil];
+                CCMenu* menu = [CCMenu menuWithItems:newgameMenuItem, tutorialMenuItem, highscoresMenuItem, nil];
                 [menu alignItemsVertically];
                 menu.position = ccp(240, 100);
                 [self addChild:menu];
@@ -58,14 +59,12 @@
 
 - (void)newgame
 {
-    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-    
-    if ([defaults boolForKey:@"hasDoneTutorial"])
-    {
-        [[CCDirector sharedDirector] replaceScene:[ClassicGameMode scene]];
-    } else {
-        [[CCDirector sharedDirector] replaceScene:[TutorialMode scene]];
-    }
+    [[CCDirector sharedDirector] replaceScene:[ClassicGameMode scene]];
+}
+
+- (void)tutorial
+{
+    [[CCDirector sharedDirector] replaceScene:[TutorialMode scene]];
 }
 
 - (void)highscores
@@ -21,6 +21,5 @@
 - (FallingObject*)dropSpecificItem:(FallingObject*)item;
 - (FallingObject*)dropRandomItem;
 - (void)randomlyAddObject:(ccTime)dt;
-- (void)skipTutorial;
 
 @end
@@ -12,7 +12,7 @@
 #import "Bottle.h"
 #import "OneUp.h"
 #import "Rock.h"
-#import "ClassicGameMode.h"
+#import "MainMenuLayer.h"
 
 // Item tags:
 //    2000 - first dropped item
@@ -35,11 +35,6 @@
                 backgroundImage.position = ccp(240, 160);
                 [self addChild:backgroundImage z:-1];
         
-        CCMenuItemImage* menuItem1 = [CCMenuItemImage itemFromNormalImage:@"skiptutorial.png" selectedImage:@"skiptutorial2.png" target:self selector:@selector(skipTutorial)];
-        CCMenu* theMenu = [CCMenu menuWithItems:menuItem1, nil];
-        theMenu.position = ccp(480-16-16-62, 320-8-16);
-        [self addChild:theMenu];
-        
         showedDeathBubble = NO;
         randomItemsDropped = 0;
     }
@@ -201,10 +196,7 @@
         [self schedule:@selector(randomlyAddObject:) interval:1.0f];
     } else if ([currentTutorial.name isEqual:@"end"])
     {
-        NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-        [defaults setBool:YES forKey:@"hasDoneTutorial"];
-        
-        [[CCDirector sharedDirector] replaceScene:[CCTransitionFade transitionWithDuration:3.0f scene:[ClassicGameMode scene] withColor:ccc3(0,0,0)]];
+        [[CCDirector sharedDirector] replaceScene:[CCTransitionFade transitionWithDuration:3.0f scene:[MainMenuLayer scene] withColor:ccc3(0,0,0)]];
     }
     
     self.currentTutorial = nil;
@@ -335,15 +327,4 @@
     randomItemsDropped++;
 }
 
-- (void)skipTutorial
-{
-    [self unscheduleAllSelectors];
-    self.currentTutorial = nil;
-    
-    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setBool:YES forKey:@"hasDoneTutorial"];
-    
-    [[CCDirector sharedDirector] replaceScene:[CCTransitionFlipY transitionWithDuration:1.0f scene:[ClassicGameMode scene]]];
-}
-
 @end