# HG changeset patch # User koda # Date 1270957393 0 # Node ID 2520ee7a548462568957e19c1f5897b5ee931ddf # Parent f94a52a763d4ad69708ffb1caa71ffe73ff7abc9 new manager for handling (future) rotations added a macro for the settings file diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/DetailViewController.m --- a/cocoaTouch/DetailViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/DetailViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -10,11 +10,16 @@ #import "SDL_uikitappdelegate.h" #import "TeamSettingsViewController.h" #import "GeneralSettingsViewController.h" +#import "CommodityFunctions.h" @implementation DetailViewController @synthesize popoverController, controllers; +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); +} + - (void)viewDidLoad { self.title = NSLocalizedString(@"Settings",@""); @@ -125,26 +130,19 @@ #pragma mark - #pragma mark Split view support #ifdef __IPHONE_3_2 --(void) splitViewController:(UISplitViewController*)svc willHideViewController:(UIViewController *)aViewController withBarButtonItem:(UIBarButtonItem*)barButtonItem forPopoverController: (UIPopoverController*)pc { +-(void) splitViewController:(UISplitViewController *)svc willHideViewController:(UIViewController *)aViewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)pc { barButtonItem.title = @"Master List"; - // [navigationBar.topItem setLeftBarButtonItem:barButtonItem animated:YES]; + [self.navigationController.navigationBar.topItem setLeftBarButtonItem:barButtonItem animated:YES]; self.popoverController = pc; } // Called when the view is shown again in the split view, invalidating the button and popover controller. -(void) splitViewController: (UISplitViewController*)svc willShowViewController:(UIViewController *)aViewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem { - // [navigationBar.topItem setLeftBarButtonItem:nil animated:YES]; + [self.navigationController.navigationBar.topItem setLeftBarButtonItem:nil animated:YES]; self.popoverController = nil; } #endif -#pragma mark - -#pragma mark Rotation support -// Ensure that the view controller supports rotation and that the split view can therefore show in both portrait and landscape. --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - -(IBAction) dismissSplitView { [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissModalView" object:nil]; } diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/FlagsViewController.m --- a/cocoaTouch/FlagsViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/FlagsViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -13,10 +13,11 @@ @synthesize teamDictionary, flagArray, flagSprites, lastIndexPath; -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); } + #pragma mark - #pragma mark View lifecycle - (void)viewDidLoad { diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/FortsViewController.m --- a/cocoaTouch/FortsViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/FortsViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -14,10 +14,11 @@ @synthesize teamDictionary, fortArray, fortSprites, lastIndexPath; -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); } + #pragma mark - #pragma mark View lifecycle - (void)viewDidLoad { diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/GameSetup.m --- a/cocoaTouch/GameSetup.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/GameSetup.m Sun Apr 11 03:43:13 2010 +0000 @@ -6,12 +6,14 @@ // Copyright 2010 __MyCompanyName__. All rights reserved. // +#include +#include + #import "GameSetup.h" #import "SDL_uikitappdelegate.h" #import "SDL_net.h" #import "PascalImports.h" -#include -#include +#import "CommodityFunctions.h" #define BUFFER_SIZE 256 #define debug(format, ...) CFShow([NSString stringWithFormat:format, ## __VA_ARGS__]); @@ -25,8 +27,7 @@ srandom(time(NULL)); ipcPort = (random() % 64541) + 1025; - NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"]; - systemSettings = [[NSDictionary alloc] initWithContentsOfFile:filePath]; //should check it exists + systemSettings = [[NSDictionary alloc] initWithContentsOfFile:SETTINGS_FILE()]; //should check it exists return self; } else return nil; @@ -328,20 +329,20 @@ // prevents using an empty nickname NSString *username; NSString *originalUsername = [systemSettings objectForKey:@"username"]; - if ([originalUsername isEqualToString:@""]) { + if ([originalUsername length] == 0) { username = [[NSString alloc] initWithFormat:@"MobileUser-%@",ipcString]; } else { username = [[NSString alloc] initWithString:originalUsername]; } - gameArgs[0] = [username UTF8String]; //UserNick - gameArgs[1] = [ipcString UTF8String]; //ipcPort - gameArgs[2] = [[[systemSettings objectForKey:@"sounds"] stringValue] UTF8String]; //isSoundEnabled - gameArgs[3] = [[[systemSettings objectForKey:@"music"] stringValue] UTF8String]; //isMusicEnabled - gameArgs[4] = [localeString UTF8String]; //cLocaleFName + gameArgs[0] = [username UTF8String]; //UserNick + gameArgs[1] = [ipcString UTF8String]; //ipcPort + gameArgs[2] = [[[systemSettings objectForKey:@"sound"] stringValue] UTF8String]; //isSoundEnabled + gameArgs[3] = [[[systemSettings objectForKey:@"music"] stringValue] UTF8String]; //isMusicEnabled + gameArgs[4] = [localeString UTF8String]; //cLocaleFName gameArgs[5] = [[[systemSettings objectForKey:@"alternate"] stringValue] UTF8String]; //cAltDamage - gameArgs[6] = [wSize UTF8String]; //cScreenHeight - gameArgs[7] = [hSize UTF8String]; //cScreenWidth + gameArgs[6] = [wSize UTF8String]; //cScreenHeight + gameArgs[7] = [hSize UTF8String]; //cScreenWidth [wSize release]; [hSize release]; diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/GeneralSettingsViewController.m --- a/cocoaTouch/GeneralSettingsViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/GeneralSettingsViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -7,16 +7,17 @@ // #import "GeneralSettingsViewController.h" -#import "SDL_uikitappdelegate.h" +#import "CommodityFunctions.h" @implementation GeneralSettingsViewController @synthesize settingsDictionary, textFieldBeingEdited, musicSwitch, soundSwitch, altDamageSwitch; -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); } + #pragma mark - #pragma mark textfield methods // return to previous table @@ -88,15 +89,12 @@ [self.soundSwitch addTarget:self action:@selector(alsoTurnOffMusic:) forControlEvents:UIControlEventValueChanged]; [self.musicSwitch addTarget:self action:@selector(dontTurnOnMusic:) forControlEvents:UIControlEventValueChanged]; [self.altDamageSwitch addTarget:self action:@selector(justUpdateDictionary:) forControlEvents:UIControlEventValueChanged]; - - NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"]; - NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] initWithContentsOfFile:filePath]; + + NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] initWithContentsOfFile:SETTINGS_FILE()]; self.settingsDictionary = dictionary; [dictionary release]; } - - -(void) viewWillAppear:(BOOL)animated { [self.tableView setContentOffset:CGPointMake(0,0) animated:NO]; isWriteNeeded = NO; @@ -113,7 +111,7 @@ if (isWriteNeeded) { NSLog(@"writing preferences to file"); - [self.settingsDictionary writeToFile:[[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"] atomically:YES]; + [self.settingsDictionary writeToFile:SETTINGS_FILE() atomically:YES]; isWriteNeeded = NO; } } diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/HogHatViewController.m --- a/cocoaTouch/HogHatViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/HogHatViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -14,10 +14,11 @@ @synthesize teamDictionary, hatArray, hatSprites, lastIndexPath, selectedHog; -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); } + #pragma mark - #pragma mark View lifecycle - (void)viewDidLoad { diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/MainMenuViewController.m --- a/cocoaTouch/MainMenuViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/MainMenuViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -16,13 +16,11 @@ @synthesize cover, versionLabel; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); + return rotationManager(interfaceOrientation); } - (void)didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. - self.cover = nil; - self.versionLabel = nil; [super didReceiveMemoryWarning]; } @@ -34,6 +32,7 @@ -(void) viewDidUnload { self.cover = nil; + self.versionLabel = nil; [super viewDidUnload]; } @@ -51,8 +50,7 @@ object:nil]; // initialize some files the first time we load the game - NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"]; - if (!([[NSFileManager defaultManager] fileExistsAtPath:filePath])) + if (!([[NSFileManager defaultManager] fileExistsAtPath:SETTINGS_FILE()])) [NSThread detachNewThreadSelector:@selector(checkFirstRun) toTarget:self withObject:nil]; [super viewDidLoad]; @@ -62,7 +60,7 @@ // if it is it blocks user interaction with an alertView until files are created -(void) checkFirstRun { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSLog(@"First time run, creating settings files"); + NSLog(@"First time run, creating settings files at %@", SETTINGS_FILE()); // show a popup with an indicator to make the user wait UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Please wait",@"") @@ -92,10 +90,8 @@ [saveDict setObject:[NSNumber numberWithBool:YES] forKey:@"sound"]; [saveDict setObject:[NSNumber numberWithBool:NO] forKey:@"alternate"]; - NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"]; - [saveDict writeToFile:filePath atomically:YES]; + [saveDict writeToFile:SETTINGS_FILE() atomically:YES]; [saveDict release]; - // create other files // ok let the user take control [alert dismissWithClickedButtonIndex:0 animated:YES]; diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/MasterViewController.m --- a/cocoaTouch/MasterViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/MasterViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -10,10 +10,17 @@ #import "DetailViewController.h" #import "GeneralSettingsViewController.h" #import "TeamSettingsViewController.h" +#import "CommodityFunctions.h" @implementation MasterViewController @synthesize detailViewController, optionList, controllers, lastIndexPath; + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); +} + + #pragma mark - #pragma mark View lifecycle - (void)viewDidLoad { @@ -50,11 +57,6 @@ [array release]; } --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - - #pragma mark - #pragma mark Table view data source diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/OverlayViewController.m --- a/cocoaTouch/OverlayViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/OverlayViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -12,15 +12,20 @@ #import "CGPointUtils.h" #import "SDL_mouse.h" #import "PopoverMenuViewController.h" +#import "CommodityFunctions.h" @implementation OverlayViewController @synthesize dimTimer, popoverController, popupMenu; +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); +} + + -(void) didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. [super didReceiveMemoryWarning]; - // Release any cached data, images, etc that aren't in use. } @@ -48,10 +53,6 @@ [NSTimer scheduledTimerWithTimeInterval:2 target:self selector:@selector(showMenuAfterwards) userInfo:nil repeats:NO]; } --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - -(void) viewDidUnload { [dimTimer invalidate]; self.dimTimer = nil; diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/PopoverMenuViewController.m --- a/cocoaTouch/PopoverMenuViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/PopoverMenuViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -14,10 +14,11 @@ @synthesize menuList; --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); } + -(void) didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. [super didReceiveMemoryWarning]; diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Sun Apr 11 03:43:13 2010 +0000 @@ -38,7 +38,6 @@ @property (nonatomic, retain) MainMenuViewController *viewController; +(SDLUIKitDelegate *)sharedAppDelegate; --(NSString *)dataFilePath:(NSString *)fileName; -(void) startSDLgame; @end diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Sun Apr 11 03:43:13 2010 +0000 @@ -73,6 +73,7 @@ } -(void) dealloc { + [viewController release]; [uiwindow release]; [super dealloc]; } @@ -104,13 +105,6 @@ [viewController appear]; } -// get a path-to-file string --(NSString *)dataFilePath:(NSString *)fileName { - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); - NSString *documentsDirectory = [paths objectAtIndex:0]; - return [documentsDirectory stringByAppendingPathComponent:fileName]; -} - // override the direct execution of SDL_main to allow us to implement the frontend (even using a nib) -(void) applicationDidFinishLaunching:(UIApplication *)application { //[application setStatusBarHidden:YES animated:NO]; @@ -145,13 +139,13 @@ } -(void) applicationWillResignActive:(UIApplication *)application { - NSLog(@"%@", NSStringFromSelector(_cmd)); + //NSLog(@"%@", NSStringFromSelector(_cmd)); if (isInGame) HW_pause(); //SDL_SendWindowEvent(self.window, SDL_WINDOWEVENT_MINIMIZED, 0, 0); } -(void) applicationDidBecomeActive:(UIApplication *)application { - NSLog(@"%@", NSStringFromSelector(_cmd)); + //NSLog(@"%@", NSStringFromSelector(_cmd)); if (isInGame) HW_pause(); //SDL_SendWindowEvent(self.window, SDL_WINDOWEVENT_RESTORED, 0, 0); } diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/SingleTeamViewController.m --- a/cocoaTouch/SingleTeamViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/SingleTeamViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -18,8 +18,8 @@ @synthesize teamDictionary, hatArray, secondaryItems, secondaryControllers, textFieldBeingEdited, teamName; --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); } diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/SplitViewRootController.m --- a/cocoaTouch/SplitViewRootController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/SplitViewRootController.m Sun Apr 11 03:43:13 2010 +0000 @@ -9,13 +9,14 @@ #import "SplitViewRootController.h" #import "MasterViewController.h" #import "DetailViewController.h" +#import "CommodityFunctions.h" @implementation SplitViewRootController @synthesize detailViewController; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); + return rotationManager(interfaceOrientation); } -(void) didReceiveMemoryWarning { @@ -28,7 +29,7 @@ // (which is just a UITableViewController) and a DetailViewController where we present options -(void) viewDidLoad { self.detailViewController = [[DetailViewController alloc] initWithStyle:UITableViewStyleGrouped]; - [detailViewController release]; + [detailViewController release]; UINavigationController *detailedNavController = [[UINavigationController alloc] initWithRootViewController:self.detailViewController]; [detailViewController release]; @@ -51,7 +52,7 @@ [mainNavController release]; [detailedNavController release]; - [splitViewRootController setDelegate: self.detailViewController]; + [splitViewRootController setDelegate:self.detailViewController]; [detailViewController release]; // add view to main controller diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/TeamSettingsViewController.m --- a/cocoaTouch/TeamSettingsViewController.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/TeamSettingsViewController.m Sun Apr 11 03:43:13 2010 +0000 @@ -14,10 +14,11 @@ @synthesize listOfTeams; --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); } + #pragma mark - #pragma mark View lifecycle // add an edit button diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/otherSrc/CommodityFunctions.h --- a/cocoaTouch/otherSrc/CommodityFunctions.h Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/otherSrc/CommodityFunctions.h Sun Apr 11 03:43:13 2010 +0000 @@ -10,6 +10,8 @@ #define MAX_HOGS 8 +#define SETTINGS_FILE() [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) \ + objectAtIndex:0] stringByAppendingString:@"/settings.plist"] #define TEAMS_DIRECTORY() [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) \ objectAtIndex:0] stringByAppendingString:@"/Teams/"] #define GRAPHICS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/"] @@ -19,3 +21,4 @@ void createTeamNamed (NSString *nameWithoutExt); UIImage *mergeTwoImages (UIImage *firstImage, UIImage *secondImage); +BOOL rotationManager (UIInterfaceOrientation interfaceOrientation); diff -r f94a52a763d4 -r 2520ee7a5484 cocoaTouch/otherSrc/CommodityFunctions.m --- a/cocoaTouch/otherSrc/CommodityFunctions.m Sun Apr 11 01:04:54 2010 +0000 +++ b/cocoaTouch/otherSrc/CommodityFunctions.m Sun Apr 11 03:43:13 2010 +0000 @@ -7,7 +7,7 @@ // #import "CommodityFunctions.h" - +#import "SDL_uikitappdelegate.h" void createTeamNamed (NSString *nameWithoutExt) { NSString *teamsDirectory = TEAMS_DIRECTORY(); @@ -50,3 +50,11 @@ UIGraphicsEndImageContext(); return resultImage; // autoreleased } + +BOOL rotationManager (UIInterfaceOrientation interfaceOrientation) { + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); + else + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); + +} diff -r f94a52a763d4 -r 2520ee7a5484 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sun Apr 11 01:04:54 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sun Apr 11 03:43:13 2010 +0000 @@ -197,7 +197,48 @@ Notifications OpenEditors - + + + Content + + PBXProjectModuleGUID + 61D96593117182B1001EB3B4 + PBXProjectModuleLabel + OverlayViewController.m + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 61D96594117182B1001EB3B4 + PBXProjectModuleLabel + OverlayViewController.m + _historyCapacity + 0 + bookmark + 61D965C2117184C7001EB3B4 + history + + 61D9659D1171832F001EB3B4 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {938, 870}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 892 245 938 911 0 0 1920 1178 + + + PerspectiveWidths -1 @@ -277,12 +318,13 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 1 + 37 + 36 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {246, 558}} + {{0, 355}, {246, 558}} PBXTopSmartGroupGIDs @@ -301,7 +343,7 @@ 246 RubberWindowFrame - 130 456 801 617 0 0 1920 1178 + 634 550 801 617 0 0 1920 1178 Module PBXSmartGroupTreeModule @@ -317,7 +359,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - SingleTeamViewController.m + OverlayViewController.m PBXSplitModuleInNavigatorKey Split0 @@ -325,11 +367,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - SingleTeamViewController.m + OverlayViewController.m _historyCapacity 0 bookmark - 6110C12B11711B9E002E5B93 + 61D965C1117184C7001EB3B4 history 6179889D114AA5BD00BA94A9 @@ -374,7 +416,6 @@ 61697B9E1163478A00CCDF37 612D5C451165535400C6D842 612D616B1165536300C6D842 - 612D618F1165545F00C6D842 61430D3B1165551600E2C62D 61430D3D1165551600E2C62D 615F1316116561BE002444F2 @@ -386,22 +427,15 @@ 611B0AC6116B6E8B00112153 611B0C42116BAF3A00112153 61056377116C0393003C420C - 6105637A116C0393003C420C - 610563DE116C15E5003C420C 610563DF116C15E5003C420C - 61CEC5A6116C168E009FFF36 61513435116C1B07001F16D1 61513436116C1B07001F16D1 6151348C116C2954001F16D1 6151348D116C2954001F16D1 6151348E116C2954001F16D1 6151348F116C2954001F16D1 - 61FE29E7116CDB7300F76CDC - 61FE2A89116CF05C00F76CDC 61FE2AE4116D658700F76CDC - 61FE2B69116D78BF00F76CDC 619C51C6116E42850049FD84 - 619C51C7116E42850049FD84 619C51CB116E42850049FD84 619C51E0116E45820049FD84 619C523D116E56330049FD84 @@ -511,13 +545,21 @@ 61F8E0D6116E98A900108149 6157F7BA116F3B2D005E4A26 6188FE02116F5136004F3690 - 6188FE18116F6D44004F3690 6188FE60116F77AF004F3690 6188FE61116F77AF004F3690 617E1DB5116FEE5B002EF3D8 617E1DB6116FEE5B002EF3D8 - 6110C12A11711B9E002E5B93 - 61A0965B1170057A008A8930 + 617B27B61171617A004A76A2 + 617B27B71171617A004A76A2 + 617B27B81171617A004A76A2 + 617B27B91171617A004A76A2 + 617B27BA1171617A004A76A2 + 617B27ED117163F6004A76A2 + 617B280E117164FC004A76A2 + 61D96559117180D9001EB3B4 + 61D9655A117180D9001EB3B4 + 61D96591117182B1001EB3B4 + 617B280D117164FC004A76A2 SplitCount @@ -529,14 +571,14 @@ GeometryConfiguration Frame - {{0, 0}, {533, 73}} + {{0, 0}, {533, 345}} RubberWindowFrame - 130 456 801 617 0 0 1920 1178 + 634 550 801 617 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 73pt + 345pt BecomeActive @@ -551,14 +593,14 @@ GeometryConfiguration Frame - {{0, 78}, {533, 498}} + {{0, 350}, {533, 226}} RubberWindowFrame - 130 456 801 617 0 0 1920 1178 + 634 550 801 617 0 0 1920 1178 Module XCDetailModule Proportion - 498pt + 226pt Proportion @@ -577,9 +619,9 @@ TableOfContents - 6110C12C11711B9E002E5B93 + 61D9655D117180D9001EB3B4 1CE0B1FE06471DED0097A5F4 - 6110C12D11711B9E002E5B93 + 61D9655E117180D9001EB3B4 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -717,15 +759,17 @@ 5 WindowOrderList - 6110C12E11711B9E002E5B93 - 6110C12F11711B9E002E5B93 + 61D965C3117184C7001EB3B4 + 61D9656D117180D9001EB3B4 + 61D9656E117180D9001EB3B4 1CD10A99069EF8BA00B06720 61798848114AA42600BA94A9 + 61D96593117182B1001EB3B4 + /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj 1C78EAAD065D492600B07095 - /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj WindowString - 130 456 801 617 0 0 1920 1178 + 634 550 801 617 0 0 1920 1178 WindowToolsV3 @@ -763,6 +807,8 @@ 307pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -802,7 +848,7 @@ TableOfContents 61798848114AA42600BA94A9 - 6110C0DB11700EC8002E5B93 + 61D96564117180D9001EB3B4 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -926,13 +972,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 6110C0DC11700EC8002E5B93 + 61D96565117180D9001EB3B4 1C162984064C10D400B95A72 - 6110C0DD11700EC8002E5B93 - 6110C0DE11700EC8002E5B93 - 6110C0DF11700EC8002E5B93 - 6110C0E011700EC8002E5B93 - 6110C0E111700EC8002E5B93 + 61D96566117180D9001EB3B4 + 61D96567117180D9001EB3B4 + 61D96568117180D9001EB3B4 + 61D96569117180D9001EB3B4 + 61D9656A117180D9001EB3B4 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -1096,7 +1142,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 6110C0E211700EC8002E5B93 + 61D9656B117180D9001EB3B4 1C78EAAC065D492600B07095 ToolbarConfiguration diff -r f94a52a763d4 -r 2520ee7a5484 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sun Apr 11 01:04:54 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sun Apr 11 03:43:13 2010 +0000 @@ -107,197 +107,234 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 292555371; - PBXWorkspaceStateSaveDate = 292555371; + PBXPerProjectTemplateStateSaveDate = 292650196; + PBXWorkspaceStateSaveDate = 292650196; }; perUserProjectItems = { - 61056377116C0393003C420C /* PBXBookmark */ = 61056377116C0393003C420C /* PBXBookmark */; - 6105637A116C0393003C420C /* PBXTextBookmark */ = 6105637A116C0393003C420C /* PBXTextBookmark */; - 610563DE116C15E5003C420C /* PBXTextBookmark */ = 610563DE116C15E5003C420C /* PBXTextBookmark */; - 610563DF116C15E5003C420C /* PBXTextBookmark */ = 610563DF116C15E5003C420C /* PBXTextBookmark */; - 6110C12A11711B9E002E5B93 /* PBXTextBookmark */ = 6110C12A11711B9E002E5B93 /* PBXTextBookmark */; - 6110C12B11711B9E002E5B93 /* PBXTextBookmark */ = 6110C12B11711B9E002E5B93 /* PBXTextBookmark */; - 611B0AC6116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */; - 611B0C42116BAF3A00112153 /* PBXTextBookmark */ = 611B0C42116BAF3A00112153 /* PBXTextBookmark */; - 611FD81F1155111700C2203D /* PBXTextBookmark */ = 611FD81F1155111700C2203D /* PBXTextBookmark */; - 611FD8201155111700C2203D /* PBXTextBookmark */ = 611FD8201155111700C2203D /* PBXTextBookmark */; - 611FD95811551C3700C2203D /* PBXBookmark */ = 611FD95811551C3700C2203D /* PBXBookmark */; - 611FD96611551E8000C2203D /* PBXBookmark */ = 611FD96611551E8000C2203D /* PBXBookmark */; - 611FDB6C1155C0B300C2203D /* PBXBookmark */ = 611FDB6C1155C0B300C2203D /* PBXBookmark */; - 611FDB6D1155C0B300C2203D /* PBXBookmark */ = 611FDB6D1155C0B300C2203D /* PBXBookmark */; - 611FDBF71155D39400C2203D /* PBXTextBookmark */ = 611FDBF71155D39400C2203D /* PBXTextBookmark */; - 612D5C451165535400C6D842 /* PBXTextBookmark */ = 612D5C451165535400C6D842 /* PBXTextBookmark */; - 612D616B1165536300C6D842 /* PBXTextBookmark */ = 612D616B1165536300C6D842 /* PBXTextBookmark */; - 612D618F1165545F00C6D842 /* PBXTextBookmark */ = 612D618F1165545F00C6D842 /* PBXTextBookmark */; - 61430D3B1165551600E2C62D /* PBXTextBookmark */ = 61430D3B1165551600E2C62D /* PBXTextBookmark */; - 61430D3D1165551600E2C62D /* PBXTextBookmark */ = 61430D3D1165551600E2C62D /* PBXTextBookmark */; - 61513435116C1B07001F16D1 /* PBXTextBookmark */ = 61513435116C1B07001F16D1 /* PBXTextBookmark */; - 61513436116C1B07001F16D1 /* PBXTextBookmark */ = 61513436116C1B07001F16D1 /* PBXTextBookmark */; - 6151348C116C2954001F16D1 /* PBXBookmark */ = 6151348C116C2954001F16D1 /* PBXBookmark */; - 6151348D116C2954001F16D1 /* PBXBookmark */ = 6151348D116C2954001F16D1 /* PBXBookmark */; - 6151348E116C2954001F16D1 /* PBXBookmark */ = 6151348E116C2954001F16D1 /* PBXBookmark */; - 6151348F116C2954001F16D1 /* PlistBookmark */ = 6151348F116C2954001F16D1 /* PlistBookmark */; - 6157F7BA116F3B2D005E4A26 /* PBXTextBookmark */ = 6157F7BA116F3B2D005E4A26 /* PBXTextBookmark */; - 615F1316116561BE002444F2 /* PBXTextBookmark */ = 615F1316116561BE002444F2 /* PBXTextBookmark */; - 615F134D11656569002444F2 /* PBXTextBookmark */ = 615F134D11656569002444F2 /* PBXTextBookmark */; - 615F147F11659AC5002444F2 /* PBXTextBookmark */ = 615F147F11659AC5002444F2 /* PBXTextBookmark */; - 615F198C1166A71E002444F2 /* PBXBookmark */ = 615F198C1166A71E002444F2 /* PBXBookmark */; - 615F198E1166A71E002444F2 /* PBXTextBookmark */ = 615F198E1166A71E002444F2 /* PBXTextBookmark */; - 61697B9E1163478A00CCDF37 /* PBXTextBookmark */ = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */; - 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */; - 61799342114B297000BA94A9 /* PBXBookmark */ = 61799342114B297000BA94A9 /* PBXBookmark */; - 61799343114B297000BA94A9 /* PBXBookmark */ = 61799343114B297000BA94A9 /* PBXBookmark */; - 6179937111501D7800BA94A9 /* PBXBookmark */ = 6179937111501D7800BA94A9 /* PBXBookmark */; - 6179937411501D7800BA94A9 /* PBXBookmark */ = 6179937411501D7800BA94A9 /* PBXBookmark */; - 6179937511501D7800BA94A9 /* PBXBookmark */ = 6179937511501D7800BA94A9 /* PBXBookmark */; - 6179938511501FFA00BA94A9 /* PBXBookmark */ = 6179938511501FFA00BA94A9 /* PBXBookmark */; - 6179943111502CEA00BA94A9 /* PBXBookmark */ = 6179943111502CEA00BA94A9 /* PBXBookmark */; - 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */ = 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */; - 617E1DB6116FEE5B002EF3D8 /* PBXTextBookmark */ = 617E1DB6116FEE5B002EF3D8 /* PBXTextBookmark */; - 6188FE02116F5136004F3690 /* PBXTextBookmark */ = 6188FE02116F5136004F3690 /* PBXTextBookmark */; - 6188FE18116F6D44004F3690 /* PBXTextBookmark */ = 6188FE18116F6D44004F3690 /* PBXTextBookmark */; - 6188FE60116F77AF004F3690 /* PBXTextBookmark */ = 6188FE60116F77AF004F3690 /* PBXTextBookmark */; - 6188FE61116F77AF004F3690 /* PBXTextBookmark */ = 6188FE61116F77AF004F3690 /* PBXTextBookmark */; - 618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */; - 6196317D116E89DF00C47CEE /* PBXTextBookmark */ = 6196317D116E89DF00C47CEE /* PBXTextBookmark */; - 619C51C6116E42850049FD84 /* PBXTextBookmark */ = 619C51C6116E42850049FD84 /* PBXTextBookmark */; - 619C51C7116E42850049FD84 /* PBXTextBookmark */ = 619C51C7116E42850049FD84 /* PBXTextBookmark */; - 619C51CB116E42850049FD84 /* PBXTextBookmark */ = 619C51CB116E42850049FD84 /* PBXTextBookmark */; - 619C51E0116E45820049FD84 /* PBXTextBookmark */ = 619C51E0116E45820049FD84 /* PBXTextBookmark */; - 619C523D116E56330049FD84 /* PBXBookmark */ = 619C523D116E56330049FD84 /* PBXBookmark */; - 619C523F116E56330049FD84 /* PBXBookmark */ = 619C523F116E56330049FD84 /* PBXBookmark */; - 619C5241116E56330049FD84 /* PBXBookmark */ = 619C5241116E56330049FD84 /* PBXBookmark */; - 619C5243116E56330049FD84 /* PBXBookmark */ = 619C5243116E56330049FD84 /* PBXBookmark */; - 619C5245116E56330049FD84 /* PBXBookmark */ = 619C5245116E56330049FD84 /* PBXBookmark */; - 619C5247116E56330049FD84 /* PBXBookmark */ = 619C5247116E56330049FD84 /* PBXBookmark */; - 619C5249116E56330049FD84 /* PBXBookmark */ = 619C5249116E56330049FD84 /* PBXBookmark */; - 619C524B116E56330049FD84 /* PBXBookmark */ = 619C524B116E56330049FD84 /* PBXBookmark */; - 619C524D116E56330049FD84 /* PBXBookmark */ = 619C524D116E56330049FD84 /* PBXBookmark */; - 619C524F116E56330049FD84 /* PBXBookmark */ = 619C524F116E56330049FD84 /* PBXBookmark */; - 619C5251116E56330049FD84 /* PBXBookmark */ = 619C5251116E56330049FD84 /* PBXBookmark */; - 619C5253116E56330049FD84 /* PBXBookmark */ = 619C5253116E56330049FD84 /* PBXBookmark */; - 619C5255116E56330049FD84 /* PBXBookmark */ = 619C5255116E56330049FD84 /* PBXBookmark */; - 619C5257116E56330049FD84 /* PBXBookmark */ = 619C5257116E56330049FD84 /* PBXBookmark */; - 619C5259116E56330049FD84 /* PBXBookmark */ = 619C5259116E56330049FD84 /* PBXBookmark */; - 619C525B116E56330049FD84 /* PBXBookmark */ = 619C525B116E56330049FD84 /* PBXBookmark */; - 619C525D116E56330049FD84 /* PBXBookmark */ = 619C525D116E56330049FD84 /* PBXBookmark */; - 619C525F116E56330049FD84 /* PBXBookmark */ = 619C525F116E56330049FD84 /* PBXBookmark */; - 619C5261116E56330049FD84 /* PBXBookmark */ = 619C5261116E56330049FD84 /* PBXBookmark */; - 619C5263116E56330049FD84 /* PBXBookmark */ = 619C5263116E56330049FD84 /* PBXBookmark */; - 619C5265116E56330049FD84 /* PBXBookmark */ = 619C5265116E56330049FD84 /* PBXBookmark */; - 619C5267116E56330049FD84 /* PBXBookmark */ = 619C5267116E56330049FD84 /* PBXBookmark */; - 619C5269116E56330049FD84 /* PBXBookmark */ = 619C5269116E56330049FD84 /* PBXBookmark */; - 619C526B116E56330049FD84 /* PBXBookmark */ = 619C526B116E56330049FD84 /* PBXBookmark */; - 619C526D116E56330049FD84 /* PBXBookmark */ = 619C526D116E56330049FD84 /* PBXBookmark */; - 619C526F116E56330049FD84 /* PBXBookmark */ = 619C526F116E56330049FD84 /* PBXBookmark */; - 619C5271116E56330049FD84 /* PBXBookmark */ = 619C5271116E56330049FD84 /* PBXBookmark */; - 619C5273116E56330049FD84 /* PBXBookmark */ = 619C5273116E56330049FD84 /* PBXBookmark */; - 619C5275116E56330049FD84 /* PBXBookmark */ = 619C5275116E56330049FD84 /* PBXBookmark */; - 619C5277116E56330049FD84 /* PBXBookmark */ = 619C5277116E56330049FD84 /* PBXBookmark */; - 619C5279116E56330049FD84 /* PBXBookmark */ = 619C5279116E56330049FD84 /* PBXBookmark */; - 619C527B116E56330049FD84 /* PBXBookmark */ = 619C527B116E56330049FD84 /* PBXBookmark */; - 619C527D116E56330049FD84 /* PBXBookmark */ = 619C527D116E56330049FD84 /* PBXBookmark */; - 619C527F116E56330049FD84 /* PBXBookmark */ = 619C527F116E56330049FD84 /* PBXBookmark */; - 619C5281116E56330049FD84 /* PBXBookmark */ = 619C5281116E56330049FD84 /* PBXBookmark */; - 619C5283116E56330049FD84 /* PBXBookmark */ = 619C5283116E56330049FD84 /* PBXBookmark */; - 619C5285116E56330049FD84 /* PBXBookmark */ = 619C5285116E56330049FD84 /* PBXBookmark */; - 619C5287116E56330049FD84 /* PBXBookmark */ = 619C5287116E56330049FD84 /* PBXBookmark */; - 619C5289116E56330049FD84 /* PBXBookmark */ = 619C5289116E56330049FD84 /* PBXBookmark */; - 619C528B116E56330049FD84 /* PBXBookmark */ = 619C528B116E56330049FD84 /* PBXBookmark */; - 619C528D116E56330049FD84 /* PBXBookmark */ = 619C528D116E56330049FD84 /* PBXBookmark */; - 619C528F116E56330049FD84 /* PBXBookmark */ = 619C528F116E56330049FD84 /* PBXBookmark */; - 619C5291116E56330049FD84 /* PBXBookmark */ = 619C5291116E56330049FD84 /* PBXBookmark */; - 619C5293116E56330049FD84 /* PBXBookmark */ = 619C5293116E56330049FD84 /* PBXBookmark */; - 619C5295116E56330049FD84 /* PBXBookmark */ = 619C5295116E56330049FD84 /* PBXBookmark */; - 619C5297116E56330049FD84 /* PBXBookmark */ = 619C5297116E56330049FD84 /* PBXBookmark */; - 619C5299116E56330049FD84 /* PBXBookmark */ = 619C5299116E56330049FD84 /* PBXBookmark */; - 619C529B116E56330049FD84 /* PBXBookmark */ = 619C529B116E56330049FD84 /* PBXBookmark */; - 619C529D116E56330049FD84 /* PBXBookmark */ = 619C529D116E56330049FD84 /* PBXBookmark */; - 619C529F116E56330049FD84 /* PBXBookmark */ = 619C529F116E56330049FD84 /* PBXBookmark */; - 619C52A1116E56330049FD84 /* PBXBookmark */ = 619C52A1116E56330049FD84 /* PBXBookmark */; - 619C52A3116E56330049FD84 /* PBXBookmark */ = 619C52A3116E56330049FD84 /* PBXBookmark */; - 619C52A5116E56330049FD84 /* PBXBookmark */ = 619C52A5116E56330049FD84 /* PBXBookmark */; - 619C52A7116E56330049FD84 /* PBXBookmark */ = 619C52A7116E56330049FD84 /* PBXBookmark */; - 619C52A9116E56330049FD84 /* PBXBookmark */ = 619C52A9116E56330049FD84 /* PBXBookmark */; - 619C52AB116E56330049FD84 /* PBXBookmark */ = 619C52AB116E56330049FD84 /* PBXBookmark */; - 619C52AD116E56330049FD84 /* PBXBookmark */ = 619C52AD116E56330049FD84 /* PBXBookmark */; - 619C52AF116E56330049FD84 /* PBXBookmark */ = 619C52AF116E56330049FD84 /* PBXBookmark */; - 619C52B1116E56330049FD84 /* PBXBookmark */ = 619C52B1116E56330049FD84 /* PBXBookmark */; - 619C52B7116E56330049FD84 /* PBXBookmark */ = 619C52B7116E56330049FD84 /* PBXBookmark */; - 619C52B9116E56330049FD84 /* PBXBookmark */ = 619C52B9116E56330049FD84 /* PBXBookmark */; - 619C52BB116E56330049FD84 /* PBXBookmark */ = 619C52BB116E56330049FD84 /* PBXBookmark */; - 619C52BD116E56330049FD84 /* PBXBookmark */ = 619C52BD116E56330049FD84 /* PBXBookmark */; - 619C52BF116E56330049FD84 /* PBXBookmark */ = 619C52BF116E56330049FD84 /* PBXBookmark */; - 619C52C1116E56330049FD84 /* PBXBookmark */ = 619C52C1116E56330049FD84 /* PBXBookmark */; - 619C5352116E72260049FD84 /* PBXTextBookmark */ = 619C5352116E72260049FD84 /* PBXTextBookmark */; - 619C5373116E731F0049FD84 /* PBXTextBookmark */ = 619C5373116E731F0049FD84 /* PBXTextBookmark */; - 619C5858116E73B00049FD84 /* PBXTextBookmark */ = 619C5858116E73B00049FD84 /* PBXTextBookmark */; - 619C5859116E73B00049FD84 /* PBXBookmark */ = 619C5859116E73B00049FD84 /* PBXBookmark */; - 619C585B116E73B00049FD84 /* PBXBookmark */ = 619C585B116E73B00049FD84 /* PBXBookmark */; - 619C585D116E73B00049FD84 /* PBXBookmark */ = 619C585D116E73B00049FD84 /* PBXBookmark */; - 619C585F116E73B00049FD84 /* PBXBookmark */ = 619C585F116E73B00049FD84 /* PBXBookmark */; - 619C5861116E73B00049FD84 /* PBXBookmark */ = 619C5861116E73B00049FD84 /* PBXBookmark */; - 619C5863116E73B00049FD84 /* PBXBookmark */ = 619C5863116E73B00049FD84 /* PBXBookmark */; - 619C5865116E73B00049FD84 /* PBXBookmark */ = 619C5865116E73B00049FD84 /* PBXBookmark */; - 619C5867116E73B00049FD84 /* PBXBookmark */ = 619C5867116E73B00049FD84 /* PBXBookmark */; - 619C5869116E73B00049FD84 /* PBXBookmark */ = 619C5869116E73B00049FD84 /* PBXBookmark */; - 619C586B116E73B00049FD84 /* PBXBookmark */ = 619C586B116E73B00049FD84 /* PBXBookmark */; - 619C586D116E73B00049FD84 /* PBXBookmark */ = 619C586D116E73B00049FD84 /* PBXBookmark */; - 619C586F116E73B00049FD84 /* PBXBookmark */ = 619C586F116E73B00049FD84 /* PBXBookmark */; - 619C5871116E73B00049FD84 /* PBXBookmark */ = 619C5871116E73B00049FD84 /* PBXBookmark */; - 619C5873116E73B00049FD84 /* PBXBookmark */ = 619C5873116E73B00049FD84 /* PBXBookmark */; - 619C5875116E73B00049FD84 /* PBXBookmark */ = 619C5875116E73B00049FD84 /* PBXBookmark */; - 619C5877116E73B00049FD84 /* PBXBookmark */ = 619C5877116E73B00049FD84 /* PBXBookmark */; - 619C5879116E73B00049FD84 /* PBXBookmark */ = 619C5879116E73B00049FD84 /* PBXBookmark */; - 619C587B116E73B00049FD84 /* PBXBookmark */ = 619C587B116E73B00049FD84 /* PBXBookmark */; - 619C587D116E73B00049FD84 /* PBXBookmark */ = 619C587D116E73B00049FD84 /* PBXBookmark */; - 619C587F116E73B00049FD84 /* PBXBookmark */ = 619C587F116E73B00049FD84 /* PBXBookmark */; - 619C5880116E73B00049FD84 /* PBXBookmark */ = 619C5880116E73B00049FD84 /* PBXBookmark */; - 619C5882116E73B00049FD84 /* PBXBookmark */ = 619C5882116E73B00049FD84 /* PBXBookmark */; - 619C5883116E73B00049FD84 /* PBXBookmark */ = 619C5883116E73B00049FD84 /* PBXBookmark */; - 619C5885116E73B00049FD84 /* PBXBookmark */ = 619C5885116E73B00049FD84 /* PBXBookmark */; - 619C5887116E73B00049FD84 /* PBXBookmark */ = 619C5887116E73B00049FD84 /* PBXBookmark */; - 619C5888116E73B00049FD84 /* PBXBookmark */ = 619C5888116E73B00049FD84 /* PBXBookmark */; - 619C5889116E73B00049FD84 /* PBXBookmark */ = 619C5889116E73B00049FD84 /* PBXBookmark */; - 619C588B116E73B00049FD84 /* PBXBookmark */ = 619C588B116E73B00049FD84 /* PBXBookmark */; - 619C588C116E73B00049FD84 /* PBXBookmark */ = 619C588C116E73B00049FD84 /* PBXBookmark */; - 619C588D116E73B00049FD84 /* PBXBookmark */ = 619C588D116E73B00049FD84 /* PBXBookmark */; - 619C588F116E73B00049FD84 /* PBXBookmark */ = 619C588F116E73B00049FD84 /* PBXBookmark */; - 619C5890116E73B00049FD84 /* PBXBookmark */ = 619C5890116E73B00049FD84 /* PBXBookmark */; - 619C5892116E73B00049FD84 /* PBXBookmark */ = 619C5892116E73B00049FD84 /* PBXBookmark */; - 619C58B2116E76080049FD84 /* PBXBookmark */ = 619C58B2116E76080049FD84 /* PBXBookmark */; - 619C58B3116E76080049FD84 /* PBXTextBookmark */ = 619C58B3116E76080049FD84 /* PBXTextBookmark */; - 61A0965B1170057A008A8930 /* PBXTextBookmark */ = 61A0965B1170057A008A8930 /* PBXTextBookmark */; - 61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */; - 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */; - 61CCBF451161637F00833FE8 /* PBXTextBookmark */ = 61CCBF451161637F00833FE8 /* PBXTextBookmark */; - 61CCBF461161637F00833FE8 /* PBXTextBookmark */ = 61CCBF461161637F00833FE8 /* PBXTextBookmark */; - 61CCBF471161637F00833FE8 /* PBXTextBookmark */ = 61CCBF471161637F00833FE8 /* PBXTextBookmark */; - 61CCBF7B1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */; - 61CCBF7C1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */; - 61CCBF7E1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */; - 61CCBF7F1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */; - 61CCBFD11161833800833FE8 /* PBXTextBookmark */ = 61CCBFD11161833800833FE8 /* PBXTextBookmark */; - 61CCBFD21161833800833FE8 /* PBXTextBookmark */ = 61CCBFD21161833800833FE8 /* PBXTextBookmark */; - 61CCBFD31161833800833FE8 /* PBXTextBookmark */ = 61CCBFD31161833800833FE8 /* PBXTextBookmark */; - 61CCBFD41161833800833FE8 /* PBXTextBookmark */ = 61CCBFD41161833800833FE8 /* PBXTextBookmark */; - 61CCBFD51161833800833FE8 /* PBXTextBookmark */ = 61CCBFD51161833800833FE8 /* PBXTextBookmark */; - 61CCBFD71161833800833FE8 /* PBXTextBookmark */ = 61CCBFD71161833800833FE8 /* PBXTextBookmark */; - 61CCBFD91161833800833FE8 /* PBXTextBookmark */ = 61CCBFD91161833800833FE8 /* PBXTextBookmark */; - 61CCBFDA1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */; - 61CCBFDB1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */; - 61CCBFDC1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */; - 61CE23E7115E49560098C467 /* PBXTextBookmark */ = 61CE23E7115E49560098C467 /* PBXTextBookmark */; - 61CE23FF115E4B290098C467 /* PBXBookmark */ = 61CE23FF115E4B290098C467 /* PBXBookmark */; - 61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */; - 61CEC5A6116C168E009FFF36 /* PBXTextBookmark */ = 61CEC5A6116C168E009FFF36 /* PBXTextBookmark */; - 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */ = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */; - 61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */; - 61F8E0D6116E98A900108149 /* PBXTextBookmark */ = 61F8E0D6116E98A900108149 /* PBXTextBookmark */; - 61FE29E7116CDB7300F76CDC /* PBXTextBookmark */ = 61FE29E7116CDB7300F76CDC /* PBXTextBookmark */; - 61FE2A89116CF05C00F76CDC /* PBXTextBookmark */ = 61FE2A89116CF05C00F76CDC /* PBXTextBookmark */; - 61FE2AE4116D658700F76CDC /* PBXTextBookmark */ = 61FE2AE4116D658700F76CDC /* PBXTextBookmark */; - 61FE2B69116D78BF00F76CDC /* PBXTextBookmark */ = 61FE2B69116D78BF00F76CDC /* PBXTextBookmark */; + 61056377116C0393003C420C = 61056377116C0393003C420C /* PBXBookmark */; + 610563DF116C15E5003C420C = 610563DF116C15E5003C420C /* PBXTextBookmark */; + 611B0AC6116B6E8B00112153 = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */; + 611B0C42116BAF3A00112153 = 611B0C42116BAF3A00112153 /* PBXTextBookmark */; + 611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */; + 611FD8201155111700C2203D = 611FD8201155111700C2203D /* PBXTextBookmark */; + 611FD95811551C3700C2203D = 611FD95811551C3700C2203D /* PBXBookmark */; + 611FD96611551E8000C2203D = 611FD96611551E8000C2203D /* PBXBookmark */; + 611FDB6C1155C0B300C2203D = 611FDB6C1155C0B300C2203D /* PBXBookmark */; + 611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */; + 611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */; + 612D5C451165535400C6D842 = 612D5C451165535400C6D842 /* PBXTextBookmark */; + 612D616B1165536300C6D842 = 612D616B1165536300C6D842 /* PBXTextBookmark */; + 61430D3B1165551600E2C62D = 61430D3B1165551600E2C62D /* PBXTextBookmark */; + 61430D3D1165551600E2C62D = 61430D3D1165551600E2C62D /* PBXTextBookmark */; + 61513435116C1B07001F16D1 = 61513435116C1B07001F16D1 /* PBXTextBookmark */; + 61513436116C1B07001F16D1 = 61513436116C1B07001F16D1 /* PBXTextBookmark */; + 6151348C116C2954001F16D1 = 6151348C116C2954001F16D1 /* PBXBookmark */; + 6151348D116C2954001F16D1 = 6151348D116C2954001F16D1 /* PBXBookmark */; + 6151348E116C2954001F16D1 = 6151348E116C2954001F16D1 /* PBXBookmark */; + 6151348F116C2954001F16D1 = 6151348F116C2954001F16D1 /* PlistBookmark */; + 6157F7BA116F3B2D005E4A26 = 6157F7BA116F3B2D005E4A26 /* PBXTextBookmark */; + 615F1316116561BE002444F2 = 615F1316116561BE002444F2 /* PBXTextBookmark */; + 615F134D11656569002444F2 = 615F134D11656569002444F2 /* PBXTextBookmark */; + 615F147F11659AC5002444F2 = 615F147F11659AC5002444F2 /* PBXTextBookmark */; + 615F198C1166A71E002444F2 = 615F198C1166A71E002444F2 /* PBXBookmark */; + 615F198E1166A71E002444F2 = 615F198E1166A71E002444F2 /* PBXTextBookmark */; + 61697B9E1163478A00CCDF37 = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */; + 6179889D114AA5BD00BA94A9 = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */; + 61799342114B297000BA94A9 = 61799342114B297000BA94A9 /* PBXBookmark */; + 61799343114B297000BA94A9 = 61799343114B297000BA94A9 /* PBXBookmark */; + 6179937111501D7800BA94A9 = 6179937111501D7800BA94A9 /* PBXBookmark */; + 6179937411501D7800BA94A9 = 6179937411501D7800BA94A9 /* PBXBookmark */; + 6179937511501D7800BA94A9 = 6179937511501D7800BA94A9 /* PBXBookmark */; + 6179938511501FFA00BA94A9 = 6179938511501FFA00BA94A9 /* PBXBookmark */; + 6179943111502CEA00BA94A9 = 6179943111502CEA00BA94A9 /* PBXBookmark */; + 617B27B61171617A004A76A2 = 617B27B61171617A004A76A2 /* PBXTextBookmark */; + 617B27B71171617A004A76A2 = 617B27B71171617A004A76A2 /* PBXTextBookmark */; + 617B27B81171617A004A76A2 = 617B27B81171617A004A76A2 /* PBXTextBookmark */; + 617B27B91171617A004A76A2 = 617B27B91171617A004A76A2 /* PBXTextBookmark */; + 617B27BA1171617A004A76A2 = 617B27BA1171617A004A76A2 /* PBXTextBookmark */; + 617B27ED117163F6004A76A2 = 617B27ED117163F6004A76A2 /* PBXTextBookmark */; + 617B280D117164FC004A76A2 = 617B280D117164FC004A76A2 /* PBXTextBookmark */; + 617B280E117164FC004A76A2 = 617B280E117164FC004A76A2 /* PBXTextBookmark */; + 617E1DB5116FEE5B002EF3D8 = 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */; + 617E1DB6116FEE5B002EF3D8 = 617E1DB6116FEE5B002EF3D8 /* PBXTextBookmark */; + 6188FE02116F5136004F3690 = 6188FE02116F5136004F3690 /* PBXTextBookmark */; + 6188FE18116F6D44004F3690 = 6188FE18116F6D44004F3690 /* PBXTextBookmark */; + 6188FE60116F77AF004F3690 = 6188FE60116F77AF004F3690 /* PBXTextBookmark */; + 6188FE61116F77AF004F3690 = 6188FE61116F77AF004F3690 /* PBXTextBookmark */; + 618AFC07115BE92A003D411B = 618AFC07115BE92A003D411B /* PBXBookmark */; + 6196317D116E89DF00C47CEE = 6196317D116E89DF00C47CEE /* PBXTextBookmark */; + 619C51C6116E42850049FD84 = 619C51C6116E42850049FD84 /* PBXTextBookmark */; + 619C51CB116E42850049FD84 = 619C51CB116E42850049FD84 /* PBXTextBookmark */; + 619C51E0116E45820049FD84 = 619C51E0116E45820049FD84 /* PBXTextBookmark */; + 619C523D116E56330049FD84 = 619C523D116E56330049FD84 /* PBXBookmark */; + 619C523F116E56330049FD84 = 619C523F116E56330049FD84 /* PBXBookmark */; + 619C5241116E56330049FD84 = 619C5241116E56330049FD84 /* PBXBookmark */; + 619C5243116E56330049FD84 = 619C5243116E56330049FD84 /* PBXBookmark */; + 619C5245116E56330049FD84 = 619C5245116E56330049FD84 /* PBXBookmark */; + 619C5247116E56330049FD84 = 619C5247116E56330049FD84 /* PBXBookmark */; + 619C5249116E56330049FD84 = 619C5249116E56330049FD84 /* PBXBookmark */; + 619C524B116E56330049FD84 = 619C524B116E56330049FD84 /* PBXBookmark */; + 619C524D116E56330049FD84 = 619C524D116E56330049FD84 /* PBXBookmark */; + 619C524F116E56330049FD84 = 619C524F116E56330049FD84 /* PBXBookmark */; + 619C5251116E56330049FD84 = 619C5251116E56330049FD84 /* PBXBookmark */; + 619C5253116E56330049FD84 = 619C5253116E56330049FD84 /* PBXBookmark */; + 619C5255116E56330049FD84 = 619C5255116E56330049FD84 /* PBXBookmark */; + 619C5257116E56330049FD84 = 619C5257116E56330049FD84 /* PBXBookmark */; + 619C5259116E56330049FD84 = 619C5259116E56330049FD84 /* PBXBookmark */; + 619C525B116E56330049FD84 = 619C525B116E56330049FD84 /* PBXBookmark */; + 619C525D116E56330049FD84 = 619C525D116E56330049FD84 /* PBXBookmark */; + 619C525F116E56330049FD84 = 619C525F116E56330049FD84 /* PBXBookmark */; + 619C5261116E56330049FD84 = 619C5261116E56330049FD84 /* PBXBookmark */; + 619C5263116E56330049FD84 = 619C5263116E56330049FD84 /* PBXBookmark */; + 619C5265116E56330049FD84 = 619C5265116E56330049FD84 /* PBXBookmark */; + 619C5267116E56330049FD84 = 619C5267116E56330049FD84 /* PBXBookmark */; + 619C5269116E56330049FD84 = 619C5269116E56330049FD84 /* PBXBookmark */; + 619C526B116E56330049FD84 = 619C526B116E56330049FD84 /* PBXBookmark */; + 619C526D116E56330049FD84 = 619C526D116E56330049FD84 /* PBXBookmark */; + 619C526F116E56330049FD84 = 619C526F116E56330049FD84 /* PBXBookmark */; + 619C5271116E56330049FD84 = 619C5271116E56330049FD84 /* PBXBookmark */; + 619C5273116E56330049FD84 = 619C5273116E56330049FD84 /* PBXBookmark */; + 619C5275116E56330049FD84 = 619C5275116E56330049FD84 /* PBXBookmark */; + 619C5277116E56330049FD84 = 619C5277116E56330049FD84 /* PBXBookmark */; + 619C5279116E56330049FD84 = 619C5279116E56330049FD84 /* PBXBookmark */; + 619C527B116E56330049FD84 = 619C527B116E56330049FD84 /* PBXBookmark */; + 619C527D116E56330049FD84 = 619C527D116E56330049FD84 /* PBXBookmark */; + 619C527F116E56330049FD84 = 619C527F116E56330049FD84 /* PBXBookmark */; + 619C5281116E56330049FD84 = 619C5281116E56330049FD84 /* PBXBookmark */; + 619C5283116E56330049FD84 = 619C5283116E56330049FD84 /* PBXBookmark */; + 619C5285116E56330049FD84 = 619C5285116E56330049FD84 /* PBXBookmark */; + 619C5287116E56330049FD84 = 619C5287116E56330049FD84 /* PBXBookmark */; + 619C5289116E56330049FD84 = 619C5289116E56330049FD84 /* PBXBookmark */; + 619C528B116E56330049FD84 = 619C528B116E56330049FD84 /* PBXBookmark */; + 619C528D116E56330049FD84 = 619C528D116E56330049FD84 /* PBXBookmark */; + 619C528F116E56330049FD84 = 619C528F116E56330049FD84 /* PBXBookmark */; + 619C5291116E56330049FD84 = 619C5291116E56330049FD84 /* PBXBookmark */; + 619C5293116E56330049FD84 = 619C5293116E56330049FD84 /* PBXBookmark */; + 619C5295116E56330049FD84 = 619C5295116E56330049FD84 /* PBXBookmark */; + 619C5297116E56330049FD84 = 619C5297116E56330049FD84 /* PBXBookmark */; + 619C5299116E56330049FD84 = 619C5299116E56330049FD84 /* PBXBookmark */; + 619C529B116E56330049FD84 = 619C529B116E56330049FD84 /* PBXBookmark */; + 619C529D116E56330049FD84 = 619C529D116E56330049FD84 /* PBXBookmark */; + 619C529F116E56330049FD84 = 619C529F116E56330049FD84 /* PBXBookmark */; + 619C52A1116E56330049FD84 = 619C52A1116E56330049FD84 /* PBXBookmark */; + 619C52A3116E56330049FD84 = 619C52A3116E56330049FD84 /* PBXBookmark */; + 619C52A5116E56330049FD84 = 619C52A5116E56330049FD84 /* PBXBookmark */; + 619C52A7116E56330049FD84 = 619C52A7116E56330049FD84 /* PBXBookmark */; + 619C52A9116E56330049FD84 = 619C52A9116E56330049FD84 /* PBXBookmark */; + 619C52AB116E56330049FD84 = 619C52AB116E56330049FD84 /* PBXBookmark */; + 619C52AD116E56330049FD84 = 619C52AD116E56330049FD84 /* PBXBookmark */; + 619C52AF116E56330049FD84 = 619C52AF116E56330049FD84 /* PBXBookmark */; + 619C52B1116E56330049FD84 = 619C52B1116E56330049FD84 /* PBXBookmark */; + 619C52B7116E56330049FD84 = 619C52B7116E56330049FD84 /* PBXBookmark */; + 619C52B9116E56330049FD84 = 619C52B9116E56330049FD84 /* PBXBookmark */; + 619C52BB116E56330049FD84 = 619C52BB116E56330049FD84 /* PBXBookmark */; + 619C52BD116E56330049FD84 = 619C52BD116E56330049FD84 /* PBXBookmark */; + 619C52BF116E56330049FD84 = 619C52BF116E56330049FD84 /* PBXBookmark */; + 619C52C1116E56330049FD84 = 619C52C1116E56330049FD84 /* PBXBookmark */; + 619C5352116E72260049FD84 = 619C5352116E72260049FD84 /* PBXTextBookmark */; + 619C5373116E731F0049FD84 = 619C5373116E731F0049FD84 /* PBXTextBookmark */; + 619C5858116E73B00049FD84 = 619C5858116E73B00049FD84 /* PBXTextBookmark */; + 619C5859116E73B00049FD84 = 619C5859116E73B00049FD84 /* PBXBookmark */; + 619C585B116E73B00049FD84 = 619C585B116E73B00049FD84 /* PBXBookmark */; + 619C585D116E73B00049FD84 = 619C585D116E73B00049FD84 /* PBXBookmark */; + 619C585F116E73B00049FD84 = 619C585F116E73B00049FD84 /* PBXBookmark */; + 619C5861116E73B00049FD84 = 619C5861116E73B00049FD84 /* PBXBookmark */; + 619C5863116E73B00049FD84 = 619C5863116E73B00049FD84 /* PBXBookmark */; + 619C5865116E73B00049FD84 = 619C5865116E73B00049FD84 /* PBXBookmark */; + 619C5867116E73B00049FD84 = 619C5867116E73B00049FD84 /* PBXBookmark */; + 619C5869116E73B00049FD84 = 619C5869116E73B00049FD84 /* PBXBookmark */; + 619C586B116E73B00049FD84 = 619C586B116E73B00049FD84 /* PBXBookmark */; + 619C586D116E73B00049FD84 = 619C586D116E73B00049FD84 /* PBXBookmark */; + 619C586F116E73B00049FD84 = 619C586F116E73B00049FD84 /* PBXBookmark */; + 619C5871116E73B00049FD84 = 619C5871116E73B00049FD84 /* PBXBookmark */; + 619C5873116E73B00049FD84 = 619C5873116E73B00049FD84 /* PBXBookmark */; + 619C5875116E73B00049FD84 = 619C5875116E73B00049FD84 /* PBXBookmark */; + 619C5877116E73B00049FD84 = 619C5877116E73B00049FD84 /* PBXBookmark */; + 619C5879116E73B00049FD84 = 619C5879116E73B00049FD84 /* PBXBookmark */; + 619C587B116E73B00049FD84 = 619C587B116E73B00049FD84 /* PBXBookmark */; + 619C587D116E73B00049FD84 = 619C587D116E73B00049FD84 /* PBXBookmark */; + 619C587F116E73B00049FD84 = 619C587F116E73B00049FD84 /* PBXBookmark */; + 619C5880116E73B00049FD84 = 619C5880116E73B00049FD84 /* PBXBookmark */; + 619C5882116E73B00049FD84 = 619C5882116E73B00049FD84 /* PBXBookmark */; + 619C5883116E73B00049FD84 = 619C5883116E73B00049FD84 /* PBXBookmark */; + 619C5885116E73B00049FD84 = 619C5885116E73B00049FD84 /* PBXBookmark */; + 619C5887116E73B00049FD84 = 619C5887116E73B00049FD84 /* PBXBookmark */; + 619C5888116E73B00049FD84 = 619C5888116E73B00049FD84 /* PBXBookmark */; + 619C5889116E73B00049FD84 = 619C5889116E73B00049FD84 /* PBXBookmark */; + 619C588B116E73B00049FD84 = 619C588B116E73B00049FD84 /* PBXBookmark */; + 619C588C116E73B00049FD84 = 619C588C116E73B00049FD84 /* PBXBookmark */; + 619C588D116E73B00049FD84 = 619C588D116E73B00049FD84 /* PBXBookmark */; + 619C588F116E73B00049FD84 = 619C588F116E73B00049FD84 /* PBXBookmark */; + 619C5890116E73B00049FD84 = 619C5890116E73B00049FD84 /* PBXBookmark */; + 619C5892116E73B00049FD84 = 619C5892116E73B00049FD84 /* PBXBookmark */; + 619C58B2116E76080049FD84 = 619C58B2116E76080049FD84 /* PBXBookmark */; + 619C58B3116E76080049FD84 = 619C58B3116E76080049FD84 /* PBXTextBookmark */; + 61B9384D11716B01001C7FC4 = 61B9384D11716B01001C7FC4 /* PBXTextBookmark */; + 61B9384E11716B01001C7FC4 = 61B9384E11716B01001C7FC4 /* PBXTextBookmark */; + 61B9386011716CE5001C7FC4 = 61B9386011716CE5001C7FC4 /* PBXTextBookmark */; + 61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */; + 61CCBF1E116162CA00833FE8 = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */; + 61CCBF451161637F00833FE8 = 61CCBF451161637F00833FE8 /* PBXTextBookmark */; + 61CCBF461161637F00833FE8 = 61CCBF461161637F00833FE8 /* PBXTextBookmark */; + 61CCBF471161637F00833FE8 = 61CCBF471161637F00833FE8 /* PBXTextBookmark */; + 61CCBF7B1161657400833FE8 = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */; + 61CCBF7C1161657400833FE8 = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */; + 61CCBF7E1161657400833FE8 = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */; + 61CCBF7F1161657400833FE8 = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */; + 61CCBFD11161833800833FE8 = 61CCBFD11161833800833FE8 /* PBXTextBookmark */; + 61CCBFD21161833800833FE8 = 61CCBFD21161833800833FE8 /* PBXTextBookmark */; + 61CCBFD31161833800833FE8 = 61CCBFD31161833800833FE8 /* PBXTextBookmark */; + 61CCBFD41161833800833FE8 = 61CCBFD41161833800833FE8 /* PBXTextBookmark */; + 61CCBFD51161833800833FE8 = 61CCBFD51161833800833FE8 /* PBXTextBookmark */; + 61CCBFD71161833800833FE8 = 61CCBFD71161833800833FE8 /* PBXTextBookmark */; + 61CCBFD91161833800833FE8 = 61CCBFD91161833800833FE8 /* PBXTextBookmark */; + 61CCBFDA1161833800833FE8 = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */; + 61CCBFDB1161833800833FE8 = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */; + 61CCBFDC1161833800833FE8 = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */; + 61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */; + 61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */; + 61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */; + 61CEDB60116ACBBB0067BAFC = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */; + 61D96559117180D9001EB3B4 /* PBXTextBookmark */ = 61D96559117180D9001EB3B4 /* PBXTextBookmark */; + 61D9655A117180D9001EB3B4 /* PBXTextBookmark */ = 61D9655A117180D9001EB3B4 /* PBXTextBookmark */; + 61D9655B117180D9001EB3B4 /* PBXTextBookmark */ = 61D9655B117180D9001EB3B4 /* PBXTextBookmark */; + 61D9655C117180D9001EB3B4 /* PBXTextBookmark */ = 61D9655C117180D9001EB3B4 /* PBXTextBookmark */; + 61D96561117180D9001EB3B4 /* PBXTextBookmark */ = 61D96561117180D9001EB3B4 /* PBXTextBookmark */; + 61D96562117180D9001EB3B4 /* PBXTextBookmark */ = 61D96562117180D9001EB3B4 /* PBXTextBookmark */; + 61D96563117180D9001EB3B4 /* PBXTextBookmark */ = 61D96563117180D9001EB3B4 /* PBXTextBookmark */; + 61D96572117180FA001EB3B4 /* PBXTextBookmark */ = 61D96572117180FA001EB3B4 /* PBXTextBookmark */; + 61D96573117180FA001EB3B4 /* PBXTextBookmark */ = 61D96573117180FA001EB3B4 /* PBXTextBookmark */; + 61D9657711718115001EB3B4 /* PBXTextBookmark */ = 61D9657711718115001EB3B4 /* PBXTextBookmark */; + 61D9657811718115001EB3B4 /* PBXTextBookmark */ = 61D9657811718115001EB3B4 /* PBXTextBookmark */; + 61D9657C1171814B001EB3B4 /* PBXTextBookmark */ = 61D9657C1171814B001EB3B4 /* PBXTextBookmark */; + 61D9657D1171814B001EB3B4 /* PBXTextBookmark */ = 61D9657D1171814B001EB3B4 /* PBXTextBookmark */; + 61D9658111718176001EB3B4 /* PBXTextBookmark */ = 61D9658111718176001EB3B4 /* PBXTextBookmark */; + 61D9658211718176001EB3B4 /* PBXTextBookmark */ = 61D9658211718176001EB3B4 /* PBXTextBookmark */; + 61D9658311718176001EB3B4 /* PBXTextBookmark */ = 61D9658311718176001EB3B4 /* PBXTextBookmark */; + 61D9658611718192001EB3B4 /* PBXTextBookmark */ = 61D9658611718192001EB3B4 /* PBXTextBookmark */; + 61D9658711718192001EB3B4 /* PBXTextBookmark */ = 61D9658711718192001EB3B4 /* PBXTextBookmark */; + 61D96591117182B1001EB3B4 /* PBXTextBookmark */ = 61D96591117182B1001EB3B4 /* PBXTextBookmark */; + 61D96592117182B1001EB3B4 /* PBXTextBookmark */ = 61D96592117182B1001EB3B4 /* PBXTextBookmark */; + 61D96595117182B1001EB3B4 /* PBXTextBookmark */ = 61D96595117182B1001EB3B4 /* PBXTextBookmark */; + 61D96596117182B1001EB3B4 /* PBXTextBookmark */ = 61D96596117182B1001EB3B4 /* PBXTextBookmark */; + 61D9659C1171832F001EB3B4 /* PBXTextBookmark */ = 61D9659C1171832F001EB3B4 /* PBXTextBookmark */; + 61D9659D1171832F001EB3B4 /* PBXTextBookmark */ = 61D9659D1171832F001EB3B4 /* PBXTextBookmark */; + 61D9659E1171832F001EB3B4 /* PBXTextBookmark */ = 61D9659E1171832F001EB3B4 /* PBXTextBookmark */; + 61D965A211718360001EB3B4 /* PBXTextBookmark */ = 61D965A211718360001EB3B4 /* PBXTextBookmark */; + 61D965A311718360001EB3B4 /* PBXTextBookmark */ = 61D965A311718360001EB3B4 /* PBXTextBookmark */; + 61D965A51171837C001EB3B4 /* PBXTextBookmark */ = 61D965A51171837C001EB3B4 /* PBXTextBookmark */; + 61D965A61171837C001EB3B4 /* PBXTextBookmark */ = 61D965A61171837C001EB3B4 /* PBXTextBookmark */; + 61D965A9117183A4001EB3B4 /* PBXTextBookmark */ = 61D965A9117183A4001EB3B4 /* PBXTextBookmark */; + 61D965AA117183A4001EB3B4 /* PBXTextBookmark */ = 61D965AA117183A4001EB3B4 /* PBXTextBookmark */; + 61D965AE117183D2001EB3B4 /* PBXTextBookmark */ = 61D965AE117183D2001EB3B4 /* PBXTextBookmark */; + 61D965AF117183D2001EB3B4 /* PBXTextBookmark */ = 61D965AF117183D2001EB3B4 /* PBXTextBookmark */; + 61D965B411718400001EB3B4 /* PBXTextBookmark */ = 61D965B411718400001EB3B4 /* PBXTextBookmark */; + 61D965B511718400001EB3B4 /* PBXTextBookmark */ = 61D965B511718400001EB3B4 /* PBXTextBookmark */; + 61D965C1117184C7001EB3B4 /* PBXTextBookmark */ = 61D965C1117184C7001EB3B4 /* PBXTextBookmark */; + 61D965C2117184C7001EB3B4 /* PBXTextBookmark */ = 61D965C2117184C7001EB3B4 /* PBXTextBookmark */; + 61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */; + 61F8E0D6116E98A900108149 = 61F8E0D6116E98A900108149 /* PBXTextBookmark */; + 61FE2AE4116D658700F76CDC = 61FE2AE4116D658700F76CDC /* PBXTextBookmark */; }; sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */; userBuildSettings = { @@ -314,26 +351,6 @@ isa = PBXBookmark; fRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */; }; - 6105637A116C0393003C420C /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */; - name = "DetailViewController.m: 37"; - rLen = 5; - rLoc = 1379; - rType = 0; - vrLen = 223; - vrLoc = 0; - }; - 610563DE116C15E5003C420C /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; - name = "MasterViewController.m: 11"; - rLen = 0; - rLoc = 260; - rType = 0; - vrLen = 203; - vrLoc = 3996; - }; 610563DF116C15E5003C420C /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 610563E0116C15E5003C420C /* SDL_renderer_gles.c */; @@ -351,26 +368,6 @@ path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/video/SDL_renderer_gles.c"; sourceTree = ""; }; - 6110C12A11711B9E002E5B93 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 619C51BE116E40FC0049FD84 /* CommodityFunctions.m */; - name = "CommodityFunctions.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 51; - vrLoc = 0; - }; - 6110C12B11711B9E002E5B93 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; - name = "SingleTeamViewController.m: 133"; - rLen = 1; - rLoc = 5496; - rType = 0; - vrLen = 128; - vrLoc = 1689; - }; 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {999, 639}}"; @@ -380,9 +377,9 @@ }; 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 5577}}"; - sepNavSelRange = "{348, 17}"; - sepNavVisRange = "{13122, 1287}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 5187}}"; + sepNavSelRange = "{511, 0}"; + sepNavVisRange = "{0, 1843}"; sepNavWindowFrame = "{{413, 349}, {1058, 792}}"; }; }; @@ -401,7 +398,7 @@ fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */; name = "GeneralSettingsViewController.m: 249"; rLen = 0; - rLoc = 10789; + rLoc = 10620; rType = 0; vrLen = 75; vrLoc = 631; @@ -472,16 +469,6 @@ vrLen = 33; vrLoc = 791; }; - 612D618F1165545F00C6D842 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; - name = "hwLibrary.pas: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 14; - vrLoc = 0; - }; 61430D3B1165551600E2C62D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; @@ -694,7 +681,7 @@ }; 617987E7114AA34C00BA94A9 /* hwengine.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {838, 7813}}"; + sepNavIntBoundsRect = "{{0, 0}, {838, 7774}}"; sepNavSelRange = "{7090, 0}"; sepNavVisRange = "{6695, 1053}"; sepNavWindowFrame = "{{421, 176}, {897, 692}}"; @@ -702,9 +689,9 @@ }; 617987E9114AA34C00BA94A9 /* hwLibrary.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 299}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 14}"; + sepNavIntBoundsRect = "{{0, 0}, {677, 329}}"; + sepNavSelRange = "{344, 7}"; + sepNavVisRange = "{0, 691}"; sepNavWindowFrame = "{{15, 481}, {897, 692}}"; }; }; @@ -1034,18 +1021,18 @@ }; 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {744, 728}}"; - sepNavSelRange = "{1384, 0}"; - sepNavVisRange = "{673, 1182}"; + sepNavIntBoundsRect = "{{0, 0}, {642, 702}}"; + sepNavSelRange = "{1425, 0}"; + sepNavVisRange = "{1130, 585}"; sepNavWindowFrame = "{{471, 203}, {803, 674}}"; }; }; 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {873, 2080}}"; - sepNavSelRange = "{4735, 0}"; - sepNavVisRange = "{3996, 1426}"; - sepNavWindowFrame = "{{1045, 206}, {803, 674}}"; + sepNavIntBoundsRect = "{{0, 0}, {873, 2041}}"; + sepNavSelRange = "{3864, 314}"; + sepNavVisRange = "{3625, 1524}"; + sepNavWindowFrame = "{{29, 241}, {803, 674}}"; }; }; 61798867114AA4AA00BA94A9 /* SDL_uikitwindow.h */ = { @@ -1065,17 +1052,17 @@ }; 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {483, 338}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 664}}"; sepNavSelRange = "{172, 0}"; - sepNavVisRange = "{148, 80}"; + sepNavVisRange = "{0, 480}"; sepNavWindowFrame = "{{852, 335}, {775, 623}}"; }; }; 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 2236}}"; - sepNavSelRange = "{3355, 0}"; - sepNavVisRange = "{1449, 2305}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 2210}}"; + sepNavSelRange = "{3579, 0}"; + sepNavVisRange = "{2155, 1824}"; sepNavWindowFrame = "{{682, 125}, {1058, 792}}"; }; }; @@ -1089,10 +1076,10 @@ }; 61798888114AA4E600BA94A9 /* GameSetup.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1020, 4810}}"; - sepNavSelRange = "{12923, 0}"; - sepNavVisRange = "{10617, 2646}"; - sepNavWindowFrame = "{{760, 256}, {1079, 870}}"; + sepNavIntBoundsRect = "{{0, 0}, {1412, 4316}}"; + sepNavSelRange = "{12127, 0}"; + sepNavVisRange = "{11887, 1340}"; + sepNavWindowFrame = "{{256, 240}, {1079, 870}}"; }; }; 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = { @@ -1151,6 +1138,86 @@ isa = PBXBookmark; fRef = 6179936711501D3D00BA94A9 /* arrowDown.png */; }; + 617B27B61171617A004A76A2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 133"; + rLen = 1; + rLoc = 5469; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 617B27B71171617A004A76A2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 153"; + rLen = 0; + rLoc = 5144; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 617B27B81171617A004A76A2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 107"; + rLen = 0; + rLoc = 3579; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 617B27B91171617A004A76A2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; + name = "hwLibrary.pas: 11"; + rLen = 7; + rLoc = 344; + rType = 0; + vrLen = 691; + vrLoc = 0; + }; + 617B27BA1171617A004A76A2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */; + name = "GameSetup.m: 332"; + rLen = 0; + rLoc = 12127; + rType = 0; + vrLen = 1340; + vrLoc = 11887; + }; + 617B27ED117163F6004A76A2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 619C51BE116E40FC0049FD84 /* CommodityFunctions.m */; + name = "CommodityFunctions.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 975; + vrLoc = 0; + }; + 617B280D117164FC004A76A2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 659; + vrLoc = 0; + }; + 617B280E117164FC004A76A2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; + name = "MasterViewController.m: 58"; + rLen = 0; + rLoc = 2574; + rType = 0; + vrLen = 929; + vrLoc = 1909; + }; 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */; @@ -1176,7 +1243,7 @@ fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; name = "HogHatViewController.m: 112"; rLen = 0; - rLoc = 3692; + rLoc = 3666; rType = 0; vrLen = 185; vrLoc = 149; @@ -1196,7 +1263,7 @@ fRef = 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */; name = "TeamSettingsViewController.m: 42"; rLen = 0; - rLoc = 1594; + rLoc = 1568; rType = 0; vrLen = 253; vrLoc = 1557; @@ -1227,18 +1294,18 @@ }; 619C51BD116E40FC0049FD84 /* CommodityFunctions.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 641}}"; - sepNavSelRange = "{416, 18}"; - sepNavVisRange = "{0, 991}"; - sepNavWindowFrame = "{{556, 211}, {1058, 792}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 664}}"; + sepNavSelRange = "{276, 19}"; + sepNavVisRange = "{0, 1269}"; + sepNavWindowFrame = "{{556, 125}, {1058, 792}}"; }; }; 619C51BE116E40FC0049FD84 /* CommodityFunctions.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {472, 741}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 51}"; - sepNavWindowFrame = "{{556, 125}, {1058, 792}}"; + sepNavIntBoundsRect = "{{0, 0}, {600, 832}}"; + sepNavSelRange = "{214, 0}"; + sepNavVisRange = "{0, 775}"; + sepNavWindowFrame = "{{61, 366}, {1058, 792}}"; }; }; 619C51C6116E42850049FD84 /* PBXTextBookmark */ = { @@ -1251,16 +1318,6 @@ vrLen = 7; vrLoc = 0; }; - 619C51C7116E42850049FD84 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; - name = "MainMenuViewController.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 3; - vrLoc = 144; - }; 619C51CB116E42850049FD84 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798857114AA48A00BA94A9 /* CGPointUtils.h */; @@ -1291,9 +1348,9 @@ }; 619C5231116E4E810049FD84 /* FlagsViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 2405}}"; - sepNavSelRange = "{321, 170}"; - sepNavVisRange = "{0, 1534}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 2496}}"; + sepNavSelRange = "{465, 0}"; + sepNavVisRange = "{0, 1505}"; sepNavWindowFrame = "{{67, 264}, {1058, 792}}"; }; }; @@ -2079,15 +2136,15 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {472, 338}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{151, 143}"; + sepNavVisRange = "{0, 582}"; sepNavWindowFrame = "{{628, 243}, {1058, 792}}"; }; }; 619C533D116E70050049FD84 /* FortsViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {929, 2808}}"; - sepNavSelRange = "{5012, 1}"; - sepNavVisRange = "{4835, 228}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 2626}}"; + sepNavSelRange = "{490, 0}"; + sepNavVisRange = "{0, 1887}"; sepNavWindowFrame = "{{84, 361}, {1058, 792}}"; }; }; @@ -2106,7 +2163,7 @@ fRef = 619C5231116E4E810049FD84 /* FlagsViewController.m */; name = "FlagsViewController.m: 69"; rLen = 0; - rLoc = 1848; + rLoc = 1822; rType = 0; vrLen = 460; vrLoc = 1667; @@ -2458,16 +2515,6 @@ vrLen = 222; vrLoc = 0; }; - 61A0965B1170057A008A8930 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; - name = "SingleTeamViewController.m: 132"; - rLen = 1; - rLoc = 5496; - rType = 0; - vrLen = 41; - vrLoc = 1746; - }; 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {999, 664}}"; @@ -2478,25 +2525,25 @@ }; 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 1638}}"; - sepNavSelRange = "{2200, 2}"; - sepNavVisRange = "{1818, 1812}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 1833}}"; + sepNavSelRange = "{468, 0}"; + sepNavVisRange = "{0, 1253}"; sepNavWindowFrame = "{{84, 318}, {1058, 792}}"; }; }; 61A11ABF1168D8B600359010 /* SplitViewRootController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 641}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 664}}"; sepNavSelRange = "{180, 0}"; sepNavVisRange = "{0, 396}"; }; }; 61A11AC01168D8B600359010 /* SplitViewRootController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 1300}}"; - sepNavSelRange = "{2368, 0}"; - sepNavVisRange = "{709, 2090}"; - sepNavWindowFrame = "{{195, 264}, {1058, 792}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 1222}}"; + sepNavSelRange = "{292, 0}"; + sepNavVisRange = "{0, 2044}"; + sepNavWindowFrame = "{{725, 326}, {1058, 792}}"; }; }; 61A11AC71168DA9400359010 /* MasterViewController.h */ = { @@ -2508,9 +2555,9 @@ }; 61A11AC81168DA9400359010 /* MasterViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 2015}}"; - sepNavSelRange = "{260, 0}"; - sepNavVisRange = "{3996, 203}"; + sepNavIntBoundsRect = "{{0, 0}, {908, 1885}}"; + sepNavSelRange = "{2574, 0}"; + sepNavVisRange = "{1909, 929}"; sepNavWindowFrame = "{{312, 236}, {1058, 792}}"; }; }; @@ -2524,15 +2571,15 @@ }; 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 2236}}"; - sepNavSelRange = "{1548, 0}"; - sepNavVisRange = "{930, 2287}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 2314}}"; + sepNavSelRange = "{6169, 0}"; + sepNavVisRange = "{5116, 1526}"; sepNavWindowFrame = "{{529, 227}, {1058, 792}}"; }; }; 61A11AD41168DB3700359010 /* DetailViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 641}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 664}}"; sepNavSelRange = "{198, 0}"; sepNavVisRange = "{0, 611}"; sepNavWindowFrame = "{{690, 271}, {1058, 792}}"; @@ -2540,9 +2587,9 @@ }; 61A11AD51168DB3700359010 /* DetailViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1503, 1989}}"; - sepNavSelRange = "{4360, 19}"; - sepNavVisRange = "{3727, 1900}"; + sepNavIntBoundsRect = "{{0, 0}, {1069, 1937}}"; + sepNavSelRange = "{1555, 5}"; + sepNavVisRange = "{0, 640}"; sepNavWindowFrame = "{{690, 271}, {1058, 792}}"; }; }; @@ -2556,9 +2603,9 @@ }; 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {761, 5148}}"; - sepNavSelRange = "{5496, 1}"; - sepNavVisRange = "{1689, 128}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 5096}}"; + sepNavSelRange = "{645, 0}"; + sepNavVisRange = "{14005, 1505}"; sepNavWindowFrame = "{{714, 185}, {1058, 792}}"; }; }; @@ -2572,12 +2619,42 @@ }; 61A11AE31168DC9400359010 /* HogHatViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 2717}}"; - sepNavSelRange = "{507, 0}"; - sepNavVisRange = "{0, 1843}"; - sepNavWindowFrame = "{{421, 119}, {1058, 792}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 2691}}"; + sepNavSelRange = "{480, 0}"; + sepNavVisRange = "{0, 1780}"; + sepNavWindowFrame = "{{421, 127}, {1058, 792}}"; }; }; + 61B9384D11716B01001C7FC4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 34"; + rLen = 0; + rLoc = 1211; + rType = 0; + vrLen = 1294; + vrLoc = 486; + }; + 61B9384E11716B01001C7FC4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */; + name = "DetailViewController.m: 42"; + rLen = 5; + rLoc = 1555; + rType = 0; + vrLen = 586; + vrLoc = 0; + }; + 61B9386011716CE5001C7FC4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */; + name = "DetailViewController.m: 42"; + rLen = 5; + rLoc = 1555; + rType = 0; + vrLen = 640; + vrLoc = 0; + }; 61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798800114AA34C00BA94A9 /* uLandGraphics.pas */; @@ -2792,26 +2869,16 @@ }; 61CE250C115E749A0098C467 /* OverlayViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {985, 4186}}"; - sepNavSelRange = "{391, 0}"; - sepNavVisRange = "{2215, 1678}"; - sepNavWindowFrame = "{{690, 149}, {938, 967}}"; + sepNavIntBoundsRect = "{{0, 0}, {915, 4147}}"; + sepNavSelRange = "{363, 0}"; + sepNavVisRange = "{0, 2200}"; + sepNavWindowFrame = "{{526, 189}, {938, 967}}"; }; }; 61CE251F115E75A70098C467 /* PBXBookmark */ = { isa = PBXBookmark; fRef = 61798A28114ADD2600BA94A9 /* playButton.png */; }; - 61CEC5A6116C168E009FFF36 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; - name = "SDL_uikitappdelegate.m: 32"; - rLen = 0; - rLoc = 1141; - rType = 0; - vrLen = 392; - vrLoc = 3; - }; 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */; @@ -2822,6 +2889,376 @@ vrLen = 0; vrLoc = 0; }; + 61D96559117180D9001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */; + name = "DetailViewController.m: 42"; + rLen = 5; + rLoc = 1555; + rType = 0; + vrLen = 640; + vrLoc = 0; + }; + 61D9655A117180D9001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 619C533C116E70050049FD84 /* FortsViewController.h */; + name = "FortsViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 582; + vrLoc = 0; + }; + 61D9655B117180D9001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 32"; + rLen = 0; + rLoc = 1211; + rType = 0; + vrLen = 1406; + vrLoc = 486; + }; + 61D9655C117180D9001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 49"; + rLen = 0; + rLoc = 1211; + rType = 0; + vrLen = 934; + vrLoc = 517; + }; + 61D96561117180D9001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11ABF1168D8B600359010 /* SplitViewRootController.h */; + name = "SplitViewRootController.h: 10"; + rLen = 0; + rLoc = 180; + rType = 0; + vrLen = 396; + vrLoc = 0; + }; + 61D96562117180D9001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 12"; + rLen = 0; + rLoc = 292; + rType = 0; + vrLen = 2211; + vrLoc = 517; + }; + 61D96563117180D9001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 36"; + rLen = 0; + rLoc = 715; + rType = 0; + vrLen = 2428; + vrLoc = 517; + }; + 61D96572117180FA001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 49"; + rLen = 0; + rLoc = 1211; + rType = 0; + vrLen = 934; + vrLoc = 517; + }; + 61D96573117180FA001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 59"; + rLen = 0; + rLoc = 1653; + rType = 0; + vrLen = 2428; + vrLoc = 517; + }; + 61D9657711718115001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 49"; + rLen = 0; + rLoc = 1211; + rType = 0; + vrLen = 898; + vrLoc = 517; + }; + 61D9657811718115001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 37"; + rLen = 0; + rLoc = 715; + rType = 0; + vrLen = 2392; + vrLoc = 517; + }; + 61D9657C1171814B001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 49"; + rLen = 0; + rLoc = 1211; + rType = 0; + vrLen = 759; + vrLoc = 517; + }; + 61D9657D1171814B001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 37"; + rLen = 0; + rLoc = 715; + rType = 0; + vrLen = 2355; + vrLoc = 517; + }; + 61D9658111718176001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 49"; + rLen = 0; + rLoc = 1211; + rType = 0; + vrLen = 759; + vrLoc = 517; + }; + 61D9658211718176001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 37"; + rLen = 0; + rLoc = 715; + rType = 0; + vrLen = 2355; + vrLoc = 517; + }; + 61D9658311718176001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 37"; + rLen = 0; + rLoc = 715; + rType = 0; + vrLen = 2355; + vrLoc = 517; + }; + 61D9658611718192001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 49"; + rLen = 0; + rLoc = 1211; + rType = 0; + vrLen = 759; + vrLoc = 517; + }; + 61D9658711718192001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 39"; + rLen = 0; + rLoc = 715; + rType = 0; + vrLen = 2355; + vrLoc = 517; + }; + 61D96591117182B1001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 33"; + rLen = 0; + rLoc = 1211; + rType = 0; + vrLen = 1367; + vrLoc = 551; + }; + 61D96592117182B1001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 708; + vrLoc = 51; + }; + 61D96595117182B1001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 25"; + rLen = 0; + rLoc = 601; + rType = 0; + vrLen = 2358; + vrLoc = 0; + }; + 61D96596117182B1001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 25"; + rLen = 0; + rLoc = 601; + rType = 0; + vrLen = 2355; + vrLoc = 0; + }; + 61D9659C1171832F001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 708; + vrLoc = 51; + }; + 61D9659D1171832F001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 38"; + rLen = 0; + rLoc = 601; + rType = 0; + vrLen = 2169; + vrLoc = 0; + }; + 61D9659E1171832F001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 38"; + rLen = 0; + rLoc = 601; + rType = 0; + vrLen = 2169; + vrLoc = 0; + }; + 61D965A211718360001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 708; + vrLoc = 51; + }; + 61D965A311718360001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 37"; + rLen = 0; + rLoc = 601; + rType = 0; + vrLen = 2165; + vrLoc = 0; + }; + 61D965A51171837C001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 606; + vrLoc = 51; + }; + 61D965A61171837C001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 24"; + rLen = 0; + rLoc = 601; + rType = 0; + vrLen = 2208; + vrLoc = 0; + }; + 61D965A9117183A4001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 606; + vrLoc = 51; + }; + 61D965AA117183A4001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 30"; + rLen = 0; + rLoc = 601; + rType = 0; + vrLen = 2227; + vrLoc = 0; + }; + 61D965AE117183D2001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 608; + vrLoc = 51; + }; + 61D965AF117183D2001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 23"; + rLen = 0; + rLoc = 600; + rType = 0; + vrLen = 2187; + vrLoc = 0; + }; + 61D965B411718400001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 18"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 585; + vrLoc = 51; + }; + 61D965B511718400001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 16"; + rLen = 0; + rLoc = 363; + rType = 0; + vrLen = 2200; + vrLoc = 0; + }; + 61D965C1117184C7001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 18"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 585; + vrLoc = 51; + }; + 61D965C2117184C7001EB3B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 16"; + rLen = 0; + rLoc = 363; + rType = 0; + vrLen = 2200; + vrLoc = 0; + }; 61E2F0811156B170002D33C1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 617987F6114AA34C00BA94A9 /* uChat.pas */; @@ -2837,31 +3274,11 @@ fRef = 619C533D116E70050049FD84 /* FortsViewController.m */; name = "FortsViewController.m: 152"; rLen = 1; - rLoc = 5012; + rLoc = 4986; rType = 0; vrLen = 430; vrLoc = 4835; }; - 61FE29E7116CDB7300F76CDC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */; - name = "GameSetup.m: 179"; - rLen = 0; - rLoc = 7069; - rType = 0; - vrLen = 168; - vrLoc = 7020; - }; - 61FE2A89116CF05C00F76CDC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; - name = "SplitViewRootController.m: 44"; - rLen = 0; - rLoc = 1399; - rType = 0; - vrLen = 340; - vrLoc = 929; - }; 61FE2AE4116D658700F76CDC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; @@ -2872,16 +3289,6 @@ vrLen = 80; vrLoc = 148; }; - 61FE2B69116D78BF00F76CDC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; - name = "OverlayViewController.m: 17"; - rLen = 0; - rLoc = 391; - rType = 0; - vrLen = 26; - vrLoc = 221; - }; 8D1107310486CEB800E47090 /* Info.plist */ = { uiCtxt = { sepNavWindowFrame = "{{777, 277}, {1058, 792}}";