project_files/HedgewarsMobile/Classes/MapConfigViewController.m
changeset 5207 4c9ae0f484da
parent 4976 088d40d8aba2
child 5208 878e551f0b4a
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m	Wed May 11 01:26:38 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m	Thu May 12 23:00:26 2011 +0200
@@ -74,7 +74,7 @@
 
     // perform as if user clicked on an entry
     [self tableView:self.tableView didSelectRowAtIndexPath:theIndex];
-    if (IS_NOT_POWERFUL() == NO)
+    if (IS_NOT_POWERFUL(getModelType()) == NO)
         [self.tableView scrollToRowAtIndexPath:theIndex atScrollPosition:UITableViewScrollPositionMiddle animated:YES];
 }
 
@@ -378,6 +378,8 @@
 #pragma mark -
 #pragma mark view management
 -(void) loadDataSourceArray {
+    NSString *model = getModelType();
+
     // themes.cfg contains all the user-selectable themes
     NSString *string = [[NSString alloc] initWithContentsOfFile:[THEMES_DIRECTORY() stringByAppendingString:@"/themes.cfg"]
                                                        encoding:NSUTF8StringEncoding
@@ -392,9 +394,9 @@
     NSMutableArray *mapArray = [[NSMutableArray alloc] init];
     for (NSString *str in mapArrayFull) {
         CGSize imgSize = PSPNGSizeFromMetaData([MAPS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]);
-        if (IS_NOT_POWERFUL() && imgSize.height > 1024.0f)
+        if (IS_NOT_POWERFUL(model) && imgSize.height > 1024.0f)
             continue;
-        if (IS_NOT_VERY_POWERFUL() && imgSize.height > 1280.0f)
+        if (IS_NOT_VERY_POWERFUL(model) && imgSize.height > 1280.0f)
             continue;
         [mapArray addObject:str];
     }
@@ -403,9 +405,9 @@
     NSMutableArray *missionArray = [[NSMutableArray alloc] init];
     for (NSString *str in missionArrayFull) {
         CGSize imgSize = PSPNGSizeFromMetaData([MISSIONS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]);
-        if (IS_NOT_POWERFUL() && imgSize.height > 1024.0f)
+        if (IS_NOT_POWERFUL(model) && imgSize.height > 1024.0f)
             continue;
-        if (IS_NOT_VERY_POWERFUL() && imgSize.height > 1280.0f)
+        if (IS_NOT_VERY_POWERFUL(model) && imgSize.height > 1280.0f)
             continue;
         [missionArray addObject:str];
     }