1 files changed, 8 insertions, 7 deletions

@@ -42,27 +42,28 @@
         [self addChild:tutorialSelection];
         
         NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-        GameModeSelection* collectSelection = [[[GameModeSelection alloc] initWithName:@"Collect" location:@"Paris" filename:@"paris" unlocked:[defaults boolForKey:@"hasDoneTutorial"]] autorelease];
-        collectSelection.position = ccp(400-32, 160);
+        GameModeSelection* collectSelection;
         
-        if (collectSelection.unlocked)
+        if ([defaults boolForKey:@"hasDoneTutorial"])
         {
             const char* sqlQuery = "SELECT * FROM highscores ORDER BY score DESC LIMIT 1";
             sqlite3_stmt* compiled_statement;
+            int score = 0;
             
             if (sqlite3_prepare_v2([Cart_CollectAppDelegate database], sqlQuery, -1, &compiled_statement, NULL) == SQLITE_OK)
             {
                 if (sqlite3_step(compiled_statement) == SQLITE_ROW)
                 {
-                    int score = sqlite3_column_int(compiled_statement, 2);
-                        
-                    [collectSelection setHighscore:score];
+                    score = sqlite3_column_int(compiled_statement, 2);
                 }
             }
+            
+            collectSelection = [[[GameModeSelection alloc] initWithName:@"Collect" location:@"Paris" filename:@"paris" highscore:score] autorelease];
         } else {
-            [collectSelection setUnlockCondition:@"Beat the tutorial!"];
+            collectSelection = [[[GameModeSelection alloc] initWithName:@"Collect" location:@"Paris" filename:@"paris" unlockCondition:@"Beat the tutorial!"] autorelease];
         }
         
+        collectSelection.position = ccp(320+32,160);
         [self addChild:collectSelection];
         
         CCMenuItemImage* newgameMenuItem = [CCMenuItemImage itemFromNormalImage:@"back.png" selectedImage:@"back2.png" target:self selector:@selector(mainmenu)];