# HG changeset patch # User koda # Date 1271198746 0 # Node ID 96dd168b080bcd37d821ccfd51a095cd46375076 # Parent d558bc5a73c57f891c73a7e3f509511a26035133 fix all of what was committed before diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/GravesViewController.h --- a/cocoaTouch/GravesViewController.h Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/GravesViewController.h Tue Apr 13 22:45:46 2010 +0000 @@ -10,14 +10,14 @@ @interface GravesViewController : UITableViewController { - NSDictionary *teamDictionary; + NSMutableDictionary *teamDictionary; NSArray *graveArray; NSArray *graveSprites; NSIndexPath *lastIndexPath; } -@property (nonatomic,retain) NSDictionary *teamDictionary; +@property (nonatomic,retain) NSMutableDictionary *teamDictionary; @property (nonatomic,retain) NSArray *graveArray; @property (nonatomic,retain) NSArray *graveSprites; @property (nonatomic,retain) NSIndexPath *lastIndexPath; diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/GravesViewController.m --- a/cocoaTouch/GravesViewController.m Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/GravesViewController.m Tue Apr 13 22:45:46 2010 +0000 @@ -6,7 +6,7 @@ // Copyright 2010 __MyCompanyName__. All rights reserved. // -#import "HogHatViewController.h" +#import "GravesViewController.h" #import "CommodityFunctions.h" @@ -27,15 +27,23 @@ // load all the voices names and store them into voiceArray NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:GRAVES_DIRECTORY() error:NULL]; self.graveArray = array; - [array release]; - - NSMutableArray *sprites = [[NSMutableArray alloc] initWithCapacity:[graveArray count]; + + NSMutableArray *sprites = [[NSMutableArray alloc] initWithCapacity:[graveArray count]]; for (NSString *graveName in graveArray) { - NSString *gravePath = [[NSString alloc] initWithFormat@"%@/%@",GRAVES_DIRECTORY(),graveName]; - UIImage *image = [[UIImage alloc] initWithContentsOfFile:gravePath]; - [gravePath release]; - [sprites addObject:image]; - [image release]; + NSString *gravePath = [[NSString alloc] initWithFormat:@"%@/%@",GRAVES_DIRECTORY(),graveName]; + UIImage *image = [[UIImage alloc] initWithContentsOfFile:gravePath]; + [gravePath release]; + + // because we also have multi frame graves, let's take the first one only + if (image.size.height > 32) { + CGRect firstSpriteArea = CGRectMake(0, 0, 32, 32); + CGImageRef cgImage = CGImageCreateWithImageInRect([image CGImage], firstSpriteArea); + [image release]; + image = [[UIImage alloc] initWithCGImage:cgImage]; + CGImageRelease(cgImage); + } + [sprites addObject:image]; + [image release]; } self.graveSprites = sprites; [sprites release]; @@ -88,14 +96,14 @@ NSString *grave = [[graveArray objectAtIndex:[indexPath row]] stringByDeletingPathExtension]; cell.textLabel.text = grave; - if ([grave isEqualToString:[hog objectForKey:@"grave"]]) { + if ([grave isEqualToString:[teamDictionary objectForKey:@"grave"]]) { cell.accessoryType = UITableViewCellAccessoryCheckmark; self.lastIndexPath = indexPath; } else { cell.accessoryType = UITableViewCellAccessoryNone; } - cell.imageView.image = [spriteArray objectAtIndex:[indexPath row]]: + cell.imageView.image = [graveSprites objectAtIndex:[indexPath row]]; return cell; } @@ -147,7 +155,7 @@ int oldRow = (lastIndexPath != nil) ? [lastIndexPath row] : -1; if (newRow != oldRow) { - [teamDictionary setObject:[graveArray objectAtIndex:newRow] forKey:@"grave"]; + [teamDictionary setObject:[[graveArray objectAtIndex:newRow] stringByDeletingPathExtension] forKey:@"grave"]; // tell our boss to write this new stuff on disk [[NSNotificationCenter defaultCenter] postNotificationName:@"setWriteNeedTeams" object:nil]; @@ -155,7 +163,7 @@ self.lastIndexPath = indexPath; [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone]; - + } [self.tableView deselectRowAtIndexPath:indexPath animated:YES]; [self.navigationController popViewControllerAnimated:YES]; } @@ -174,11 +182,11 @@ self.lastIndexPath = nil; self.teamDictionary = nil; self.graveArray = nil; - self.spriteArray = nil; + self.graveSprites = nil; } - (void)dealloc { - [spriteArray release]; + [graveSprites release]; [graveArray release]; [teamDictionary release]; [lastIndexPath release]; diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/HogHatViewController.m --- a/cocoaTouch/HogHatViewController.m Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/HogHatViewController.m Tue Apr 13 22:45:46 2010 +0000 @@ -28,22 +28,21 @@ NSString *hatsDirectory = HATS_DIRECTORY(); NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:hatsDirectory error:NULL]; self.hatArray = array; - [array release]; - + // load all the hat images from the previous array but save only the first sprite and store it in hatSprites NSMutableArray *spriteArray = [[NSMutableArray alloc] initWithCapacity:[hatArray count]]; - for (int i=0; i < [hatArray count]; i++) { - NSString *hatFile = [[NSString alloc] initWithFormat:@"%@/%@", hatsDirectory,[hatArray objectAtIndex:i]]; + for (NSString *hat in hatArray) { + NSString *hatFile = [[NSString alloc] initWithFormat:@"%@/%@", hatsDirectory,hat]; UIImage *image = [[UIImage alloc] initWithContentsOfFile: hatFile]; [hatFile release]; CGRect firstSpriteArea = CGRectMake(0, 0, 32, 32); - CGImageRef cgImgage = CGImageCreateWithImageInRect([image CGImage], firstSpriteArea); + CGImageRef cgImage = CGImageCreateWithImageInRect([image CGImage], firstSpriteArea); [image release]; - UIImage *hatSprite = [[UIImage alloc] initWithCGImage:cgImgage]; + UIImage *hatSprite = [[UIImage alloc] initWithCGImage:cgImage]; [spriteArray addObject:hatSprite]; - CGImageRelease(cgImgage); + CGImageRelease(cgImage); [hatSprite release]; } self.hatSprites = spriteArray; diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/LevelViewController.m --- a/cocoaTouch/LevelViewController.m Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/LevelViewController.m Tue Apr 13 22:45:46 2010 +0000 @@ -6,7 +6,7 @@ // Copyright 2010 __MyCompanyName__. All rights reserved. // -#import "HogHatViewController.h" +#import "LevelViewController.h" #import "CommodityFunctions.h" @@ -25,11 +25,11 @@ [super viewDidLoad]; NSArray *array = [[NSArray alloc] initWithObjects: - NSLocalizedString(@"Human",@""), - NSLocalizedString(@"Weaky",@""), - NSLocalizedString(@"Average",@""), - NSLocalizedString(@"Bully",@""), - NSLocalizedString(@"Aggressive",@""),nil] + NSLocalizedString(@"Human",@""), + NSLocalizedString(@"Weaky",@""), + NSLocalizedString(@"Average",@""), + NSLocalizedString(@"Bully",@""), + NSLocalizedString(@"Aggressive",@""),nil]; self.levelArray = array; [array release]; /* @@ -81,25 +81,25 @@ } // Customize the appearance of table view cells. -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { static NSString *CellIdentifier = @"Cell"; + NSInteger row = [indexPath row]; UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; if (cell == nil) { cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; } - cell.textLabel.text = [[levelArray objectAtIndex:[indexPath row]] stringValue]; - NSDictionary *hog = [[self.teamDictionary objectForKey:@"hedgehogs"] objectAtIndex:0] - if ([cell.textLabel.text isEqualToString:[[hog objectForKey:@"level"]] stringValue]) { + cell.textLabel.text = [levelArray objectAtIndex:row]; + NSDictionary *hog = [[self.teamDictionary objectForKey:@"hedgehogs"] objectAtIndex:0]; + if ([[hog objectForKey:@"level"] intValue] == row) { cell.accessoryType = UITableViewCellAccessoryCheckmark; self.lastIndexPath = indexPath; } else { cell.accessoryType = UITableViewCellAccessoryNone; } - cell.imageView.image = [levelSprites objectAtIndex:[indexPath row]]: + cell.imageView.image = [levelSprites objectAtIndex:row]; return cell; } @@ -151,11 +151,11 @@ int oldRow = (lastIndexPath != nil) ? [lastIndexPath row] : -1; if (newRow != oldRow) { - NSMutableArray *hogs = [teamDictionary objectForKey:@"hedgehogs"]; - - for (NSDictionary *hog in hogs) { - [hog setObject:[NSNumber numberWithInt:newRow] forKey:@"level"]; - } + NSMutableArray *hogs = [teamDictionary objectForKey:@"hedgehogs"]; + + for (NSMutableDictionary *hog in hogs) { + [hog setObject:[NSNumber numberWithInt:newRow] forKey:@"level"]; + } // tell our boss to write this new stuff on disk [[NSNotificationCenter defaultCenter] postNotificationName:@"setWriteNeedTeams" object:nil]; @@ -163,7 +163,7 @@ self.lastIndexPath = indexPath; [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone]; - + } [self.tableView deselectRowAtIndexPath:indexPath animated:YES]; [self.navigationController popViewControllerAnimated:YES]; } @@ -171,13 +171,13 @@ #pragma mark - #pragma mark Memory management -- (void)didReceiveMemoryWarning { +-(void) didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. [super didReceiveMemoryWarning]; // Relinquish ownership any cached data, images, etc that aren't in use. } -- (void)viewDidUnload { +-(void) viewDidUnload { [super viewDidUnload]; self.lastIndexPath = nil; self.teamDictionary = nil; @@ -185,7 +185,7 @@ self.levelSprites = nil; } -- (void)dealloc { +-(void) dealloc { [levelArray release]; [levelSprites release]; [teamDictionary release]; diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/OverlayViewController.m --- a/cocoaTouch/OverlayViewController.m Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/OverlayViewController.m Tue Apr 13 22:45:46 2010 +0000 @@ -29,7 +29,27 @@ // Release any cached data, images, etc that aren't in use. } +/* +- (void)didRotate:(NSNotification *)notification { + if (orientation == UIDeviceOrientationLandscapeLeft) { + } + if (orientation == UIDeviceOrientationLandscapeRight) { + } + if (orientation == UIDeviceOrientationPortrait) { + } + if (orientation == UIDeviceOrientationPortrait) { + } +} +*/ + -(void) viewDidLoad { + /* + [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(didRotate:) + name:UIDeviceOrientationDidChangeNotification + object:nil]; + */ isPopoverVisible = NO; self.view.alpha = 0; diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/PopoverMenuViewController.m --- a/cocoaTouch/PopoverMenuViewController.m Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/PopoverMenuViewController.m Tue Apr 13 22:45:46 2010 +0000 @@ -9,6 +9,7 @@ #import "SDL_uikitappdelegate.h" #import "PopoverMenuViewController.h" #import "PascalImports.h" +#import "CommodityFunctions.h" @implementation PopoverMenuViewController @synthesize menuList; diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/SingleTeamViewController.h --- a/cocoaTouch/SingleTeamViewController.h Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/SingleTeamViewController.h Tue Apr 13 22:45:46 2010 +0000 @@ -9,6 +9,11 @@ #import @class HogHatViewController; +@class GravesViewController; +@class VoicesViewController; +@class FortsViewController; +@class FlagsViewController; +@class LevelViewController; @interface SingleTeamViewController : UITableViewController { NSMutableDictionary *teamDictionary; @@ -17,10 +22,14 @@ NSArray *hatArray; NSArray *secondaryItems; - NSArray *secondaryControllers; BOOL isWriteNeeded; - HogHatViewController *hogChildController; + HogHatViewController *hogHatViewController; + GravesViewController *gravesViewController; + VoicesViewController *voicesViewController; + FortsViewController *fortsViewController; + FlagsViewController *flagsViewController; + LevelViewController *levelViewController; } @property (nonatomic,retain) NSMutableDictionary *teamDictionary; @@ -28,7 +37,6 @@ @property (nonatomic,retain) NSString *teamName; @property (nonatomic,retain) NSArray *hatArray; @property (nonatomic,retain) NSArray *secondaryItems; -@property (nonatomic,retain) NSArray *secondaryControllers; -(void) writeFile; -(void) setWriteNeeded; diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/SingleTeamViewController.m --- a/cocoaTouch/SingleTeamViewController.m Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/SingleTeamViewController.m Tue Apr 13 22:45:46 2010 +0000 @@ -8,14 +8,17 @@ #import "SingleTeamViewController.h" #import "HogHatViewController.h" +#import "GravesViewController.h" +#import "VoicesViewController.h" +#import "FortsViewController.h" #import "FlagsViewController.h" -#import "FortsViewController.h" +#import "LevelViewController.h" #import "CommodityFunctions.h" #define TEAMNAME_TAG 1234 @implementation SingleTeamViewController -@synthesize teamDictionary, hatArray, secondaryItems, secondaryControllers, textFieldBeingEdited, teamName; +@synthesize teamDictionary, hatArray, secondaryItems, textFieldBeingEdited, teamName; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { @@ -34,17 +37,14 @@ // set the new value -(BOOL) save:(id) sender { NSInteger index = textFieldBeingEdited.tag; + if (textFieldBeingEdited != nil) { if (TEAMNAME_TAG == index) { - NSLog(@"%@", textFieldBeingEdited.text); [self.teamDictionary setObject:textFieldBeingEdited.text forKey:@"teamname"]; } else { - //replace the old value with the new one - NSDictionary *oldHog = [[teamDictionary objectForKey:@"hedgehogs"] objectAtIndex:index]; - NSMutableDictionary *newHog = [[NSMutableDictionary alloc] initWithDictionary: oldHog]; - [newHog setObject:textFieldBeingEdited.text forKey:@"hogname"]; - [[teamDictionary objectForKey:@"hedgehogs"] replaceObjectAtIndex:index withObject:newHog]; - [newHog release]; + //replace the old value with the new one + NSMutableDictionary *hog = [[teamDictionary objectForKey:@"hedgehogs"] objectAtIndex:index]; + [hog setObject:textFieldBeingEdited.text forKey:@"hogname"]; } isWriteNeeded = YES; @@ -97,39 +97,25 @@ #pragma mark - #pragma mark View lifecycle -- (void)viewDidLoad { +-(void) viewDidLoad { [super viewDidLoad]; - + // labels for the entries NSArray *array = [[NSArray alloc] initWithObjects: - NSLocalizedString(@"Grave",@""), - NSLocalizedString(@"Voice",@""), - NSLocalizedString(@"Fort",@""), - NSLocalizedString(@"Flag",@""), - NSLocalizedString(@"Level",@""),nil]; + NSLocalizedString(@"Grave",@""), + NSLocalizedString(@"Voice",@""), + NSLocalizedString(@"Fort",@""), + NSLocalizedString(@"Flag",@""), + NSLocalizedString(@"Level",@""),nil]; self.secondaryItems = array; [array release]; - - // insert controllers here - NSMutableArray *controllersArray = [[NSMutableArray alloc] initWithCapacity:[secondaryItems count]]; - - FlagsViewController *flagsViewController = [[FlagsViewController alloc] initWithStyle:UITableViewStyleGrouped]; - [controllersArray addObject:flagsViewController]; - [flagsViewController release]; - - FortsViewController *fortsViewController = [[FortsViewController alloc] initWithStyle:UITableViewStyleGrouped]; - [controllersArray addObject:fortsViewController]; - [fortsViewController release]; - - self.secondaryControllers = controllersArray; - [controllersArray release]; // listen if any childController modifies the plist and write it if needed [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setWriteNeeded) name:@"setWriteNeedTeams" object:nil]; isWriteNeeded = NO; } -- (void)viewWillAppear:(BOOL)animated { +-(void) viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; // load data about the team and write if there has been a change @@ -181,10 +167,17 @@ // write on file if there has been a change -(void) viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; + + // end the editing of the current field + if (textFieldBeingEdited != nil) { + [self save:nil]; + } + if (isWriteNeeded) [self writeFile]; } +#pragma mark - // needed by other classes to warn about a user change -(void) setWriteNeeded { isWriteNeeded = YES; @@ -234,40 +227,36 @@ } -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - static NSString *CellIdentifier = @"Cell"; + static NSString *CellIdentifier0 = @"Cell0"; + static NSString *CellIdentifier1 = @"Cell1"; + static NSString *CellIdentifier2 = @"Cell2"; + + NSArray *hogArray; + UITableViewCell *cell; + NSInteger row = [indexPath row]; - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault - reuseIdentifier:CellIdentifier] autorelease]; - if ([indexPath section] != 2) { - // create a uitextfield for each row, expand it to take the maximum size - UITextField *aTextField; - if ([indexPath section] == 1) { - aTextField = [[UITextField alloc] - initWithFrame:CGRectMake(42, 12, (cell.frame.size.width + cell.frame.size.width/3) - 42, 25)]; - } else { - aTextField = [[UITextField alloc] - initWithFrame:CGRectMake(5, 12, (cell.frame.size.width + cell.frame.size.width/3) - 42, 25)]; + switch ([indexPath section]) { + case 0: + + cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier0]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:CellIdentifier0] autorelease]; + // create a uitextfield for each row, expand it to take the maximum size + UITextField *aTextField = [[UITextField alloc] + initWithFrame:CGRectMake(5, 12, (cell.frame.size.width + cell.frame.size.width/3) - 42, 25)]; + aTextField.clearsOnBeginEditing = NO; + aTextField.returnKeyType = UIReturnKeyDone; + aTextField.adjustsFontSizeToFitWidth = YES; + aTextField.delegate = self; + aTextField.tag = [indexPath row]; + aTextField.font = [UIFont boldSystemFontOfSize:[UIFont systemFontSize] + 2]; + aTextField.clearButtonMode = UITextFieldViewModeWhileEditing; + [aTextField addTarget:self action:@selector(save:) forControlEvents:UIControlEventEditingDidEndOnExit]; + [cell.contentView addSubview:aTextField]; + [aTextField release]; } - aTextField.clearsOnBeginEditing = NO; - aTextField.returnKeyType = UIReturnKeyDone; - aTextField.adjustsFontSizeToFitWidth = YES; - aTextField.delegate = self; - aTextField.tag = [indexPath row]; - aTextField.font = [UIFont boldSystemFontOfSize:[UIFont systemFontSize] + 2]; - aTextField.clearButtonMode = UITextFieldViewModeWhileEditing; - [aTextField addTarget:self action:@selector(save:) forControlEvents:UIControlEventEditingDidEndOnExit]; - [cell.contentView addSubview:aTextField]; - [aTextField release]; - } - } - - NSArray *hogArray; - NSInteger row = [indexPath row]; - switch ([indexPath section]) { - case 0: cell.imageView.image = nil; cell.accessoryType = UITableViewCellAccessoryNone; for (UIView *oneView in cell.contentView.subviews) { @@ -280,8 +269,28 @@ } break; case 1: + cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier1]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:CellIdentifier1] autorelease]; + + // create a uitextfield for each row, expand it to take the maximum size + UITextField *aTextField = [[UITextField alloc] + initWithFrame:CGRectMake(42, 12, (cell.frame.size.width + cell.frame.size.width/3) - 42, 25)]; + aTextField.clearsOnBeginEditing = NO; + aTextField.returnKeyType = UIReturnKeyDone; + aTextField.adjustsFontSizeToFitWidth = YES; + aTextField.delegate = self; + aTextField.tag = [indexPath row]; + aTextField.font = [UIFont boldSystemFontOfSize:[UIFont systemFontSize] + 2]; + aTextField.clearButtonMode = UITextFieldViewModeWhileEditing; + [aTextField addTarget:self action:@selector(save:) forControlEvents:UIControlEventEditingDidEndOnExit]; + [cell.contentView addSubview:aTextField]; + [aTextField release]; + } + hogArray = [self.teamDictionary objectForKey:@"hedgehogs"]; - + cell.imageView.image = [self.hatArray objectAtIndex:row]; for (UIView *oneView in cell.contentView.subviews) { @@ -291,10 +300,16 @@ textFieldFound.text = [[hogArray objectAtIndex:row] objectForKey:@"hogname"]; } } - + cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton; break; case 2: + cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier2]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:CellIdentifier2] autorelease]; + } + cell.textLabel.text = [self.secondaryItems objectAtIndex:row]; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; switch (row) { @@ -307,8 +322,6 @@ break; } break; - default: - break; } return cell; @@ -319,16 +332,49 @@ #pragma mark Table view delegate -(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { NSInteger row = [indexPath row]; + NSInteger section = [indexPath section]; UITableViewController *nextController; UITableViewCell *cell; - switch ([indexPath section]) { - case 2: - //TODO: this part should be rewrittend with lazy loading instead of an array of controllers - nextController = [secondaryControllers objectAtIndex:row%2 ]; //TODO: fix the objectAtIndex + + switch (section) { + case 2: //secondary items + switch (row) { + case 0: // grave + if (nil == gravesViewController) + gravesViewController = [[GravesViewController alloc] initWithStyle:UITableViewStyleGrouped]; + + nextController = gravesViewController; + break; + case 1: // voice + if (nil == voicesViewController) + voicesViewController = [[VoicesViewController alloc] initWithStyle:UITableViewStyleGrouped]; + + nextController = voicesViewController; + break; + case 2: // fort + if (nil == fortsViewController) + fortsViewController = [[FortsViewController alloc] initWithStyle:UITableViewStyleGrouped]; + + nextController = fortsViewController; + break; + case 3: // flag + if (nil == flagsViewController) + flagsViewController = [[FlagsViewController alloc] initWithStyle:UITableViewStyleGrouped]; + + nextController = flagsViewController; + break; + case 4: // level + if (nil == levelViewController) + levelViewController = [[LevelViewController alloc] initWithStyle:UITableViewStyleGrouped]; + + nextController = levelViewController; + break; + } + nextController.title = [secondaryItems objectAtIndex:row]; [nextController setTeamDictionary:teamDictionary]; [self.navigationController pushViewController:nextController animated:YES]; - break; + break; default: cell = [aTableView cellForRowAtIndexPath:indexPath]; for (UIView *oneView in cell.contentView.subviews) { @@ -340,19 +386,20 @@ [aTableView deselectRowAtIndexPath:indexPath animated:NO]; break; } + } // action to perform when you want to change a hog hat --(void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { - if (nil == hogChildController) { - hogChildController = [[HogHatViewController alloc] initWithStyle:UITableViewStyleGrouped]; +-(void) tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { + if (nil == hogHatViewController) { + hogHatViewController = [[HogHatViewController alloc] initWithStyle:UITableViewStyleGrouped]; } // cache the dictionary file of the team, so that other controllers can modify it - hogChildController.teamDictionary = self.teamDictionary; - hogChildController.selectedHog = [indexPath row]; + hogHatViewController.teamDictionary = self.teamDictionary; + hogHatViewController.selectedHog = [indexPath row]; - [self.navigationController pushViewController:hogChildController animated:YES]; + [self.navigationController pushViewController:hogHatViewController animated:YES]; } @@ -370,8 +417,10 @@ self.teamName = nil; self.hatArray = nil; self.secondaryItems = nil; - self.secondaryControllers = nil; - hogChildController = nil; + hogHatViewController = nil; + flagsViewController = nil; + fortsViewController = nil; + gravesViewController = nil; [super viewDidUnload]; } @@ -381,8 +430,10 @@ [teamName release]; [hatArray release]; [secondaryItems release]; - [secondaryControllers release]; - [hogChildController release]; + [hogHatViewController release]; + [fortsViewController release]; + [gravesViewController release]; + [flagsViewController release]; [super dealloc]; } diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/VoicesViewController.h --- a/cocoaTouch/VoicesViewController.h Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/VoicesViewController.h Tue Apr 13 22:45:46 2010 +0000 @@ -11,17 +11,16 @@ @interface VoicesViewController : UITableViewController { - NSDictionary *teamDictionary; + NSMutableDictionary *teamDictionary; NSArray *voiceArray; NSIndexPath *lastIndexPath; - Mix_Music *musicBeingPlayed; + Mix_Chunk *voiceBeingPlayed; } -@property (nonatomic,retain) NSDictionary *teamDictionary; +@property (nonatomic,retain) NSMutableDictionary *teamDictionary; @property (nonatomic,retain) NSArray *voiceArray; @property (nonatomic,retain) NSIndexPath *lastIndexPath; -@property (nonatomic,retain) Mix_Music *musicBeingPlayed; @end diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/VoicesViewController.m --- a/cocoaTouch/VoicesViewController.m Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/VoicesViewController.m Tue Apr 13 22:45:46 2010 +0000 @@ -6,12 +6,12 @@ // Copyright 2010 __MyCompanyName__. All rights reserved. // -#import "HogHatViewController.h" +#import "VoicesViewController.h" #import "CommodityFunctions.h" @implementation VoicesViewController -@synthesize teamDictionary, voiceArray, lastIndexPath, musicBeingPlayed; +@synthesize teamDictionary, voiceArray, lastIndexPath; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { @@ -26,12 +26,11 @@ srandom(time(NULL)); Mix_OpenAudio(44100, AUDIO_S16SYS, 2, 1024); - musicBeingPlayed = NULL; + voiceBeingPlayed = NULL; // load all the voices names and store them into voiceArray NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:VOICES_DIRECTORY() error:NULL]; self.voiceArray = array; - [array release]; } - (void)viewWillAppear:(BOOL)animated { @@ -49,10 +48,10 @@ - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; - if(musicBeingPlayed != NULL) { - Mix_HaltMusic(); - Mix_FreeMusic(musicBeingPlayed); - musicBeingPlayed = NULL; + if(voiceBeingPlayed != NULL) { + Mix_HaltChannel(-1); + Mix_FreeChunk(voiceBeingPlayed); + voiceBeingPlayed = NULL; } } @@ -135,16 +134,22 @@ return YES; } */ - +-(void) allowSelection { + self.tableView.allowsSelection = YES; +} #pragma mark - #pragma mark Table view delegate -- (void)tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { +-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { int newRow = [indexPath row]; int oldRow = (lastIndexPath != nil) ? [lastIndexPath row] : -1; + // avoid a crash in sdl_mixer + self.tableView.allowsSelection = NO; + [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(allowSelection) userInfo:nil repeats:NO]; + if (newRow != oldRow) { - [teamDictionary setObject:[voiceArray objectAtIndex:newRow] forKey:@"voicepack"]; + [teamDictionary setObject:[voiceArray objectAtIndex:newRow] forKey:@"voicepack"]; // tell our boss to write this new stuff on disk [[NSNotificationCenter defaultCenter] postNotificationName:@"setWriteNeedTeams" object:nil]; @@ -154,30 +159,31 @@ [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone]; } [self.tableView deselectRowAtIndexPath:indexPath animated:YES]; - - if(musicBeingPlayed != NULL) { - Mix_HaltMusic(); - Mix_FreeMusic(musicBeingPlayed); - musicBeingPlayed = NULL; + + if (voiceBeingPlayed != NULL) { + Mix_HaltChannel(-1); + Mix_FreeChunk(voiceBeingPlayed); + voiceBeingPlayed = NULL; } + // the keyword static prevents re-initialization of the variable - NSString *voiceDir = [[NSString alloc] initWithFormat:@"%@/%@/",VOICES_DIRECTORY(),[voiceArray objectAtIndex:newRow]; + NSString *voiceDir = [[NSString alloc] initWithFormat:@"%@/%@/",VOICES_DIRECTORY(),[voiceArray objectAtIndex:newRow]]; NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:voiceDir error:NULL]; - + int index = random() % [array count]; - music = Mix_LoadMUS([[voiceDir stringByAppendingString:[array objectAtIndex:index]] UTF8String]); - [array release]; + voiceBeingPlayed = Mix_LoadWAV([[voiceDir stringByAppendingString:[array objectAtIndex:index]] UTF8String]); [voiceDir release]; + Mix_PlayChannel(-1, voiceBeingPlayed, 0); } #pragma mark - #pragma mark Memory management - (void)didReceiveMemoryWarning { - Mix_HaltMusic(); - Mix_FreeMusic(musicBeingPlayed); - musicBeingPlayed = NULL; + Mix_HaltChannel(-1); + Mix_FreeChunk(voiceBeingPlayed); + voiceBeingPlayed = NULL; // Releases the view if it doesn't have a superview. [super didReceiveMemoryWarning]; // Relinquish ownership any cached data, images, etc that aren't in use. @@ -187,14 +193,13 @@ [super viewDidUnload]; Mix_CloseAudio(); - self.musicBeingPlayed = NULL; + voiceBeingPlayed = NULL; self.lastIndexPath = nil; self.teamDictionary = nil; self.voiceArray = nil; } - (void)dealloc { - [musicBeingPlayed release]; [voiceArray release]; [teamDictionary release]; [lastIndexPath release]; diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/otherSrc/CommodityFunctions.h --- a/cocoaTouch/otherSrc/CommodityFunctions.h Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/otherSrc/CommodityFunctions.h Tue Apr 13 22:45:46 2010 +0000 @@ -17,10 +17,10 @@ #define TEAMS_DIRECTORY() [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) \ objectAtIndex:0] stringByAppendingString:@"/Teams/"] -#define VOICES_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Sounds/voices/"] +#define VOICES_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Sounds/voices/"] #define GRAPHICS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/"] #define HATS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"] -#define FLAGS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Flags/" +#define FLAGS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Flags/"] #define GRAVES_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Graves/"] #define FORTS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Forts/"] diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/otherSrc/CommodityFunctions.m --- a/cocoaTouch/otherSrc/CommodityFunctions.m Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/otherSrc/CommodityFunctions.m Tue Apr 13 22:45:46 2010 +0000 @@ -42,10 +42,10 @@ [theTeam release]; } -UIImage *mergeTwoImages (UIImage *firstImage, UIImage *secondImage) { +UIImage *mergeHogHatSprites (UIImage *firstImage, UIImage *secondImage) { UIGraphicsBeginImageContext(firstImage.size); [firstImage drawAtPoint:CGPointMake(0,0)]; - [secondImage drawAtPoint:CGPointMake(0,-4)]; + [secondImage drawAtPoint:CGPointMake(0,-5)]; UIImage *resultImage = UIGraphicsGetImageFromCurrentImageContext(); UIGraphicsEndImageContext(); return resultImage; // autoreleased diff -r d558bc5a73c5 -r 96dd168b080b cocoaTouch/xib/MainMenuViewController-iPhone.xib --- a/cocoaTouch/xib/MainMenuViewController-iPhone.xib Tue Apr 13 14:39:05 2010 +0000 +++ b/cocoaTouch/xib/MainMenuViewController-iPhone.xib Tue Apr 13 22:45:46 2010 +0000 @@ -37,8 +37,8 @@ IBCocoaTouchFramework - - 292 + + 293 YES @@ -46,6 +46,7 @@ 274 {{0, 21}, {480, 278}} + 3 MCAwAA @@ -60,9 +61,10 @@ - 292 - {{13, 33}, {240, 52}} + 293 + {{121, 25}, {240, 52}} + NO NO 4 @@ -75,9 +77,10 @@ - 292 - {{233, 127}, {220, 52}} + 289 + {{240, 102}, {220, 52}} + 1 MCAwIDAgMAA @@ -111,9 +114,10 @@ - 292 - {{233, 231}, {220, 52}} + 265 + {{240, 177}, {220, 52}} + 1 MCAwIDAgMAA @@ -138,9 +142,10 @@ - 292 - {{33, 187}, {220, 52}} + 260 + {{12, 144}, {220, 52}} + 1 MCAwIDAgMAA @@ -168,6 +173,7 @@ 292 {{60, 102}, {145, 21}} + NO YES NO @@ -189,9 +195,10 @@ - 292 - {{313, 49}, {59, 52}} + 269 + {{209, 237}, {59, 52}} + NO NO 2 @@ -212,9 +219,10 @@ - 274 - {480, 21} + 290 + {480, 17} + NO NO 4 @@ -227,9 +235,10 @@ - 274 - {{0, 300}, {480, 20}} + 266 + {{0, 297}, {480, 23}} + NO NO 4 @@ -242,6 +251,8 @@ {480, 320} + + 1 MCAwIDAAA @@ -319,15 +330,15 @@ YES - + + - + + - - @@ -348,11 +359,6 @@ - 36 - - - - 22 @@ -387,6 +393,11 @@ + + 36 + + + diff -r d558bc5a73c5 -r 96dd168b080b project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Tue Apr 13 14:39:05 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Tue Apr 13 22:45:46 2010 +0000 @@ -101,6 +101,9 @@ 6179936D11501D3D00BA94A9 /* arrowRight.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936911501D3D00BA94A9 /* arrowRight.png */; }; 6179936E11501D3D00BA94A9 /* arrowUp.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936A11501D3D00BA94A9 /* arrowUp.png */; }; 617995321150403800BA94A9 /* joyPush.png in Resources */ = {isa = PBXBuildFile; fileRef = 617995311150403800BA94A9 /* joyPush.png */; }; + 618BE5931175126900F22556 /* LevelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 618BE5921175126900F22556 /* LevelViewController.m */; }; + 618BE60311751F4F00F22556 /* GravesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 618BE60211751F4F00F22556 /* GravesViewController.m */; }; + 618BE6A3117527CD00F22556 /* VoicesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 618BE6A2117527CD00F22556 /* VoicesViewController.m */; }; 619C51BF116E40FC0049FD84 /* CommodityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 619C51BE116E40FC0049FD84 /* CommodityFunctions.m */; }; 619C5232116E4E810049FD84 /* FlagsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 619C5231116E4E810049FD84 /* FlagsViewController.m */; }; 619C533E116E70050049FD84 /* FortsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 619C533D116E70050049FD84 /* FortsViewController.m */; }; @@ -275,6 +278,12 @@ 6179936911501D3D00BA94A9 /* arrowRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowRight.png; path = ../../cocoaTouch/resources/arrowRight.png; sourceTree = SOURCE_ROOT; }; 6179936A11501D3D00BA94A9 /* arrowUp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowUp.png; path = ../../cocoaTouch/resources/arrowUp.png; sourceTree = SOURCE_ROOT; }; 617995311150403800BA94A9 /* joyPush.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyPush.png; path = ../../cocoaTouch/resources/joyPush.png; sourceTree = SOURCE_ROOT; }; + 618BE5911175126900F22556 /* LevelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LevelViewController.h; path = ../../cocoaTouch/LevelViewController.h; sourceTree = SOURCE_ROOT; }; + 618BE5921175126900F22556 /* LevelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LevelViewController.m; path = ../../cocoaTouch/LevelViewController.m; sourceTree = SOURCE_ROOT; }; + 618BE60111751F4F00F22556 /* GravesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GravesViewController.h; path = ../../cocoaTouch/GravesViewController.h; sourceTree = SOURCE_ROOT; }; + 618BE60211751F4F00F22556 /* GravesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GravesViewController.m; path = ../../cocoaTouch/GravesViewController.m; sourceTree = SOURCE_ROOT; }; + 618BE6A1117527CD00F22556 /* VoicesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VoicesViewController.h; path = ../../cocoaTouch/VoicesViewController.h; sourceTree = SOURCE_ROOT; }; + 618BE6A2117527CD00F22556 /* VoicesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VoicesViewController.m; path = ../../cocoaTouch/VoicesViewController.m; sourceTree = SOURCE_ROOT; }; 619C51BD116E40FC0049FD84 /* CommodityFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommodityFunctions.h; path = ../../cocoaTouch/otherSrc/CommodityFunctions.h; sourceTree = SOURCE_ROOT; }; 619C51BE116E40FC0049FD84 /* CommodityFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommodityFunctions.m; path = ../../cocoaTouch/otherSrc/CommodityFunctions.m; sourceTree = SOURCE_ROOT; }; 619C5230116E4E800049FD84 /* FlagsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FlagsViewController.h; path = ../../cocoaTouch/FlagsViewController.h; sourceTree = SOURCE_ROOT; }; @@ -448,13 +457,15 @@ path = Classes; sourceTree = ""; }; - 611B0A94116B621600112153 /* General */ = { + 611B0A94116B621600112153 /* first level */ = { isa = PBXGroup; children = ( 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */, 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */, + 61A11ACD1168DB1B00359010 /* TeamSettingsViewController.h */, + 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */, ); - name = General; + name = "first level"; sourceTree = ""; }; 61798860114AA49D00BA94A9 /* SDLOverrides */ = { @@ -550,6 +561,25 @@ name = buttons; sourceTree = ""; }; + 618BE596117512A300F22556 /* third level */ = { + isa = PBXGroup; + children = ( + 61A11AE21168DC9400359010 /* HogHatViewController.h */, + 61A11AE31168DC9400359010 /* HogHatViewController.m */, + 618BE60111751F4F00F22556 /* GravesViewController.h */, + 618BE60211751F4F00F22556 /* GravesViewController.m */, + 618BE6A1117527CD00F22556 /* VoicesViewController.h */, + 618BE6A2117527CD00F22556 /* VoicesViewController.m */, + 619C533C116E70050049FD84 /* FortsViewController.h */, + 619C533D116E70050049FD84 /* FortsViewController.m */, + 619C5230116E4E800049FD84 /* FlagsViewController.h */, + 619C5231116E4E810049FD84 /* FlagsViewController.m */, + 618BE5911175126900F22556 /* LevelViewController.h */, + 618BE5921175126900F22556 /* LevelViewController.m */, + ); + name = "third level"; + sourceTree = ""; + }; 61A118481168371400359010 /* Frontend */ = { isa = PBXGroup; children = ( @@ -573,27 +603,20 @@ 61A11AC81168DA9400359010 /* MasterViewController.m */, 61A11AD41168DB3700359010 /* DetailViewController.h */, 61A11AD51168DB3700359010 /* DetailViewController.m */, - 611B0A94116B621600112153 /* General */, - 61A11AD01168DB1F00359010 /* Teams */, + 611B0A94116B621600112153 /* first level */, + 61A11AD01168DB1F00359010 /* second level */, + 618BE596117512A300F22556 /* third level */, ); name = Settings; sourceTree = ""; }; - 61A11AD01168DB1F00359010 /* Teams */ = { + 61A11AD01168DB1F00359010 /* second level */ = { isa = PBXGroup; children = ( - 61A11ACD1168DB1B00359010 /* TeamSettingsViewController.h */, - 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */, 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */, 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */, - 61A11AE21168DC9400359010 /* HogHatViewController.h */, - 61A11AE31168DC9400359010 /* HogHatViewController.m */, - 619C5230116E4E800049FD84 /* FlagsViewController.h */, - 619C5231116E4E810049FD84 /* FlagsViewController.m */, - 619C533C116E70050049FD84 /* FortsViewController.h */, - 619C533D116E70050049FD84 /* FortsViewController.m */, ); - name = Teams; + name = "second level"; sourceTree = ""; }; 61CE2509115E74260098C467 /* XIB */ = { @@ -821,7 +844,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#copy new stuff over old stuff\nsvn export --force ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#the following ones must be removed when their support is implemented\n\n#delete all sound files\nrm -rf ${PROJECT_DIR}/Data/Sounds/\nrm -rf ${PROJECT_DIR}/Data/Music/\n\n#delete all names\nrm -rf ${PROJECT_DIR}/Data/Names/\n\n#delete all missions\nrm -rf ${PROJECT_DIR}/Data/Missions/\n\n#delete all reserved hats\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/"; + shellScript = "#copy new stuff over old stuff\nsvn export --force ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#the following ones must be removed when their support is implemented\n\n#delete all sound files\n#rm -rf ${PROJECT_DIR}/Data/Sounds/\n#rm -rf ${PROJECT_DIR}/Data/Music/\n\n#delete all names\nrm -rf ${PROJECT_DIR}/Data/Names/\n\n#delete all missions\nrm -rf ${PROJECT_DIR}/Data/Missions/\n\n#delete all reserved hats\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/"; showEnvVarsInLog = 0; }; 9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = { @@ -916,6 +939,9 @@ 619C5232116E4E810049FD84 /* FlagsViewController.m in Sources */, 619C533E116E70050049FD84 /* FortsViewController.m in Sources */, 619C58AB116E752A0049FD84 /* UIImageScale.m in Sources */, + 618BE5931175126900F22556 /* LevelViewController.m in Sources */, + 618BE60311751F4F00F22556 /* GravesViewController.m in Sources */, + 618BE6A3117527CD00F22556 /* VoicesViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1036,6 +1062,7 @@ "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/src\"/**", "\"$(SRCROOT)/../../../Library/lpng141\"", "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_net\"", + "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer\"", ); ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( @@ -1072,6 +1099,7 @@ "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/src\"/**", "\"$(SRCROOT)/../../../Library/lpng141\"", "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_net\"", + "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer\"", ); OTHER_LDFLAGS = ( "-lz", diff -r d558bc5a73c5 -r 96dd168b080b project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Tue Apr 13 14:39:05 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Tue Apr 13 22:45:46 2010 +0000 @@ -202,24 +202,24 @@ Content PBXProjectModuleGUID - 61D96593117182B1001EB3B4 + 618BE70F11752C5200F22556 PBXProjectModuleLabel - OverlayViewController.m + SDL_mixer.h PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 61D96594117182B1001EB3B4 + 618BE71011752C5200F22556 PBXProjectModuleLabel - OverlayViewController.m + SDL_mixer.h _historyCapacity 0 bookmark - 61D965C2117184C7001EB3B4 + 618BE74711752E6200F22556 history - 61D9659D1171832F001EB3B4 + 618BE71111752C5200F22556 SplitCount @@ -231,11 +231,11 @@ Geometry Frame - {{0, 20}, {938, 870}} + {{0, 20}, {1002, 681}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 892 245 938 911 0 0 1920 1178 + 107 367 1002 722 0 0 1920 1178 @@ -270,6 +270,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -293,7 +295,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 246 + 244 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -310,21 +312,24 @@ 61A11AC31168DA2B00359010 611B0A94116B621600112153 61A11AD01168DB1F00359010 + 618BE596117512A300F22556 29B97317FDCFA39411CA2CEA 1C37FBAC04509CD000000102 + 618BE6D11175291600F22556 1C37FAAC04509CD000000102 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 37 36 + 4 + 2 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 355}, {246, 558}} + {{0, 164}, {244, 558}} PBXTopSmartGroupGIDs @@ -336,19 +341,19 @@ GeometryConfiguration Frame - {{0, 0}, {263, 576}} + {{0, 0}, {261, 576}} GroupTreeTableConfiguration MainColumn - 246 + 244 RubberWindowFrame - 634 550 801 617 0 0 1920 1178 + 357 355 801 617 0 0 1920 1178 Module PBXSmartGroupTreeModule Proportion - 263pt + 261pt Dock @@ -359,7 +364,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - OverlayViewController.m + SDL_audiotypecvt.c PBXSplitModuleInNavigatorKey Split0 @@ -367,11 +372,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - OverlayViewController.m + SDL_audiotypecvt.c _historyCapacity 0 bookmark - 61D965C1117184C7001EB3B4 + 618BE74511752E6200F22556 history 6179889D114AA5BD00BA94A9 @@ -503,9 +508,7 @@ 619C52BD116E56330049FD84 619C52BF116E56330049FD84 619C52C1116E56330049FD84 - 619C5352116E72260049FD84 619C5373116E731F0049FD84 - 619C5858116E73B00049FD84 619C5859116E73B00049FD84 619C585B116E73B00049FD84 619C585D116E73B00049FD84 @@ -544,22 +547,33 @@ 6196317D116E89DF00C47CEE 61F8E0D6116E98A900108149 6157F7BA116F3B2D005E4A26 - 6188FE02116F5136004F3690 6188FE60116F77AF004F3690 - 6188FE61116F77AF004F3690 617E1DB5116FEE5B002EF3D8 - 617E1DB6116FEE5B002EF3D8 - 617B27B61171617A004A76A2 617B27B71171617A004A76A2 617B27B81171617A004A76A2 617B27B91171617A004A76A2 617B27BA1171617A004A76A2 - 617B27ED117163F6004A76A2 617B280E117164FC004A76A2 61D96559117180D9001EB3B4 - 61D9655A117180D9001EB3B4 61D96591117182B1001EB3B4 - 617B280D117164FC004A76A2 + 618BE56311750F6B00F22556 + 618BE56511750F6B00F22556 + 618BE56611750F6B00F22556 + 618BE599117512E400F22556 + 618BE59A117512E400F22556 + 618BE5FD11751F1C00F22556 + 618BE5FE11751F1C00F22556 + 618BE61E117520B700F22556 + 618BE6C2117528B200F22556 + 618BE6C3117528B200F22556 + 618BE6E81175298700F22556 + 618BE70011752C5200F22556 + 618BE70111752C5200F22556 + 618BE70311752C5200F22556 + 618BE70511752C5200F22556 + 618BE70711752C5200F22556 + 618BE72C11752D7900F22556 + 618BE72D11752D7900F22556 SplitCount @@ -571,18 +585,16 @@ GeometryConfiguration Frame - {{0, 0}, {533, 345}} + {{0, 0}, {535, 328}} RubberWindowFrame - 634 550 801 617 0 0 1920 1178 + 357 355 801 617 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 345pt + 328pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -593,18 +605,18 @@ GeometryConfiguration Frame - {{0, 350}, {533, 226}} + {{0, 333}, {535, 243}} RubberWindowFrame - 634 550 801 617 0 0 1920 1178 + 357 355 801 617 0 0 1920 1178 Module XCDetailModule Proportion - 226pt + 243pt Proportion - 533pt + 535pt Name @@ -619,9 +631,9 @@ TableOfContents - 61D9655D117180D9001EB3B4 + 618BE52B11750CEC00F22556 1CE0B1FE06471DED0097A5F4 - 61D9655E117180D9001EB3B4 + 618BE52C11750CEC00F22556 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -759,17 +771,20 @@ 5 WindowOrderList - 61D965C3117184C7001EB3B4 - 61D9656D117180D9001EB3B4 - 61D9656E117180D9001EB3B4 + 618BE73011752D7900F22556 + 618BE6CB117528B200F22556 + 618BE5BE11751B1300F22556 + 618BE59E117512E400F22556 + 618BE57711750F6B00F22556 + 618BE57811750F6B00F22556 1CD10A99069EF8BA00B06720 61798848114AA42600BA94A9 - 61D96593117182B1001EB3B4 + 618BE70F11752C5200F22556 + 1C78EAAD065D492600B07095 /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 1C78EAAD065D492600B07095 WindowString - 634 550 801 617 0 0 1920 1178 + 357 355 801 617 0 0 1920 1178 WindowToolsV3 @@ -790,7 +805,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + VoicesViewController.m StatusBarVisibility @@ -799,7 +814,7 @@ Frame {{0, 0}, {605, 307}} RubberWindowFrame - 787 221 605 638 0 0 1920 1178 + 1146 372 605 638 0 0 1920 1178 Module PBXNavigatorGroup @@ -825,7 +840,7 @@ Frame {{0, 312}, {605, 285}} RubberWindowFrame - 787 221 605 638 0 0 1920 1178 + 1146 372 605 638 0 0 1920 1178 Module PBXBuildResultsModule @@ -848,7 +863,7 @@ TableOfContents 61798848114AA42600BA94A9 - 61D96564117180D9001EB3B4 + 618BE52D11750CEC00F22556 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -857,7 +872,7 @@ WindowContentMinSize 486 300 WindowString - 787 221 605 638 0 0 1920 1178 + 1146 372 605 638 0 0 1920 1178 WindowToolGUID 61798848114AA42600BA94A9 WindowToolIsVisible @@ -946,10 +961,10 @@ Frame {{412, 0}, {411, 253}} RubberWindowFrame - 807 238 823 519 0 0 1920 1178 + 558 215 823 519 0 0 1920 1178 RubberWindowFrame - 807 238 823 519 0 0 1920 1178 + 558 215 823 519 0 0 1920 1178 Module PBXDebugSessionModule @@ -972,18 +987,18 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 61D96565117180D9001EB3B4 + 618BE56F11750F6B00F22556 1C162984064C10D400B95A72 - 61D96566117180D9001EB3B4 - 61D96567117180D9001EB3B4 - 61D96568117180D9001EB3B4 - 61D96569117180D9001EB3B4 - 61D9656A117180D9001EB3B4 + 618BE57011750F6B00F22556 + 618BE57111750F6B00F22556 + 618BE57211750F6B00F22556 + 618BE57311750F6B00F22556 + 618BE57411750F6B00F22556 ToolbarConfiguration xcode.toolbar.config.debugV3 WindowString - 807 238 823 519 0 0 1920 1178 + 558 215 823 519 0 0 1920 1178 WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible @@ -1117,18 +1132,18 @@ GeometryConfiguration Frame - {{0, 0}, {656, 344}} + {{0, 0}, {750, 328}} RubberWindowFrame - 20 793 656 385 0 0 1920 1178 + 20 809 750 369 0 0 1920 1178 Module PBXDebugCLIModule Proportion - 344pt + 328pt Proportion - 344pt + 328pt Name @@ -1142,13 +1157,13 @@ TableOfContents 1C78EAAD065D492600B07095 - 61D9656B117180D9001EB3B4 + 618BE57511750F6B00F22556 1C78EAAC065D492600B07095 ToolbarConfiguration xcode.toolbar.config.consoleV3 WindowString - 20 793 656 385 0 0 1920 1178 + 20 809 750 369 0 0 1920 1178 WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible diff -r d558bc5a73c5 -r 96dd168b080b project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Tue Apr 13 14:39:05 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Tue Apr 13 22:45:46 2010 +0000 @@ -9,7 +9,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { activeBuildConfigurationName = Debug; activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */; - activeSDKPreference = iphonesimulator3.2; + activeSDKPreference = iphonesimulator3.0; activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */; addToTargets = ( 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */, @@ -68,7 +68,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 294, + 296, 20, 48, 43, @@ -90,7 +90,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 254, + 256, 60, 20, 48, @@ -107,234 +107,208 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 292650196; - PBXWorkspaceStateSaveDate = 292650196; + PBXPerProjectTemplateStateSaveDate = 292883685; + PBXWorkspaceStateSaveDate = 292883685; }; perUserProjectItems = { - 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 */; + 61056377116C0393003C420C /* PBXBookmark */ = 61056377116C0393003C420C /* PBXBookmark */; + 610563DF116C15E5003C420C /* PBXTextBookmark */ = 610563DF116C15E5003C420C /* 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 */; + 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 */; + 617B27B71171617A004A76A2 /* PBXTextBookmark */ = 617B27B71171617A004A76A2 /* PBXTextBookmark */; + 617B27B81171617A004A76A2 /* PBXTextBookmark */ = 617B27B81171617A004A76A2 /* PBXTextBookmark */; + 617B27B91171617A004A76A2 /* PBXTextBookmark */ = 617B27B91171617A004A76A2 /* PBXTextBookmark */; + 617B27BA1171617A004A76A2 /* PBXTextBookmark */ = 617B27BA1171617A004A76A2 /* PBXTextBookmark */; + 617B280E117164FC004A76A2 /* PBXTextBookmark */ = 617B280E117164FC004A76A2 /* PBXTextBookmark */; + 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */ = 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */; + 6188FE60116F77AF004F3690 /* PBXTextBookmark */ = 6188FE60116F77AF004F3690 /* PBXTextBookmark */; + 618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */; + 618BE56311750F6B00F22556 /* PBXTextBookmark */ = 618BE56311750F6B00F22556 /* PBXTextBookmark */; + 618BE56511750F6B00F22556 /* PBXTextBookmark */ = 618BE56511750F6B00F22556 /* PBXTextBookmark */; + 618BE56611750F6B00F22556 /* PBXTextBookmark */ = 618BE56611750F6B00F22556 /* PBXTextBookmark */; + 618BE599117512E400F22556 /* PBXTextBookmark */ = 618BE599117512E400F22556 /* PBXTextBookmark */; + 618BE59A117512E400F22556 /* PBXTextBookmark */ = 618BE59A117512E400F22556 /* PBXTextBookmark */; + 618BE5FD11751F1C00F22556 /* PBXTextBookmark */ = 618BE5FD11751F1C00F22556 /* PBXTextBookmark */; + 618BE5FE11751F1C00F22556 /* PBXTextBookmark */ = 618BE5FE11751F1C00F22556 /* PBXTextBookmark */; + 618BE61E117520B700F22556 /* PBXTextBookmark */ = 618BE61E117520B700F22556 /* PBXTextBookmark */; + 618BE6C2117528B200F22556 /* PBXTextBookmark */ = 618BE6C2117528B200F22556 /* PBXTextBookmark */; + 618BE6C3117528B200F22556 /* PBXTextBookmark */ = 618BE6C3117528B200F22556 /* PBXTextBookmark */; + 618BE6E81175298700F22556 /* PBXTextBookmark */ = 618BE6E81175298700F22556 /* PBXTextBookmark */; + 618BE70011752C5200F22556 /* PBXTextBookmark */ = 618BE70011752C5200F22556 /* PBXTextBookmark */; + 618BE70111752C5200F22556 /* PBXTextBookmark */ = 618BE70111752C5200F22556 /* PBXTextBookmark */; + 618BE70311752C5200F22556 /* PBXTextBookmark */ = 618BE70311752C5200F22556 /* PBXTextBookmark */; + 618BE70511752C5200F22556 /* PBXTextBookmark */ = 618BE70511752C5200F22556 /* PBXTextBookmark */; + 618BE70711752C5200F22556 /* PBXTextBookmark */ = 618BE70711752C5200F22556 /* PBXTextBookmark */; + 618BE71111752C5200F22556 /* PBXTextBookmark */ = 618BE71111752C5200F22556 /* PBXTextBookmark */; + 618BE72C11752D7900F22556 /* PBXTextBookmark */ = 618BE72C11752D7900F22556 /* PBXTextBookmark */; + 618BE72D11752D7900F22556 /* PBXTextBookmark */ = 618BE72D11752D7900F22556 /* PBXTextBookmark */; + 618BE74511752E6200F22556 /* PBXTextBookmark */ = 618BE74511752E6200F22556 /* PBXTextBookmark */; + 618BE74711752E6200F22556 /* PBXTextBookmark */ = 618BE74711752E6200F22556 /* PBXTextBookmark */; + 6196317D116E89DF00C47CEE /* PBXTextBookmark */ = 6196317D116E89DF00C47CEE /* PBXTextBookmark */; + 619C51C6116E42850049FD84 /* PBXTextBookmark */ = 619C51C6116E42850049FD84 /* 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 */; + 619C5373116E731F0049FD84 /* PBXTextBookmark */ = 619C5373116E731F0049FD84 /* 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 */; + 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 */; + 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */ = 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 */; + 61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */; + 61F8E0D6116E98A900108149 /* PBXTextBookmark */ = 61F8E0D6116E98A900108149 /* PBXTextBookmark */; + 61FE2AE4116D658700F76CDC /* PBXTextBookmark */ = 61FE2AE4116D658700F76CDC /* PBXTextBookmark */; }; sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */; userBuildSettings = { @@ -537,7 +511,7 @@ fRef = 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */; name = "SingleTeamViewController.h: 19"; rLen = 0; - rLoc = 524; + rLoc = 631; rType = 0; vrLen = 213; vrLoc = 337; @@ -976,9 +950,9 @@ }; 61798856114AA48A00BA94A9 /* CGPointUtils.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {733, 533}}"; - sepNavSelRange = "{607, 0}"; - sepNavVisRange = "{34, 602}"; + sepNavIntBoundsRect = "{{0, 0}, {544, 559}}"; + sepNavSelRange = "{423, 0}"; + sepNavVisRange = "{34, 609}"; sepNavWindowFrame = "{{107, 411}, {960, 678}}"; }; }; @@ -1138,16 +1112,6 @@ 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 */; @@ -1188,26 +1152,6 @@ 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 */; @@ -1228,36 +1172,6 @@ vrLen = 144; vrLoc = 0; }; - 617E1DB6116FEE5B002EF3D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AE21168DC9400359010 /* HogHatViewController.h */; - name = "HogHatViewController.h: 24"; - rLen = 0; - rLoc = 547; - rType = 0; - vrLen = 261; - vrLoc = 385; - }; - 6188FE02116F5136004F3690 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; - name = "HogHatViewController.m: 112"; - rLen = 0; - rLoc = 3666; - rType = 0; - vrLen = 185; - vrLoc = 149; - }; - 6188FE18116F6D44004F3690 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 619C533C116E70050049FD84 /* FortsViewController.h */; - name = "FortsViewController.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 143; - vrLoc = 151; - }; 6188FE60116F77AF004F3690 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */; @@ -1268,19 +1182,320 @@ vrLen = 253; vrLoc = 1557; }; - 6188FE61116F77AF004F3690 /* PBXTextBookmark */ = { + 618AFC07115BE92A003D411B /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798A20114ADD2600BA94A9 /* backgroundLeft.png */; + }; + 618BE56311750F6B00F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 18"; + rLen = 0; + rLoc = 422; + rType = 0; + vrLen = 585; + vrLoc = 51; + }; + 618BE56511750F6B00F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 619C51BD116E40FC0049FD84 /* CommodityFunctions.h */; + name = "CommodityFunctions.h: 18"; + rLen = 0; + rLoc = 566; + rType = 0; + vrLen = 1367; + vrLoc = 150; + }; + 618BE56611750F6B00F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 619C51BE116E40FC0049FD84 /* CommodityFunctions.m */; + name = "CommodityFunctions.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 773; + vrLoc = 48; + }; + 618BE5911175126900F22556 /* LevelViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {943, 627}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 586}"; + }; + }; + 618BE5921175126900F22556 /* LevelViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1048, 2587}}"; + sepNavSelRange = "{4973, 0}"; + sepNavVisRange = "{4553, 1451}"; + sepNavWindowFrame = "{{15, 395}, {1002, 778}}"; + }; + }; + 618BE599117512E400F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11ACD1168DB1B00359010 /* TeamSettingsViewController.h */; + name = "TeamSettingsViewController.h: 17"; + rLen = 0; + rLoc = 364; + rType = 0; + vrLen = 429; + vrLoc = 0; + }; + 618BE59A117512E400F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE21168DC9400359010 /* HogHatViewController.h */; + name = "HogHatViewController.h: 24"; + rLen = 0; + rLoc = 547; + rType = 0; + vrLen = 598; + vrLoc = 53; + }; + 618BE5FD11751F1C00F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 319"; + rLen = 0; + rLoc = 13287; + rType = 0; + vrLen = 1448; + vrLoc = 10577; + }; + 618BE5FE11751F1C00F22556 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 619C5230116E4E800049FD84 /* FlagsViewController.h */; name = "FlagsViewController.h: 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 152; + vrLen = 520; + vrLoc = 0; + }; + 618BE60111751F4F00F22556 /* GravesViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {474, 338}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 595}"; + }; + }; + 618BE60211751F4F00F22556 /* GravesViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1048, 2600}}"; + sepNavSelRange = "{5050, 0}"; + sepNavVisRange = "{4224, 1659}"; + sepNavWindowFrame = "{{38, 374}, {1002, 778}}"; + }; + }; + 618BE61E117520B700F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; + name = "HogHatViewController.m: 109"; + rLen = 0; + rLoc = 3614; + rType = 0; + vrLen = 525; + vrLoc = 0; + }; + 618BE6A1117527CD00F22556 /* VoicesViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {943, 625}}"; + sepNavSelRange = "{383, 0}"; + sepNavVisRange = "{0, 578}"; + sepNavWindowFrame = "{{638, 196}, {1002, 778}}"; + }; + }; + 618BE6A2117527CD00F22556 /* VoicesViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {782, 2938}}"; + sepNavSelRange = "{624, 0}"; + sepNavVisRange = "{408, 646}"; + sepNavWindowFrame = "{{692, 148}, {1002, 778}}"; + }; + }; + 618BE6C2117528B200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE60111751F4F00F22556 /* GravesViewController.h */; + name = "GravesViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 595; + vrLoc = 0; + }; + 618BE6C3117528B200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 619C533C116E70050049FD84 /* FortsViewController.h */; + name = "FortsViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 520; + vrLoc = 0; + }; + 618BE6E81175298700F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE6A1117527CD00F22556 /* VoicesViewController.h */; + name = "VoicesViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 399; vrLoc = 0; }; - 618AFC07115BE92A003D411B /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 61798A20114ADD2600BA94A9 /* backgroundLeft.png */; + 618BE70011752C5200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798856114AA48A00BA94A9 /* CGPointUtils.c */; + name = "CGPointUtils.c: 19"; + rLen = 0; + rLoc = 423; + rType = 0; + vrLen = 573; + vrLoc = 34; + }; + 618BE70111752C5200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE70211752C5200F22556 /* SDL_audiocvt.c */; + name = "SDL_audiocvt.c: 796"; + rLen = 0; + rLoc = 25474; + rType = 0; + vrLen = 492; + vrLoc = 25149; + }; + 618BE70211752C5200F22556 /* SDL_audiocvt.c */ = { + isa = PBXFileReference; + name = SDL_audiocvt.c; + path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/audio/SDL_audiocvt.c"; + sourceTree = ""; + }; + 618BE70311752C5200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE70411752C5200F22556 /* music_ogg.c */; + name = "music_ogg.c: 171"; + rLen = 0; + rLoc = 4193; + rType = 0; + vrLen = 545; + vrLoc = 4408; + }; + 618BE70411752C5200F22556 /* music_ogg.c */ = { + isa = PBXFileReference; + name = music_ogg.c; + path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/music_ogg.c"; + sourceTree = ""; + }; + 618BE70511752C5200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE70611752C5200F22556 /* music.c */; + name = "music.c: 285"; + rLen = 0; + rLoc = 6392; + rType = 0; + vrLen = 428; + vrLoc = 6200; + }; + 618BE70611752C5200F22556 /* music.c */ = { + isa = PBXFileReference; + name = music.c; + path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/music.c"; + sourceTree = ""; + }; + 618BE70711752C5200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE70811752C5200F22556 /* mixer.c */; + name = "mixer.c: 276"; + rLen = 0; + rLoc = 6646; + rType = 0; + vrLen = 678; + vrLoc = 6380; + }; + 618BE70811752C5200F22556 /* mixer.c */ = { + isa = PBXFileReference; + name = mixer.c; + path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/mixer.c"; + sourceTree = ""; + }; + 618BE70B11752C5200F22556 /* SDL_audiotypecvt.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = SDL_audiotypecvt.c; + path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/audio/SDL_audiotypecvt.c"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {775, 208949}}"; + sepNavSelRange = "{123570, 0}"; + sepNavVisRange = "{123042, 992}"; + }; + }; + 618BE71111752C5200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE71211752C5200F22556 /* SDL_mixer.h */; + rLen = 1; + rLoc = 148; + rType = 1; + }; + 618BE71211752C5200F22556 /* SDL_mixer.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = SDL_mixer.h; + path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/SDL_mixer.h"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {943, 8775}}"; + sepNavSelRange = "{4362, 9}"; + sepNavVisRange = "{3265, 1642}"; + sepNavWindowFrame = "{{107, 311}, {1002, 778}}"; + }; + }; + 618BE72C11752D7900F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE6A2117527CD00F22556 /* VoicesViewController.m */; + name = "VoicesViewController.m: 47"; + rLen = 0; + rLoc = 1137; + rType = 0; + vrLen = 512; + vrLoc = 943; + }; + 618BE72D11752D7900F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE70B11752C5200F22556 /* SDL_audiotypecvt.c */; + rLen = 0; + rLoc = 3860; + rType = 1; + }; + 618BE74511752E6200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE74611752E6200F22556 /* SDL_audiotypecvt.c */; + name = "SDL_audiotypecvt.c: 3861"; + rLen = 0; + rLoc = 123570; + rType = 0; + vrLen = 992; + vrLoc = 123042; + }; + 618BE74611752E6200F22556 /* SDL_audiotypecvt.c */ = { + isa = PBXFileReference; + name = SDL_audiotypecvt.c; + path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/audio/SDL_audiotypecvt.c"; + sourceTree = ""; + }; + 618BE74711752E6200F22556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618BE74811752E6200F22556 /* SDL_mixer.h */; + name = "SDL_mixer.h: 149"; + rLen = 9; + rLoc = 4362; + rType = 0; + vrLen = 1642; + vrLoc = 3265; + }; + 618BE74811752E6200F22556 /* SDL_mixer.h */ = { + isa = PBXFileReference; + name = SDL_mixer.h; + path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/SDL_mixer.h"; + sourceTree = ""; }; 6196317D116E89DF00C47CEE /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -1294,18 +1509,18 @@ }; 619C51BD116E40FC0049FD84 /* CommodityFunctions.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 664}}"; - sepNavSelRange = "{276, 19}"; - sepNavVisRange = "{0, 1269}"; - sepNavWindowFrame = "{{556, 125}, {1058, 792}}"; + sepNavIntBoundsRect = "{{0, 0}, {852, 403}}"; + sepNavSelRange = "{566, 0}"; + sepNavVisRange = "{150, 1367}"; + sepNavWindowFrame = "{{556, 127}, {1058, 792}}"; }; }; 619C51BE116E40FC0049FD84 /* CommodityFunctions.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {600, 832}}"; - sepNavSelRange = "{214, 0}"; - sepNavVisRange = "{0, 775}"; - sepNavWindowFrame = "{{61, 366}, {1058, 792}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 793}}"; + sepNavSelRange = "{1959, 0}"; + sepNavVisRange = "{182, 2230}"; + sepNavWindowFrame = "{{84, 204}, {1058, 792}}"; }; }; 619C51C6116E42850049FD84 /* PBXTextBookmark */ = { @@ -1313,7 +1528,7 @@ fRef = 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */; name = "PopoverMenuViewController.m: 13"; rLen = 0; - rLoc = 299; + rLoc = 330; rType = 0; vrLen = 7; vrLoc = 0; @@ -1342,15 +1557,15 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {472, 338}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 152}"; + sepNavVisRange = "{0, 520}"; sepNavWindowFrame = "{{86, 212}, {1058, 792}}"; }; }; 619C5231116E4E810049FD84 /* FlagsViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 2496}}"; - sepNavSelRange = "{465, 0}"; - sepNavVisRange = "{0, 1505}"; + sepNavIntBoundsRect = "{{0, 0}, {754, 2483}}"; + sepNavSelRange = "{586, 0}"; + sepNavVisRange = "{320, 855}"; sepNavWindowFrame = "{{67, 264}, {1058, 792}}"; }; }; @@ -2134,9 +2349,9 @@ }; 619C533C116E70050049FD84 /* FortsViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {472, 338}}"; + sepNavIntBoundsRect = "{{0, 0}, {474, 338}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 582}"; + sepNavVisRange = "{0, 520}"; sepNavWindowFrame = "{{628, 243}, {1058, 792}}"; }; }; @@ -2148,16 +2363,6 @@ sepNavWindowFrame = "{{84, 361}, {1058, 792}}"; }; }; - 619C5352116E72260049FD84 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 619C51BD116E40FC0049FD84 /* CommodityFunctions.h */; - name = "CommodityFunctions.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 747; - vrLoc = 0; - }; 619C5373116E731F0049FD84 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 619C5231116E4E810049FD84 /* FlagsViewController.m */; @@ -2168,16 +2373,6 @@ vrLen = 460; vrLoc = 1667; }; - 619C5858116E73B00049FD84 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61798856114AA48A00BA94A9 /* CGPointUtils.c */; - name = "CGPointUtils.c: 19"; - rLen = 0; - rLoc = 423; - rType = 0; - vrLen = 489; - vrLoc = 188; - }; 619C5859116E73B00049FD84 /* PBXBookmark */ = { isa = PBXBookmark; fRef = 619C585A116E73B00049FD84 /* AirBomb.png */; @@ -2525,9 +2720,9 @@ }; 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 1833}}"; - sepNavSelRange = "{468, 0}"; - sepNavVisRange = "{0, 1253}"; + sepNavIntBoundsRect = "{{0, 0}, {670, 1807}}"; + sepNavSelRange = "{288, 0}"; + sepNavVisRange = "{0, 501}"; sepNavWindowFrame = "{{84, 318}, {1058, 792}}"; }; }; @@ -2555,15 +2750,15 @@ }; 61A11AC81168DA9400359010 /* MasterViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {908, 1885}}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 1885}}"; sepNavSelRange = "{2574, 0}"; - sepNavVisRange = "{1909, 929}"; + sepNavVisRange = "{1981, 857}"; sepNavWindowFrame = "{{312, 236}, {1058, 792}}"; }; }; 61A11ACD1168DB1B00359010 /* TeamSettingsViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 641}}"; + sepNavIntBoundsRect = "{{0, 0}, {472, 296}}"; sepNavSelRange = "{364, 0}"; sepNavVisRange = "{0, 429}"; sepNavWindowFrame = "{{730, 203}, {1058, 792}}"; @@ -2595,66 +2790,36 @@ }; 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 639}}"; - sepNavSelRange = "{380, 0}"; - sepNavVisRange = "{0, 965}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 664}}"; + sepNavSelRange = "{755, 0}"; + sepNavVisRange = "{0, 1248}"; sepNavWindowFrame = "{{38, 374}, {1002, 778}}"; }; }; 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 5096}}"; - sepNavSelRange = "{645, 0}"; - sepNavVisRange = "{14005, 1505}"; - sepNavWindowFrame = "{{714, 185}, {1058, 792}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 5525}}"; + sepNavSelRange = "{14780, 0}"; + sepNavVisRange = "{14282, 2328}"; + sepNavWindowFrame = "{{474, 113}, {1058, 792}}"; }; }; 61A11AE21168DC9400359010 /* HogHatViewController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {472, 364}}"; sepNavSelRange = "{547, 0}"; - sepNavVisRange = "{385, 261}"; + sepNavVisRange = "{53, 598}"; sepNavWindowFrame = "{{49, 251}, {1058, 792}}"; }; }; 61A11AE31168DC9400359010 /* HogHatViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {999, 2691}}"; - sepNavSelRange = "{480, 0}"; - sepNavVisRange = "{0, 1780}"; - sepNavWindowFrame = "{{421, 127}, {1058, 792}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 2704}}"; + sepNavSelRange = "{152, 0}"; + sepNavVisRange = "{0, 1704}"; + sepNavWindowFrame = "{{807, 320}, {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 */; @@ -2869,10 +3034,10 @@ }; 61CE250C115E749A0098C467 /* OverlayViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {915, 4147}}"; - sepNavSelRange = "{363, 0}"; - sepNavVisRange = "{0, 2200}"; - sepNavWindowFrame = "{{526, 189}, {938, 967}}"; + sepNavIntBoundsRect = "{{0, 0}, {915, 4550}}"; + sepNavSelRange = "{422, 0}"; + sepNavVisRange = "{1924, 2141}"; + sepNavWindowFrame = "{{892, 189}, {938, 967}}"; }; }; 61CE251F115E75A70098C467 /* PBXBookmark */ = { @@ -2899,176 +3064,6 @@ 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 */; @@ -3079,186 +3074,6 @@ 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 */;