5 files changed, 21 insertions, 3 deletions

@@ -1601,6 +1601,7 @@
                                 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
                                 COPY_PHASE_STRIP = NO;
                                 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                                GCC_C_LANGUAGE_STANDARD = c99;
                                 GCC_DYNAMIC_NO_PIC = NO;
                                 GCC_OPTIMIZATION_LEVEL = 0;
                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1629,6 +1630,7 @@
                                 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
                                 COPY_PHASE_STRIP = YES;
                                 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                                GCC_C_LANGUAGE_STANDARD = c99;
                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                 GCC_PREFIX_HEADER = Cart_Collect_Prefix.pch;
                                 GCC_TREAT_WARNINGS_AS_ERRORS = NO;
@@ -12,7 +12,8 @@
 @interface CocosOverlayScrollView : UIScrollView <UIScrollViewDelegate>
 {
     CCNode* targetLayer;
+    UIPageControl* pageControl;
 }
 @property(nonatomic, retain) CCNode* targetLayer;
--(id) initWithFrame: (CGRect) frameRect numPages: (int) numPages width: (float) width layer: (CCNode*) layer;
+-(id) initWithFrame: (CGRect) frameRect numPages: (int) numPages width: (float) width layer: (CCNode*) layer pageControl:(UIPageControl*)pageControl;
 @end
@@ -12,7 +12,7 @@
 @synthesize targetLayer;
 
 // Configure your favorite UIScrollView options here
--(id) initWithFrame: (CGRect) frameRect numPages: (int) numPages width: (float) width layer: (CCNode*) layer {
+-(id) initWithFrame: (CGRect) frameRect numPages: (int) numPages width: (float) width layer: (CCNode*) layer pageControl:(UIPageControl *)m_pageControl{
     if ((self = [super initWithFrame: frameRect])){ 
         self.contentSize = CGSizeMake(width*numPages, 320);
         self.bounces = YES;
@@ -26,6 +26,7 @@
         [self setScrollEnabled:TRUE];
         self.targetLayer = layer;
         // self.canCancelContentTouches  = YES;
+        pageControl = m_pageControl;
     }
     return self;
 }
@@ -96,4 +97,10 @@
     self.targetLayer = nil;
     [super dealloc];
 }
+
+- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
+{
+    [pageControl setCurrentPage:(NSUInteger)([scrollView contentOffset].x / [scrollView frame].size.width)];
+}
+
 @end
\ No newline at end of file
@@ -15,6 +15,7 @@
     NSMutableArray* gameModes;
     TouchDelegatingView* touchDelegatingView;
     CocosOverlayScrollView* scrollView;
+    UIPageControl* pageControl;
 }
 
 + (CCScene*)scene;
@@ -86,9 +86,15 @@
         [panels addChild:menu];
         [self addChild:panels];
         
+        pageControl = [[UIPageControl alloc] init];
+        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];
+        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];
@@ -107,6 +113,7 @@
 {
     [touchDelegatingView removeFromSuperview];
     [scrollView removeFromSuperview];
+    [pageControl removeFromSuperview];
 }
 
 - (void)mainmenu