1 files changed, 39 insertions, 5 deletions

@@ -13,6 +13,7 @@
 #import "GameMode.h"
 #import "RootViewController.h"
 #import "MainMenuLayer.h"
+#import "TestFlight.h"
 
 @implementation Cart_CollectAppDelegate
 
@@ -42,6 +43,9 @@
 
 - (void) applicationDidFinishLaunching:(UIApplication*)application
 {
+    // REMOVE THIS LINE FOR RELEASE BUILDS
+    [TestFlight takeOff:@"66a3925c85c93e7628c14d167ff6c1b7_MjM4MTEyMDExLTA4LTE3IDEzOjEyOjQ4Ljg2NDE2OQ"];
+    
         [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
         
         NSMutableDictionary* registerDefaults = [NSMutableDictionary dictionaryWithObjectsAndKeys:
@@ -138,6 +142,8 @@
 
 -(void) applicationDidEnterBackground:(UIApplication*)application {
         [[CCDirector sharedDirector] stopAnimation];
+    
+    [[NSUserDefaults standardUserDefaults] synchronize];
         
         if ([[CCDirector sharedDirector] runningScene].tag == GAME_SCENE)
         {
@@ -190,20 +196,48 @@
                 {
                         NSString* databasePathFromApp = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:databaseName];
                         [fileManager copyItemAtPath:databasePathFromApp toPath:databasePath error:nil];
-                        //[fileManager release];
                         
-                        [userDefaults setInteger:1 forKey:@"databaseVersion"];
+                        [userDefaults setInteger:2 forKey:@"databaseVersion"];
+                }
+        
+        if (sqlite3_open([databasePath UTF8String], &database) != SQLITE_OK)
+                {
+                        NSLog(@"Failed to open database");
                 }
                 
+        // Database migrations!
                 if ([userDefaults integerForKey:@"databaseVersion"] < 1)
                 {
                         // Upgrade the database to version 1, which is completely unnecessary as no prior version exists
                 }
-                
-                if (sqlite3_open([databasePath UTF8String], &database) != SQLITE_OK)
+        
+        if ([userDefaults integerForKey:@"databaseVersion"] < 2)
                 {
-                        NSLog(@"Failed to open database");
+                        // Database version 2 adds a "gameMode" column to highscores to allow for multiple highscore lists
+            const char* sqlQuery = "ALTER TABLE highscores ADD gameMode varchar(255)";
+            sqlite3_stmt* compiled_statement;
+            
+            if (sqlite3_prepare_v2(database, sqlQuery, -1, &compiled_statement, NULL) == SQLITE_OK)
+            {
+                sqlite3_step(compiled_statement);
+                
+                sqlQuery = "UPDATE highscores SET gameMode = \"Collect\"";
+                if (sqlite3_prepare_v2(database, sqlQuery, -1, &compiled_statement, NULL) == SQLITE_OK)
+                {
+                    sqlite3_step(compiled_statement);
+                
+                    NSLog(@"Updated database to version 2.");
+                    [userDefaults setInteger:2 forKey:@"databaseVersion"];
+                } else {
+                    NSLog(@"Error while updating database to version 2. '%s'", sqlite3_errmsg(database));
+                }
+            } else {
+                NSLog(@"Error while updating database to version 2. '%s'", sqlite3_errmsg(database));
+            }
                 }
+        
+        // It's rather important that the database version gets saved
+        [userDefaults synchronize];
         }
         
         return database;