1 files changed, 14 insertions, 6 deletions

@@ -38,10 +38,8 @@
     
     if (nil != self)
     {
-        gameModes = [[NSMutableArray alloc] init];
-        CCMenu* menu = [CCMenu menuWithItems:nil];
         NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-        float onePanelWide = 128;
+        gameModes = [[NSMutableArray alloc] init];
         
         GameModeSelection* tutorialSelection = [GameModeSelection selectionWithName:@"Tutorial" location:@"Florence" filename:@"florence" unlocked:YES];
         [gameModes addObject:tutorialSelection];
@@ -69,6 +67,8 @@
         
         [gameModes addObject:collectSelection];
         
+        CCMenu* menu = [CCMenu menuWithItems:nil];
+        float onePanelWide = 128;
         float padding = 15;
         float totalPanelWidth = onePanelWide + padding*2;
         float numberOfPanels = [gameModes count];
@@ -90,15 +90,12 @@
         pageControl.numberOfPages = numberOfPanels;
         pageControl.currentPage = currentWorldOffset;
         pageControl.frame = CGRectMake(0, 250, 480, 20);
-        [[[CCDirector sharedDirector] openGLView] addSubview:pageControl];
         
         menu.position = ccpAdd(menu.position, ccp(totalWidth/2 - totalPanelWidth/2, 320));
         touchDelegatingView = [[TouchDelegatingView alloc] initWithFrame:CGRectMake(0, 0, 480, 320)];
         scrollView = [[CocosOverlayScrollView alloc] initWithFrame:CGRectMake(0, 0, totalPanelWidth, 320) numPages:numberOfPanels width:totalPanelWidth layer:panels pageControl:pageControl];
         touchDelegatingView.scrollView = scrollView;
         [scrollView setContentOffset:CGPointMake(currentWorldOffset*totalPanelWidth+1,0) animated:NO];
-        [[[CCDirector sharedDirector] openGLView] addSubview:touchDelegatingView];
-        [[[CCDirector sharedDirector] openGLView] addSubview:scrollView];
         
         CCMenuItemImage* newgameMenuItem = [CCMenuItemImage itemFromNormalImage:@"back.png" selectedImage:@"back2.png" target:self selector:@selector(mainmenu)];
         CCMenu* myMenu = [CCMenu menuWithItems:newgameMenuItem, nil];
@@ -109,8 +106,19 @@
     return self;
 }
 
+- (void)onEnterTransitionDidFinish
+{
+    [super onEnterTransitionDidFinish];
+    
+    [[[CCDirector sharedDirector] openGLView] addSubview:pageControl];
+    [[[CCDirector sharedDirector] openGLView] addSubview:touchDelegatingView];
+    [[[CCDirector sharedDirector] openGLView] addSubview:scrollView];
+}
+
 - (void)onExit
 {
+    [super onExit];
+    
     [touchDelegatingView removeFromSuperview];
     [scrollView removeFromSuperview];
     [pageControl removeFromSuperview];