# HG changeset patch
# User Anton Malmygin <antonc27@mail.ru>
# Date 1439510535 -7200
# Node ID 102684240fe82f5ff71cd860123496cc50c0329e
# Parent  3729ac42189b91af43c1b763b61ad5781e2d346c
- Interscreen transitions fixed

diff -r 3729ac42189b -r 102684240fe8 project_files/HedgewarsMobile/Classes/AboutViewController.m
--- a/project_files/HedgewarsMobile/Classes/AboutViewController.m	Fri Aug 14 01:55:42 2015 +0200
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m	Fri Aug 14 02:02:15 2015 +0200
@@ -53,7 +53,7 @@
 
 -(IBAction) buttonPressed:(id) sender {
     [[AudioManagerController mainManager] playBackSound];
-    [[self parentViewController] dismissModalViewControllerAnimated:YES];
+    [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
 }
 
 -(IBAction) segmentedControlChanged:(id) sender {
diff -r 3729ac42189b -r 102684240fe8 project_files/HedgewarsMobile/Classes/GameConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m	Fri Aug 14 01:55:42 2015 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m	Fri Aug 14 02:02:15 2015 +0200
@@ -47,7 +47,7 @@
                 [alert release];
             } else {
                 [[AudioManagerController mainManager] playBackSound];
-                [[self parentViewController] dismissModalViewControllerAnimated:YES];
+                [[self presentingViewController] dismissViewControllerAnimated:YES completion:nil];
             }
             break;
         case 1:
diff -r 3729ac42189b -r 102684240fe8 project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m
--- a/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m	Fri Aug 14 01:55:42 2015 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m	Fri Aug 14 02:02:15 2015 +0200
@@ -201,7 +201,7 @@
         statsPage.statsArray = stats;
         statsPage.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
 
-        [callingController presentModalViewController:statsPage animated:YES];
+        [callingController presentViewController:statsPage animated:YES completion:nil];
         [statsPage release];
     }
 }
diff -r 3729ac42189b -r 102684240fe8 project_files/HedgewarsMobile/Classes/MainMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m	Fri Aug 14 01:55:42 2015 +0200
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m	Fri Aug 14 02:02:15 2015 +0200
@@ -105,7 +105,7 @@
                 self.gameConfigViewController = gcvc;
                 [gcvc release];
             }
-            [self presentModalViewController:self.gameConfigViewController animated:YES];
+            [self presentViewController:self.gameConfigViewController animated:YES completion:nil];
             break;
         case 2:
             if (nil == self.settingsViewController) {
@@ -114,7 +114,7 @@
                 self.settingsViewController = svrc;
                 [svrc release];
             }
-            [self presentModalViewController:self.settingsViewController animated:YES];
+            [self presentViewController:self.settingsViewController animated:YES completion:nil];
             break;
         case 3:
 #ifdef DEBUG
@@ -160,7 +160,7 @@
                 self.aboutViewController = about;
                 [about release];
             }
-            [self presentModalViewController:self.aboutViewController animated:YES];
+            [self presentViewController:self.aboutViewController animated:YES completion:nil];
 #endif
             break;
         case 4:
@@ -172,7 +172,7 @@
                 self.savedGamesViewController = savedgames;
                 [savedgames release];
             }
-            [self presentModalViewController:self.savedGamesViewController animated:YES];
+            [self presentViewController:self.savedGamesViewController animated:YES completion:nil];
             break;
         case 5:
             if (nil == self.missionsViewController) {
@@ -184,7 +184,7 @@
                 self.missionsViewController = missions;
                 [missions release];
             }
-            [self presentModalViewController:self.missionsViewController animated:YES];
+            [self presentViewController:self.missionsViewController animated:YES completion:nil];
             break;
         case 6:
             [GameInterfaceBridge registerCallingController:self];
diff -r 3729ac42189b -r 102684240fe8 project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m
--- a/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m	Fri Aug 14 01:55:42 2015 +0200
+++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m	Fri Aug 14 02:02:15 2015 +0200
@@ -65,7 +65,7 @@
 
     if (button.tag == 0) {
         [[AudioManagerController mainManager] playBackSound];
-        [[self parentViewController] dismissModalViewControllerAnimated:YES];
+        [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
     } else {
         [GameInterfaceBridge registerCallingController:self];
         [GameInterfaceBridge startMissionGame:self.missionName];
diff -r 3729ac42189b -r 102684240fe8 project_files/HedgewarsMobile/Classes/RestoreViewController.m
--- a/project_files/HedgewarsMobile/Classes/RestoreViewController.m	Fri Aug 14 01:55:42 2015 +0200
+++ b/project_files/HedgewarsMobile/Classes/RestoreViewController.m	Fri Aug 14 02:02:15 2015 +0200
@@ -32,14 +32,14 @@
 
     if (theButton.tag != 0) {
         [[AudioManagerController mainManager] playClickSound];
-        [GameInterfaceBridge registerCallingController:self.parentViewController];
+        [GameInterfaceBridge registerCallingController:self.presentingViewController];
         [GameInterfaceBridge startSaveGame:[[NSUserDefaults standardUserDefaults] objectForKey:@"savedGamePath"]];
     } else {
         [[AudioManagerController mainManager] playBackSound];
         [defaults setObject:@"" forKey:@"savedGamePath"];
         [defaults synchronize];
     }
-    [self.parentViewController dismissModalViewControllerAnimated:YES];
+    [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
 }
 
 -(void) viewDidLoad {
diff -r 3729ac42189b -r 102684240fe8 project_files/HedgewarsMobile/Classes/SavedGamesViewController.m
--- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m	Fri Aug 14 01:55:42 2015 +0200
+++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m	Fri Aug 14 02:02:15 2015 +0200
@@ -68,7 +68,7 @@
     if (button.tag == 0) {
         [[AudioManagerController mainManager] playBackSound];
         [self.tableView setEditing:NO animated:YES];
-        [[self parentViewController] dismissModalViewControllerAnimated:YES];
+        [[self presentingViewController] dismissViewControllerAnimated:YES completion:nil];
     } else {
         NSString *titleStr, *cancelStr, *confirmStr;
         titleStr = NSLocalizedString(@"Are you reeeeeally sure?", @"");
diff -r 3729ac42189b -r 102684240fe8 project_files/HedgewarsMobile/Classes/SettingsBaseViewController.m
--- a/project_files/HedgewarsMobile/Classes/SettingsBaseViewController.m	Fri Aug 14 01:55:42 2015 +0200
+++ b/project_files/HedgewarsMobile/Classes/SettingsBaseViewController.m	Fri Aug 14 02:02:15 2015 +0200
@@ -133,7 +133,7 @@
 
 -(void) dismissSplitView {
     [[AudioManagerController mainManager] playBackSound];
-    [[[HedgewarsAppDelegate sharedAppDelegate] mainViewController] dismissModalViewControllerAnimated:YES];
+    [[[HedgewarsAppDelegate sharedAppDelegate] mainViewController] dismissViewControllerAnimated:YES completion:nil];
 }
 
 -(void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
diff -r 3729ac42189b -r 102684240fe8 project_files/HedgewarsMobile/Classes/StatsPageViewController.m
--- a/project_files/HedgewarsMobile/Classes/StatsPageViewController.m	Fri Aug 14 01:55:42 2015 +0200
+++ b/project_files/HedgewarsMobile/Classes/StatsPageViewController.m	Fri Aug 14 02:02:15 2015 +0200
@@ -162,7 +162,7 @@
 #pragma mark button delegate
 -(void) dismissView {
     [[AudioManagerController mainManager] playClickSound];
-    [self dismissModalViewControllerAnimated:YES];
+    [self dismissViewControllerAnimated:YES completion:nil];
 }
 
 #pragma mark -