6 files changed, 22 insertions, 11 deletions

@@ -100,7 +100,11 @@
 
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 {
-    [pageControl setCurrentPage:(NSUInteger)([scrollView contentOffset].x / [scrollView frame].size.width)];
+    int currentPage = (NSUInteger)(scrollView.contentOffset.x / scrollView.frame.size.width);
+    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setInteger:currentPage forKey:@"lastSelectedMode"];
+    
+    [pageControl setCurrentPage:currentPage];
 }
 
 @end
\ No newline at end of file
@@ -12,7 +12,7 @@
 #define GAME_SCENE 436
 #define GAME_LAYER 437
 
-@interface GameMode : CCLayer {
+@interface GameMode : CCLayer <UIAlertViewDelegate> {
     NSMutableSet* objects;
         int score;
         int lives;
@@ -146,7 +146,9 @@
 
 - (void)mainmenu
 {
-    [[CCDirector sharedDirector] replaceScene:[MainMenuLayer scene]];
+    UIAlertView* alert = [[UIAlertView alloc] initWithTitle:@"Cartographic" message:@"Are you sure you want to quit the currently playing game?" delegate:self cancelButtonTitle:@"Yes" otherButtonTitles:@"No", nil];
+    [alert show];
+    [alert release];
 }
 
 - (void)setScore:(int)m_score
@@ -179,6 +181,14 @@
     delayedAction = nil;
 }
 
+- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex
+{
+    if (buttonIndex == 0)
+    {
+        [[CCDirector sharedDirector] replaceScene:[MainMenuLayer scene]];
+    }
+}
+
 - (void)dealloc
 {
     [objects release];
@@ -132,9 +132,6 @@
 
 - (void)didSelectGameMode:(GameModeSelection *)gameMode
 {
-    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setInteger:[gameModes indexOfObject:gameMode] forKey:@"lastSelectedMode"];
-    
     if ([gameMode.name isEqual:@"Tutorial"])
     {
         [[CCDirector sharedDirector] replaceScene:[TutorialMode scene]];
@@ -48,7 +48,7 @@
     [super onEnterTransitionDidFinish];
     
     [self scheduleDelayedAction:^{
-        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"Welcome to Cart Collect. This is a tutorial designed to help you get started playing the game. Below this bubble is a cart. Tilt your device to move it." name:@"cart" spriteReference:cart.sprite];
+        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"Welcome to Cartographic. This is a tutorial designed to help you get started playing the game. Below this bubble is a cart. Tilt your device to move it." name:@"cart" spriteReference:cart.sprite];
         self.currentTutorial = bubble;
         [bubble release];
     } delay:2.0f];
@@ -131,13 +131,13 @@
             self.currentTutorial = bubble;
             [bubble release];
         } else {
-            TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"As you play, Cart Collect gets progressively more intense. Watch what happens when rocks are added to the mix and the speed is turned up." name:@"intense"];
+            TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"As you play, Cartographic gets progressively more intense. Watch what happens when rocks are added to the mix and the speed is turned up." name:@"intense"];
             self.currentTutorial = bubble;
             [bubble release];
         }
     } else if (item.sprite.tag == 2010)
     {
-        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"As you play, Cart Collect gets progressively more intense. Watch what happens when rocks are added to the mix and the speed is turned up." name:@"intense"];
+        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"As you play, Cartographic gets progressively more intense. Watch what happens when rocks are added to the mix and the speed is turned up." name:@"intense"];
         self.currentTutorial = bubble;
         [bubble release];
     }
@@ -324,7 +324,7 @@
         } else if (randomItemsDropped == 15)
     {
         [self scheduleDelayedAction:^{
-            TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"That's pretty much it! You've completed the tutorial, so now it's time to play an actual game of Cart Collect!" name:@"end"];
+            TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"That's pretty much it! You've completed the tutorial, so now it's time to play an actual game of Cartographic!" name:@"end"];
             self.currentTutorial = bubble;
             [bubble release];
         } delay:2.0f];
@@ -27,7 +27,7 @@
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleShortVersionString</key>
-        <string>0.3</string>
+        <string>0.3.1</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleURLTypes</key>