# HG changeset patch
# User koda
# Date 1316032779 -7200
# Node ID ed9676dc8cb48ff4067c59dd418f3b19a8f4c43f
# Parent  190d6bb075c57fcec94c05f38de7334a53028995# Parent  0a00bbe97e22d9843cf9428818061f30b8c4549d
merge

diff -r 0a00bbe97e22 -r ed9676dc8cb4 .hgtags
--- a/.hgtags	Wed Sep 14 20:42:45 2011 +0200
+++ b/.hgtags	Wed Sep 14 22:39:39 2011 +0200
@@ -42,3 +42,5 @@
 0000000000000000000000000000000000000000 0.9.9
 fee68e3a303998fdfcc69f74775dc84a36f587fb 0.9.9.1
 0000000000000000000000000000000000000000 0.9.9.1
+718f98a9df122d73f3ba9add4d1654865199de31 Hedgewars-iOS-1.3
+cba92708277b6d0aeabfff2b878845b7d848bdcd Hedgewars-iOS-1.3.1
diff -r 0a00bbe97e22 -r ed9676dc8cb4 project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m
--- a/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m	Wed Sep 14 20:42:45 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m	Wed Sep 14 22:39:39 2011 +0200
@@ -78,8 +78,8 @@
         height = (int) screenBounds.size.width;
     }
 
-    NSString *horizontalSize = [[NSString alloc] initWithFormat:@"%d", width];
-    NSString *verticalSize = [[NSString alloc] initWithFormat:@"%d", height];
+    NSString *horizontalSize = [[NSString alloc] initWithFormat:@"%d", width * (int)getScreenScale()];
+    NSString *verticalSize = [[NSString alloc] initWithFormat:@"%d", height * (int)getScreenScale()];
     NSString *rotation = [[NSString alloc] initWithString:@"0"];
 
     NSString *modelId = getModelType();
@@ -88,7 +88,7 @@
         tmpQuality = 0x00000001 | 0x00000002 | 0x00000008 | 0x00000040;                 // rqLowRes | rqBlurryLand | rqSimpleRope | rqKillFlakes
     else if ([modelId hasPrefix:@"iPhone2"] || [modelId hasPrefix:@"iPod3"])                                    // = iPhone 3GS or iPod Touch 3G
         tmpQuality = 0x00000002 | 0x00000040;                                           // rqBlurryLand | rqKillFlakes
-    else if ([modelId hasPrefix:@"iPad1"] || [modelId hasPrefix:@"iPod4"])                    // = iPad 1G or iPod Touch 4G
+    else if ([modelId hasPrefix:@"iPad1"] || [modelId hasPrefix:@"iPod4"])                                      // = iPad 1G or iPod Touch 4G
         tmpQuality = 0x00000002;                                                        // rqBlurryLand
     else                                                                                                        // = everything else
         tmpQuality = 0;                                                                 // full quality
diff -r 0a00bbe97e22 -r ed9676dc8cb4 project_files/HedgewarsMobile/Classes/InGameMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m	Wed Sep 14 20:42:45 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m	Wed Sep 14 22:39:39 2011 +0200
@@ -45,7 +45,7 @@
     NSArray *array = [[NSArray alloc] initWithObjects:
                       NSLocalizedString(@"Show Help", @""),
                       NSLocalizedString(@"Tag", @""),
-                      NSLocalizedString(@"Snapshot",@""),
+//                      NSLocalizedString(@"Snapshot",@""),
                       NSLocalizedString(@"End Game", @""),
                       nil];
     self.menuList = array;
@@ -117,7 +117,8 @@
 }
 
 -(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 4;
+    return 3;
+//    return 4;
 }
 
 -(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -151,6 +152,7 @@
 
             break;
         case 2:
+/*
             alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Going to take a screenshot",@"")
                                                message:NSLocalizedString(@"The game snapshot will be placed in your Photo Album and it will be taken as soon as the pause menu is dismissed",@"")
                                               delegate:nil
@@ -162,6 +164,7 @@
 
             break;
         case 3:
+*/
             actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"")
                                                       delegate:self
                                              cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"")
diff -r 0a00bbe97e22 -r ed9676dc8cb4 project_files/HedgewarsMobile/Info.plist
--- a/project_files/HedgewarsMobile/Info.plist	Wed Sep 14 20:42:45 2011 +0200
+++ b/project_files/HedgewarsMobile/Info.plist	Wed Sep 14 22:39:39 2011 +0200
@@ -28,7 +28,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.3</string>
+	<string>1.3.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile~ipad</key>