# HG changeset patch # User koda # Date 1270410713 0 # Node ID 91074496d5c980d52e7fc4d775535498e20270fb # Parent 8690a3aa93b5aee160d1fc3eac5c946eb5d936d5 merged code from ipad and iphone frontends (aka HedgewarsMobile is a universal application) diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/DetailViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/DetailViewController.h Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,26 @@ +// +// DetailViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 27/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + +#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_3_2 +@interface DetailViewController : UITableViewController { +#else +@interface DetailViewController : UITableViewController { +#endif + id popoverController; + NSArray *controllers; +} + +// used in iphone version +-(IBAction) dismissSplitView; + +@property (nonatomic, retain) id popoverController; +@property (nonatomic, retain) NSArray * controllers; + +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/DetailViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/DetailViewController.m Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,138 @@ + // +// DetailViewController.m +// HedgewarsMobile +// +// Created by Vittorio on 27/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "DetailViewController.h" +#import "TeamSettingsViewController.h" +#import "SDL_uikitappdelegate.h" + +@implementation DetailViewController +@synthesize popoverController, controllers; + + +- (void)viewDidLoad { + self.title = NSLocalizedString(@"Settings",@""); + + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:0 target:self action:@selector(dismissSplitView)]; + + NSMutableArray *array= [[NSMutableArray alloc] init]; + + TeamSettingsViewController *teamSettingsViewController = [[TeamSettingsViewController alloc] + initWithStyle:UITableViewStyleGrouped]; + teamSettingsViewController.title = NSLocalizedString(@"Teams",@""); + [array addObject:teamSettingsViewController]; + [teamSettingsViewController release]; + + self.controllers = array; + [array release]; + + [super viewDidLoad]; +} + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + self.controllers = nil; + self.popoverController = nil; + [super viewDidUnload]; +} + +- (void)dealloc { + [controllers release]; + [popoverController release]; + [super dealloc]; +} + +#pragma mark - +#pragma mark Table view data source +-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + +-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return [controllers count]; +} + +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *CellIdentifier = @"Cell"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:CellIdentifier] autorelease]; + } + + NSInteger row = [indexPath row]; + UITableViewController *controller = [controllers objectAtIndex:row]; + + cell.textLabel.text = controller.title; + cell.imageView.image = [UIImage imageNamed:@"Icon.png"]; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + + return cell; +} + +-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + NSInteger row = [indexPath row]; + UITableViewController *nextController = [self.controllers objectAtIndex:row]; + [self.navigationController pushViewController:nextController animated:YES]; +} + +/* +#pragma mark - +#pragma mark Managing the popover controller +// When setting the detail item, update the view and dismiss the popover controller if it's showing. +-(void) setDetailItem:(id) newDetailItem { + if (detailItem != newDetailItem) { + [detailItem release]; + detailItem = [newDetailItem retain]; + + // Update the view. + // navigationBar.topItem.title = (NSString*) detailItem; + + //test.text=(NSString*) detailItem; + } + + // if (popoverController != nil) { + // [popoverController dismissPopoverAnimated:YES]; + // } +} +*/ + +#pragma mark - +#pragma mark Split view support +#ifdef __IPHONE_3_2 +-(void) splitViewController:(UISplitViewController*)svc willHideViewController:(UIViewController *)aViewController withBarButtonItem:(UIBarButtonItem*)barButtonItem forPopoverController: (UIPopoverController*)pc { + barButtonItem.title = @"Master List"; + // [navigationBar.topItem setLeftBarButtonItem:barButtonItem animated:YES]; + self.popoverController = pc; +} + +// Called when the view is shown again in the split view, invalidating the button and popover controller. +-(void) splitViewController: (UISplitViewController*)svc willShowViewController:(UIViewController *)aViewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem { + // [navigationBar.topItem setLeftBarButtonItem:nil animated:YES]; + self.popoverController = nil; +} +#endif +#pragma mark - +#pragma mark Rotation support +// Ensure that the view controller supports rotation and that the split view can therefore show in both portrait and landscape. +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +} + +-(IBAction) dismissSplitView { + [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissModalView" object:nil]; +} + +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/HogHatViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/HogHatViewController.h Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,20 @@ +// +// HogHatViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface HogHatViewController : UITableViewController { + NSArray *hatList; + NSDictionary *hog; +} + +@property (nonatomic,retain) NSArray *hatList; +@property (nonatomic,retain) NSDictionary *hog; + +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/HogHatViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/HogHatViewController.m Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,191 @@ +// +// HogHatViewController.m +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "HogHatViewController.h" + + +@implementation HogHatViewController +@synthesize hatList, hog; + +#pragma mark - +#pragma mark View lifecycle + + +- (void)viewDidLoad { + [super viewDidLoad]; + + //NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + NSString *hatPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]; + NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:hatPath + error:NULL]; + self.hatList = array; + //NSLog(@"%@", hatList); +} + +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + self.title = [hog objectForKey:@"hogname"]; + [self.tableView reloadData]; +} + +/* +- (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; +} +*/ +/* +- (void)viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; +} +*/ +/* +- (void)viewDidDisappear:(BOOL)animated { + [super viewDidDisappear:animated]; +} +*/ + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Override to allow orientations other than the default portrait orientation. + return YES; +} + + +#pragma mark - +#pragma mark Table view data source +-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { + return 2; +} + +-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + NSInteger rows; + if (0 == section) + rows = 1; + else + rows = [self.hatList count]; + return rows; +} + +// Customize the appearance of table view cells. +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + static NSString *CellIdentifier = @"Cell"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; + } + + if (0 == [indexPath section]) { + cell.textLabel.text = [hog objectForKey:@"hogname"]; + cell.imageView.image = nil; + cell.accessoryType = UITableViewCellAccessoryNone; + } else { + cell.textLabel.text = [[hatList objectAtIndex:[indexPath row]] stringByDeletingPathExtension]; + if ([cell.textLabel.text isEqualToString:[hog objectForKey:@"hat"]]) { + cell.accessoryType = UITableViewCellAccessoryCheckmark; + } else { + cell.accessoryType = UITableViewCellAccessoryNone; + } + + NSString *hatsPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]; + NSString *hatFile = [hatsPath stringByAppendingString:[hatList objectAtIndex:[indexPath row]]]; + UIImage *image = [UIImage imageWithContentsOfFile: hatFile]; + + CGRect firstSpriteArea = CGRectMake(0, 0, 32, 32); + CGImageRef cgImgage = CGImageCreateWithImageInRect([image CGImage], firstSpriteArea); + cell.imageView.image = [UIImage imageWithCGImage: cgImgage]; + CGImageRelease(cgImgage); + } + + return cell; +} + + +/* +// Override to support conditional editing of the table view. +- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the specified item to be editable. + return YES; +} +*/ + + +/* +// Override to support editing the table view. +- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { + + if (editingStyle == UITableViewCellEditingStyleDelete) { + // Delete the row from the data source + [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; + } + else if (editingStyle == UITableViewCellEditingStyleInsert) { + // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view + } +} +*/ + + +/* +// Override to support rearranging the table view. +- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { +} +*/ + + +/* +// Override to support conditional rearranging of the table view. +- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the item to be re-orderable. + return YES; +} +*/ + + +#pragma mark - +#pragma mark Table view delegate + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + // Navigation logic may go here. Create and push another view controller. + /* + <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil]; + // ... + // Pass the selected object to the new view controller. + [self.navigationController pushViewController:detailViewController animated:YES]; + [detailViewController release]; + */ +} + + +#pragma mark - +#pragma mark Memory management + +- (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 { + [super viewDidUnload]; + self.hatList = nil; + self.hog = nil; + // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand. + // For example: self.myOutlet = nil; +} + + +- (void)dealloc { + [hog release]; + [hatList release]; + [super dealloc]; +} + + +@end + diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/MainMenuViewController.h --- a/cocoaTouch/MainMenuViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ b/cocoaTouch/MainMenuViewController.h Sun Apr 04 19:51:53 2010 +0000 @@ -10,19 +10,16 @@ #import "SettingsViewController.h" @interface MainMenuViewController : UIViewController { - UILabel *versionLabel; - UIView *mainView; - SettingsViewController *settingsViewController; + UIView *cover; + UILabel *versionLabel; } -@property (nonatomic, retain) IBOutlet UILabel *versionLabel; -@property (nonatomic, retain) IBOutlet UIView *mainView; -@property (nonatomic, retain) SettingsViewController *settingsViewController; +@property (nonatomic,retain) UIView *cover; +@property (nonatomic,retain) IBOutlet UILabel *versionLabel; -(void) appear; -(void) disappear; +-(void) hideBehind; --(IBAction) startPlaying; --(IBAction) notYetImplemented; -//-(IBAction) switchViews:(id)sender; +-(IBAction) switchViews:(id)sender; @end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/MainMenuViewController.m --- a/cocoaTouch/MainMenuViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ b/cocoaTouch/MainMenuViewController.m Sun Apr 04 19:51:53 2010 +0000 @@ -9,16 +9,11 @@ #import "MainMenuViewController.h" #import "SDL_uikitappdelegate.h" #import "PascalImports.h" - -// in case we don't want SDL_mixer... -//#import "SoundEffect.h" -//SoundEffect *erasingSound = [[SoundEffect alloc] initWithContentsOfFile:[mainBundle pathForResource:@"Erase" ofType:@"caf"]]; -//SoundEffect *selectSound = [[SoundEffect alloc] initWithContentsOfFile:[mainBundle pathForResource:@"Select" ofType:@"caf"]]; +#import "SplitViewRootController.h" @implementation MainMenuViewController - -@synthesize versionLabel, settingsViewController, mainView; +@synthesize cover, versionLabel; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); @@ -26,49 +21,43 @@ - (void)didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. + self.cover = nil; + self.versionLabel = nil; [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. - if (nil == self.settingsViewController.view.superview) { - self.settingsViewController = nil; - [settingsViewController release]; - } +} + +- (void)dealloc { + [versionLabel release]; + [cover release]; + [super dealloc]; +} + +-(void) viewDidUnload { + self.cover = nil; + [super viewDidUnload]; } -(void) viewDidLoad { - [NSThread detachNewThreadSelector:@selector(checkFirstRun) toTarget:self withObject:nil]; - + char *ver; HW_versionInfo(NULL, &ver); NSString *versionNumber = [[NSString alloc] initWithCString:ver]; self.versionLabel.text = versionNumber; [versionNumber release]; - - [super viewDidLoad]; -} -- (void)viewDidUnload { - // Release any retained subviews of the main view. - self.versionLabel = nil; + // initialize some files the first time we load the game + [NSThread detachNewThreadSelector:@selector(checkFirstRun) toTarget:self withObject:nil]; + // listen to request to remove the modalviewcontroller + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(dismissModalViewController) + name: @"dismissModalView" + object:nil]; + + [super viewDidLoad]; } -- (void)dealloc { - [versionLabel release]; - [settingsViewController release]; - [super dealloc]; -} - -// disable the buttons when to prevent launching twice the game --(void) viewWillDisappear:(BOOL)animated { - self.mainView.userInteractionEnabled = NO; - [super viewWillDisappear:animated]; -} - --(void) viewDidAppear:(BOOL)animated { - self.mainView.userInteractionEnabled = YES; - [super viewDidAppear:animated]; -} - +// this is called to verify whether it's the first time the app is launched +// if it is it blocks user interaction with an alertView until files are created -(void) checkFirstRun { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; @@ -78,20 +67,48 @@ NSLog(@"First time run, creating settings files"); // show a popup with an indicator to make the user wait - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"One-time Preferences Configuration",@"") + UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Please wait",@"") message:nil delegate:nil cancelButtonTitle:nil otherButtonTitles:nil]; [alert show]; - + [alert release]; + UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] - initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; + initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; indicator.center = CGPointMake(alert.bounds.size.width / 2, alert.bounds.size.height - 50); [indicator startAnimating]; [alert addSubview:indicator]; [indicator release]; + // create Default Team.plist + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + NSString *teamsDirectory = [[paths objectAtIndex:0] stringByAppendingString:@"Teams/"]; + [[NSFileManager defaultManager] createDirectoryAtPath:teamsDirectory + withIntermediateDirectories:NO + attributes:nil + error:NULL]; + + NSMutableArray *hedgehogs = [[NSMutableArray alloc] init]; + + for (int i = 0; i < 8; i++) { + NSString *hogName = [[NSString alloc] initWithFormat:@"hedgehog %d",i]; + NSDictionary *hog = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level", + hogName,@"hogname",@"NoHat",@"hat",nil]; + [hogName release]; + [hedgehogs addObject:hog]; + [hog release]; + } + + NSDictionary *defaultTeam = [[NSDictionary alloc] initWithObjectsAndKeys:@"4421353",@"color",@"0",@"hash", + @"Default Team",@"teamname",@"Statue",@"grave",@"Plane",@"fort", + @"Default",@"voicepack",@"hedgewars",@"flag",hedgehogs,@"hedgehogs",nil]; + [hedgehogs release]; + NSString *defaultTeamFile = [teamsDirectory stringByAppendingString:@"Default Team.plist"]; + [defaultTeam writeToFile:defaultTeamFile atomically:YES]; + [defaultTeam release]; + // create settings.plist NSMutableDictionary *saveDict = [[NSMutableDictionary alloc] init]; @@ -105,15 +122,15 @@ [saveDict release]; // create other files - - // memory cleanup + + // ok let the user take control [alert dismissWithClickedButtonIndex:0 animated:YES]; - [alert release]; } [pool release]; [NSThread exit]; } +#pragma mark - -(void) appear { [[SDLUIKitDelegate sharedAppDelegate].uiwindow addSubview:self.view]; [self release]; @@ -122,9 +139,14 @@ [UIView setAnimationDuration:1]; self.view.alpha = 1; [UIView commitAnimations]; + + [NSTimer scheduledTimerWithTimeInterval:0.7 target:self selector:@selector(hideBehind) userInfo:nil repeats:NO]; } -(void) disappear { + if (nil != cover) + [cover release]; + [UIView beginAnimations:@"removing main controller" context:NULL]; [UIView setAnimationDuration:1]; self.view.alpha = 0; @@ -134,43 +156,45 @@ [self.view removeFromSuperview]; } -#pragma mark - -#pragma mark Action buttons --(IBAction) startPlaying { - [[SDLUIKitDelegate sharedAppDelegate] startSDLgame]; -} - --(IBAction) notYetImplemented { - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Not Yet Implemented" - message:@"Sorry, this feature is not yet implemented" - delegate:nil - cancelButtonTitle:@"Well, don't worry" - otherButtonTitles:nil]; - [alert show]; - [alert release]; +// this is a silly way to hide the sdl contex that remained active +-(void) hideBehind { + if (nil == cover) { + cover= [[UIView alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; + cover.backgroundColor = [UIColor blackColor]; + } + [[SDLUIKitDelegate sharedAppDelegate].uiwindow insertSubview:cover belowSubview:self.view]; } --(IBAction) switchViews:(id)sender { - // view not displayed or not created - if (nil == self.settingsViewController.view.superview) { - // view not created - if (nil == self.settingsViewController) { - SettingsViewController *controller = [[SettingsViewController alloc] initWithNibName:@"SettingsViewController" bundle:nil]; - self.settingsViewController = controller; - [controller release]; - } - self.settingsViewController.view.frame = CGRectMake(0, -257, 480, 278); - self.settingsViewController.parentView = self.mainView; +#pragma mark - +-(IBAction) switchViews:(id) sender { + UIButton *button = (UIButton *)sender; + SplitViewRootController *splitViewController; + UIAlertView *alert; + + switch (button.tag) { + case 0: + [[SDLUIKitDelegate sharedAppDelegate] startSDLgame]; + break; + case 2: + // for now this controller is just to simplify code management + splitViewController = [[SplitViewRootController alloc] initWithNibName:nil bundle:nil]; + splitViewController.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal; + [self presentModalViewController:splitViewController animated:YES]; + break; + default: + alert = [[UIAlertView alloc] initWithTitle:@"Not Yet Implemented" + message:@"Sorry, this feature is not yet implemented" + delegate:nil + cancelButtonTitle:@"Well, don't worry" + otherButtonTitles:nil]; + [alert show]; + [alert release]; + break; + } +} - [UIView beginAnimations:@"Settings SwitchView" context:NULL]; - [UIView setAnimationDuration:1]; - - self.settingsViewController.view.frame = CGRectMake(0, 21, 480, 278); - self.mainView.frame = CGRectMake(0, 299, 480, 278); - [UIView commitAnimations]; - - [self.view insertSubview:settingsViewController.view atIndex:0]; - } +-(void) dismissModalViewController { + [self dismissModalViewControllerAnimated:YES]; } @end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/MainMenuViewController.xib --- a/cocoaTouch/MainMenuViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,745 +0,0 @@ - - - - 784 - 10C540 - 740 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 62 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - - - IBFirstResponder - - - - 292 - - YES - - - 292 - - YES - - - 274 - {480, 278} - - - 3 - MCAwAA - - 4 - NO - - NSImage - backgroundCenter.png - - - - - 292 - {{13, 12}, {240, 52}} - - NO - NO - 4 - NO - - NSImage - title.png - - - - - 292 - {{233, 106}, {220, 52}} - - - 1 - MCAwIDAgMAA - - NO - NO - 0 - 0 - - Helvetica-Bold - 15 - 16 - - - 3 - MQA - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - 3 - MC41AA - - - NSImage - playButton.png - - - - - 292 - {{233, 210}, {220, 52}} - - - 1 - MCAwIDAgMAA - - NO - NO - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - networkButton.png - - - - - 292 - {{33, 166}, {220, 52}} - - - 1 - MCAwIDAgMAA - - NO - NO - 0 - 0 - - - - 3 - MAA - - - - NSImage - storeButton.png - - - - - 292 - {{60, 81}, {145, 21}} - - NO - YES - NO - - - Helvetica-Oblique - 17 - 16 - - - 1 - MSAxIDEAA - - - 1 - 10 - 1 - - - - 292 - {{314, 28}, {59, 52}} - - NO - NO - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - settingsButton.png - - - - {{0, 21}, {480, 278}} - - - 1 - MCAwIDAAA - - NO - - - - 274 - {480, 21} - - NO - NO - 4 - NO - - NSImage - borderTop.png - - - - - 274 - {{0, 300}, {480, 20}} - - NO - NO - 4 - NO - - NSImage - borderBottom.png - - - - {480, 320} - - - - - - - YES - - - view - - - - 3 - - - - notYetImplemented - - - 7 - - 29 - - - - switchViews: - - - 7 - - 30 - - - - notYetImplemented - - - 7 - - 31 - - - - startPlaying - - - 7 - - 32 - - - - mainView - - - - 33 - - - - versionLabel - - - - 34 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 35 - - - - - 36 - - - - - 21 - - - YES - - - - - - - - - - - - 22 - - - - - 23 - - - - - 27 - - - - - 28 - - - - - 24 - - - - - 26 - - - - - 25 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 21.IBEditorWindowLastContentRect - 21.IBPluginDependency - 22.IBPluginDependency - 23.IBPluginDependency - 24.IBPluginDependency - 25.IBPluginDependency - 26.IBPluginDependency - 27.IBPluginDependency - 28.IBPluginDependency - 35.IBPluginDependency - 36.IBPluginDependency - - - YES - MainMenuViewController - UIResponder - {{619, 293}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{671, 637}, {480, 278}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 36 - - - - YES - - MainMenuViewController - UIViewController - - YES - - YES - notYetImplemented - startPlaying - switchViews: - - - YES - id - id - id - - - - YES - - YES - mainView - versionLabel - - - YES - UIView - UILabel - - - - IBProjectSource - ../../../hedge.build/trunk/cocoaTouch/MainMenuViewController.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSNetServices.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPort.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSStream.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSXMLParser.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIButton - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIButton.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UIImageView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIImageView.h - - - - UILabel - UIView - - IBFrameworkSource - UIKit.framework/Headers/UILabel.h - - - - UIResponder - NSObject - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - - 0 - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../../Documents/xcode/hwengine/hwengine.xcodeproj - 3 - 3.1 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/MasterViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/MasterViewController.h Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,24 @@ +// +// MasterViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 27/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@class DetailViewController; + +@interface MasterViewController : UITableViewController { + DetailViewController *detailViewController; + NSArray *optionList; +} + +@property (nonatomic, retain) IBOutlet DetailViewController *detailViewController; +@property (nonatomic, retain) NSArray *optionList; + +-(IBAction) dismissSplitView; + +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/MasterViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/MasterViewController.m Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,128 @@ +// +// MasterViewController.m +// HedgewarsMobile +// +// Created by Vittorio on 27/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "MasterViewController.h" +#import "DetailViewController.h" +#import "TeamSettingsViewController.h" + +@implementation MasterViewController +@synthesize detailViewController, optionList; + +#pragma mark - +#pragma mark View lifecycle + + +- (void)viewDidLoad { + [super viewDidLoad]; + optionList = [[NSArray alloc] initWithObjects:NSLocalizedString(@"General",@""), + NSLocalizedString(@"Teams",@""), + NSLocalizedString(@"Weapons",@""), + NSLocalizedString(@"Schemes",@""), + nil]; + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:0 target:self action:@selector(dismissSplitView)]; + + // Uncomment the following line to preserve selection between presentations. + //self.clearsSelectionOnViewWillAppear = NO; + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. + //self.navigationItem.rightBarButtonItem = self.editButtonItem; +} + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +} + + +#pragma mark - +#pragma mark Table view data source + +-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + + +-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return [optionList count]; +} + + +// Customize the appearance of table view cells. +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *CellIdentifier = @"Cell"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; + cell.textLabel.text = [optionList objectAtIndex:[indexPath row]]; + } + + return cell; +} + +/* +// Override to support editing the table view. +- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { + + if (editingStyle == UITableViewCellEditingStyleDelete) { + // Delete the row from the data source + [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; + } + else if (editingStyle == UITableViewCellEditingStyleInsert) { + // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view + } +} +*/ + +/* +// Override to support rearranging the table view. +- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { +} +*/ + +/* +// Override to support conditional rearranging of the table view. +- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the item to be re-orderable. + return YES; +} +*/ + +#pragma mark - +#pragma mark Table view delegate +-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + + [detailViewController.navigationController popToRootViewControllerAnimated:NO]; + TeamSettingsViewController *teamSettingsViewController = [[TeamSettingsViewController alloc] + initWithStyle:UITableViewStyleGrouped]; + teamSettingsViewController.title = [optionList objectAtIndex:[indexPath row]]; + teamSettingsViewController.navigationItem.hidesBackButton = YES; + + [detailViewController.navigationController pushViewController: teamSettingsViewController animated:YES]; +} + + +#pragma mark - +#pragma mark Memory management +-(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)dealloc { + [optionList release]; + [detailViewController release]; + [super dealloc]; +} + +-(IBAction) dismissSplitView { + [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissModalView" object:nil]; +} + +@end + diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/OverlayViewController.h --- a/cocoaTouch/OverlayViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ b/cocoaTouch/OverlayViewController.h Sun Apr 04 19:51:53 2010 +0000 @@ -11,12 +11,15 @@ @interface OverlayViewController : UIViewController { NSTimer *dimTimer; + id menuPopover; //UIPopoverController CGFloat initialDistanceForPinching; CGPoint gestureStartPoint; + BOOL popoverVisible; } @property (nonatomic,retain) NSTimer *dimTimer; +@property (nonatomic,retain) id menuPopover; -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; -(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; @@ -24,6 +27,7 @@ -(IBAction) buttonReleased:(id) sender; -(IBAction) buttonPressed:(id) sender; +-(IBAction) showPopover; -(void) dimOverlay; -(void) showMenuAfterwards; diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/OverlayViewController.m --- a/cocoaTouch/OverlayViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ b/cocoaTouch/OverlayViewController.m Sun Apr 04 19:51:53 2010 +0000 @@ -11,10 +11,10 @@ #import "PascalImports.h" #import "CGPointUtils.h" #import "SDL_mouse.h" -#import "PopupMenuViewController.h" +#import "PopoverMenuViewController.h" @implementation OverlayViewController -@synthesize dimTimer; +@synthesize dimTimer, menuPopover; -(void) didReceiveMemoryWarning { @@ -52,9 +52,13 @@ -(void) viewDidUnload { [dimTimer invalidate]; + self.dimTimer = nil; + menuPopover = nil; + [super viewDidUnload]; } -(void) dealloc { + [menuPopover release]; // dimTimer is autoreleased [super dealloc]; } @@ -92,7 +96,6 @@ // issue certain action based on the tag of the button -(IBAction) buttonPressed:(id) sender { [self activateOverlay]; - UIActionSheet *actionSheet; UIButton *theButton = (UIButton *)sender; switch (theButton.tag) { @@ -118,23 +121,6 @@ HW_backjump(); break; case 7: - HW_pause(); - break; - case 8: - HW_chat(); - break; - case 9: - actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"") - delegate:self - cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"") - destructiveButtonTitle:NSLocalizedString(@"As sure as I can be!", @"") - otherButtonTitles:nil]; - [actionSheet showInView:self.view]; - [actionSheet release]; - - HW_pause(); - break; - case 10: HW_tab(); break; default: @@ -143,7 +129,42 @@ } } +// present a further check before closing game +-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { + if ([actionSheet cancelButtonIndex] != buttonIndex) + HW_terminate(NO); + else + HW_pause(); +} + +// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize +-(IBAction) showPopover{ + PopoverMenuViewController *popupMenu = [[PopoverMenuViewController alloc] init]; + popoverVisible = YES; + Class popoverController = NSClassFromString(@"UIPopoverController"); + if (popoverController) { +#ifdef __IPHONE_3_2 + menuPopover = [[popoverController alloc] initWithContentViewController:popupMenu]; + [menuPopover setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; + + [menuPopover presentPopoverFromRect:CGRectMake(960, 0, 220, 32) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionUp animated:YES]; +#endif + } else { + //iphone stuff + } +} + +// because of the actionSheet, the popover might not get dismissed, so we do it manually (through a NSNotification system, see above) +// are we sure about this? +-(void) dismissPopover { + /*if (popoverVisible) + [menuPopover dismissPopoverAnimated:YES]; + popoverVisible = NO;*/ +} + #pragma mark - +#pragma mark Custom touch event handling + #define kMinimumPinchDelta 50 #define kMinimumGestureLength 10 #define kMaximumVariance 3 @@ -151,7 +172,8 @@ -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { NSArray *twoTouches; UITouch *touch = [touches anyObject]; - + int width = [[UIScreen mainScreen] bounds].size.width; + switch ([touches count]) { case 1: gestureStartPoint = [touch locationInView:self.view]; @@ -160,7 +182,7 @@ case 1: NSLog(@"X:%d Y:%d", (int)gestureStartPoint.x, (int)gestureStartPoint.y ); SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window, - (int)gestureStartPoint.y, 320 - (int)gestureStartPoint.x); + (int)gestureStartPoint.y, width - (int)gestureStartPoint.x); HW_click(); break; case 2: @@ -203,13 +225,14 @@ NSArray *twoTouches; CGPoint currentPosition; UITouch *touch = [touches anyObject]; + int width = [[UIScreen mainScreen] bounds].size.width; switch ([touches count]) { case 1: currentPosition = [touch locationInView:self.view]; // panning SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window, - (int)gestureStartPoint.y, 320 - (int)gestureStartPoint.x); + (int)gestureStartPoint.y, width - (int)gestureStartPoint.x); // remember that we have x and y inverted /* temporarily disabling hog movements for camera panning testing CGFloat vertDiff = gestureStartPoint.x - currentPosition.x; diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/OverlayViewController.xib --- a/cocoaTouch/OverlayViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,699 +0,0 @@ - - - - 768 - 10C540 - 762 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 87 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 292 - - YES - - - 292 - {{0, 237}, {39, 53}} - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - Helvetica-Bold - 15 - 16 - - - 3 - MQA - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - 3 - MC41AA - - - NSImage - arrowLeft.png - - - - - 292 - {{75, 237}, {39, 54}} - - NO - NO - 1 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowRight.png - - - - - 292 - {{416, 233}, {64, 64}} - - NO - NO - 6 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - joyPush.png - - - - - 292 - {{368, 213}, {64, 64}} - - NO - NO - 5 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - 292 - {{344, 262}, {64, 64}} - - NO - NO - 4 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - 292 - {{29, 207}, {53, 39}} - - NO - NO - 2 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowUp.png - - - - - 292 - {{29, 281}, {53, 39}} - - NO - NO - 3 - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowDown.png - - - - {480, 320} - - - 3 - MSAwAA - - NO - YES - - 3 - - IBCocoaTouchFramework - - - - - YES - - - view - - - - 3 - - - - buttonPressed: - - - 1 - - 8 - - - - buttonReleased: - - - 9 - - 9 - - - - buttonReleased: - - - 7 - - 10 - - - - buttonReleased: - - - 8 - - 11 - - - - buttonReleased: - - - 8 - - 13 - - - - buttonReleased: - - - 9 - - 14 - - - - buttonPressed: - - - 1 - - 15 - - - - buttonReleased: - - - 7 - - 16 - - - - buttonReleased: - - - 9 - - 18 - - - - buttonPressed: - - - 1 - - 19 - - - - buttonReleased: - - - 8 - - 20 - - - - buttonReleased: - - - 7 - - 21 - - - - buttonReleased: - - - 8 - - 23 - - - - buttonReleased: - - - 9 - - 24 - - - - buttonPressed: - - - 1 - - 25 - - - - buttonReleased: - - - 7 - - 26 - - - - buttonReleased: - - - 9 - - 44 - - - - buttonPressed: - - - 1 - - 45 - - - - buttonReleased: - - - 8 - - 46 - - - - buttonReleased: - - - 7 - - 47 - - - - buttonReleased: - - - 8 - - 49 - - - - buttonReleased: - - - 7 - - 50 - - - - buttonReleased: - - - 9 - - 51 - - - - buttonPressed: - - - 1 - - 52 - - - - buttonReleased: - - - 9 - - 54 - - - - buttonReleased: - - - 7 - - 55 - - - - buttonPressed: - - - 1 - - 56 - - - - buttonReleased: - - - 8 - - 57 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - left - - - 12 - - - right - - - 17 - - - up - - - 22 - - - down - - - 43 - - - push2 - - - 48 - - - push1 - - - 53 - - - push3 - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 12.IBPluginDependency - 17.IBPluginDependency - 22.IBPluginDependency - 4.IBPluginDependency - 43.IBPluginDependency - 48.IBPluginDependency - 53.IBPluginDependency - - - YES - OverlayViewController - UIResponder - {{222, 776}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 57 - - - - YES - - OverlayViewController - UIViewController - - YES - - YES - buttonPressed: - buttonReleased: - - - YES - id - id - - - - IBProjectSource - ../../cocoaTouch/OverlayViewController.h - - - - OverlayViewController - UIViewController - - YES - - YES - buttonPressed: - buttonReleased: - showPopover - - - YES - id - id - id - - - - IBProjectSource - ../../cocoaTouch/iPad/OverlayViewController.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - - YES - - YES - arrowDown.png - arrowLeft.png - arrowRight.png - arrowUp.png - joyPush.png - - - YES - {64, 64} - {64, 64} - {64, 64} - {64, 64} - {64, 64} - - - 87 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/PopoverMenuViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/PopoverMenuViewController.h Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,18 @@ +// +// popupMenuViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 25/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface PopoverMenuViewController : UITableViewController { + NSArray *menuList; + BOOL isPaused; +} +@property (nonatomic,retain) NSArray *menuList; + +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/PopoverMenuViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/PopoverMenuViewController.m Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,115 @@ + // +// popupMenuViewController.m +// HedgewarsMobile +// +// Created by Vittorio on 25/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "SDL_uikitappdelegate.h" +#import "PopoverMenuViewController.h" +#import "PascalImports.h" + +@implementation PopoverMenuViewController +@synthesize menuList; + + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Overriden to allow any orientation. + return YES; +} + +-(void) didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +-(void) viewDidLoad { + isPaused = NO; + self.tableView.allowsSelection = YES; + self.tableView.alwaysBounceVertical = YES; + self.tableView.delaysContentTouches = NO; + menuList = [[NSArray alloc] initWithObjects: + NSLocalizedString(@"Pause Game", @""), + NSLocalizedString(@"Chat", @""), + NSLocalizedString(@"End Game", @""), + nil]; + [super viewDidLoad]; +} + + +-(void) dealloc { + [menuList release]; + [super dealloc]; +} + +#pragma mark - +#pragma mark tableView methods +-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + +-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return 3; +} + +-(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *cellIdentifier = @"CellIdentifier"; + + UITableViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:cellIdentifier]; + if (nil == cell) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:cellIdentifier] autorelease]; + } + cell.textLabel.text = [menuList objectAtIndex:[indexPath row]]; + + return cell; +} + +-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + UIActionSheet *actionSheet; + + switch ([indexPath row]) { + case 0: + HW_pause(); + isPaused = !isPaused; + break; + case 1: + HW_chat(); + //SDL_iPhoneKeyboardShow([SDLUIKitDelegate sharedAppDelegate].window); + break; + case 2: + actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"") + delegate:self + cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"") + destructiveButtonTitle:NSLocalizedString(@"Of course!", @"") + otherButtonTitles:nil]; + [actionSheet showInView:self.view]; + [actionSheet release]; + + if (!isPaused) + HW_pause(); + break; + default: + NSLog(@"Warning: unset case value in section!"); + break; + } + + [aTableView deselectRowAtIndexPath:indexPath animated:YES]; +} + +#pragma mark - +#pragma mark actionSheet methods +-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { + if ([actionSheet cancelButtonIndex] != buttonIndex) { + [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissPopover" object:nil]; + HW_terminate(NO); + } + else + if (!isPaused) + HW_pause(); +} + +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Sun Apr 04 16:38:00 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Sun Apr 04 19:51:53 2010 +0000 @@ -44,3 +44,14 @@ -(void) startSDLgame; @end + +#ifndef __IPHONE_3_2 // if iPhoneOS is 3.2 or greater then __IPHONE_3_2 will be defined + +typedef enum { + UIUserInterfaceIdiomPhone, // iPhone and iPod touch style UI + UIUserInterfaceIdiomPad, // iPad style UI +} UIUserInterfaceIdiom; + +#define UI_USER_INTERFACE_IDIOM() UIUserInterfaceIdiomPhone + +#endif // ifndef __IPHONE_3_2 diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Sun Apr 04 16:38:00 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Sun Apr 04 19:51:53 2010 +0000 @@ -79,7 +79,11 @@ [setup release]; // overlay with controls, become visible after 2 seconds - overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController" bundle:nil]; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController-iPad" bundle:nil]; + else + overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController-iPhone" bundle:nil]; + [uiwindow addSubview:overlayController.view]; [overlayController release]; @@ -110,7 +114,10 @@ self.uiwindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; self.uiwindow.backgroundColor = [UIColor blackColor]; - self.viewController = [[MainMenuViewController alloc] initWithNibName:@"MainMenuViewController" bundle:nil]; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + self.viewController = [[MainMenuViewController alloc] initWithNibName:@"MainMenuViewController-iPad" bundle:nil]; + else + self.viewController = [[MainMenuViewController alloc] initWithNibName:@"MainMenuViewController-iPhone" bundle:nil]; [uiwindow addSubview:viewController.view]; [viewController release]; diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SchemeEditViewController.h --- a/cocoaTouch/SchemeEditViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -// -// SchemeEditViewController.h -// hwengine -// -// Created by Vittorio on 08/01/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface SchemeEditViewController : UIViewController { - UITableViewCell *cell0; - UITableView *table; -} -@property (nonatomic, retain) IBOutlet UITableViewCell *cell0; -@property (nonatomic, retain) IBOutlet UITableView *table; - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SchemeEditViewController.m --- a/cocoaTouch/SchemeEditViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -// -// SchemeEditViewController.m -// hwengine -// -// Created by Vittorio on 08/01/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "SchemeEditViewController.h" - - -@implementation SchemeEditViewController -@synthesize cell0, table; -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { - // Custom initialization - } - return self; -} -*/ - -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - table.backgroundColor = [UIColor clearColor]; - [super viewDidLoad]; -} - -// Override to allow orientations other than the default portrait orientation. -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - - - - - return cell0; - - - - -} --(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView{ - return 1; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return 1; -} - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SchemeEditViewController.xib --- a/cocoaTouch/SchemeEditViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,595 +0,0 @@ - - - - 784 - 10C540 - 740 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 62 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - - - IBFirstResponder - - - - 292 - - YES - - - 292 - - YES - - - 256 - - YES - - - 292 - {{206, 8}, {94, 27}} - - NO - YES - YES - 0 - 0 - YES - - - - 292 - {{20, 11}, {42, 21}} - - NO - YES - NO - Label - - 1 - MCAwIDAAA - - - 1 - 10 - - - {320, 43} - - - 3 - MCAwAA - - NO - YES - 4 - YES - - - {{0, 208}, {320, 44}} - - - 1 - MSAxIDEAA - - NO - 1 - - - - - 292 - {{0, -6}, {320, 443}} - - NO - 4 - NO - - NSImage - Background.png - - - - - 274 - {320, 431} - - NO - YES - NO - NO - 1 - 1 - 0 - YES - 44 - 10 - 10 - - - {320, 431} - - - 3 - MQA - - 2 - - - NO - - - - - - YES - - - cell0 - - - - 11 - - - - view - - - - 14 - - - - delegate - - - - 17 - - - - dataSource - - - - 18 - - - - table - - - - 19 - - - - - YES - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 13 - - - YES - - - - - - - - 7 - - - YES - - - - - - - 10 - - - - - 9 - - - - - 15 - - - - - 16 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 10.IBPluginDependency - 13.IBEditorWindowLastContentRect - 13.IBPluginDependency - 15.IBPluginDependency - 16.IBEditorWindowLastContentRect - 16.IBPluginDependency - 7.IBEditorWindowLastContentRect - 7.IBPluginDependency - 9.IBPluginDependency - - - YES - SchemeEditViewController - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{465, 427}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{528, 253}, {320, 431}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{685, 423}, {320, 44}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 19 - - - - YES - - SchemeEditViewController - UIViewController - - YES - - YES - cell0 - table - - - YES - UITableViewCell - UITableView - - - - IBProjectSource - ../../../hedge.build/trunk/cocoaTouch/SchemeEditViewController.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSNetServices.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPort.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSStream.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSXMLParser.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UIImageView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIImageView.h - - - - UILabel - UIView - - IBFrameworkSource - UIKit.framework/Headers/UILabel.h - - - - UIResponder - NSObject - - - - UIScrollView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIScrollView.h - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UISwitch - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UISwitch.h - - - - UITableView - UIScrollView - - IBFrameworkSource - UIKit.framework/Headers/UITableView.h - - - - UITableViewCell - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITableViewCell.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - - 0 - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../../Documents/xcode/hwengine/hwengine.xcodeproj - 3 - 3.1 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SettingsViewController.xib --- a/cocoaTouch/SettingsViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,698 +0,0 @@ - - - - 784 - 10C540 - 740 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 62 - - - YES - - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - - - IBFirstResponder - - - - 292 - {{100, 18}, {200, 31}} - NO - NO - 0 - - username - - 1 - MC40MDAwMDAwMDYgMC40MDAwMDAwMDYgMQA - - - Helvetica - 15 - 16 - - 2 - YES - 17 - - 1 - 9 - - - - - 292 - {{100, 50}, {200, 31}} - NO - NO - 0 - - network password (if any) - - 3 - MAA - - 2 - - - - 2 - YES - YES - 17 - - 1 - 9 - YES - - - - - 292 - - YES - - - 274 - {480, 278} - - NO - 4 - NO - - NSImage - backgroundTop.png - - - - - 274 - {480, 278} - - NO - YES - NO - NO - NO - NO - 1 - 1 - 0 - 44 - 10 - 10 - - - {480, 278} - - - 1 - MCAwIDAAA - - 4 - - - - 292 - - YES - - - 292 - {{100, 39}, {280, 50}} - - NO - NO - 0 - 0 - - Helvetica-Bold - 15 - 16 - - 1 - Erase All Data - - 3 - MQA - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - 3 - MC41AA - - - - {480, 100} - - - 3 - MQA - - - NO - YES - NO - 3 - - - - - YES - - - view - - - - 3 - - - - username - - - - 13 - - - - password - - - - 14 - - - - backgroundTap: - - - 1 - - 17 - - - - textFieldDoneEditing: - - - 20 - - 18 - - - - textFieldDoneEditing: - - - 20 - - 19 - - - - dataSource - - - - 31 - - - - delegate - - - - 32 - - - - deleteData: - - - 7 - - 42 - - - - buttonContainer - - - - 46 - - - - settingsTable - - - - 47 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - 5 - - - - - 6 - - - - - 44 - - - YES - - - - - - 41 - - - - - 30 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 30.IBPluginDependency - 4.IBPluginDependency - 41.IBEditorWindowLastContentRect - 41.IBPluginDependency - 44.IBEditorWindowLastContentRect - 44.IBPluginDependency - 5.IBPluginDependency - 6.IBPluginDependency - - - YES - SettingsViewController - UIResponder - UIControl - {{476, 534}, {480, 278}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{1352, 334}, {220, 50}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{476, 500}, {480, 100}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 47 - - - - YES - - SettingsViewController - UIViewController - - YES - - YES - backgroundTap: - deleteData: - textFieldDoneEditing: - - - YES - id - id - id - - - - YES - - YES - buttonContainer - password - settingsTable - username - - - YES - UIView - UITextField - UITableView - UITextField - - - - IBProjectSource - ../../../hedge.build/trunk/cocoaTouch/SettingsViewController.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSNetServices.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPort.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSStream.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSXMLParser.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIButton - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIButton.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UIImageView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIImageView.h - - - - UIResponder - NSObject - - - - UIScrollView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIScrollView.h - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UITableView - UIScrollView - - IBFrameworkSource - UIKit.framework/Headers/UITableView.h - - - - UITextField - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - - 0 - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../../Documents/xcode/hwengine/hwengine.xcodeproj - 3 - 3.1 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SingleTeamViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SingleTeamViewController.h Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,23 @@ +// +// SingleTeamViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + +@class HogHatViewController; +@interface SingleTeamViewController : UITableViewController { + NSArray *hogsList; + NSArray *secondaryItems; + NSString *teamName; + + HogHatViewController *hogChildController; +} + +@property (nonatomic,retain) NSArray *hogsList; +@property (nonatomic,retain) NSArray *secondaryItems; +@property (nonatomic,retain) NSString *teamName; +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SingleTeamViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SingleTeamViewController.m Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,207 @@ +// +// SingleTeamViewController.m +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "SingleTeamViewController.h" +#import "HogHatViewController.h" + +@implementation SingleTeamViewController +@synthesize hogsList, secondaryItems, teamName; + + +#pragma mark - +#pragma mark View lifecycle +- (void)viewDidLoad { + [super viewDidLoad]; + + // Uncomment the following line to preserve selection between presentations. + //self.clearsSelectionOnViewWillAppear = NO; + + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. + // self.navigationItem.rightBarButtonItem = self.editButtonItem; + + NSMutableArray *array = [[NSMutableArray alloc] initWithObjects: + NSLocalizedString(@"Color",@""), + NSLocalizedString(@"Grave",@""), + NSLocalizedString(@"Voice",@""), + NSLocalizedString(@"Fort",@""), + NSLocalizedString(@"Flag",@""), + NSLocalizedString(@"Level",@""),nil]; + self.secondaryItems = array; + [array release]; +} + + +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + NSString *teamFile = [[NSString alloc] initWithFormat:@"%@Teams/%@.plist",[paths objectAtIndex:0],self.teamName]; + NSDictionary *teamDict = [[NSDictionary alloc] initWithContentsOfFile:teamFile]; + [teamFile release]; + + self.hogsList = [teamDict objectForKey:@"hedgehogs"]; + self.teamName = [teamDict objectForKey:@"teamname"]; + [teamDict release]; + self.title = teamName; +} + +/* +- (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; +} +*/ +/* +- (void)viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; +} +*/ +/* +- (void)viewDidDisappear:(BOOL)animated { + [super viewDidDisappear:animated]; +} +*/ + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +} + + +#pragma mark - +#pragma mark Table view data source +-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { + return 3; +} + +-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + NSInteger rows; + switch (section) { + case 0: + rows = 1; + break; + case 1: + rows = 8; + break; + case 2: + rows = 6; + break; + default: + break; + } + return rows; +} + +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *CellIdentifier = @"Cell"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:CellIdentifier] autorelease]; + } + + NSInteger row = [indexPath row]; + switch ([indexPath section]) { + case 0: + cell.textLabel.text = teamName; + break; + case 1: + cell.textLabel.text = [[self.hogsList objectAtIndex:row] objectForKey:@"hogname"]; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + break; + case 2: + cell.textLabel.text = [self.secondaryItems objectAtIndex:row]; + break; + default: + break; + } + + return cell; +} + + +/* +// Override to support conditional editing of the table view. +- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the specified item to be editable. + return YES; +} +*/ + + +/* +// Override to support editing the table view. +- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { + + if (editingStyle == UITableViewCellEditingStyleDelete) { + // Delete the row from the data source + [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; + } + else if (editingStyle == UITableViewCellEditingStyleInsert) { + // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view + } +} +*/ + + +/* +// Override to support rearranging the table view. +- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { +} +*/ + + +/* +// Override to support conditional rearranging of the table view. +- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the item to be re-orderable. + return YES; +} +*/ + + +#pragma mark - +#pragma mark Table view delegate + +-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + if (1 == [indexPath section]) { + if (nil == hogChildController) { + hogChildController = [[HogHatViewController alloc] initWithStyle:UITableViewStyleGrouped]; + } + + hogChildController.hog = [hogsList objectAtIndex:[indexPath row]]; + //NSLog(@"%@",hogChildController.hog); + [self.navigationController pushViewController:hogChildController animated:YES]; + } +} + + +#pragma mark - +#pragma mark Memory management + +-(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 { + self.hogsList = nil; + self.secondaryItems = nil; + self.teamName = nil; +} + + +-(void) dealloc { + [secondaryItems release]; + [hogsList release]; + [teamName release]; + [super dealloc]; +} + + +@end + diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SplitViewRootController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SplitViewRootController.h Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,22 @@ +// +// SplitViewRootController.h +// HedgewarsMobile +// +// Created by Vittorio on 27/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + +@class MasterViewController; +@class DetailViewController; +@interface SplitViewRootController : UIViewController { + id splitViewRootController; //UISplitViewController + MasterViewController *masterViewController; + DetailViewController *detailViewController; +} + +@property (nonatomic,retain) IBOutlet id splitViewRootController; +@property (nonatomic,retain) IBOutlet MasterViewController *masterViewController; +@property (nonatomic,retain) IBOutlet DetailViewController *detailViewController; +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/SplitViewRootController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SplitViewRootController.m Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,95 @@ + // +// SplitViewRootController.m +// HedgewarsMobile +// +// Created by Vittorio on 27/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "SplitViewRootController.h" +#import "MasterViewController.h" +#import "DetailViewController.h" + +@implementation SplitViewRootController +@synthesize splitViewRootController, masterViewController, detailViewController; + + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +} + +-(void) didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + // Release any cached data, images, etc that aren't in use. +} + +// load the view programmatically; we need a splitViewController that handles a MasterViewController +// (which is just a UITableViewController) and a DetailViewController where we present options +-(void) viewDidLoad { + UINavigationController *detailedNavController; + detailViewController = [[DetailViewController alloc] initWithStyle:UITableViewStyleGrouped]; + + Class splitViewController = NSClassFromString(@"UISplitViewController"); + if (splitViewController) { + splitViewRootController = [[splitViewController alloc] init]; + CGRect screensize = [[UIScreen mainScreen] bounds]; + [[splitViewRootController view] setFrame:CGRectMake(0, 0, screensize.size.height, screensize.size.width)]; + masterViewController = [[MasterViewController alloc] initWithStyle:UITableViewStylePlain]; + + UINavigationController *mainNavController = [[UINavigationController alloc] initWithRootViewController:masterViewController]; + detailedNavController = [[UINavigationController alloc] initWithRootViewController:detailViewController]; + + // set attributes + masterViewController.detailViewController = detailViewController; + [splitViewRootController setViewControllers:[NSArray arrayWithObjects: mainNavController, detailedNavController, nil]]; + [mainNavController release]; + [detailedNavController release]; + + [splitViewRootController setDelegate: detailViewController]; + + // add view to main controller + [self.view addSubview:[splitViewRootController view]]; + [detailViewController release]; + [masterViewController release]; + } else { + detailedNavController = [[UINavigationController alloc] initWithRootViewController:detailViewController]; + [self.view addSubview:detailedNavController.view]; + //[detailedNavController release]; + } + + [super viewDidLoad]; +} + +-(void) dealloc { + [detailViewController release]; + [masterViewController release]; + [splitViewRootController release]; + [super dealloc]; +} + +#pragma mark - +#pragma mark additional methods as we're using a UINavigationController programmatically +// see http://davidebenini.it/2009/01/03/viewwillappear-not-being-called-inside-a-uinavigationcontroller/ +-(void) viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + [detailViewController.navigationController viewWillAppear:animated]; +} + +-(void) viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; + [detailViewController.navigationController viewWillDisappear:animated]; +} + +-(void) viewDidAppear:(BOOL)animated { + [super viewDidLoad]; + [detailViewController.navigationController viewDidAppear:animated]; +} + +-(void) viewDidDisappear:(BOOL)animated { + [super viewDidUnload]; + [detailViewController.navigationController viewDidDisappear:animated]; +} + + +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/TeamEditViewController.h --- a/cocoaTouch/TeamEditViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -// -// TeamEditViewController.h -// hwengine -// -// Created by Vittorio on 08/01/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface TeamEditViewController : UIViewController { - -} - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/TeamEditViewController.m --- a/cocoaTouch/TeamEditViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -// -// TeamEditViewController.m -// hwengine -// -// Created by Vittorio on 08/01/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "TeamEditViewController.h" - - -@implementation TeamEditViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} -*/ - -// Override to allow orientations other than the default portrait orientation. -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/TeamEditViewController.xib --- a/cocoaTouch/TeamEditViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ - - - - 784 - 10A394 - 732 - 1027.1 - 430.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 60 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - - - IBFirstResponder - - - - 292 - {320, 460} - - - 3 - MQA - - 2 - - - - - - - - YES - - - view - - - - 3 - - - - - YES - - 0 - - - - - - 1 - - - - - -1 - - - File's Owner - - - -2 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - - - YES - TeamEditViewController - UIResponder - {{556, 412}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 3 - - - - YES - - TeamEditViewController - UIViewController - - IBProjectSource - TeamEditViewController.h - - - - - 0 - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - - 3 - 3.1 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/TeamMenuViewController.h --- a/cocoaTouch/TeamMenuViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -// -// TeamMenuViewController.h -// hwengine -// -// Created by Vittorio on 08/01/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface TeamMenuViewController : UIViewController { - -} - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/TeamMenuViewController.m --- a/cocoaTouch/TeamMenuViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -// -// TeamMenuViewController.m -// hwengine -// -// Created by Vittorio on 08/01/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "TeamMenuViewController.h" - - -@implementation TeamMenuViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} -*/ - -// Override to allow orientations other than the default portrait orientation. -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/TeamMenuViewController.xib --- a/cocoaTouch/TeamMenuViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ - - - - 784 - 10A394 - 732 - 1027.1 - 430.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 60 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - - - IBFirstResponder - - - - 292 - {320, 460} - - - 3 - MQA - - 2 - - - - - - - - YES - - - view - - - - 3 - - - - - YES - - 0 - - - - - - 1 - - - - - -1 - - - File's Owner - - - -2 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - - - YES - TeamMenuViewController - UIResponder - {{556, 412}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 3 - - - - YES - - TeamMenuViewController - UIViewController - - IBProjectSource - TeamMenuViewController.h - - - - - 0 - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - - 3 - 3.1 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/TeamSettingsViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/TeamSettingsViewController.h Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,18 @@ +// +// TeamSettingsViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import +@class SingleTeamViewController; + +@interface TeamSettingsViewController : UITableViewController { + NSArray *list; + SingleTeamViewController *childController; +} +@property (nonatomic, retain) NSArray *list; + +@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/TeamSettingsViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/TeamSettingsViewController.m Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,167 @@ +// +// TeamSettingsViewController.m +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "TeamSettingsViewController.h" +#import "SingleTeamViewController.h" + +@implementation TeamSettingsViewController +@synthesize list; + +#pragma mark - +#pragma mark View lifecycle +- (void)viewDidLoad { + [super viewDidLoad]; + + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + NSString *teamsDirectory = [[paths objectAtIndex:0] stringByAppendingString:@"Teams/"]; + + NSArray *contents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:teamsDirectory + error:NULL]; + self.list = contents; + + // Uncomment the following line to preserve selection between presentations. + // self.clearsSelectionOnViewWillAppear = NO; + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. + self.navigationItem.rightBarButtonItem = self.editButtonItem; +} + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Override to allow orientations other than the default portrait orientation. + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +} + + +#pragma mark - +#pragma mark Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + // Return the number of sections. + return 1; +} + + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + // Return the number of rows in the section. + return [list count]; +} + + +// Customize the appearance of table view cells. +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + static NSString *CellIdentifier = @"Cell"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; + } + + NSUInteger row = [indexPath row]; + NSString *rowString = [[list objectAtIndex:row] stringByDeletingPathExtension]; + cell.textLabel.text = rowString; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + //cell.imageView.image = [UIImage imageNamed:@"Default.png"]; + //[rowString release]; + + return cell; +} + + +/* +// Override to support conditional editing of the table view. +- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the specified item to be editable. + return YES; +} +*/ + + +/* +// Override to support editing the table view. +- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { + + if (editingStyle == UITableViewCellEditingStyleDelete) { + // Delete the row from the data source + [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; + } + else if (editingStyle == UITableViewCellEditingStyleInsert) { + // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view + } +} +*/ + + +/* +// Override to support rearranging the table view. +- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { +} +*/ + + +/* +// Override to support conditional rearranging of the table view. +- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the item to be re-orderable. + return YES; +} +*/ + + +#pragma mark - +#pragma mark Table view delegate +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + if (childController == nil) { + childController = [[SingleTeamViewController alloc] initWithStyle:UITableViewStyleGrouped]; + } + + NSInteger row = [indexPath row]; + NSString *selectedTeam = [[list objectAtIndex:row] stringByDeletingPathExtension]; + + childController.teamName = selectedTeam; + [self.navigationController pushViewController:childController animated:YES]; +} + +/* +-(void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { + UIAlertView *alert = [[UIAlertView alloc] initWithTitle: @"Hey, do you see the disclosure button?" + message:@"If you're trying to drill down, touch that instead" + delegate:nil + cancelButtonTitle:@"Won't happen again" + otherButtonTitles:nil]; + [alert show]; + [alert release]; +} +*/ + +#pragma mark - +#pragma mark Memory management + +- (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 { + // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand. + // For example: self.myOutlet = nil; +} +*/ + +- (void)dealloc { + [list release]; + if (nil != childController) + [childController release]; + [super dealloc]; +} + + +@end + diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/Default.png Binary file cocoaTouch/iPad/Default.png has changed diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/DetailViewController.h --- a/cocoaTouch/iPad/DetailViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -// -// DetailViewController.h -// HedgewarsMobile -// -// Created by Vittorio on 27/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface DetailViewController : UITableViewController { - UIPopoverController *popoverController; - NSArray *controllers; - - id detailItem; -} - -@property (nonatomic, retain) UIPopoverController *popoverController; -@property (nonatomic, retain) id detailItem; -@property (nonatomic, retain) NSArray * controllers; - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/DetailViewController.m --- a/cocoaTouch/iPad/DetailViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,128 +0,0 @@ - // -// DetailViewController.m -// HedgewarsMobile -// -// Created by Vittorio on 27/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "DetailViewController.h" -#import "TeamSettingsViewController.h" - -@implementation DetailViewController -@synthesize popoverController, detailItem, controllers; - - -- (void)viewDidLoad { - self.title =@"First"; - NSMutableArray *array= [[NSMutableArray alloc] init]; - - TeamSettingsViewController *teamSettingsViewController = [[TeamSettingsViewController alloc] - initWithStyle:UITableViewStyleGrouped]; - teamSettingsViewController.title = NSLocalizedString(@"Teams",@""); - [array addObject:teamSettingsViewController]; - [teamSettingsViewController release]; - - self.controllers = array; - [array release]; - - [super viewDidLoad]; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - self.controllers = nil; - self.popoverController = nil; - self.detailItem = nil; - [super viewDidUnload]; -} - -- (void)dealloc { - [controllers release]; - [popoverController release]; - [detailItem release]; - [super dealloc]; -} - -#pragma mark - -#pragma mark Table view data source --(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - --(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [controllers count]; -} - --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - static NSString *CellIdentifier = @"Cell"; - - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault - reuseIdentifier:CellIdentifier] autorelease]; - } - - NSInteger row = [indexPath row]; - UITableViewController *controller = [controllers objectAtIndex:row]; - - cell.textLabel.text = controller.title; - cell.imageView.image = [UIImage imageNamed:@"Icon.png"]; - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - - return cell; -} - --(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - NSInteger row = [indexPath row]; - UITableViewController *nextController = [self.controllers objectAtIndex:row]; - [self.navigationController pushViewController:nextController animated:YES]; -} - -#pragma mark - -#pragma mark Managing the popover controller -// When setting the detail item, update the view and dismiss the popover controller if it's showing. --(void) setDetailItem:(id) newDetailItem { - if (detailItem != newDetailItem) { - [detailItem release]; - detailItem = [newDetailItem retain]; - - // Update the view. - // navigationBar.topItem.title = (NSString*) detailItem; - - //test.text=(NSString*) detailItem; - } - - if (popoverController != nil) { - [popoverController dismissPopoverAnimated:YES]; - } -} - -#pragma mark - -#pragma mark Split view support --(void) splitViewController:(UISplitViewController*)svc willHideViewController:(UIViewController *)aViewController withBarButtonItem:(UIBarButtonItem*)barButtonItem forPopoverController: (UIPopoverController*)pc { - barButtonItem.title = @"Master List"; - // [navigationBar.topItem setLeftBarButtonItem:barButtonItem animated:YES]; - self.popoverController = pc; -} - -// Called when the view is shown again in the split view, invalidating the button and popover controller. --(void) splitViewController: (UISplitViewController*)svc willShowViewController:(UIViewController *)aViewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem { - // [navigationBar.topItem setLeftBarButtonItem:nil animated:YES]; - self.popoverController = nil; -} - -#pragma mark - -#pragma mark Rotation support -// Ensure that the view controller supports rotation and that the split view can therefore show in both portrait and landscape. --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/DetailViewController.xib --- a/cocoaTouch/iPad/DetailViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,302 +0,0 @@ - - - - 800 - 10C540 - 762 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 87 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - - - 292 - - YES - - - 292 - {{491, 393}, {42, 21}} - - NO - YES - 7 - NO - IBIPadFramework - Label - - 1 - MCAwIDAAA - - - 1 - 10 - - - - 274 - {{563, 127}, {423, 435}} - - - 3 - MQA - - YES - IBIPadFramework - NO - 1 - 0 - YES - 44 - 22 - 22 - - - - 290 - {1024, 44} - - IBIPadFramework - - YES - - - Title - - IBIPadFramework - 1 - - 0 - - IBIPadFramework - - - - - {1024, 768} - - - 1 - MC40MDAwMDAwMDYgMC44MDAwMDAwMTE5IDEAA - - - 3 - - IBIPadFramework - - - 3 - - IBIPadFramework - YES - - - - - YES - - - view - - - - 22 - - - - dataSource - - - - 35 - - - - delegate - - - - 36 - - - - delegate - - - - 38 - - - - - YES - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 52 - - - YES - - - - - - 21 - - - YES - - - - - - - - 34 - - - - - 32 - - - - - 23 - - - YES - - - - - - 24 - - - YES - - - - - - 25 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 21.IBEditorWindowLastContentRect - 21.IBPluginDependency - 23.IBEditorWindowLastContentRect - 23.IBPluginDependency - 24.IBPluginDependency - 25.IBPluginDependency - 32.IBPluginDependency - 34.IBPluginDependency - 52.IBEditorWindowLastContentRect - 52.IBPluginDependency - - - YES - UINavigationController - UIResponder - {{62, 248}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{42, 1078}, {1024, 44}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{63, 388}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 52 - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - 87 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/HogHatViewController.h --- a/cocoaTouch/iPad/HogHatViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -// -// HogHatViewController.h -// HedgewarsMobile -// -// Created by Vittorio on 02/04/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface HogHatViewController : UITableViewController { - NSArray *hatList; - NSDictionary *hog; -} - -@property (nonatomic,retain) NSArray *hatList; -@property (nonatomic,retain) NSDictionary *hog; - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/HogHatViewController.m --- a/cocoaTouch/iPad/HogHatViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,191 +0,0 @@ -// -// HogHatViewController.m -// HedgewarsMobile -// -// Created by Vittorio on 02/04/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "HogHatViewController.h" - - -@implementation HogHatViewController -@synthesize hatList, hog; - -#pragma mark - -#pragma mark View lifecycle - - -- (void)viewDidLoad { - [super viewDidLoad]; - - //NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); - NSString *hatPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]; - NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:hatPath - error:NULL]; - self.hatList = array; - //NSLog(@"%@", hatList); -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - self.title = [hog objectForKey:@"hogname"]; - [self.tableView reloadData]; -} - -/* -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; -} -*/ -/* -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; -} -*/ -/* -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; -} -*/ - -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Override to allow orientations other than the default portrait orientation. - return YES; -} - - -#pragma mark - -#pragma mark Table view data source --(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { - return 2; -} - --(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - NSInteger rows; - if (0 == section) - rows = 1; - else - rows = [self.hatList count]; - return rows; -} - -// Customize the appearance of table view cells. -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - - static NSString *CellIdentifier = @"Cell"; - - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; - } - - if (0 == [indexPath section]) { - cell.textLabel.text = [hog objectForKey:@"hogname"]; - cell.imageView.image = nil; - cell.accessoryType = UITableViewCellAccessoryNone; - } else { - cell.textLabel.text = [[hatList objectAtIndex:[indexPath row]] stringByDeletingPathExtension]; - if ([cell.textLabel.text isEqualToString:[hog objectForKey:@"hat"]]) { - cell.accessoryType = UITableViewCellAccessoryCheckmark; - } else { - cell.accessoryType = UITableViewCellAccessoryNone; - } - - NSString *hatsPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]; - NSString *hatFile = [hatsPath stringByAppendingString:[hatList objectAtIndex:[indexPath row]]]; - UIImage *image = [UIImage imageWithContentsOfFile: hatFile]; - - CGRect firstSpriteArea = CGRectMake(0, 0, 32, 32); - CGImageRef cgImgage = CGImageCreateWithImageInRect([image CGImage], firstSpriteArea); - cell.imageView.image = [UIImage imageWithCGImage: cgImgage]; - CGImageRelease(cgImgage); - } - - return cell; -} - - -/* -// Override to support conditional editing of the table view. -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the specified item to be editable. - return YES; -} -*/ - - -/* -// Override to support editing the table view. -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { - - if (editingStyle == UITableViewCellEditingStyleDelete) { - // Delete the row from the data source - [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; - } - else if (editingStyle == UITableViewCellEditingStyleInsert) { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } -} -*/ - - -/* -// Override to support rearranging the table view. -- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { -} -*/ - - -/* -// Override to support conditional rearranging of the table view. -- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the item to be re-orderable. - return YES; -} -*/ - - -#pragma mark - -#pragma mark Table view delegate - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // Navigation logic may go here. Create and push another view controller. - /* - <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil]; - // ... - // Pass the selected object to the new view controller. - [self.navigationController pushViewController:detailViewController animated:YES]; - [detailViewController release]; - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (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 { - [super viewDidUnload]; - self.hatList = nil; - self.hog = nil; - // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand. - // For example: self.myOutlet = nil; -} - - -- (void)dealloc { - [hog release]; - [hatList release]; - [super dealloc]; -} - - -@end - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/MainMenuViewController.h --- a/cocoaTouch/iPad/MainMenuViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -// -// MainMenuViewController.h -// hwengine -// -// Created by Vittorio on 08/01/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import -#import "SettingsViewController.h" - -@interface MainMenuViewController : UIViewController { - UIView *cover; -} - -@property (nonatomic,retain) UIView *cover; - --(void) appear; --(void) disappear; --(void) hideBehind; - --(IBAction) switchViews:(id)sender; -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/MainMenuViewController.m --- a/cocoaTouch/iPad/MainMenuViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,190 +0,0 @@ -// -// MainMenuViewController.m -// hwengine -// -// Created by Vittorio on 08/01/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "MainMenuViewController.h" -#import "SDL_uikitappdelegate.h" -#import "PascalImports.h" -#import "SplitViewRootController.h" - - -@implementation MainMenuViewController -@synthesize cover; - --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; -} - -- (void)dealloc { - [cover release]; - [super dealloc]; -} - --(void) viewDidUnload { - self.cover = nil; - [super viewDidUnload]; -} - --(void) viewDidLoad { - // initialize some files the first time we load the game - [NSThread detachNewThreadSelector:@selector(checkFirstRun) toTarget:self withObject:nil]; - // listen to request to remove the modalviewcontroller - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(dismissModalViewController) - name: @"dismissModalView" - object:nil]; - - [super viewDidLoad]; -} - -// this is called to verify whether it's the first time the app is launched -// if it is it blocks user interaction with an alertView until files are created --(void) checkFirstRun { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"]; - if (!([[NSFileManager defaultManager] fileExistsAtPath:filePath])) { - // file not present, means that also other files are absent - NSLog(@"First time run, creating settings files"); - - // show a popup with an indicator to make the user wait - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Please wait",@"") - message:nil - delegate:nil - cancelButtonTitle:nil - otherButtonTitles:nil]; - [alert show]; - [alert release]; - - UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] - initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; - indicator.center = CGPointMake(alert.bounds.size.width / 2, alert.bounds.size.height - 50); - [indicator startAnimating]; - [alert addSubview:indicator]; - [indicator release]; - - // create Default Team.plist - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); - NSString *teamsDirectory = [[paths objectAtIndex:0] stringByAppendingString:@"Teams/"]; - [[NSFileManager defaultManager] createDirectoryAtPath:teamsDirectory - withIntermediateDirectories:NO - attributes:nil - error:NULL]; - - NSMutableArray *hedgehogs = [[NSMutableArray alloc] init]; - - for (int i = 0; i < 8; i++) { - NSString *hogName = [[NSString alloc] initWithFormat:@"hedgehog %d",i]; - NSDictionary *hog = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level", - hogName,@"hogname",@"NoHat",@"hat",nil]; - [hogName release]; - [hedgehogs addObject:hog]; - [hog release]; - } - - NSDictionary *defaultTeam = [[NSDictionary alloc] initWithObjectsAndKeys:@"4421353",@"color",@"0",@"hash", - @"Default Team",@"teamname",@"Statue",@"grave",@"Plane",@"fort", - @"Default",@"voicepack",@"hedgewars",@"flag",hedgehogs,@"hedgehogs",nil]; - [hedgehogs release]; - NSString *defaultTeamFile = [teamsDirectory stringByAppendingString:@"Default Team.plist"]; - [defaultTeam writeToFile:defaultTeamFile atomically:YES]; - [defaultTeam release]; - - // create settings.plist - NSMutableDictionary *saveDict = [[NSMutableDictionary alloc] init]; - - [saveDict setObject:@"" forKey:@"username"]; - [saveDict setObject:@"" forKey:@"password"]; - [saveDict setObject:@"1" forKey:@"music"]; - [saveDict setObject:@"1" forKey:@"sounds"]; - [saveDict setObject:@"0" forKey:@"alternate"]; - - [saveDict writeToFile:filePath atomically:YES]; - [saveDict release]; - - // create other files - - // ok let the user take control - [alert dismissWithClickedButtonIndex:0 animated:YES]; - } - [pool release]; - [NSThread exit]; -} - -#pragma mark - --(void) appear { - [[SDLUIKitDelegate sharedAppDelegate].uiwindow addSubview:self.view]; - [self release]; - - [UIView beginAnimations:@"inserting main controller" context:NULL]; - [UIView setAnimationDuration:1]; - self.view.alpha = 1; - [UIView commitAnimations]; - - [NSTimer scheduledTimerWithTimeInterval:0.7 target:self selector:@selector(hideBehind) userInfo:nil repeats:NO]; -} - --(void) disappear { - if (nil != cover) - [cover release]; - - [UIView beginAnimations:@"removing main controller" context:NULL]; - [UIView setAnimationDuration:1]; - self.view.alpha = 0; - [UIView commitAnimations]; - - [self retain]; - [self.view removeFromSuperview]; -} - -// this is a silly way to hide the sdl contex that remained active --(void) hideBehind { - if (nil == cover) { - cover= [[UIView alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; - cover.backgroundColor = [UIColor blackColor]; - } - [[SDLUIKitDelegate sharedAppDelegate].uiwindow insertSubview:cover belowSubview:self.view]; -} - -#pragma mark - --(IBAction) switchViews:(id) sender { - UIButton *button = (UIButton *)sender; - SplitViewRootController *splitViewController; - UIAlertView *alert; - - switch (button.tag) { - case 0: - [[SDLUIKitDelegate sharedAppDelegate] startSDLgame]; - break; - case 2: - // for now this controller is just to simplify code management - splitViewController = [[SplitViewRootController alloc] initWithNibName:nil bundle:nil]; - splitViewController.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal; - [self presentModalViewController:splitViewController animated:YES]; - break; - default: - alert = [[UIAlertView alloc] initWithTitle:@"Not Yet Implemented" - message:@"Sorry, this feature is not yet implemented" - delegate:nil - cancelButtonTitle:@"Well, don't worry" - otherButtonTitles:nil]; - [alert show]; - [alert release]; - break; - } -} - --(void) dismissModalViewController { - [self dismissModalViewControllerAnimated:YES]; -} - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/MainMenuViewController.xib --- a/cocoaTouch/iPad/MainMenuViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,381 +0,0 @@ - - - - 800 - 10C540 - 762 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 87 - - - YES - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - - 292 - - YES - - - 274 - {1024, 768} - - NO - IBIPadFramework - - NSImage - Background.png - - - - - 292 - {{147, 20}, {745, 146}} - - NO - 4 - NO - IBIPadFramework - - NSImage - HedgewarsTitle.png - - - - - 292 - {{147, 200}, {258, 215}} - - NO - IBIPadFramework - 0 - 0 - - Helvetica-Bold - 15 - 16 - - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - NSImage - Multiplayer.png - - - - - 292 - {{634, 493}, {258, 215}} - - NO - 1 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - NetworkPlay.png - - - - - 292 - {{279, 591}, {18, 19}} - - NO - 2 - IBIPadFramework - 0 - 0 - - 3 - YES - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - - {1024, 768} - - 1 - MCAwIDAAA - - IBIPadFramework - - - - - YES - - - view - - - - 3 - - - - switchViews: - - - 7 - - 47 - - - - switchViews: - - - 7 - - 48 - - - - switchViews: - - - 7 - - 49 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 37 - - - - - 38 - - - - - 39 - - - local - - - 40 - - - multi - - - 45 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 37.IBPluginDependency - 38.IBPluginDependency - 39.IBPluginDependency - 40.IBPluginDependency - 45.IBPluginDependency - - - YES - MainMenuViewController - UIResponder - {{313, 256}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 49 - - - - YES - - MainMenuViewController - UIViewController - - YES - - YES - notYetImplemented - startPlaying - - - YES - id - id - - - - YES - - YES - mainView - versionLabel - - - YES - UIView - UILabel - - - - IBProjectSource - ../../cocoaTouch/MainMenuViewController.h - - - - MainMenuViewController - UIViewController - - switchViews: - id - - - IBProjectSource - ../../cocoaTouch/iPad/MainMenuViewController.h - - - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - - YES - - YES - Background.png - HedgewarsTitle.png - Multiplayer.png - NetworkPlay.png - - - YES - {1024, 768} - {720, 140} - {264, 219} - {314, 260} - - - 87 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/MasterViewController.h --- a/cocoaTouch/iPad/MasterViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -// -// MasterViewController.h -// HedgewarsMobile -// -// Created by Vittorio on 27/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - - -@class DetailViewController; - -@interface MasterViewController : UITableViewController { - DetailViewController *detailViewController; - NSArray *optionList; -} - -@property (nonatomic, retain) IBOutlet DetailViewController *detailViewController; -@property (nonatomic, retain) NSArray *optionList; - --(IBAction) dismissSplitView; - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/MasterViewController.m --- a/cocoaTouch/iPad/MasterViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,127 +0,0 @@ -// -// MasterViewController.m -// HedgewarsMobile -// -// Created by Vittorio on 27/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "MasterViewController.h" -#import "DetailViewController.h" - -@implementation MasterViewController -@synthesize detailViewController, optionList; - -#pragma mark - -#pragma mark View lifecycle - - -- (void)viewDidLoad { - [super viewDidLoad]; - optionList = [[NSArray alloc] initWithObjects:NSLocalizedString(@"General",@""), - NSLocalizedString(@"Teams",@""), - NSLocalizedString(@"Weapons",@""), - NSLocalizedString(@"Schemes",@""), - nil]; - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:0 target:self action:@selector(dismissSplitView)]; - - // Uncomment the following line to preserve selection between presentations. - //self.clearsSelectionOnViewWillAppear = NO; - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - //self.navigationItem.rightBarButtonItem = self.editButtonItem; -} - --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - - -#pragma mark - -#pragma mark Table view data source - --(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - - --(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [optionList count]; -} - - -// Customize the appearance of table view cells. --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - static NSString *CellIdentifier = @"Cell"; - - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; - cell.textLabel.text = [optionList objectAtIndex:[indexPath row]]; - } - - return cell; -} - -/* -// Override to support editing the table view. -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { - - if (editingStyle == UITableViewCellEditingStyleDelete) { - // Delete the row from the data source - [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; - } - else if (editingStyle == UITableViewCellEditingStyleInsert) { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } -} -*/ - -/* -// Override to support rearranging the table view. -- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { -} -*/ - -/* -// Override to support conditional rearranging of the table view. -- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the item to be re-orderable. - return YES; -} -*/ - -#pragma mark - -#pragma mark Table view delegate --(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // Navigation logic may go here. Create and push another view controller. - /* - DetailViewController *detailViewController = [[DetailViewController alloc] initWithNibName:@"DetailViewController" bundle:nil]; - // Pass the selected object to the new view controller. - [self.navigationController pushViewController:detailViewController animated:YES]; - [detailViewController release]; - */ - detailViewController.detailItem = [[NSString alloc] initWithFormat:@"%d", [indexPath row]]; -} - - -#pragma mark - -#pragma mark Memory management --(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)dealloc { - [optionList release]; - [detailViewController release]; - [super dealloc]; -} - --(IBAction) dismissSplitView { - [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissModalView" object:nil]; -} - -@end - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/OverlayViewController.h --- a/cocoaTouch/iPad/OverlayViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -// -// overlayViewController.h -// HedgewarsMobile -// -// Created by Vittorio on 16/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface OverlayViewController : UIViewController { - NSTimer *dimTimer; - UIPopoverController* menuPopover; - - CGFloat initialDistanceForPinching; - CGPoint gestureStartPoint; -} - -@property (nonatomic,retain) NSTimer *dimTimer; -@property (nonatomic,retain) UIPopoverController* menuPopover; - --(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; --(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; --(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event; - --(IBAction) buttonReleased:(id) sender; --(IBAction) buttonPressed:(id) sender; --(IBAction) showPopover; - --(void) dimOverlay; --(void) showMenuAfterwards; - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/OverlayViewController.m --- a/cocoaTouch/iPad/OverlayViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,267 +0,0 @@ -// -// overlayViewController.m -// HedgewarsMobile -// -// Created by Vittorio on 16/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "OverlayViewController.h" -#import "SDL_uikitappdelegate.h" -#import "PascalImports.h" -#import "CGPointUtils.h" -#import "SDL_mouse.h" -#import "PopupMenuViewController.h" - -@implementation OverlayViewController -@synthesize dimTimer, menuPopover; - - --(void) didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - --(void) viewDidLoad { - self.view.alpha = 0; - - // needed for rotation to work on os < 3.2 - self.view.center = CGPointMake(self.view.frame.size.height/2.0, self.view.frame.size.width/2.0); - self.view.transform = CGAffineTransformRotate(self.view.transform, (M_PI/2.0)); - - dimTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:6] - interval:1000 - target:self - selector:@selector(dimOverlay) - userInfo:nil - repeats:YES]; - - // add timer too runloop, otherwise it doesn't work - [[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode]; - // listen for dismissal of the popover (see below)x - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(dismissPopover) name:@"dismissPopover" object:nil]; - // present the overlay after 2 seconds - [NSTimer scheduledTimerWithTimeInterval:2 target:self selector:@selector(showMenuAfterwards) userInfo:nil repeats:NO]; -} - --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - --(void) viewDidUnload { - [dimTimer invalidate]; - self.dimTimer = nil; - menuPopover = nil; - [super viewDidUnload]; -} - --(void) dealloc { - [menuPopover release]; - // dimTimer is autoreleased - [super dealloc]; -} - -// draws the controller overlay after the sdl window has taken control --(void) showMenuAfterwards { - [[SDLUIKitDelegate sharedAppDelegate].uiwindow bringSubviewToFront:self.view]; - - [UIView beginAnimations:@"showing overlay" context:NULL]; - [UIView setAnimationDuration:1]; - self.view.alpha = 1; - [UIView commitAnimations]; -} - -// dim the overlay when there's no more input for a certain amount of time --(IBAction) buttonReleased:(id) sender { - HW_allKeysUp(); - [dimTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:2.7]]; -} - -// nice transition for dimming --(void) dimOverlay { - [UIView beginAnimations:@"overlay dim" context:NULL]; - [UIView setAnimationDuration:0.6]; - self.view.alpha = 0.2; - [UIView commitAnimations]; -} - -// set the overlay visible and put off the timer for enough time --(void) activateOverlay { - self.view.alpha = 1; - [dimTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:1000]]; -} - -// issue certain action based on the tag of the button --(IBAction) buttonPressed:(id) sender { - [self activateOverlay]; - UIButton *theButton = (UIButton *)sender; - - switch (theButton.tag) { - case 0: - HW_walkLeft(); - break; - case 1: - HW_walkRight(); - break; - case 2: - HW_aimUp(); - break; - case 3: - HW_aimDown(); - break; - case 4: - HW_shoot(); - break; - case 5: - HW_jump(); - break; - case 6: - HW_backjump(); - break; - case 7: - HW_tab(); - break; - default: - NSLog(@"Nope"); - break; - } -} - -// present a further check before closing game --(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { - if ([actionSheet cancelButtonIndex] != buttonIndex) - HW_terminate(NO); - else - HW_pause(); -} - -// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize --(IBAction) showPopover{ - PopupMenuViewController *popupMenu = [[PopupMenuViewController alloc] init]; - - menuPopover = [[UIPopoverController alloc] initWithContentViewController:popupMenu]; - [menuPopover setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; - - [menuPopover presentPopoverFromRect:CGRectMake(960, 0, 220, 32) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionUp animated:YES]; -} - -// because of the actionSheet, the popOver might not get dismissed, so we do it manually (through a NSNotification system, see above) --(void) dismissPopover { - if (menuPopover.popoverVisible) - [menuPopover dismissPopoverAnimated:YES]; -} - -#pragma mark - -#pragma mark Custom touch event handling - -#define kMinimumPinchDelta 50 -#define kMinimumGestureLength 10 -#define kMaximumVariance 3 - --(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - NSArray *twoTouches; - UITouch *touch = [touches anyObject]; - int width = [[UIScreen mainScreen] bounds].size.width; - - switch ([touches count]) { - case 1: - gestureStartPoint = [touch locationInView:self.view]; - initialDistanceForPinching = 0; - switch ([touch tapCount]) { - case 1: - NSLog(@"X:%d Y:%d", (int)gestureStartPoint.x, (int)gestureStartPoint.y ); - SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window, - (int)gestureStartPoint.y, width - (int)gestureStartPoint.x); - HW_click(); - break; - case 2: - HW_ammoMenu(); - break; - default: - break; - } - break; - case 2: - if (2 == [touch tapCount]) { - HW_zoomReset(); - } - - // pinching - twoTouches = [touches allObjects]; - UITouch *first = [twoTouches objectAtIndex:0]; - UITouch *second = [twoTouches objectAtIndex:1]; - initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); - break; - default: - break; - } - -} - --(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { - initialDistanceForPinching = 0; - gestureStartPoint.x = 0; - gestureStartPoint.y = 0; - HW_allKeysUp(); -} - --(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { - // this can happen if the user puts more than 5 touches on the screen at once, or perhaps in other circumstances. - [self touchesEnded:touches withEvent:event]; -} - --(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { - NSArray *twoTouches; - CGPoint currentPosition; - UITouch *touch = [touches anyObject]; - int width = [[UIScreen mainScreen] bounds].size.width; - - switch ([touches count]) { - case 1: - currentPosition = [touch locationInView:self.view]; - // panning - SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window, - (int)gestureStartPoint.y, width - (int)gestureStartPoint.x); - // remember that we have x and y inverted - /* temporarily disabling hog movements for camera panning testing - CGFloat vertDiff = gestureStartPoint.x - currentPosition.x; - CGFloat horizDiff = gestureStartPoint.y - currentPosition.y; - CGFloat deltaX = fabsf(vertDiff); - CGFloat deltaY = fabsf(horizDiff); - - if (deltaY >= kMinimumGestureLength && deltaX <= kMaximumVariance) { - NSLog(@"Horizontal swipe detected, begX:%f curX:%f", gestureStartPoint.x, currentPosition.x); - if (horizDiff > 0) HW_walkLeft(); - else HW_walkRight(); - } else if (deltaX >= kMinimumGestureLength && deltaY <= kMaximumVariance){ - NSLog(@"Vertical swipe detected, begY:%f curY:%f", gestureStartPoint.y, currentPosition.y); - if (vertDiff < 0) HW_aimUp(); - else HW_aimDown(); - } - */ - break; - case 2: - twoTouches = [touches allObjects]; - UITouch *first = [twoTouches objectAtIndex:0]; - UITouch *second = [twoTouches objectAtIndex:1]; - CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); - - if (0 == initialDistanceForPinching) - initialDistanceForPinching = currentDistanceOfPinching; - - if (currentDistanceOfPinching < initialDistanceForPinching + kMinimumPinchDelta) - HW_zoomOut(); - else if (currentDistanceOfPinching > initialDistanceForPinching + kMinimumPinchDelta) - HW_zoomIn(); - - currentDistanceOfPinching = initialDistanceForPinching; - break; - default: - break; - } -} - - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/OverlayViewController.xib --- a/cocoaTouch/iPad/OverlayViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,718 +0,0 @@ - - - - 800 - 10C540 - 762 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 87 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - - 292 - - YES - - - 292 - {{0, 675}, {39, 53}} - - NO - NO - IBIPadFramework - 0 - 0 - - Helvetica-Bold - 15 - 16 - - - 3 - MQA - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - 3 - MC41AA - - - NSImage - arrowLeft.png - - - - - 292 - {{90, 675}, {39, 54}} - - NO - NO - 1 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowRight.png - - - - - 292 - {{964, 690}, {64, 48}} - - NO - NO - 6 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - joyPush.png - - - - - 292 - {{919, 665}, {64, 50}} - - NO - NO - 5 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - 292 - {{908, 723}, {61, 45}} - - NO - NO - 4 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - 292 - {{37, 638}, {53, 39}} - - NO - NO - 2 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowUp.png - - - - - 292 - {{37, 729}, {53, 39}} - - NO - NO - 3 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowDown.png - - - - - 292 - {{956, -5}, {72, 64}} - - NO - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - menuCorner.png - - - - {1024, 768} - - - 3 - MSAwAA - - NO - YES - - 3 - - IBIPadFramework - - - - - YES - - - view - - - - 3 - - - - buttonPressed: - - - 1 - - 8 - - - - buttonReleased: - - - 9 - - 9 - - - - buttonReleased: - - - 7 - - 10 - - - - buttonReleased: - - - 8 - - 11 - - - - buttonReleased: - - - 8 - - 13 - - - - buttonReleased: - - - 9 - - 14 - - - - buttonPressed: - - - 1 - - 15 - - - - buttonReleased: - - - 7 - - 16 - - - - buttonReleased: - - - 9 - - 18 - - - - buttonPressed: - - - 1 - - 19 - - - - buttonReleased: - - - 8 - - 20 - - - - buttonReleased: - - - 7 - - 21 - - - - buttonReleased: - - - 8 - - 23 - - - - buttonReleased: - - - 9 - - 24 - - - - buttonPressed: - - - 1 - - 25 - - - - buttonReleased: - - - 7 - - 26 - - - - buttonReleased: - - - 9 - - 44 - - - - buttonPressed: - - - 1 - - 45 - - - - buttonReleased: - - - 8 - - 46 - - - - buttonReleased: - - - 7 - - 47 - - - - buttonReleased: - - - 8 - - 49 - - - - buttonReleased: - - - 7 - - 50 - - - - buttonReleased: - - - 9 - - 51 - - - - buttonPressed: - - - 1 - - 52 - - - - buttonReleased: - - - 9 - - 54 - - - - buttonReleased: - - - 7 - - 55 - - - - buttonPressed: - - - 1 - - 56 - - - - buttonReleased: - - - 8 - - 57 - - - - showPopover - - - 7 - - 59 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - left - - - 12 - - - right - - - 17 - - - up - - - 22 - - - down - - - 43 - - - push2 - - - 48 - - - push1 - - - 53 - - - push3 - - - 58 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 12.IBPluginDependency - 17.IBPluginDependency - 22.IBPluginDependency - 4.IBPluginDependency - 43.IBPluginDependency - 48.IBPluginDependency - 53.IBPluginDependency - 58.IBPluginDependency - - - YES - OverlayViewController - UIResponder - {{0, 273}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 59 - - - - YES - - OverlayViewController - UIViewController - - YES - - YES - buttonPressed: - buttonReleased: - showPopover - - - YES - id - id - id - - - - IBProjectSource - ../../cocoaTouch/iPad/OverlayViewController.h - - - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - - YES - - YES - arrowDown.png - arrowLeft.png - arrowRight.png - arrowUp.png - joyPush.png - menuCorner.png - - - YES - {64, 64} - {64, 64} - {64, 64} - {64, 64} - {64, 64} - {64, 64} - - - 87 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/PopupMenuViewController.h --- a/cocoaTouch/iPad/PopupMenuViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -// -// popupMenuViewController.h -// HedgewarsMobile -// -// Created by Vittorio on 25/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface PopupMenuViewController : UITableViewController { - NSArray *menuList; - BOOL isPaused; -} -@property (nonatomic,retain) NSArray *menuList; - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/PopupMenuViewController.m --- a/cocoaTouch/iPad/PopupMenuViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,115 +0,0 @@ - // -// popupMenuViewController.m -// HedgewarsMobile -// -// Created by Vittorio on 25/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "SDL_uikitappdelegate.h" -#import "PopupMenuViewController.h" -#import "PascalImports.h" - -@implementation PopupMenuViewController -@synthesize menuList; - - --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Overriden to allow any orientation. - return YES; -} - --(void) didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - --(void) viewDidLoad { - isPaused = NO; - self.tableView.allowsSelection = YES; - self.tableView.alwaysBounceVertical = YES; - self.tableView.delaysContentTouches = NO; - menuList = [[NSArray alloc] initWithObjects: - NSLocalizedString(@"Pause Game", @""), - NSLocalizedString(@"Chat", @""), - NSLocalizedString(@"End Game", @""), - nil]; - [super viewDidLoad]; -} - - --(void) dealloc { - [menuList release]; - [super dealloc]; -} - -#pragma mark - -#pragma mark tableView methods --(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - --(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return 3; -} - --(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - static NSString *cellIdentifier = @"CellIdentifier"; - - UITableViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:cellIdentifier]; - if (nil == cell) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault - reuseIdentifier:cellIdentifier] autorelease]; - } - cell.textLabel.text = [menuList objectAtIndex:[indexPath row]]; - - return cell; -} - --(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - UIActionSheet *actionSheet; - - switch ([indexPath row]) { - case 0: - HW_pause(); - isPaused = !isPaused; - break; - case 1: - HW_chat(); - //SDL_iPhoneKeyboardShow([SDLUIKitDelegate sharedAppDelegate].window); - break; - case 2: - actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"") - delegate:self - cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"") - destructiveButtonTitle:NSLocalizedString(@"Of course!", @"") - otherButtonTitles:nil]; - [actionSheet showInView:self.view]; - [actionSheet release]; - - if (!isPaused) - HW_pause(); - break; - default: - NSLog(@"Warning: unset case value in section!"); - break; - } - - [aTableView deselectRowAtIndexPath:indexPath animated:YES]; -} - -#pragma mark - -#pragma mark actionSheet methods --(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { - if ([actionSheet cancelButtonIndex] != buttonIndex) { - [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissPopover" object:nil]; - HW_terminate(NO); - } - else - if (!isPaused) - HW_pause(); -} - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/PopupMenuViewController.xib --- a/cocoaTouch/iPad/PopupMenuViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,220 +0,0 @@ - - - - 800 - 10C540 - 762 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 87 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - - 292 - - YES - - - 274 - {320, 320} - - - 3 - MQA - - YES - IBIPadFramework - YES - YES - NO - 1 - NO - NO - NO - 1 - 3 - 44 - 22 - 22 - - - {320, 320} - - - NO - IBIPadFramework - - - - - YES - - - view - - - - 3 - - - - dataSource - - - - 18 - - - - delegate - - - - 19 - - - - menuTable - - - - 20 - - - - - YES - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 2 - - - YES - - - - - - 17 - - - - - - - YES - - YES - -1.CustomClassName - -1.showNotes - -2.CustomClassName - 17.IBPluginDependency - 2.IBEditorWindowLastContentRect - 2.IBPluginDependency - - - YES - PopupMenuViewController - - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{353, 836}, {320, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 20 - - - - YES - - PopupMenuViewController - UIViewController - - menuTable - UITableView - - - IBProjectSource - ../../cocoaTouch/iPad/PopupMenuViewController.h - - - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - 87 - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/SettingsViewController.xib --- a/cocoaTouch/iPad/SettingsViewController.xib Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,476 +0,0 @@ - - - - 768 - 10C540 - 759 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 79 - - - YES - - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - - 292 - {{100, 18}, {200, 31}} - NO - NO - IBIPadFramework - 0 - - username - - 1 - MC40MDAwMDAwMDYgMC40MDAwMDAwMDYgMQA - - - Helvetica - 15 - 16 - - 2 - YES - 17 - - 1 - 9 - IBCocoaTouchFramework - - - - - 292 - {{100, 50}, {200, 31}} - NO - NO - IBIPadFramework - 0 - - network password (if any) - - 3 - MAA - - 2 - - - - 2 - YES - YES - 17 - - 1 - 9 - YES - IBCocoaTouchFramework - - - - - 292 - - YES - - - 274 - {{272, 245}, {480, 278}} - - NO - 4 - NO - IBIPadFramework - - NSImage - backgroundTop.png - - - - - 274 - {{272, 245}, {480, 278}} - - NO - YES - NO - IBIPadFramework - NO - NO - NO - 1 - 1 - 0 - 44 - 10 - 10 - - - {1024, 768} - - - 1 - MCAwIDAAA - - 4 - IBIPadFramework - - - - 292 - - YES - - - 292 - {{100, 39}, {280, 50}} - - NO - NO - IBIPadFramework - 0 - 0 - - Helvetica-Bold - 15 - 16 - - 1 - Erase All Data - - 3 - MQA - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - 3 - MC41AA - - - - {480, 100} - - - 3 - MQA - - - NO - YES - NO - 3 - IBIPadFramework - - - - - YES - - - view - - - - 3 - - - - username - - - - 13 - - - - password - - - - 14 - - - - backgroundTap: - - - 1 - - 17 - - - - textFieldDoneEditing: - - - 20 - - 18 - - - - textFieldDoneEditing: - - - 20 - - 19 - - - - dataSource - - - - 31 - - - - delegate - - - - 32 - - - - deleteData: - - - 7 - - 42 - - - - buttonContainer - - - - 46 - - - - settingsTable - - - - 47 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - 5 - - - - - 6 - - - - - 44 - - - YES - - - - - - 41 - - - - - 30 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 30.IBPluginDependency - 4.IBPluginDependency - 41.IBEditorWindowLastContentRect - 41.IBPluginDependency - 44.IBEditorWindowLastContentRect - 44.IBPluginDependency - 5.IBPluginDependency - 6.IBPluginDependency - - - YES - SettingsViewController - UIResponder - UIControl - {{476, 44}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{1352, 334}, {220, 50}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{725, 399}, {480, 100}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 47 - - - - YES - - SettingsViewController - UIViewController - - YES - - YES - backgroundTap: - deleteData: - textFieldDoneEditing: - - - YES - id - id - id - - - - YES - - YES - buttonContainer - password - settingsTable - username - - - YES - UIView - UITextField - UITableView - UITextField - - - - IBProjectSource - ../../cocoaTouch/SettingsViewController.h - - - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - - backgroundTop.png - {480, 278} - - 79 - - - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/SingleTeamViewController.h --- a/cocoaTouch/iPad/SingleTeamViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -// -// SingleTeamViewController.h -// HedgewarsMobile -// -// Created by Vittorio on 02/04/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - -@class HogHatViewController; -@interface SingleTeamViewController : UITableViewController { - NSArray *hogsList; - NSArray *secondaryItems; - NSString *teamName; - - HogHatViewController *hogChildController; -} - -@property (nonatomic,retain) NSArray *hogsList; -@property (nonatomic,retain) NSArray *secondaryItems; -@property (nonatomic,retain) NSString *teamName; -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/SingleTeamViewController.m --- a/cocoaTouch/iPad/SingleTeamViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,207 +0,0 @@ -// -// SingleTeamViewController.m -// HedgewarsMobile -// -// Created by Vittorio on 02/04/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "SingleTeamViewController.h" -#import "HogHatViewController.h" - -@implementation SingleTeamViewController -@synthesize hogsList, secondaryItems, teamName; - - -#pragma mark - -#pragma mark View lifecycle -- (void)viewDidLoad { - [super viewDidLoad]; - - // Uncomment the following line to preserve selection between presentations. - //self.clearsSelectionOnViewWillAppear = NO; - - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - // self.navigationItem.rightBarButtonItem = self.editButtonItem; - - NSMutableArray *array = [[NSMutableArray alloc] initWithObjects: - NSLocalizedString(@"Color",@""), - NSLocalizedString(@"Grave",@""), - NSLocalizedString(@"Voice",@""), - NSLocalizedString(@"Fort",@""), - NSLocalizedString(@"Flag",@""), - NSLocalizedString(@"Level",@""),nil]; - self.secondaryItems = array; - [array release]; -} - - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); - NSString *teamFile = [[NSString alloc] initWithFormat:@"%@Teams/%@.plist",[paths objectAtIndex:0],self.teamName]; - NSDictionary *teamDict = [[NSDictionary alloc] initWithContentsOfFile:teamFile]; - [teamFile release]; - - self.hogsList = [teamDict objectForKey:@"hedgehogs"]; - self.teamName = [teamDict objectForKey:@"teamname"]; - [teamDict release]; - self.title = teamName; -} - -/* -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; -} -*/ -/* -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; -} -*/ -/* -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; -} -*/ - --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - - -#pragma mark - -#pragma mark Table view data source --(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { - return 3; -} - --(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - NSInteger rows; - switch (section) { - case 0: - rows = 1; - break; - case 1: - rows = 8; - break; - case 2: - rows = 6; - break; - default: - break; - } - return rows; -} - --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - static NSString *CellIdentifier = @"Cell"; - - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault - reuseIdentifier:CellIdentifier] autorelease]; - } - - NSInteger row = [indexPath row]; - switch ([indexPath section]) { - case 0: - cell.textLabel.text = teamName; - break; - case 1: - cell.textLabel.text = [[self.hogsList objectAtIndex:row] objectForKey:@"hogname"]; - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - break; - case 2: - cell.textLabel.text = [self.secondaryItems objectAtIndex:row]; - break; - default: - break; - } - - return cell; -} - - -/* -// Override to support conditional editing of the table view. -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the specified item to be editable. - return YES; -} -*/ - - -/* -// Override to support editing the table view. -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { - - if (editingStyle == UITableViewCellEditingStyleDelete) { - // Delete the row from the data source - [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; - } - else if (editingStyle == UITableViewCellEditingStyleInsert) { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } -} -*/ - - -/* -// Override to support rearranging the table view. -- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { -} -*/ - - -/* -// Override to support conditional rearranging of the table view. -- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the item to be re-orderable. - return YES; -} -*/ - - -#pragma mark - -#pragma mark Table view delegate - --(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - if (1 == [indexPath section]) { - if (nil == hogChildController) { - hogChildController = [[HogHatViewController alloc] initWithStyle:UITableViewStyleGrouped]; - } - - hogChildController.hog = [hogsList objectAtIndex:[indexPath row]]; - //NSLog(@"%@",hogChildController.hog); - [self.navigationController pushViewController:hogChildController animated:YES]; - } -} - - -#pragma mark - -#pragma mark Memory management - --(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 { - self.hogsList = nil; - self.secondaryItems = nil; - self.teamName = nil; -} - - --(void) dealloc { - [secondaryItems release]; - [hogsList release]; - [teamName release]; - [super dealloc]; -} - - -@end - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/SplitViewRootController.h --- a/cocoaTouch/iPad/SplitViewRootController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -// -// SplitViewRootController.h -// HedgewarsMobile -// -// Created by Vittorio on 27/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - -@class MasterViewController; -@class DetailViewController; -@interface SplitViewRootController : UIViewController { - UISplitViewController *splitViewController; - MasterViewController *masterViewController; - DetailViewController *detailViewController; -} - -@property (nonatomic,retain) IBOutlet UISplitViewController *splitViewController; -@property (nonatomic,retain) IBOutlet MasterViewController *masterViewController; -@property (nonatomic,retain) IBOutlet DetailViewController *detailViewController; -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/SplitViewRootController.m --- a/cocoaTouch/iPad/SplitViewRootController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ - // -// SplitViewRootController.m -// HedgewarsMobile -// -// Created by Vittorio on 27/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "SplitViewRootController.h" -#import "MasterViewController.h" -#import "DetailViewController.h" - -@implementation SplitViewRootController -@synthesize splitViewController, masterViewController, detailViewController; - - --(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - --(void) didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - // Release any cached data, images, etc that aren't in use. -} - -// load the view programmatically; we need a splitViewController that handles a MasterViewController -// (which is just a UITableViewController) and a DetailViewController where we present options --(void) viewDidLoad { - // init every possible controller - splitViewController = [[UISplitViewController alloc] init]; - CGRect screensize = [[UIScreen mainScreen] bounds]; - splitViewController.view.frame = CGRectMake(0, 0, screensize.size.height, screensize.size.width); - masterViewController = [[MasterViewController alloc] initWithStyle:UITableViewStylePlain]; - detailViewController = [[DetailViewController alloc] initWithStyle:UITableViewStyleGrouped]; - - UINavigationController *mainNavController = [[UINavigationController alloc] initWithRootViewController:masterViewController]; - UINavigationController *detailedNavController = [[UINavigationController alloc] initWithRootViewController:detailViewController]; - - // set attributes - masterViewController.detailViewController = detailViewController; - splitViewController.viewControllers = [NSArray arrayWithObjects: mainNavController, detailedNavController, nil]; - [mainNavController release]; - [detailedNavController release]; - - splitViewController.delegate = detailViewController; - - // add view to main controller - [self.view addSubview:splitViewController.view]; - [detailViewController release]; - [masterViewController release]; - - [super viewDidLoad]; -} - --(void) dealloc { - [detailViewController release]; - [masterViewController release]; - [splitViewController release]; - [super dealloc]; -} - -#pragma mark - -#pragma mark additional methods as we're using a UINavigationController programmatically -// see http://davidebenini.it/2009/01/03/viewwillappear-not-being-called-inside-a-uinavigationcontroller/ --(void) viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [detailViewController.navigationController viewWillAppear:animated]; -} - --(void) viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - [detailViewController.navigationController viewWillDisappear:animated]; -} - --(void) viewDidAppear:(BOOL)animated { - [super viewDidLoad]; - [detailViewController.navigationController viewDidAppear:animated]; -} - --(void) viewDidDisappear:(BOOL)animated { - [super viewDidUnload]; - [detailViewController.navigationController viewDidDisappear:animated]; -} - - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/TeamSettingsViewController.h --- a/cocoaTouch/iPad/TeamSettingsViewController.h Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -// -// TeamSettingsViewController.h -// HedgewarsMobile -// -// Created by Vittorio on 02/04/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import -@class SingleTeamViewController; - -@interface TeamSettingsViewController : UITableViewController { - NSArray *list; - SingleTeamViewController *childController; -} -@property (nonatomic, retain) NSArray *list; - -@end diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/iPad/TeamSettingsViewController.m --- a/cocoaTouch/iPad/TeamSettingsViewController.m Sun Apr 04 16:38:00 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,167 +0,0 @@ -// -// TeamSettingsViewController.m -// HedgewarsMobile -// -// Created by Vittorio on 02/04/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "TeamSettingsViewController.h" -#import "SingleTeamViewController.h" - -@implementation TeamSettingsViewController -@synthesize list; - -#pragma mark - -#pragma mark View lifecycle -- (void)viewDidLoad { - [super viewDidLoad]; - - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); - NSString *teamsDirectory = [[paths objectAtIndex:0] stringByAppendingString:@"Teams/"]; - - NSArray *contents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:teamsDirectory - error:NULL]; - self.list = contents; - - // Uncomment the following line to preserve selection between presentations. - // self.clearsSelectionOnViewWillAppear = NO; - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - self.navigationItem.rightBarButtonItem = self.editButtonItem; -} - -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Override to allow orientations other than the default portrait orientation. - return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); -} - - -#pragma mark - -#pragma mark Table view data source - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - // Return the number of sections. - return 1; -} - - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - // Return the number of rows in the section. - return [list count]; -} - - -// Customize the appearance of table view cells. -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - - static NSString *CellIdentifier = @"Cell"; - - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; - } - - NSUInteger row = [indexPath row]; - NSString *rowString = [[list objectAtIndex:row] stringByDeletingPathExtension]; - cell.textLabel.text = rowString; - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - //cell.imageView.image = [UIImage imageNamed:@"Default.png"]; - //[rowString release]; - - return cell; -} - - -/* -// Override to support conditional editing of the table view. -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the specified item to be editable. - return YES; -} -*/ - - -/* -// Override to support editing the table view. -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { - - if (editingStyle == UITableViewCellEditingStyleDelete) { - // Delete the row from the data source - [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; - } - else if (editingStyle == UITableViewCellEditingStyleInsert) { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } -} -*/ - - -/* -// Override to support rearranging the table view. -- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { -} -*/ - - -/* -// Override to support conditional rearranging of the table view. -- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the item to be re-orderable. - return YES; -} -*/ - - -#pragma mark - -#pragma mark Table view delegate -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - if (childController == nil) { - childController = [[SingleTeamViewController alloc] initWithStyle:UITableViewStyleGrouped]; - } - - NSInteger row = [indexPath row]; - NSString *selectedTeam = [[list objectAtIndex:row] stringByDeletingPathExtension]; - - childController.teamName = selectedTeam; - [self.navigationController pushViewController:childController animated:YES]; -} - -/* --(void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { - UIAlertView *alert = [[UIAlertView alloc] initWithTitle: @"Hey, do you see the disclosure button?" - message:@"If you're trying to drill down, touch that instead" - delegate:nil - cancelButtonTitle:@"Won't happen again" - otherButtonTitles:nil]; - [alert show]; - [alert release]; -} -*/ - -#pragma mark - -#pragma mark Memory management - -- (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 { - // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand. - // For example: self.myOutlet = nil; -} -*/ - -- (void)dealloc { - [list release]; - if (nil != childController) - [childController release]; - [super dealloc]; -} - - -@end - diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/resources/Default-iPad.png Binary file cocoaTouch/resources/Default-iPad.png has changed diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/xib/MainMenuViewController-iPad.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/xib/MainMenuViewController-iPad.xib Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,631 @@ + + + + 800 + 10D573 + 762 + 1038.29 + 460.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 87 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + + 292 + + YES + + + 274 + {1024, 768} + + NO + IBIPadFramework + + NSImage + Background.png + + + + + 292 + {{147, 20}, {745, 146}} + + NO + 4 + NO + IBIPadFramework + + NSImage + HedgewarsTitle.png + + + + + 292 + {{147, 200}, {258, 215}} + + NO + IBIPadFramework + 0 + 0 + + Helvetica-Bold + 15 + 16 + + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + NSImage + Multiplayer.png + + + + + 292 + {{634, 493}, {258, 215}} + + NO + 1 + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + NetworkPlay.png + + + + + 292 + {{279, 591}, {18, 19}} + + NO + 2 + IBIPadFramework + 0 + 0 + + 3 + YES + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + 292 + {{762, 183}, {87, 21}} + + NO + YES + 7 + NO + IBIPadFramework + + + 1 + MSAxIDEAA + + 1 + + + + 1 + 10 + + + {1024, 768} + + + 1 + MCAwIDAAA + + IBIPadFramework + + + + + YES + + + view + + + + 3 + + + + switchViews: + + + 7 + + 47 + + + + switchViews: + + + 7 + + 48 + + + + switchViews: + + + 7 + + 49 + + + + versionLabel + + + + 51 + + + + + YES + + 0 + + + + + + 1 + + + YES + + + + + + + + + + + -1 + + + File's Owner + + + -2 + + + + + 37 + + + + + 38 + + + + + 39 + + + local + + + 40 + + + multi + + + 45 + + + + + 50 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 37.IBPluginDependency + 38.IBPluginDependency + 39.IBPluginDependency + 40.IBPluginDependency + 45.IBPluginDependency + 50.IBPluginDependency + + + YES + MainMenuViewController + UIResponder + {{224, 56}, {1024, 768}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 51 + + + + YES + + MainMenuViewController + UIViewController + + switchViews: + id + + + versionLabel + UILabel + + + IBProjectSource + ../../cocoaTouch/MainMenuViewController.h + + + + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPort.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIButton + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UIButton.h + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h + + + + UILabel + UIView + + IBFrameworkSource + UIKit.framework/Headers/UILabel.h + + + + UIResponder + NSObject + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + + 0 + IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 3 + + YES + + YES + Background.png + HedgewarsTitle.png + Multiplayer.png + NetworkPlay.png + + + YES + {1024, 768} + {720, 140} + {264, 219} + {314, 260} + + + 87 + + diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/xib/MainMenuViewController-iPhone.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/xib/MainMenuViewController-iPhone.xib Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,746 @@ + + + + 800 + 10D573 + 762 + 1038.29 + 460.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 87 + + + YES + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + YES + + + 274 + {{0, 21}, {480, 278}} + + + 3 + MCAwAA + + 4 + NO + IBCocoaTouchFramework + + NSImage + backgroundCenter.png + + + + + 292 + {{13, 33}, {240, 52}} + + NO + NO + 4 + NO + IBCocoaTouchFramework + + NSImage + title.png + + + + + 292 + {{233, 127}, {220, 52}} + + + 1 + MCAwIDAgMAA + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + Helvetica-Bold + 15 + 16 + + + 3 + MQA + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + 3 + MC41AA + + + NSImage + playButton.png + + + + + 292 + {{233, 231}, {220, 52}} + + + 1 + MCAwIDAgMAA + + NO + NO + 3 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + networkButton.png + + + + + 292 + {{33, 187}, {220, 52}} + + + 1 + MCAwIDAgMAA + + NO + NO + 3 + IBCocoaTouchFramework + 0 + 0 + + + + 3 + MAA + + + + NSImage + storeButton.png + + + + + 292 + {{60, 102}, {145, 21}} + + NO + YES + NO + IBCocoaTouchFramework + + + Helvetica-Oblique + 17 + 16 + + + 1 + MSAxIDEAA + + + 1 + 10 + 1 + + + + 292 + {{313, 49}, {59, 52}} + + NO + NO + 2 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + settingsButton.png + + + + + 274 + {480, 21} + + NO + NO + 4 + NO + IBCocoaTouchFramework + + NSImage + borderTop.png + + + + + 274 + {{0, 300}, {480, 20}} + + NO + NO + 4 + NO + IBCocoaTouchFramework + + NSImage + borderBottom.png + + + + {480, 320} + + 1 + MCAwIDAAA + + IBCocoaTouchFramework + + + + + YES + + + view + + + + 3 + + + + switchViews: + + + 7 + + 30 + + + + versionLabel + + + + 37 + + + + switchViews: + + + 7 + + 38 + + + + switchViews: + + + 7 + + 39 + + + + switchViews: + + + 7 + + 40 + + + + + YES + + 0 + + + + + + 1 + + + YES + + + + + + + + + + + + + + -1 + + + File's Owner + + + -2 + + + + + 35 + + + + + 36 + + + + + 22 + + + + + 23 + + + + + 24 + + + + + 25 + + + + + 26 + + + + + 27 + + + + + 28 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 22.IBPluginDependency + 23.IBPluginDependency + 24.IBPluginDependency + 25.IBPluginDependency + 26.IBPluginDependency + 27.IBPluginDependency + 28.IBPluginDependency + 35.IBPluginDependency + 36.IBPluginDependency + + + YES + MainMenuViewController + UIResponder + {{75, 599}, {480, 320}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 40 + + + + YES + + MainMenuViewController + UIViewController + + switchViews: + id + + + versionLabel + UILabel + + + IBProjectSource + ../../cocoaTouch/MainMenuViewController.h + + + + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPort.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIButton + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UIButton.h + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h + + + + UILabel + UIView + + IBFrameworkSource + UIKit.framework/Headers/UILabel.h + + + + UIResponder + NSObject + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 3 + + YES + + YES + backgroundCenter.png + borderBottom.png + borderTop.png + networkButton.png + playButton.png + settingsButton.png + storeButton.png + title.png + + + YES + {480, 278} + {480, 21} + {480, 21} + {217, 51} + {216, 51} + {57, 51} + {216, 51} + {262, 84} + + + 87 + + diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/xib/OverlayViewController-iPad.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/xib/OverlayViewController-iPad.xib Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,718 @@ + + + + 800 + 10C540 + 762 + 1038.25 + 458.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 87 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + + 292 + + YES + + + 292 + {{0, 675}, {39, 53}} + + NO + NO + IBIPadFramework + 0 + 0 + + Helvetica-Bold + 15 + 16 + + + 3 + MQA + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + 3 + MC41AA + + + NSImage + arrowLeft.png + + + + + 292 + {{90, 675}, {39, 54}} + + NO + NO + 1 + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + arrowRight.png + + + + + 292 + {{964, 690}, {64, 48}} + + NO + NO + 6 + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + joyPush.png + + + + + 292 + {{919, 665}, {64, 50}} + + NO + NO + 5 + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + 292 + {{908, 723}, {61, 45}} + + NO + NO + 4 + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + 292 + {{37, 638}, {53, 39}} + + NO + NO + 2 + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + arrowUp.png + + + + + 292 + {{37, 729}, {53, 39}} + + NO + NO + 3 + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + arrowDown.png + + + + + 292 + {{956, -5}, {72, 64}} + + NO + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + menuCorner.png + + + + {1024, 768} + + + 3 + MSAwAA + + NO + YES + + 3 + + IBIPadFramework + + + + + YES + + + view + + + + 3 + + + + buttonPressed: + + + 1 + + 8 + + + + buttonReleased: + + + 9 + + 9 + + + + buttonReleased: + + + 7 + + 10 + + + + buttonReleased: + + + 8 + + 11 + + + + buttonReleased: + + + 8 + + 13 + + + + buttonReleased: + + + 9 + + 14 + + + + buttonPressed: + + + 1 + + 15 + + + + buttonReleased: + + + 7 + + 16 + + + + buttonReleased: + + + 9 + + 18 + + + + buttonPressed: + + + 1 + + 19 + + + + buttonReleased: + + + 8 + + 20 + + + + buttonReleased: + + + 7 + + 21 + + + + buttonReleased: + + + 8 + + 23 + + + + buttonReleased: + + + 9 + + 24 + + + + buttonPressed: + + + 1 + + 25 + + + + buttonReleased: + + + 7 + + 26 + + + + buttonReleased: + + + 9 + + 44 + + + + buttonPressed: + + + 1 + + 45 + + + + buttonReleased: + + + 8 + + 46 + + + + buttonReleased: + + + 7 + + 47 + + + + buttonReleased: + + + 8 + + 49 + + + + buttonReleased: + + + 7 + + 50 + + + + buttonReleased: + + + 9 + + 51 + + + + buttonPressed: + + + 1 + + 52 + + + + buttonReleased: + + + 9 + + 54 + + + + buttonReleased: + + + 7 + + 55 + + + + buttonPressed: + + + 1 + + 56 + + + + buttonReleased: + + + 8 + + 57 + + + + showPopover + + + 7 + + 59 + + + + + YES + + 0 + + + + + + 1 + + + YES + + + + + + + + + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + left + + + 12 + + + right + + + 17 + + + up + + + 22 + + + down + + + 43 + + + push2 + + + 48 + + + push1 + + + 53 + + + push3 + + + 58 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 12.IBPluginDependency + 17.IBPluginDependency + 22.IBPluginDependency + 4.IBPluginDependency + 43.IBPluginDependency + 48.IBPluginDependency + 53.IBPluginDependency + 58.IBPluginDependency + + + YES + OverlayViewController + UIResponder + {{0, 273}, {1024, 768}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 59 + + + + YES + + OverlayViewController + UIViewController + + YES + + YES + buttonPressed: + buttonReleased: + showPopover + + + YES + id + id + id + + + + IBProjectSource + ../../cocoaTouch/iPad/OverlayViewController.h + + + + + 0 + IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 3 + + YES + + YES + arrowDown.png + arrowLeft.png + arrowRight.png + arrowUp.png + joyPush.png + menuCorner.png + + + YES + {64, 64} + {64, 64} + {64, 64} + {64, 64} + {64, 64} + {64, 64} + + + 87 + + diff -r 8690a3aa93b5 -r 91074496d5c9 cocoaTouch/xib/OverlayViewController-iPhone.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/xib/OverlayViewController-iPhone.xib Sun Apr 04 19:51:53 2010 +0000 @@ -0,0 +1,699 @@ + + + + 768 + 10C540 + 762 + 1038.25 + 458.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 87 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + YES + + + 292 + {{0, 237}, {39, 53}} + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + Helvetica-Bold + 15 + 16 + + + 3 + MQA + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + 3 + MC41AA + + + NSImage + arrowLeft.png + + + + + 292 + {{75, 237}, {39, 54}} + + NO + NO + 1 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + arrowRight.png + + + + + 292 + {{416, 233}, {64, 64}} + + NO + NO + 6 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + joyPush.png + + + + + 292 + {{368, 213}, {64, 64}} + + NO + NO + 5 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + 292 + {{344, 262}, {64, 64}} + + NO + NO + 4 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + 292 + {{29, 207}, {53, 39}} + + NO + NO + 2 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + arrowUp.png + + + + + 292 + {{29, 281}, {53, 39}} + + NO + NO + 3 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + arrowDown.png + + + + {480, 320} + + + 3 + MSAwAA + + NO + YES + + 3 + + IBCocoaTouchFramework + + + + + YES + + + view + + + + 3 + + + + buttonPressed: + + + 1 + + 8 + + + + buttonReleased: + + + 9 + + 9 + + + + buttonReleased: + + + 7 + + 10 + + + + buttonReleased: + + + 8 + + 11 + + + + buttonReleased: + + + 8 + + 13 + + + + buttonReleased: + + + 9 + + 14 + + + + buttonPressed: + + + 1 + + 15 + + + + buttonReleased: + + + 7 + + 16 + + + + buttonReleased: + + + 9 + + 18 + + + + buttonPressed: + + + 1 + + 19 + + + + buttonReleased: + + + 8 + + 20 + + + + buttonReleased: + + + 7 + + 21 + + + + buttonReleased: + + + 8 + + 23 + + + + buttonReleased: + + + 9 + + 24 + + + + buttonPressed: + + + 1 + + 25 + + + + buttonReleased: + + + 7 + + 26 + + + + buttonReleased: + + + 9 + + 44 + + + + buttonPressed: + + + 1 + + 45 + + + + buttonReleased: + + + 8 + + 46 + + + + buttonReleased: + + + 7 + + 47 + + + + buttonReleased: + + + 8 + + 49 + + + + buttonReleased: + + + 7 + + 50 + + + + buttonReleased: + + + 9 + + 51 + + + + buttonPressed: + + + 1 + + 52 + + + + buttonReleased: + + + 9 + + 54 + + + + buttonReleased: + + + 7 + + 55 + + + + buttonPressed: + + + 1 + + 56 + + + + buttonReleased: + + + 8 + + 57 + + + + + YES + + 0 + + + + + + 1 + + + YES + + + + + + + + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + left + + + 12 + + + right + + + 17 + + + up + + + 22 + + + down + + + 43 + + + push2 + + + 48 + + + push1 + + + 53 + + + push3 + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 12.IBPluginDependency + 17.IBPluginDependency + 22.IBPluginDependency + 4.IBPluginDependency + 43.IBPluginDependency + 48.IBPluginDependency + 53.IBPluginDependency + + + YES + OverlayViewController + UIResponder + {{222, 776}, {480, 320}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 57 + + + + YES + + OverlayViewController + UIViewController + + YES + + YES + buttonPressed: + buttonReleased: + + + YES + id + id + + + + IBProjectSource + ../../cocoaTouch/OverlayViewController.h + + + + OverlayViewController + UIViewController + + YES + + YES + buttonPressed: + buttonReleased: + showPopover + + + YES + id + id + id + + + + IBProjectSource + ../../cocoaTouch/iPad/OverlayViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + ../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 3 + + YES + + YES + arrowDown.png + arrowLeft.png + arrowRight.png + arrowUp.png + joyPush.png + + + YES + {64, 64} + {64, 64} + {64, 64} + {64, 64} + {64, 64} + + + 87 + + diff -r 8690a3aa93b5 -r 91074496d5c9 hedgewars/uMisc.pas --- a/hedgewars/uMisc.pas Sun Apr 04 16:38:00 2010 +0000 +++ b/hedgewars/uMisc.pas Sun Apr 04 19:51:53 2010 +0000 @@ -651,7 +651,7 @@ procedure initModule; -{$IFDEF DEBUGFILE}var i: LongInt;{$ENDIF} +{$IFDEF DEBUGFILE}{$IFNDEF IPHONEOS}var i: LongInt;{$ENDIF}{$ENDIF} begin cDrownSpeed.QWordValue := 257698038; // 0.06 cMaxWindSpeed.QWordValue:= 2147484; // 0.0005 diff -r 8690a3aa93b5 -r 91074496d5c9 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Sun Apr 04 16:38:00 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Sun Apr 04 19:51:53 2010 +0000 @@ -25,96 +25,6 @@ 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; - 6100DA77115446B000F455E0 /* backgroundBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A1E114ADD2600BA94A9 /* backgroundBottom.png */; }; - 6100DA78115446B000F455E0 /* backgroundCenter.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A1F114ADD2600BA94A9 /* backgroundCenter.png */; }; - 6100DA79115446B000F455E0 /* backgroundLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A20114ADD2600BA94A9 /* backgroundLeft.png */; }; - 6100DA7A115446B000F455E0 /* backgroundRight.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A21114ADD2600BA94A9 /* backgroundRight.png */; }; - 6100DA7B115446B000F455E0 /* backgroundTop.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A22114ADD2600BA94A9 /* backgroundTop.png */; }; - 6100DA7C115446B000F455E0 /* borderBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A23114ADD2600BA94A9 /* borderBottom.png */; }; - 6100DA7D115446B000F455E0 /* borderTop.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A24114ADD2600BA94A9 /* borderTop.png */; }; - 6100DA7F115446B000F455E0 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A26114ADD2600BA94A9 /* Icon.png */; }; - 6100DA80115446B000F455E0 /* networkButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A27114ADD2600BA94A9 /* networkButton.png */; }; - 6100DA81115446B000F455E0 /* playButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A28114ADD2600BA94A9 /* playButton.png */; }; - 6100DA82115446B000F455E0 /* settingsButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A29114ADD2600BA94A9 /* settingsButton.png */; }; - 6100DA83115446B000F455E0 /* storeButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A2A114ADD2600BA94A9 /* storeButton.png */; }; - 6100DA84115446B000F455E0 /* title.png in Resources */ = {isa = PBXBuildFile; fileRef = 61798A2B114ADD2600BA94A9 /* title.png */; }; - 6100DA85115446B000F455E0 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; }; - 6100DA86115446B000F455E0 /* menuCorner.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179934E114BD5AB00BA94A9 /* menuCorner.png */; }; - 6100DA87115446B000F455E0 /* arrowDown.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936711501D3D00BA94A9 /* arrowDown.png */; }; - 6100DA88115446B000F455E0 /* arrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936811501D3D00BA94A9 /* arrowLeft.png */; }; - 6100DA89115446B000F455E0 /* arrowRight.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936911501D3D00BA94A9 /* arrowRight.png */; }; - 6100DA8A115446B000F455E0 /* arrowUp.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936A11501D3D00BA94A9 /* arrowUp.png */; }; - 6100DA8C115446B000F455E0 /* joyPush.png in Resources */ = {isa = PBXBuildFile; fileRef = 617995311150403800BA94A9 /* joyPush.png */; }; - 6100DA8E115446B000F455E0 /* hwengine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */; }; - 6100DA8F115446B000F455E0 /* hwLibrary.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; }; - 6100DA90115446B000F455E0 /* PascalExports.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; }; - 6100DA91115446B000F455E0 /* SDLh.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987ED114AA34C00BA94A9 /* SDLh.pas */; }; - 6100DA92115446B000F455E0 /* uAI.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987F1114AA34C00BA94A9 /* uAI.pas */; }; - 6100DA93115446B000F455E0 /* uAIActions.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987F2114AA34C00BA94A9 /* uAIActions.pas */; }; - 6100DA94115446B000F455E0 /* uAIAmmoTests.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987F3114AA34C00BA94A9 /* uAIAmmoTests.pas */; }; - 6100DA95115446B000F455E0 /* uAIMisc.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987F4114AA34C00BA94A9 /* uAIMisc.pas */; }; - 6100DA96115446B000F455E0 /* uAmmos.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987F5114AA34C00BA94A9 /* uAmmos.pas */; }; - 6100DA97115446B000F455E0 /* uChat.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987F6114AA34C00BA94A9 /* uChat.pas */; }; - 6100DA98115446B000F455E0 /* uCollisions.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987F7114AA34C00BA94A9 /* uCollisions.pas */; }; - 6100DA99115446B000F455E0 /* uConsole.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987F8114AA34C00BA94A9 /* uConsole.pas */; }; - 6100DA9A115446B000F455E0 /* uConsts.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987F9114AA34C00BA94A9 /* uConsts.pas */; }; - 6100DA9B115446B000F455E0 /* uFloat.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */; }; - 6100DA9C115446B000F455E0 /* uGame.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FB114AA34C00BA94A9 /* uGame.pas */; }; - 6100DA9D115446B000F455E0 /* uGears.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FC114AA34C00BA94A9 /* uGears.pas */; }; - 6100DA9E115446B000F455E0 /* uIO.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FD114AA34C00BA94A9 /* uIO.pas */; }; - 6100DA9F115446B000F455E0 /* uKeys.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; }; - 6100DAA0115446B000F455E0 /* uLand.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FF114AA34C00BA94A9 /* uLand.pas */; }; - 6100DAA1115446B000F455E0 /* uLandGraphics.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798800114AA34C00BA94A9 /* uLandGraphics.pas */; }; - 6100DAA2115446B000F455E0 /* uLandObjects.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798801114AA34C00BA94A9 /* uLandObjects.pas */; }; - 6100DAA3115446B000F455E0 /* uLandTemplates.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798802114AA34C00BA94A9 /* uLandTemplates.pas */; }; - 6100DAA4115446B000F455E0 /* uLandTexture.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798803114AA34C00BA94A9 /* uLandTexture.pas */; }; - 6100DAA5115446B000F455E0 /* uLocale.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798804114AA34C00BA94A9 /* uLocale.pas */; }; - 6100DAA6115446B000F455E0 /* uMisc.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798805114AA34C00BA94A9 /* uMisc.pas */; }; - 6100DAA7115446B000F455E0 /* uRandom.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798806114AA34C00BA94A9 /* uRandom.pas */; }; - 6100DAA8115446B000F455E0 /* uScript.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798807114AA34C00BA94A9 /* uScript.pas */; }; - 6100DAA9115446B000F455E0 /* uSHA.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798808114AA34C00BA94A9 /* uSHA.pas */; }; - 6100DAAA115446B000F455E0 /* uSound.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61798809114AA34C00BA94A9 /* uSound.pas */; }; - 6100DAAB115446B000F455E0 /* uStats.pas in Sources */ = {isa = PBXBuildFile; fileRef = 6179880A114AA34C00BA94A9 /* uStats.pas */; }; - 6100DAAC115446B000F455E0 /* uStore.pas in Sources */ = {isa = PBXBuildFile; fileRef = 6179880B114AA34C00BA94A9 /* uStore.pas */; }; - 6100DAAD115446B000F455E0 /* uTeams.pas in Sources */ = {isa = PBXBuildFile; fileRef = 6179880C114AA34C00BA94A9 /* uTeams.pas */; }; - 6100DAAE115446B000F455E0 /* uVisualGears.pas in Sources */ = {isa = PBXBuildFile; fileRef = 6179880E114AA34C00BA94A9 /* uVisualGears.pas */; }; - 6100DAAF115446B000F455E0 /* uWorld.pas in Sources */ = {isa = PBXBuildFile; fileRef = 6179880F114AA34C00BA94A9 /* uWorld.pas */; }; - 6100DAB0115446B000F455E0 /* CGPointUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = 61798856114AA48A00BA94A9 /* CGPointUtils.c */; }; - 6100DAB1115446B000F455E0 /* IMG_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 61798858114AA48A00BA94A9 /* IMG_png.c */; }; - 6100DAB2115446B000F455E0 /* IMG.c in Sources */ = {isa = PBXBuildFile; fileRef = 61798859114AA48A00BA94A9 /* IMG.c */; }; - 6100DAB3115446B000F455E0 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; }; - 6100DAB5115446B000F455E0 /* SDL_uikitwindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */; }; - 6100DAB7115446B000F455E0 /* SchemeEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798872114AA4D000BA94A9 /* SchemeEditViewController.m */; }; - 6100DAB8115446B000F455E0 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798875114AA4D000BA94A9 /* SettingsViewController.m */; }; - 6100DAB9115446B000F455E0 /* TeamEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798878114AA4D000BA94A9 /* TeamEditViewController.m */; }; - 6100DABA115446B000F455E0 /* TeamMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6179887B114AA4D000BA94A9 /* TeamMenuViewController.m */; }; - 6100DABB115446B000F455E0 /* GameSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798888114AA4E600BA94A9 /* GameSetup.m */; }; - 6100DABE115446B000F455E0 /* libSDL_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798A13114AB65600BA94A9 /* libSDL_ttf.a */; }; - 6100DABF115446B000F455E0 /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617989BB114AB47500BA94A9 /* libSDL_net.a */; }; - 6100DAC0115446B000F455E0 /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617988DA114AAA3900BA94A9 /* libSDLiPhoneOS.a */; }; - 6100DAC1115446B000F455E0 /* libSDL_mixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798993114AB3FA00BA94A9 /* libSDL_mixer.a */; }; - 6100DAC2115446B000F455E0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; }; - 6100DAC3115446B000F455E0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; - 6100DAC4115446B000F455E0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; - 6100DAC5115446B000F455E0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; - 6100DAC6115446B000F455E0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; - 6100DAC7115446B000F455E0 /* libfreetype_arm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798916114AAF2100BA94A9 /* libfreetype_arm.a */; }; - 6100DAC8115446B000F455E0 /* libfreetype_x86.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798917114AAF2100BA94A9 /* libfreetype_x86.a */; }; - 6100DAC9115446B000F455E0 /* libpng_arm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798918114AAF2100BA94A9 /* libpng_arm.a */; }; - 6100DACA115446B000F455E0 /* libpng_x86.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798919114AAF2100BA94A9 /* libpng_x86.a */; }; - 6100DACB115446B000F455E0 /* libvorbis_arm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6179891A114AAF2100BA94A9 /* libvorbis_arm.a */; }; - 6100DACC115446B000F455E0 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798934114AB25F00BA94A9 /* AudioToolbox.framework */; }; - 611FD993115590E700C2203D /* MainMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611FD990115590E700C2203D /* MainMenuViewController.xib */; }; - 611FD995115590E700C2203D /* SettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611FD992115590E700C2203D /* SettingsViewController.xib */; }; - 611FD9C91155A1F200C2203D /* Background.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9C81155A1F200C2203D /* Background.png */; }; - 611FD9CC1155A28C00C2203D /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; }; - 611FD9D01155A40700C2203D /* NetworkPlay.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */; }; - 611FD9D21155A41000C2203D /* Multiplayer.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9D11155A41000C2203D /* Multiplayer.png */; }; - 611FDB641155BFFF00C2203D /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FDB631155BFFF00C2203D /* Default.png */; }; - 615F159E1166216A002444F2 /* TeamSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */; }; - 615F15AE116628CC002444F2 /* SingleTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */; }; - 615F16DC11668358002444F2 /* HogHatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 615F16DB11668358002444F2 /* HogHatViewController.m */; }; - 615F19861166A6AB002444F2 /* untitled.m in Sources */ = {isa = PBXBuildFile; fileRef = 615F19851166A6AB002444F2 /* untitled.m */; }; 61798816114AA34C00BA94A9 /* hwengine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */; }; 61798818114AA34C00BA94A9 /* hwLibrary.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; }; 6179881B114AA34C00BA94A9 /* PascalExports.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; }; @@ -155,15 +65,6 @@ 61798869114AA4AA00BA94A9 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; }; 6179886B114AA4AA00BA94A9 /* SDL_uikitwindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */; }; 6179887D114AA4D000BA94A9 /* MainMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; }; - 6179887E114AA4D000BA94A9 /* MainMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61798870114AA4D000BA94A9 /* MainMenuViewController.xib */; }; - 6179887F114AA4D000BA94A9 /* SchemeEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798872114AA4D000BA94A9 /* SchemeEditViewController.m */; }; - 61798880114AA4D000BA94A9 /* SchemeEditViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61798873114AA4D000BA94A9 /* SchemeEditViewController.xib */; }; - 61798881114AA4D000BA94A9 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798875114AA4D000BA94A9 /* SettingsViewController.m */; }; - 61798882114AA4D000BA94A9 /* SettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61798876114AA4D000BA94A9 /* SettingsViewController.xib */; }; - 61798883114AA4D000BA94A9 /* TeamEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798878114AA4D000BA94A9 /* TeamEditViewController.m */; }; - 61798884114AA4D000BA94A9 /* TeamEditViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61798879114AA4D000BA94A9 /* TeamEditViewController.xib */; }; - 61798885114AA4D000BA94A9 /* TeamMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6179887B114AA4D000BA94A9 /* TeamMenuViewController.m */; }; - 61798886114AA4D000BA94A9 /* TeamMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6179887C114AA4D000BA94A9 /* TeamMenuViewController.xib */; }; 61798889114AA4E600BA94A9 /* GameSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 61798888114AA4E600BA94A9 /* GameSetup.m */; }; 617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617988DA114AAA3900BA94A9 /* libSDLiPhoneOS.a */; }; 6179891B114AAF2100BA94A9 /* libfreetype_arm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798916114AAF2100BA94A9 /* libfreetype_arm.a */; }; @@ -196,31 +97,28 @@ 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 */; }; - 61C0838A11567C83005D474F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61C0838911567C83005D474F /* CoreGraphics.framework */; }; - 61CE24EE115E71C20098C467 /* OverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61CE24EB115E71C20098C467 /* OverlayViewController.m */; }; - 61CE24EF115E71C20098C467 /* PopupMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */; }; - 61CE2503115E73210098C467 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61CE2501115E73210098C467 /* OverlayViewController.xib */; }; + 61A118431168367200359010 /* OverlayViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61A118421168367200359010 /* OverlayViewController-iPhone.xib */; }; + 61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A117FE1168322700359010 /* CoreGraphics.framework */; }; + 61A118CA11683C7600359010 /* MainMenuViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61A118C911683C7600359010 /* MainMenuViewController-iPad.xib */; }; + 61A118CC11683C7A00359010 /* MainMenuViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61A118CB11683C7A00359010 /* MainMenuViewController-iPhone.xib */; }; + 61A118D211683CD100359010 /* Background.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9C81155A1F200C2203D /* Background.png */; }; + 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; }; + 61A118D411683CD100359010 /* Multiplayer.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9D11155A41000C2203D /* Multiplayer.png */; }; + 61A118D511683CD100359010 /* NetworkPlay.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */; }; + 61A118DF11683D1F00359010 /* OverlayViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61A118401168366200359010 /* OverlayViewController-iPad.xib */; }; + 61A11A4E1168D13600359010 /* PopoverMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */; }; + 61A11AC11168D8B600359010 /* SplitViewRootController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */; }; + 61A11AC91168DA9400359010 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; }; + 61A11ACF1168DB1B00359010 /* TeamSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */; }; + 61A11AD61168DB3700359010 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AD51168DB3700359010 /* DetailViewController.m */; }; + 61A11AE11168DC6E00359010 /* SingleTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; }; + 61A11AE41168DC9400359010 /* HogHatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; }; + 61A11B591169234900359010 /* Default-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61A11B581169234900359010 /* Default-iPad.png */; }; 61CE250D115E749A0098C467 /* OverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; }; - 61CE2511115E74C90098C467 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61CE2510115E74C90098C467 /* OverlayViewController.xib */; }; - 61CE25C3115E7D1D0098C467 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; }; - 61E2F06911567CC7002D33C1 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61E2F06811567CC7002D33C1 /* CoreGraphics.framework */; }; - 61FA761F115DA0DB00DA6ED0 /* MainMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */; }; - 61FA7647115DA6A300DA6ED0 /* SplitViewRootController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; }; - 61FA765D115DAACC00DA6ED0 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */; }; 922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ - 6100DACE115446B000F455E0 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.proxy.script; - fileType = sourcecode.pascal; - isEditable = 1; - outputFiles = ( - "$(DERIVED_SOURCES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_BASE).s", - ); - script = "#!/bin/bash\n\n# Xcode's up-to-date checks are overzealous for us: a different SDK does not necessarily\n# mean we recompile all sources, because we do not have different units for different SDK\n# versions yet (and even if we did, not necessarily all files would be recompiled)...\n\ndestdir=\"${DERIVED_SOURCES_DIR}-${CURRENT_VARIANT}/${CURRENT_ARCH}\"\nif [ ! -f \"$destdir/compilefailed\" ]; then\n # check whether the assembler code is newer than the source code\n if [ \"$destdir/${INPUT_FILE_BASE}.s\" -nt \"$INPUT_FILE_PATH\" ]; then\n # in this case we're ok, just touch the assembler file to avoid us getting here again next time\n echo Updating assembler time stamp of \"$destdir/${INPUT_FILE_BASE}.s\"\n touch \"$destdir/${INPUT_FILE_BASE}.s\"\n exit 0\n fi\n\n echo File not found or not up-to-date: $destdir/${INPUT_FILE_BASE}.s\n echo \"$INPUT_FILE_PATH:1: error: 1: \\\"$INPUT_FILE_PATH\\\" was not (re)compiled. If it is no longer used, please remove it from the \\\"Compile Sources\\\" phase of the \\\"$TARGETNAME\\\" target.\"\n exit 1\nfi"; - }; 9283015B0F10E46D00CC5A3C /* PBXBuildRule */ = { isa = PBXBuildRule; compilerSpec = com.apple.compilers.proxy.script; @@ -234,13 +132,6 @@ /* End PBXBuildRule section */ /* Begin PBXContainerItemProxy section */ - 6100DA70115446B000F455E0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 928301160F10CAFC00CC5A3C; - remoteInfo = fpc; - }; 617988D9114AAA3900BA94A9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */; @@ -285,22 +176,10 @@ 28FD14FF0DC6FC520079059D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 32CA4F630368D1EE00C91783 /* HedgewarsMobile_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HedgewarsMobile_Prefix.pch; sourceTree = ""; }; - 6100DAD2115446B000F455E0 /* iHedgewars.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iHedgewars.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 611FD990115590E700C2203D /* MainMenuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenuViewController.xib; path = ../../cocoaTouch/iPad/MainMenuViewController.xib; sourceTree = SOURCE_ROOT; }; - 611FD992115590E700C2203D /* SettingsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SettingsViewController.xib; path = ../../cocoaTouch/iPad/SettingsViewController.xib; sourceTree = SOURCE_ROOT; }; 611FD9C81155A1F200C2203D /* Background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Background.png; path = ../../QTfrontend/res/Background.png; sourceTree = SOURCE_ROOT; }; 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HedgewarsTitle.png; path = ../../QTfrontend/res/HedgewarsTitle.png; sourceTree = SOURCE_ROOT; }; 611FD9CF1155A40700C2203D /* NetworkPlay.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = NetworkPlay.png; path = ../../QTfrontend/res/NetworkPlay.png; sourceTree = SOURCE_ROOT; }; 611FD9D11155A41000C2203D /* Multiplayer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Multiplayer.png; path = ../../QTfrontend/res/Multiplayer.png; sourceTree = SOURCE_ROOT; }; - 611FDB631155BFFF00C2203D /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../../cocoaTouch/iPad/Default.png; sourceTree = SOURCE_ROOT; }; - 615F159C1166216A002444F2 /* TeamSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TeamSettingsViewController.h; path = ../../cocoaTouch/iPad/TeamSettingsViewController.h; sourceTree = SOURCE_ROOT; }; - 615F159D1166216A002444F2 /* TeamSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TeamSettingsViewController.m; path = ../../cocoaTouch/iPad/TeamSettingsViewController.m; sourceTree = SOURCE_ROOT; }; - 615F15AC116628CC002444F2 /* SingleTeamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SingleTeamViewController.h; path = ../../cocoaTouch/iPad/SingleTeamViewController.h; sourceTree = SOURCE_ROOT; }; - 615F15AD116628CC002444F2 /* SingleTeamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SingleTeamViewController.m; path = ../../cocoaTouch/iPad/SingleTeamViewController.m; sourceTree = SOURCE_ROOT; }; - 615F16DA11668358002444F2 /* HogHatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HogHatViewController.h; path = ../../cocoaTouch/iPad/HogHatViewController.h; sourceTree = SOURCE_ROOT; }; - 615F16DB11668358002444F2 /* HogHatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HogHatViewController.m; path = ../../cocoaTouch/iPad/HogHatViewController.m; sourceTree = SOURCE_ROOT; }; - 615F19841166A6AB002444F2 /* untitled.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = untitled.h; sourceTree = ""; }; - 615F19851166A6AB002444F2 /* untitled.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = untitled.m; sourceTree = ""; }; 617987E1114AA34C00BA94A9 /* CCHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = CCHandlers.inc; path = ../../hedgewars/CCHandlers.inc; sourceTree = SOURCE_ROOT; }; 617987E4114AA34C00BA94A9 /* GSHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = GSHandlers.inc; path = ../../hedgewars/GSHandlers.inc; sourceTree = SOURCE_ROOT; }; 617987E5114AA34C00BA94A9 /* HHHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = HHHandlers.inc; path = ../../hedgewars/HHHandlers.inc; sourceTree = SOURCE_ROOT; }; @@ -353,19 +232,6 @@ 61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_uikitwindow.m; path = ../../cocoaTouch/SDLOverrides/SDL_uikitwindow.m; sourceTree = SOURCE_ROOT; }; 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainMenuViewController.h; path = ../../cocoaTouch/MainMenuViewController.h; sourceTree = SOURCE_ROOT; }; 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainMenuViewController.m; path = ../../cocoaTouch/MainMenuViewController.m; sourceTree = SOURCE_ROOT; }; - 61798870114AA4D000BA94A9 /* MainMenuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenuViewController.xib; path = ../../cocoaTouch/MainMenuViewController.xib; sourceTree = SOURCE_ROOT; }; - 61798871114AA4D000BA94A9 /* SchemeEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SchemeEditViewController.h; path = ../../cocoaTouch/SchemeEditViewController.h; sourceTree = SOURCE_ROOT; }; - 61798872114AA4D000BA94A9 /* SchemeEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SchemeEditViewController.m; path = ../../cocoaTouch/SchemeEditViewController.m; sourceTree = SOURCE_ROOT; }; - 61798873114AA4D000BA94A9 /* SchemeEditViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SchemeEditViewController.xib; path = ../../cocoaTouch/SchemeEditViewController.xib; sourceTree = SOURCE_ROOT; }; - 61798874114AA4D000BA94A9 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SettingsViewController.h; path = ../../cocoaTouch/SettingsViewController.h; sourceTree = SOURCE_ROOT; }; - 61798875114AA4D000BA94A9 /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SettingsViewController.m; path = ../../cocoaTouch/SettingsViewController.m; sourceTree = SOURCE_ROOT; }; - 61798876114AA4D000BA94A9 /* SettingsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SettingsViewController.xib; path = ../../cocoaTouch/SettingsViewController.xib; sourceTree = SOURCE_ROOT; }; - 61798877114AA4D000BA94A9 /* TeamEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TeamEditViewController.h; path = ../../cocoaTouch/TeamEditViewController.h; sourceTree = SOURCE_ROOT; }; - 61798878114AA4D000BA94A9 /* TeamEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TeamEditViewController.m; path = ../../cocoaTouch/TeamEditViewController.m; sourceTree = SOURCE_ROOT; }; - 61798879114AA4D000BA94A9 /* TeamEditViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = TeamEditViewController.xib; path = ../../cocoaTouch/TeamEditViewController.xib; sourceTree = SOURCE_ROOT; }; - 6179887A114AA4D000BA94A9 /* TeamMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TeamMenuViewController.h; path = ../../cocoaTouch/TeamMenuViewController.h; sourceTree = SOURCE_ROOT; }; - 6179887B114AA4D000BA94A9 /* TeamMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TeamMenuViewController.m; path = ../../cocoaTouch/TeamMenuViewController.m; sourceTree = SOURCE_ROOT; }; - 6179887C114AA4D000BA94A9 /* TeamMenuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = TeamMenuViewController.xib; path = ../../cocoaTouch/TeamMenuViewController.xib; sourceTree = SOURCE_ROOT; }; 61798887114AA4E600BA94A9 /* GameSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GameSetup.h; path = ../../cocoaTouch/GameSetup.h; sourceTree = SOURCE_ROOT; }; 61798888114AA4E600BA94A9 /* GameSetup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GameSetup.m; path = ../../cocoaTouch/GameSetup.m; sourceTree = SOURCE_ROOT; }; 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDLiPhoneOS.xcodeproj; path = "../../../Library/SDL-1.3/SDL/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj"; sourceTree = SOURCE_ROOT; }; @@ -399,24 +265,28 @@ 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; }; - 61C0838911567C83005D474F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 61CE24EA115E71C20098C467 /* OverlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OverlayViewController.h; path = ../../cocoaTouch/iPad/OverlayViewController.h; sourceTree = SOURCE_ROOT; }; - 61CE24EB115E71C20098C467 /* OverlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OverlayViewController.m; path = ../../cocoaTouch/iPad/OverlayViewController.m; sourceTree = SOURCE_ROOT; }; - 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PopupMenuViewController.h; path = ../../cocoaTouch/iPad/PopupMenuViewController.h; sourceTree = SOURCE_ROOT; }; - 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PopupMenuViewController.m; path = ../../cocoaTouch/iPad/PopupMenuViewController.m; sourceTree = SOURCE_ROOT; }; - 61CE2501115E73210098C467 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = ../../cocoaTouch/iPad/OverlayViewController.xib; sourceTree = SOURCE_ROOT; }; + 61A117FE1168322700359010 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 61A118401168366200359010 /* OverlayViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "OverlayViewController-iPad.xib"; path = "../../cocoaTouch/xib/OverlayViewController-iPad.xib"; sourceTree = SOURCE_ROOT; }; + 61A118421168367200359010 /* OverlayViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "OverlayViewController-iPhone.xib"; path = "../../cocoaTouch/xib/OverlayViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; }; + 61A118C911683C7600359010 /* MainMenuViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainMenuViewController-iPad.xib"; path = "../../cocoaTouch/xib/MainMenuViewController-iPad.xib"; sourceTree = SOURCE_ROOT; }; + 61A118CB11683C7A00359010 /* MainMenuViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainMenuViewController-iPhone.xib"; path = "../../cocoaTouch/xib/MainMenuViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; }; + 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PopoverMenuViewController.h; path = ../../cocoaTouch/PopoverMenuViewController.h; sourceTree = SOURCE_ROOT; }; + 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PopoverMenuViewController.m; path = ../../cocoaTouch/PopoverMenuViewController.m; sourceTree = SOURCE_ROOT; }; + 61A11ABF1168D8B600359010 /* SplitViewRootController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplitViewRootController.h; path = ../../cocoaTouch/SplitViewRootController.h; sourceTree = SOURCE_ROOT; }; + 61A11AC01168D8B600359010 /* SplitViewRootController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SplitViewRootController.m; path = ../../cocoaTouch/SplitViewRootController.m; sourceTree = SOURCE_ROOT; }; + 61A11AC71168DA9400359010 /* MasterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MasterViewController.h; path = ../../cocoaTouch/MasterViewController.h; sourceTree = SOURCE_ROOT; }; + 61A11AC81168DA9400359010 /* MasterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MasterViewController.m; path = ../../cocoaTouch/MasterViewController.m; sourceTree = SOURCE_ROOT; }; + 61A11ACD1168DB1B00359010 /* TeamSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TeamSettingsViewController.h; path = ../../cocoaTouch/TeamSettingsViewController.h; sourceTree = SOURCE_ROOT; }; + 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TeamSettingsViewController.m; path = ../../cocoaTouch/TeamSettingsViewController.m; sourceTree = SOURCE_ROOT; }; + 61A11AD41168DB3700359010 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailViewController.h; path = ../../cocoaTouch/DetailViewController.h; sourceTree = SOURCE_ROOT; }; + 61A11AD51168DB3700359010 /* DetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailViewController.m; path = ../../cocoaTouch/DetailViewController.m; sourceTree = SOURCE_ROOT; }; + 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SingleTeamViewController.h; path = ../../cocoaTouch/SingleTeamViewController.h; sourceTree = SOURCE_ROOT; }; + 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SingleTeamViewController.m; path = ../../cocoaTouch/SingleTeamViewController.m; sourceTree = SOURCE_ROOT; }; + 61A11AE21168DC9400359010 /* HogHatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HogHatViewController.h; path = ../../cocoaTouch/HogHatViewController.h; sourceTree = SOURCE_ROOT; }; + 61A11AE31168DC9400359010 /* HogHatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HogHatViewController.m; path = ../../cocoaTouch/HogHatViewController.m; sourceTree = SOURCE_ROOT; }; + 61A11B581169234900359010 /* Default-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-iPad.png"; path = "../../cocoaTouch/resources/Default-iPad.png"; sourceTree = SOURCE_ROOT; }; 61CE250B115E749A0098C467 /* OverlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OverlayViewController.h; path = ../../cocoaTouch/OverlayViewController.h; sourceTree = SOURCE_ROOT; }; 61CE250C115E749A0098C467 /* OverlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OverlayViewController.m; path = ../../cocoaTouch/OverlayViewController.m; sourceTree = SOURCE_ROOT; }; - 61CE2510115E74C90098C467 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = ../../cocoaTouch/OverlayViewController.xib; sourceTree = SOURCE_ROOT; }; - 61E2F06811567CC7002D33C1 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainMenuViewController.h; path = ../../cocoaTouch/iPad/MainMenuViewController.h; sourceTree = SOURCE_ROOT; }; - 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainMenuViewController.m; path = ../../cocoaTouch/iPad/MainMenuViewController.m; sourceTree = SOURCE_ROOT; }; - 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplitViewRootController.h; path = ../../cocoaTouch/iPad/SplitViewRootController.h; sourceTree = SOURCE_ROOT; }; - 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SplitViewRootController.m; path = ../../cocoaTouch/iPad/SplitViewRootController.m; sourceTree = SOURCE_ROOT; }; - 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MasterViewController.h; path = ../../cocoaTouch/iPad/MasterViewController.h; sourceTree = SOURCE_ROOT; }; - 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MasterViewController.m; path = ../../cocoaTouch/iPad/MasterViewController.m; sourceTree = SOURCE_ROOT; }; - 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailViewController.h; path = ../../cocoaTouch/iPad/DetailViewController.h; sourceTree = SOURCE_ROOT; }; - 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailViewController.m; path = ../../cocoaTouch/iPad/DetailViewController.m; sourceTree = SOURCE_ROOT; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 928301170F10CAFC00CC5A3C /* libfpc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfpc.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -426,6 +296,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */, 61798A14114AB65C00BA94A9 /* libSDL_ttf.a in Frameworks */, 617989BE114AB47A00BA94A9 /* libSDL_net.a in Frameworks */, 617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */, @@ -441,30 +312,6 @@ 6179891E114AAF2100BA94A9 /* libpng_x86.a in Frameworks */, 6179891F114AAF2100BA94A9 /* libvorbis_arm.a in Frameworks */, 61798935114AB25F00BA94A9 /* AudioToolbox.framework in Frameworks */, - 61C0838A11567C83005D474F /* CoreGraphics.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 6100DABD115446B000F455E0 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 6100DABE115446B000F455E0 /* libSDL_ttf.a in Frameworks */, - 6100DABF115446B000F455E0 /* libSDL_net.a in Frameworks */, - 6100DAC0115446B000F455E0 /* libSDLiPhoneOS.a in Frameworks */, - 6100DAC1115446B000F455E0 /* libSDL_mixer.a in Frameworks */, - 6100DAC2115446B000F455E0 /* libfpc.a in Frameworks */, - 6100DAC3115446B000F455E0 /* Foundation.framework in Frameworks */, - 6100DAC4115446B000F455E0 /* UIKit.framework in Frameworks */, - 6100DAC5115446B000F455E0 /* OpenGLES.framework in Frameworks */, - 6100DAC6115446B000F455E0 /* QuartzCore.framework in Frameworks */, - 6100DAC7115446B000F455E0 /* libfreetype_arm.a in Frameworks */, - 6100DAC8115446B000F455E0 /* libfreetype_x86.a in Frameworks */, - 6100DAC9115446B000F455E0 /* libpng_arm.a in Frameworks */, - 6100DACA115446B000F455E0 /* libpng_x86.a in Frameworks */, - 6100DACB115446B000F455E0 /* libvorbis_arm.a in Frameworks */, - 6100DACC115446B000F455E0 /* AudioToolbox.framework in Frameworks */, - 61E2F06911567CC7002D33C1 /* CoreGraphics.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -474,11 +321,10 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + 61798860114AA49D00BA94A9 /* SDLOverrides */, + 61A118481168371400359010 /* Frontend */, 61798887114AA4E600BA94A9 /* GameSetup.h */, 61798888114AA4E600BA94A9 /* GameSetup.m */, - 61FA7620115DA0EA00DA6ED0 /* iPad Frontend */, - 6179886C114AA4B900BA94A9 /* iPhone Frontend */, - 61798860114AA49D00BA94A9 /* SDLOverrides */, ); path = Classes; sourceTree = ""; @@ -488,7 +334,6 @@ children = ( 1D6058910D05DD3D006BFB54 /* HedgewarsMobile.app */, 928301170F10CAFC00CC5A3C /* libfpc.a */, - 6100DAD2115446B000F455E0 /* iHedgewars.app */, ); name = Products; sourceTree = ""; @@ -503,8 +348,6 @@ 29B97317FDCFA39411CA2CEA /* Resources */, 6100DAD4115446B000F455E0 /* Resources-iPad */, 19C28FACFE9D520D11CA2CBB /* Products */, - 615F19841166A6AB002444F2 /* untitled.h */, - 615F19851166A6AB002444F2 /* untitled.m */, ); name = CustomTemplate; sourceTree = ""; @@ -543,22 +386,21 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( - 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */, + 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */, 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */, 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */, - 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */, - 28FD15070DC6FC5B0079059D /* QuartzCore.framework */, + 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */, + 61798934114AB25F00BA94A9 /* AudioToolbox.framework */, + 61A117FE1168322700359010 /* CoreGraphics.framework */, + 1D30AB110D05D00D00671497 /* Foundation.framework */, 28FD14FF0DC6FC520079059D /* OpenGLES.framework */, + 28FD15070DC6FC5B0079059D /* QuartzCore.framework */, 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, - 1D30AB110D05D00D00671497 /* Foundation.framework */, - 61798934114AB25F00BA94A9 /* AudioToolbox.framework */, 61798916114AAF2100BA94A9 /* libfreetype_arm.a */, 61798917114AAF2100BA94A9 /* libfreetype_x86.a */, 61798918114AAF2100BA94A9 /* libpng_arm.a */, 61798919114AAF2100BA94A9 /* libpng_x86.a */, 6179891A114AAF2100BA94A9 /* libvorbis_arm.a */, - 61C0838911567C83005D474F /* CoreGraphics.framework */, - 61E2F06811567CC7002D33C1 /* CoreGraphics.framework */, ); name = Frameworks; sourceTree = ""; @@ -567,7 +409,7 @@ isa = PBXGroup; children = ( 61CE2509115E74260098C467 /* XIB */, - 611FDB631155BFFF00C2203D /* Default.png */, + 61A11B581169234900359010 /* Default-iPad.png */, 611FD9C81155A1F200C2203D /* Background.png */, 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */, 611FD9D11155A41000C2203D /* Multiplayer.png */, @@ -579,34 +421,13 @@ 6100DB1711544E8400F455E0 /* XIB */ = { isa = PBXGroup; children = ( - 61CE2510115E74C90098C467 /* OverlayViewController.xib */, - 61798870114AA4D000BA94A9 /* MainMenuViewController.xib */, - 61798873114AA4D000BA94A9 /* SchemeEditViewController.xib */, - 61798876114AA4D000BA94A9 /* SettingsViewController.xib */, - 61798879114AA4D000BA94A9 /* TeamEditViewController.xib */, - 6179887C114AA4D000BA94A9 /* TeamMenuViewController.xib */, + 61A118CB11683C7A00359010 /* MainMenuViewController-iPhone.xib */, + 61A118421168367200359010 /* OverlayViewController-iPhone.xib */, ); name = XIB; path = Classes; sourceTree = ""; }; - 615F159B11662108002444F2 /* Settings */ = { - isa = PBXGroup; - children = ( - 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */, - 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */, - 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */, - 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */, - 615F15AC116628CC002444F2 /* SingleTeamViewController.h */, - 615F15AD116628CC002444F2 /* SingleTeamViewController.m */, - 615F159C1166216A002444F2 /* TeamSettingsViewController.h */, - 615F159D1166216A002444F2 /* TeamSettingsViewController.m */, - 615F16DA11668358002444F2 /* HogHatViewController.h */, - 615F16DB11668358002444F2 /* HogHatViewController.m */, - ); - name = Settings; - sourceTree = ""; - }; 61798860114AA49D00BA94A9 /* SDLOverrides */ = { isa = PBXGroup; children = ( @@ -618,25 +439,6 @@ name = SDLOverrides; sourceTree = ""; }; - 6179886C114AA4B900BA94A9 /* iPhone Frontend */ = { - isa = PBXGroup; - children = ( - 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */, - 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */, - 61798871114AA4D000BA94A9 /* SchemeEditViewController.h */, - 61798872114AA4D000BA94A9 /* SchemeEditViewController.m */, - 61798874114AA4D000BA94A9 /* SettingsViewController.h */, - 61798875114AA4D000BA94A9 /* SettingsViewController.m */, - 61798877114AA4D000BA94A9 /* TeamEditViewController.h */, - 61798878114AA4D000BA94A9 /* TeamEditViewController.m */, - 6179887A114AA4D000BA94A9 /* TeamMenuViewController.h */, - 6179887B114AA4D000BA94A9 /* TeamMenuViewController.m */, - 61CE250B115E749A0098C467 /* OverlayViewController.h */, - 61CE250C115E749A0098C467 /* OverlayViewController.m */, - ); - name = "iPhone Frontend"; - sourceTree = ""; - }; 61798892114AA56300BA94A9 /* inc */ = { isa = PBXGroup; children = ( @@ -719,40 +521,56 @@ name = buttons; sourceTree = ""; }; + 61A118481168371400359010 /* Frontend */ = { + isa = PBXGroup; + children = ( + 61A11AC31168DA2B00359010 /* Settings */, + 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */, + 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */, + 61CE250B115E749A0098C467 /* OverlayViewController.h */, + 61CE250C115E749A0098C467 /* OverlayViewController.m */, + 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */, + 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */, + ); + name = Frontend; + sourceTree = ""; + }; + 61A11AC31168DA2B00359010 /* Settings */ = { + isa = PBXGroup; + children = ( + 61A11ABF1168D8B600359010 /* SplitViewRootController.h */, + 61A11AC01168D8B600359010 /* SplitViewRootController.m */, + 61A11AC71168DA9400359010 /* MasterViewController.h */, + 61A11AC81168DA9400359010 /* MasterViewController.m */, + 61A11AD41168DB3700359010 /* DetailViewController.h */, + 61A11AD51168DB3700359010 /* DetailViewController.m */, + 61A11AD01168DB1F00359010 /* Teams */, + ); + name = Settings; + sourceTree = ""; + }; + 61A11AD01168DB1F00359010 /* Teams */ = { + isa = PBXGroup; + children = ( + 61A11ACD1168DB1B00359010 /* TeamSettingsViewController.h */, + 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */, + 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */, + 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */, + 61A11AE21168DC9400359010 /* HogHatViewController.h */, + 61A11AE31168DC9400359010 /* HogHatViewController.m */, + ); + name = Teams; + sourceTree = ""; + }; 61CE2509115E74260098C467 /* XIB */ = { isa = PBXGroup; children = ( - 611FD990115590E700C2203D /* MainMenuViewController.xib */, - 611FD992115590E700C2203D /* SettingsViewController.xib */, - 61CE2501115E73210098C467 /* OverlayViewController.xib */, + 61A118C911683C7600359010 /* MainMenuViewController-iPad.xib */, + 61A118401168366200359010 /* OverlayViewController-iPad.xib */, ); name = XIB; sourceTree = ""; }; - 61FA7620115DA0EA00DA6ED0 /* iPad Frontend */ = { - isa = PBXGroup; - children = ( - 615F159B11662108002444F2 /* Settings */, - 61FA766A115DAB2A00DA6ED0 /* Overlay */, - 61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */, - 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */, - 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */, - 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */, - ); - name = "iPad Frontend"; - sourceTree = ""; - }; - 61FA766A115DAB2A00DA6ED0 /* Overlay */ = { - isa = PBXGroup; - children = ( - 61CE24EA115E71C20098C467 /* OverlayViewController.h */, - 61CE24EB115E71C20098C467 /* OverlayViewController.m */, - 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */, - 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */, - ); - name = Overlay; - sourceTree = ""; - }; 9283015C0F10E48900CC5A3C /* Pascal Sources */ = { isa = PBXGroup; children = ( @@ -818,26 +636,6 @@ productReference = 1D6058910D05DD3D006BFB54 /* HedgewarsMobile.app */; productType = "com.apple.product-type.application"; }; - 6100DA6E115446B000F455E0 /* iHedgewars */ = { - isa = PBXNativeTarget; - buildConfigurationList = 6100DACF115446B000F455E0 /* Build configuration list for PBXNativeTarget "iHedgewars" */; - buildPhases = ( - 6100DA71115446B000F455E0 /* Resources */, - 6100DA8D115446B000F455E0 /* Sources */, - 6100DABD115446B000F455E0 /* Frameworks */, - 6100DACD115446B000F455E0 /* ShellScript */, - ); - buildRules = ( - 6100DACE115446B000F455E0 /* PBXBuildRule */, - ); - dependencies = ( - 6100DA6F115446B000F455E0 /* PBXTargetDependency */, - ); - name = iHedgewars; - productName = HedgewarsMobile; - productReference = 6100DAD2115446B000F455E0 /* iHedgewars.app */; - productType = "com.apple.product-type.application"; - }; 928301160F10CAFC00CC5A3C /* fpc */ = { isa = PBXNativeTarget; buildConfigurationList = 9283011C0F10CB4B00CC5A3C /* Build configuration list for PBXNativeTarget "fpc" */; @@ -859,6 +657,9 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HedgewarsMobile" */; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; @@ -887,7 +688,6 @@ 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */, 928301160F10CAFC00CC5A3C /* fpc */, 6179928B114AE0C800BA94A9 /* UpdateDataFolder */, - 6100DA6E115446B000F455E0 /* iHedgewars */, ); }; /* End PBXProject section */ @@ -928,11 +728,11 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 6179887E114AA4D000BA94A9 /* MainMenuViewController.xib in Resources */, - 61798880114AA4D000BA94A9 /* SchemeEditViewController.xib in Resources */, - 61798882114AA4D000BA94A9 /* SettingsViewController.xib in Resources */, - 61798884114AA4D000BA94A9 /* TeamEditViewController.xib in Resources */, - 61798886114AA4D000BA94A9 /* TeamMenuViewController.xib in Resources */, + 61A118DF11683D1F00359010 /* OverlayViewController-iPad.xib in Resources */, + 61A118D211683CD100359010 /* Background.png in Resources */, + 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */, + 61A118D411683CD100359010 /* Multiplayer.png in Resources */, + 61A118D511683CD100359010 /* NetworkPlay.png in Resources */, 61798A2C114ADD2600BA94A9 /* backgroundBottom.png in Resources */, 61798A2D114ADD2600BA94A9 /* backgroundCenter.png in Resources */, 61798A2E114ADD2600BA94A9 /* backgroundLeft.png in Resources */, @@ -954,61 +754,16 @@ 6179936D11501D3D00BA94A9 /* arrowRight.png in Resources */, 6179936E11501D3D00BA94A9 /* arrowUp.png in Resources */, 617995321150403800BA94A9 /* joyPush.png in Resources */, - 61CE2511115E74C90098C467 /* OverlayViewController.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 6100DA71115446B000F455E0 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 6100DA77115446B000F455E0 /* backgroundBottom.png in Resources */, - 6100DA78115446B000F455E0 /* backgroundCenter.png in Resources */, - 6100DA79115446B000F455E0 /* backgroundLeft.png in Resources */, - 6100DA7A115446B000F455E0 /* backgroundRight.png in Resources */, - 6100DA7B115446B000F455E0 /* backgroundTop.png in Resources */, - 6100DA7C115446B000F455E0 /* borderBottom.png in Resources */, - 6100DA7D115446B000F455E0 /* borderTop.png in Resources */, - 6100DA7F115446B000F455E0 /* Icon.png in Resources */, - 6100DA80115446B000F455E0 /* networkButton.png in Resources */, - 6100DA81115446B000F455E0 /* playButton.png in Resources */, - 6100DA82115446B000F455E0 /* settingsButton.png in Resources */, - 6100DA83115446B000F455E0 /* storeButton.png in Resources */, - 6100DA84115446B000F455E0 /* title.png in Resources */, - 6100DA85115446B000F455E0 /* Data in Resources */, - 6100DA86115446B000F455E0 /* menuCorner.png in Resources */, - 6100DA87115446B000F455E0 /* arrowDown.png in Resources */, - 6100DA88115446B000F455E0 /* arrowLeft.png in Resources */, - 6100DA89115446B000F455E0 /* arrowRight.png in Resources */, - 6100DA8A115446B000F455E0 /* arrowUp.png in Resources */, - 6100DA8C115446B000F455E0 /* joyPush.png in Resources */, - 611FD993115590E700C2203D /* MainMenuViewController.xib in Resources */, - 611FD995115590E700C2203D /* SettingsViewController.xib in Resources */, - 611FD9C91155A1F200C2203D /* Background.png in Resources */, - 611FD9CC1155A28C00C2203D /* HedgewarsTitle.png in Resources */, - 611FD9D01155A40700C2203D /* NetworkPlay.png in Resources */, - 611FD9D21155A41000C2203D /* Multiplayer.png in Resources */, - 611FDB641155BFFF00C2203D /* Default.png in Resources */, - 61CE2503115E73210098C467 /* OverlayViewController.xib in Resources */, + 61A118431168367200359010 /* OverlayViewController-iPhone.xib in Resources */, + 61A118CA11683C7600359010 /* MainMenuViewController-iPad.xib in Resources */, + 61A118CC11683C7A00359010 /* MainMenuViewController-iPhone.xib in Resources */, + 61A11B591169234900359010 /* Default-iPad.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 6100DACD115446B000F455E0 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "export CODESIGN_ALLOCATE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate\nif [ \"${PLATFORM_NAME}\" == \"iphoneos\" ]; then\n\t${PROJECT_DIR}/gen_entitlements.py \"com.kodahedge.${PRODUCT_NAME:identifier}\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/${PROJECT_NAME}.xcent\";\n\tcodesign -f -s \"iPhone developer\" --entitlements \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/${PROJECT_NAME}.xcent\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/\"\nfi"; - }; 61798A54114ADD5E00BA94A9 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1033,7 +788,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd ${PROJECT_DIR}/build/HedgewarsMobile.build/Debug-iphonesimulator/iHedgewars.build/DerivedSources-normal/\nrm -fr i386/\nln -sf ../../HedgewarsMobile.build/DerivedSources-normal/i386/ i386\ncd ${PROJECT_DIR}\n\n#copy new stuff over old stuff\nsvn export --force ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#delete all CMakeLists.txt\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 forts\nrm -rf ${PROJECT_DIR}/Data/Forts/\n\n#delete all forts\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/"; + shellScript = "#cd ${PROJECT_DIR}/build/HedgewarsMobile.build/Debug-iphonesimulator/iHedgewars.build/DerivedSources-normal/\n#rm -fr i386/\n#ln -sf ../../HedgewarsMobile.build/DerivedSources-normal/i386/ i386\n#cd ${PROJECT_DIR}\n\n#copy new stuff over old stuff\nsvn export --force ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#delete all CMakeLists.txt\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 forts\nrm -rf ${PROJECT_DIR}/Data/Forts/\n\n#delete all forts\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/"; showEnvVarsInLog = 0; }; 9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = { @@ -1114,84 +869,21 @@ 61798869114AA4AA00BA94A9 /* SDL_uikitappdelegate.m in Sources */, 6179886B114AA4AA00BA94A9 /* SDL_uikitwindow.m in Sources */, 6179887D114AA4D000BA94A9 /* MainMenuViewController.m in Sources */, - 6179887F114AA4D000BA94A9 /* SchemeEditViewController.m in Sources */, - 61798881114AA4D000BA94A9 /* SettingsViewController.m in Sources */, - 61798883114AA4D000BA94A9 /* TeamEditViewController.m in Sources */, - 61798885114AA4D000BA94A9 /* TeamMenuViewController.m in Sources */, 61798889114AA4E600BA94A9 /* GameSetup.m in Sources */, 61CE250D115E749A0098C467 /* OverlayViewController.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 6100DA8D115446B000F455E0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 6100DA8E115446B000F455E0 /* hwengine.pas in Sources */, - 6100DA8F115446B000F455E0 /* hwLibrary.pas in Sources */, - 6100DA90115446B000F455E0 /* PascalExports.pas in Sources */, - 6100DA91115446B000F455E0 /* SDLh.pas in Sources */, - 6100DA92115446B000F455E0 /* uAI.pas in Sources */, - 6100DA93115446B000F455E0 /* uAIActions.pas in Sources */, - 6100DA94115446B000F455E0 /* uAIAmmoTests.pas in Sources */, - 6100DA95115446B000F455E0 /* uAIMisc.pas in Sources */, - 6100DA96115446B000F455E0 /* uAmmos.pas in Sources */, - 6100DA97115446B000F455E0 /* uChat.pas in Sources */, - 6100DA98115446B000F455E0 /* uCollisions.pas in Sources */, - 6100DA99115446B000F455E0 /* uConsole.pas in Sources */, - 6100DA9A115446B000F455E0 /* uConsts.pas in Sources */, - 6100DA9B115446B000F455E0 /* uFloat.pas in Sources */, - 6100DA9C115446B000F455E0 /* uGame.pas in Sources */, - 6100DA9D115446B000F455E0 /* uGears.pas in Sources */, - 6100DA9E115446B000F455E0 /* uIO.pas in Sources */, - 6100DA9F115446B000F455E0 /* uKeys.pas in Sources */, - 6100DAA0115446B000F455E0 /* uLand.pas in Sources */, - 6100DAA1115446B000F455E0 /* uLandGraphics.pas in Sources */, - 6100DAA2115446B000F455E0 /* uLandObjects.pas in Sources */, - 6100DAA3115446B000F455E0 /* uLandTemplates.pas in Sources */, - 6100DAA4115446B000F455E0 /* uLandTexture.pas in Sources */, - 6100DAA5115446B000F455E0 /* uLocale.pas in Sources */, - 6100DAA6115446B000F455E0 /* uMisc.pas in Sources */, - 6100DAA7115446B000F455E0 /* uRandom.pas in Sources */, - 6100DAA8115446B000F455E0 /* uScript.pas in Sources */, - 6100DAA9115446B000F455E0 /* uSHA.pas in Sources */, - 6100DAAA115446B000F455E0 /* uSound.pas in Sources */, - 6100DAAB115446B000F455E0 /* uStats.pas in Sources */, - 6100DAAC115446B000F455E0 /* uStore.pas in Sources */, - 6100DAAD115446B000F455E0 /* uTeams.pas in Sources */, - 6100DAAE115446B000F455E0 /* uVisualGears.pas in Sources */, - 6100DAAF115446B000F455E0 /* uWorld.pas in Sources */, - 6100DAB0115446B000F455E0 /* CGPointUtils.c in Sources */, - 6100DAB1115446B000F455E0 /* IMG_png.c in Sources */, - 6100DAB2115446B000F455E0 /* IMG.c in Sources */, - 6100DAB3115446B000F455E0 /* SDL_uikitappdelegate.m in Sources */, - 6100DAB5115446B000F455E0 /* SDL_uikitwindow.m in Sources */, - 6100DAB7115446B000F455E0 /* SchemeEditViewController.m in Sources */, - 6100DAB8115446B000F455E0 /* SettingsViewController.m in Sources */, - 6100DAB9115446B000F455E0 /* TeamEditViewController.m in Sources */, - 6100DABA115446B000F455E0 /* TeamMenuViewController.m in Sources */, - 6100DABB115446B000F455E0 /* GameSetup.m in Sources */, - 61FA761F115DA0DB00DA6ED0 /* MainMenuViewController.m in Sources */, - 61FA7647115DA6A300DA6ED0 /* SplitViewRootController.m in Sources */, - 61FA765D115DAACC00DA6ED0 /* MasterViewController.m in Sources */, - 61CE24EE115E71C20098C467 /* OverlayViewController.m in Sources */, - 61CE24EF115E71C20098C467 /* PopupMenuViewController.m in Sources */, - 61CE25C3115E7D1D0098C467 /* DetailViewController.m in Sources */, - 615F159E1166216A002444F2 /* TeamSettingsViewController.m in Sources */, - 615F15AE116628CC002444F2 /* SingleTeamViewController.m in Sources */, - 615F16DC11668358002444F2 /* HogHatViewController.m in Sources */, - 615F19861166A6AB002444F2 /* untitled.m in Sources */, + 61A11A4E1168D13600359010 /* PopoverMenuViewController.m in Sources */, + 61A11AC11168D8B600359010 /* SplitViewRootController.m in Sources */, + 61A11AC91168DA9400359010 /* MasterViewController.m in Sources */, + 61A11ACF1168DB1B00359010 /* TeamSettingsViewController.m in Sources */, + 61A11AD61168DB3700359010 /* DetailViewController.m in Sources */, + 61A11AE11168DC6E00359010 /* SingleTeamViewController.m in Sources */, + 61A11AE41168DC9400359010 /* HogHatViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 6100DA6F115446B000F455E0 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 928301160F10CAFC00CC5A3C /* fpc */; - targetProxy = 6100DA70115446B000F455E0 /* PBXContainerItemProxy */; - }; 9283015A0F10E41300CC5A3C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 928301160F10CAFC00CC5A3C /* fpc */; @@ -1215,7 +907,7 @@ "\"$(SRCROOT)\"", ); PRODUCT_NAME = HedgewarsMobile; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1236,38 +928,6 @@ }; name = Release; }; - 6100DAD0115446B000F455E0 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = HedgewarsMobile_Prefix.pch; - INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\""; - PRODUCT_NAME = iHedgewars; - SDKROOT = iphoneos3.2; - TARGETED_DEVICE_FAMILY = 2; - }; - name = Debug; - }; - 6100DAD1115446B000F455E0 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = HedgewarsMobile_Prefix.pch; - INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\""; - PRODUCT_NAME = iHedgewars; - SDKROOT = iphonesimulator3.2; - TARGETED_DEVICE_FAMILY = 2; - }; - name = Release; - }; 6179928C114AE0C800BA94A9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1317,7 +977,7 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix"; @@ -1345,7 +1005,8 @@ "-Wl,-no_order_inits", ); PREBINDING = NO; - SDKROOT = iphonesimulator3.0; + SDKROOT = iphonesimulator3.2; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1382,6 +1043,7 @@ PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos3.0; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; @@ -1397,15 +1059,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6100DACF115446B000F455E0 /* Build configuration list for PBXNativeTarget "iHedgewars" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 6100DAD0115446B000F455E0 /* Debug */, - 6100DAD1115446B000F455E0 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 61799290114AE0CD00BA94A9 /* Build configuration list for PBXAggregateTarget "UpdateDataFolder" */ = { isa = XCConfigurationList; buildConfigurations = ( diff -r 8690a3aa93b5 -r 91074496d5c9 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sun Apr 04 16:38:00 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sun Apr 04 19:51:53 2010 +0000 @@ -202,25 +202,25 @@ Content PBXProjectModuleGUID - 615F167111664BE1002444F2 + 61A11B0C11691E2400359010 PBXProjectModuleLabel - SingleTeamViewController.m + MainMenuViewController.m PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 615F167211664BE1002444F2 + 61A11B0D11691E2400359010 PBXProjectModuleLabel - SingleTeamViewController.m + MainMenuViewController.m _historyCapacity 0 bookmark - 612FA5281166ECE4001625AE + 61A11B5E1169240500359010 history - 615F17D511668C5A002444F2 - 615F21921166B73B002444F2 + 61A11B0E11691E2400359010 + 61A11B2611691EF100359010 SplitCount @@ -232,11 +232,51 @@ Geometry Frame - {{0, 20}, {895, 596}} + {{0, 20}, {1058, 695}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 129 335 895 637 0 0 1920 1178 + 260 192 1058 736 0 0 1920 1178 + + + + Content + + PBXProjectModuleGUID + 61A11B1211691E2400359010 + PBXProjectModuleLabel + SingleTeamViewController.m + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 61A11B1311691E2400359010 + PBXProjectModuleLabel + SingleTeamViewController.m + _historyCapacity + 0 + bookmark + 61A11B5F1169240500359010 + history + + 61A11AEE1169069300359010 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {1058, 695}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 222 248 1058 736 0 0 1920 1178 @@ -296,7 +336,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 186 + 235 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -309,25 +349,25 @@ 29B97314FDCFA39411CA2CEA 080E96DDFE201D6D7F000001 - 61FA7620115DA0EA00DA6ED0 - 615F159B11662108002444F2 - 29B97317FDCFA39411CA2CEA + 61A118481168371400359010 6100DAD4115446B000F455E0 + 61CE2509115E74260098C467 + 19C28FACFE9D520D11CA2CBB 1C37FBAC04509CD000000102 + 61A118691168391A00359010 + 61A118BA11683B4100359010 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 14 - 6 - 5 + 3 2 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 558}} + {{0, 0}, {235, 558}} PBXTopSmartGroupGIDs @@ -339,19 +379,19 @@ GeometryConfiguration Frame - {{0, 0}, {203, 576}} + {{0, 0}, {252, 576}} GroupTreeTableConfiguration MainColumn - 186 + 235 RubberWindowFrame - 242 382 801 617 0 0 1920 1178 + 162 341 801 617 0 0 1920 1178 Module PBXSmartGroupTreeModule Proportion - 203pt + 252pt Dock @@ -362,7 +402,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - HogHatViewController.m + amGirder.png PBXSplitModuleInNavigatorKey Split0 @@ -370,11 +410,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - HogHatViewController.m + amGirder.png _historyCapacity 0 bookmark - 612FA5271166ECE4001625AE + 61A11B5D1169240500359010 history 6179889D114AA5BD00BA94A9 @@ -414,7 +454,6 @@ 61CE2577115E78900098C467 61CE2578115E78900098C467 61CE25B4115E7C940098C467 - 615E2397115F023B00B0ACA1 61CCBE60116135FF00833FE8 61CCBF1E116162CA00833FE8 61CCBF451161637F00833FE8 @@ -448,28 +487,17 @@ 615F1316116561BE002444F2 615F134D11656569002444F2 615F147F11659AC5002444F2 - 615F148B11659BC2002444F2 - 615F14AA11659E9A002444F2 - 615F154E1165A976002444F2 - 615F157111661DA5002444F2 - 615F15B6116629A0002444F2 615F15B7116629A0002444F2 - 615F15B8116629A0002444F2 615F15B9116629A0002444F2 615F15BB116629A0002444F2 615F15DC11662BE8002444F2 - 615F162511663A99002444F2 - 615F165211663FA7002444F2 - 615F166F11664BE1002444F2 615F174311668823002444F2 615F180A11668DA5002444F2 615F198C1166A71E002444F2 - 615F198D1166A71E002444F2 615F198E1166A71E002444F2 615F198F1166A71E002444F2 615F19911166A71E002444F2 615F19AA1166A803002444F2 - 615F1BB81166B565002444F2 615F1E0B1166B68C002444F2 615F1E0D1166B68C002444F2 615F1E0F1166B68C002444F2 @@ -503,7 +531,6 @@ 615F1E471166B68C002444F2 615F1E491166B68C002444F2 612FA4551166B907001625AE - 615F19331166A409002444F2 SplitCount @@ -515,14 +542,14 @@ GeometryConfiguration Frame - {{0, 0}, {593, 296}} + {{0, 0}, {544, 72}} RubberWindowFrame - 242 382 801 617 0 0 1920 1178 + 162 341 801 617 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 296pt + 72pt ContentConfiguration @@ -535,18 +562,18 @@ GeometryConfiguration Frame - {{0, 301}, {593, 275}} + {{0, 77}, {544, 499}} RubberWindowFrame - 242 382 801 617 0 0 1920 1178 + 162 341 801 617 0 0 1920 1178 Module XCDetailModule Proportion - 275pt + 499pt Proportion - 593pt + 544pt Name @@ -561,9 +588,9 @@ TableOfContents - 612FA4181166B757001625AE + 61A117441168280200359010 1CE0B1FE06471DED0097A5F4 - 612FA4191166B757001625AE + 61A117451168280200359010 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -701,17 +728,20 @@ 5 WindowOrderList - 612FA4571166B907001625AE - 612FA4491166B7D9001625AE - 612FA43E1166B787001625AE + 1C0AD2AF069F1E9B00FABCE6 + 61A118FE11683FAD00359010 + 61A118D911683CD700359010 + 61A1182D1168323000359010 + 61A117501168280200359010 1CD10A99069EF8BA00B06720 61798848114AA42600BA94A9 + 61A11B1211691E2400359010 + 1C78EAAD065D492600B07095 + 61A11B0C11691E2400359010 /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 615F167111664BE1002444F2 - 1C78EAAD065D492600B07095 WindowString - 242 382 801 617 0 0 1920 1178 + 162 341 801 617 0 0 1920 1178 WindowToolsV3 @@ -739,16 +769,18 @@ GeometryConfiguration Frame - {{0, 0}, {1065, 243}} + {{0, 0}, {605, 307}} RubberWindowFrame - 253 402 1065 574 0 0 1920 1178 + 956 539 605 638 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 243pt + 307pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -763,9 +795,9 @@ GeometryConfiguration Frame - {{0, 248}, {1065, 285}} + {{0, 312}, {605, 285}} RubberWindowFrame - 253 402 1065 574 0 0 1920 1178 + 956 539 605 638 0 0 1920 1178 Module PBXBuildResultsModule @@ -774,7 +806,7 @@ Proportion - 533pt + 597pt Name @@ -788,7 +820,7 @@ TableOfContents 61798848114AA42600BA94A9 - 612FA41F1166B757001625AE + 61A117471168280200359010 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -797,7 +829,7 @@ WindowContentMinSize 486 300 WindowString - 253 402 1065 574 0 0 1920 1178 + 956 539 605 638 0 0 1920 1178 WindowToolGUID 61798848114AA42600BA94A9 WindowToolIsVisible @@ -875,13 +907,11 @@ DebugVariablesTableConfiguration Name - 120 + 149 Value - 85 + 114 Summary - 95 - Type - 84 + 124 Frame {{0, 239}, {412, 239}} @@ -912,13 +942,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 612FA4201166B757001625AE + 61A117481168280200359010 1C162984064C10D400B95A72 - 612FA4211166B757001625AE - 612FA4221166B757001625AE - 612FA4231166B757001625AE - 612FA4241166B757001625AE - 612FA4251166B757001625AE + 61A117491168280200359010 + 61A1174A1168280200359010 + 61A1174B1168280200359010 + 61A1174C1168280200359010 + 61A1174D1168280200359010 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -1082,7 +1112,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 612FA4261166B757001625AE + 61A1174E1168280200359010 1C78EAAC065D492600B07095 ToolbarConfiguration @@ -1531,7 +1561,7 @@ TableOfContents 1C0AD2AF069F1E9B00FABCE6 - 619F1DA8115C156500A32B0B + 61A1195A1168457500359010 1CA6456E063B45B4001379D8 ToolbarConfiguration diff -r 8690a3aa93b5 -r 91074496d5c9 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sun Apr 04 16:38:00 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sun Apr 04 19:51:53 2010 +0000 @@ -8,18 +8,19 @@ }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeBuildConfigurationName = Debug; - activeExecutable = 6100DAD3115446B000F455E0 /* iHedgewars */; + activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */; activeSDKPreference = iphonesimulator3.2; - activeTarget = 6100DA6E115446B000F455E0 /* iHedgewars */; + activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */; addToTargets = ( - 6100DA6E115446B000F455E0 /* iHedgewars */, + 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */, ); breakpoints = ( + 61A11A651168D37800359010 /* OverlayViewController.m:144 */, + 61A11A671168D37900359010 /* OverlayViewController.m:147 */, ); codeSenseManager = 617987E0114AA2EB00BA94A9 /* Code sense */; executables = ( 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */, - 6100DAD3115446B000F455E0 /* iHedgewars */, ); ignoreBreakpointsInProjectsDict = { SDL_mixer = Ignored; @@ -55,7 +56,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 354, + 305, 20, 48, 43, @@ -77,7 +78,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 314, + 265, 60, 20, 48, @@ -94,141 +95,399 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 291944260; - PBXWorkspaceStateSaveDate = 291944260; + PBXPerProjectTemplateStateSaveDate = 292038637; + PBXWorkspaceStateSaveDate = 292038637; }; perUserProjectItems = { - 611FD81D1155111700C2203D /* PBXTextBookmark */ = 611FD81D1155111700C2203D /* PBXTextBookmark */; - 611FD81F1155111700C2203D /* PBXTextBookmark */ = 611FD81F1155111700C2203D /* PBXTextBookmark */; - 611FD8201155111700C2203D /* PBXTextBookmark */ = 611FD8201155111700C2203D /* PBXTextBookmark */; - 611FD8211155111700C2203D /* PBXTextBookmark */ = 611FD8211155111700C2203D /* PBXTextBookmark */; - 611FD8281155111700C2203D /* PBXTextBookmark */ = 611FD8281155111700C2203D /* PBXTextBookmark */; - 611FD8291155111700C2203D /* PBXTextBookmark */ = 611FD8291155111700C2203D /* PBXTextBookmark */; - 611FD82B1155111700C2203D /* PBXTextBookmark */ = 611FD82B1155111700C2203D /* PBXTextBookmark */; - 611FD82C1155111700C2203D /* PBXTextBookmark */ = 611FD82C1155111700C2203D /* PBXTextBookmark */; - 611FD95711551C3700C2203D /* PBXTextBookmark */ = 611FD95711551C3700C2203D /* PBXTextBookmark */; - 611FD95811551C3700C2203D /* PBXBookmark */ = 611FD95811551C3700C2203D /* PBXBookmark */; - 611FD95911551C3700C2203D /* PBXBookmark */ = 611FD95911551C3700C2203D /* PBXBookmark */; - 611FD96611551E8000C2203D /* PBXBookmark */ = 611FD96611551E8000C2203D /* PBXBookmark */; - 611FDAC41155B77500C2203D /* PBXTextBookmark */ = 611FDAC41155B77500C2203D /* PBXTextBookmark */; - 611FDB481155BCE500C2203D /* PBXTextBookmark */ = 611FDB481155BCE500C2203D /* PBXTextBookmark */; - 611FDB6B1155C0B300C2203D /* PBXBookmark */ = 611FDB6B1155C0B300C2203D /* PBXBookmark */; - 611FDB6C1155C0B300C2203D /* PBXBookmark */ = 611FDB6C1155C0B300C2203D /* PBXBookmark */; - 611FDB6D1155C0B300C2203D /* PBXBookmark */ = 611FDB6D1155C0B300C2203D /* PBXBookmark */; - 611FDBF71155D39400C2203D /* PBXTextBookmark */ = 611FDBF71155D39400C2203D /* PBXTextBookmark */; - 612D5C451165535400C6D842 /* PBXTextBookmark */ = 612D5C451165535400C6D842 /* PBXTextBookmark */; - 612D616B1165536300C6D842 /* PBXTextBookmark */ = 612D616B1165536300C6D842 /* PBXTextBookmark */; - 612D618F1165545F00C6D842 /* PBXTextBookmark */ = 612D618F1165545F00C6D842 /* PBXTextBookmark */; - 612FA4551166B907001625AE /* PBXBookmark */ = 612FA4551166B907001625AE /* PBXBookmark */; - 612FA5271166ECE4001625AE /* PBXTextBookmark */ = 612FA5271166ECE4001625AE /* PBXTextBookmark */; - 612FA5281166ECE4001625AE /* PBXTextBookmark */ = 612FA5281166ECE4001625AE /* PBXTextBookmark */; - 61430D3B1165551600E2C62D /* PBXTextBookmark */ = 61430D3B1165551600E2C62D /* PBXTextBookmark */; - 61430D3D1165551600E2C62D /* PBXTextBookmark */ = 61430D3D1165551600E2C62D /* PBXTextBookmark */; - 615E2397115F023B00B0ACA1 /* PBXTextBookmark */ = 615E2397115F023B00B0ACA1 /* PBXTextBookmark */; - 615F12CE11655B21002444F2 /* PBXTextBookmark */ = 615F12CE11655B21002444F2 /* PBXTextBookmark */; - 615F12CF11655B21002444F2 /* PBXTextBookmark */ = 615F12CF11655B21002444F2 /* PBXTextBookmark */; - 615F12FB116560D9002444F2 /* PBXTextBookmark */ = 615F12FB116560D9002444F2 /* PBXTextBookmark */; - 615F1316116561BE002444F2 /* PBXTextBookmark */ = 615F1316116561BE002444F2 /* PBXTextBookmark */; - 615F134D11656569002444F2 /* PBXTextBookmark */ = 615F134D11656569002444F2 /* PBXTextBookmark */; - 615F147F11659AC5002444F2 /* PBXTextBookmark */ = 615F147F11659AC5002444F2 /* PBXTextBookmark */; - 615F148B11659BC2002444F2 /* PBXTextBookmark */ = 615F148B11659BC2002444F2 /* PBXTextBookmark */; - 615F14AA11659E9A002444F2 /* PBXTextBookmark */ = 615F14AA11659E9A002444F2 /* PBXTextBookmark */; - 615F154E1165A976002444F2 /* PBXTextBookmark */ = 615F154E1165A976002444F2 /* PBXTextBookmark */; - 615F157111661DA5002444F2 /* PBXTextBookmark */ = 615F157111661DA5002444F2 /* PBXTextBookmark */; - 615F15B6116629A0002444F2 /* PBXTextBookmark */ = 615F15B6116629A0002444F2 /* PBXTextBookmark */; - 615F15B7116629A0002444F2 /* PBXTextBookmark */ = 615F15B7116629A0002444F2 /* PBXTextBookmark */; - 615F15B8116629A0002444F2 /* PBXTextBookmark */ = 615F15B8116629A0002444F2 /* PBXTextBookmark */; - 615F15B9116629A0002444F2 /* PBXTextBookmark */ = 615F15B9116629A0002444F2 /* PBXTextBookmark */; - 615F15BB116629A0002444F2 /* PBXTextBookmark */ = 615F15BB116629A0002444F2 /* PBXTextBookmark */; - 615F15DC11662BE8002444F2 /* PBXTextBookmark */ = 615F15DC11662BE8002444F2 /* PBXTextBookmark */; - 615F162511663A99002444F2 /* PBXTextBookmark */ = 615F162511663A99002444F2 /* PBXTextBookmark */; - 615F165211663FA7002444F2 /* PBXTextBookmark */ = 615F165211663FA7002444F2 /* PBXTextBookmark */; - 615F166F11664BE1002444F2 /* PBXTextBookmark */ = 615F166F11664BE1002444F2 /* PBXTextBookmark */; - 615F174311668823002444F2 /* PBXTextBookmark */ = 615F174311668823002444F2 /* PBXTextBookmark */; - 615F17D511668C5A002444F2 /* PBXTextBookmark */ = 615F17D511668C5A002444F2 /* PBXTextBookmark */; - 615F180A11668DA5002444F2 /* PBXTextBookmark */ = 615F180A11668DA5002444F2 /* PBXTextBookmark */; - 615F19331166A409002444F2 /* PBXTextBookmark */ = 615F19331166A409002444F2 /* PBXTextBookmark */; - 615F198C1166A71E002444F2 /* PBXBookmark */ = 615F198C1166A71E002444F2 /* PBXBookmark */; - 615F198D1166A71E002444F2 /* PBXTextBookmark */ = 615F198D1166A71E002444F2 /* PBXTextBookmark */; - 615F198E1166A71E002444F2 /* PBXTextBookmark */ = 615F198E1166A71E002444F2 /* PBXTextBookmark */; - 615F198F1166A71E002444F2 /* PBXTextBookmark */ = 615F198F1166A71E002444F2 /* PBXTextBookmark */; - 615F19911166A71E002444F2 /* PBXTextBookmark */ = 615F19911166A71E002444F2 /* PBXTextBookmark */; - 615F19AA1166A803002444F2 /* PBXTextBookmark */ = 615F19AA1166A803002444F2 /* PBXTextBookmark */; - 615F1BB81166B565002444F2 /* PBXTextBookmark */ = 615F1BB81166B565002444F2 /* PBXTextBookmark */; - 615F1E0B1166B68C002444F2 /* PBXBookmark */ = 615F1E0B1166B68C002444F2 /* PBXBookmark */; - 615F1E0D1166B68C002444F2 /* PBXBookmark */ = 615F1E0D1166B68C002444F2 /* PBXBookmark */; - 615F1E0F1166B68C002444F2 /* PBXBookmark */ = 615F1E0F1166B68C002444F2 /* PBXBookmark */; - 615F1E111166B68C002444F2 /* PBXBookmark */ = 615F1E111166B68C002444F2 /* PBXBookmark */; - 615F1E131166B68C002444F2 /* PBXBookmark */ = 615F1E131166B68C002444F2 /* PBXBookmark */; - 615F1E151166B68C002444F2 /* PBXBookmark */ = 615F1E151166B68C002444F2 /* PBXBookmark */; - 615F1E171166B68C002444F2 /* PBXBookmark */ = 615F1E171166B68C002444F2 /* PBXBookmark */; - 615F1E191166B68C002444F2 /* PBXBookmark */ = 615F1E191166B68C002444F2 /* PBXBookmark */; - 615F1E1B1166B68C002444F2 /* PBXBookmark */ = 615F1E1B1166B68C002444F2 /* PBXBookmark */; - 615F1E1D1166B68C002444F2 /* PBXBookmark */ = 615F1E1D1166B68C002444F2 /* PBXBookmark */; - 615F1E1F1166B68C002444F2 /* PBXBookmark */ = 615F1E1F1166B68C002444F2 /* PBXBookmark */; - 615F1E211166B68C002444F2 /* PBXBookmark */ = 615F1E211166B68C002444F2 /* PBXBookmark */; - 615F1E231166B68C002444F2 /* PBXBookmark */ = 615F1E231166B68C002444F2 /* PBXBookmark */; - 615F1E251166B68C002444F2 /* PBXBookmark */ = 615F1E251166B68C002444F2 /* PBXBookmark */; - 615F1E271166B68C002444F2 /* PBXBookmark */ = 615F1E271166B68C002444F2 /* PBXBookmark */; - 615F1E291166B68C002444F2 /* PBXBookmark */ = 615F1E291166B68C002444F2 /* PBXBookmark */; - 615F1E2B1166B68C002444F2 /* PBXBookmark */ = 615F1E2B1166B68C002444F2 /* PBXBookmark */; - 615F1E2D1166B68C002444F2 /* PBXBookmark */ = 615F1E2D1166B68C002444F2 /* PBXBookmark */; - 615F1E2F1166B68C002444F2 /* PBXBookmark */ = 615F1E2F1166B68C002444F2 /* PBXBookmark */; - 615F1E311166B68C002444F2 /* PBXBookmark */ = 615F1E311166B68C002444F2 /* PBXBookmark */; - 615F1E331166B68C002444F2 /* PBXBookmark */ = 615F1E331166B68C002444F2 /* PBXBookmark */; - 615F1E351166B68C002444F2 /* PBXBookmark */ = 615F1E351166B68C002444F2 /* PBXBookmark */; - 615F1E371166B68C002444F2 /* PBXBookmark */ = 615F1E371166B68C002444F2 /* PBXBookmark */; - 615F1E391166B68C002444F2 /* PBXBookmark */ = 615F1E391166B68C002444F2 /* PBXBookmark */; - 615F1E3B1166B68C002444F2 /* PBXBookmark */ = 615F1E3B1166B68C002444F2 /* PBXBookmark */; - 615F1E3D1166B68C002444F2 /* PBXBookmark */ = 615F1E3D1166B68C002444F2 /* PBXBookmark */; - 615F1E3F1166B68C002444F2 /* PBXBookmark */ = 615F1E3F1166B68C002444F2 /* PBXBookmark */; - 615F1E411166B68C002444F2 /* PBXBookmark */ = 615F1E411166B68C002444F2 /* PBXBookmark */; - 615F1E431166B68C002444F2 /* PBXBookmark */ = 615F1E431166B68C002444F2 /* PBXBookmark */; - 615F1E451166B68C002444F2 /* PBXBookmark */ = 615F1E451166B68C002444F2 /* PBXBookmark */; - 615F1E471166B68C002444F2 /* PBXBookmark */ = 615F1E471166B68C002444F2 /* PBXBookmark */; - 615F1E491166B68C002444F2 /* PBXBookmark */ = 615F1E491166B68C002444F2 /* PBXBookmark */; - 615F21921166B73B002444F2 /* PBXTextBookmark */ = 615F21921166B73B002444F2 /* 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 */; - 618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */; - 6194CC0711505FCF00A4BA5C /* PlistBookmark */ = 6194CC0711505FCF00A4BA5C /* PlistBookmark */; - 61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */; - 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */; - 61CCBF451161637F00833FE8 /* PBXTextBookmark */ = 61CCBF451161637F00833FE8 /* PBXTextBookmark */; - 61CCBF461161637F00833FE8 /* PBXTextBookmark */ = 61CCBF461161637F00833FE8 /* PBXTextBookmark */; - 61CCBF471161637F00833FE8 /* PBXTextBookmark */ = 61CCBF471161637F00833FE8 /* PBXTextBookmark */; - 61CCBF791161657400833FE8 /* PBXTextBookmark */ = 61CCBF791161657400833FE8 /* 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 */; - 61CCBFD81161833800833FE8 /* PBXTextBookmark */ = 61CCBFD81161833800833FE8 /* 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 */; - 61CE2514115E74CC0098C467 /* PBXBookmark */ = 61CE2514115E74CC0098C467 /* PBXBookmark */; - 61CE2515115E74CC0098C467 /* PBXTextBookmark */ = 61CE2515115E74CC0098C467 /* PBXTextBookmark */; - 61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */; - 61CE2577115E78900098C467 /* PBXTextBookmark */ = 61CE2577115E78900098C467 /* PBXTextBookmark */; - 61CE2578115E78900098C467 /* PBXTextBookmark */ = 61CE2578115E78900098C467 /* PBXTextBookmark */; - 61CE25B4115E7C940098C467 /* PBXTextBookmark */ = 61CE25B4115E7C940098C467 /* PBXTextBookmark */; - 61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */; + 611FD81D1155111700C2203D = 611FD81D1155111700C2203D /* PBXTextBookmark */; + 611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */; + 611FD8201155111700C2203D = 611FD8201155111700C2203D /* PBXTextBookmark */; + 611FD8211155111700C2203D = 611FD8211155111700C2203D /* PBXTextBookmark */; + 611FD8281155111700C2203D = 611FD8281155111700C2203D /* PBXTextBookmark */; + 611FD8291155111700C2203D = 611FD8291155111700C2203D /* PBXTextBookmark */; + 611FD82B1155111700C2203D = 611FD82B1155111700C2203D /* PBXTextBookmark */; + 611FD82C1155111700C2203D = 611FD82C1155111700C2203D /* PBXTextBookmark */; + 611FD95711551C3700C2203D = 611FD95711551C3700C2203D /* PBXTextBookmark */; + 611FD95811551C3700C2203D = 611FD95811551C3700C2203D /* PBXBookmark */; + 611FD95911551C3700C2203D = 611FD95911551C3700C2203D /* PBXBookmark */; + 611FD96611551E8000C2203D = 611FD96611551E8000C2203D /* PBXBookmark */; + 611FDAC41155B77500C2203D = 611FDAC41155B77500C2203D /* PBXTextBookmark */; + 611FDB481155BCE500C2203D = 611FDB481155BCE500C2203D /* PBXTextBookmark */; + 611FDB6B1155C0B300C2203D = 611FDB6B1155C0B300C2203D /* PBXBookmark */; + 611FDB6C1155C0B300C2203D = 611FDB6C1155C0B300C2203D /* PBXBookmark */; + 611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */; + 611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */; + 612D5C451165535400C6D842 = 612D5C451165535400C6D842 /* PBXTextBookmark */; + 612D616B1165536300C6D842 = 612D616B1165536300C6D842 /* PBXTextBookmark */; + 612D618F1165545F00C6D842 = 612D618F1165545F00C6D842 /* PBXTextBookmark */; + 612FA4551166B907001625AE = 612FA4551166B907001625AE /* PBXBookmark */; + 612FA5271166ECE4001625AE = 612FA5271166ECE4001625AE /* PBXTextBookmark */; + 612FA5281166ECE4001625AE = 612FA5281166ECE4001625AE /* PBXTextBookmark */; + 61430D3B1165551600E2C62D = 61430D3B1165551600E2C62D /* PBXTextBookmark */; + 61430D3D1165551600E2C62D = 61430D3D1165551600E2C62D /* PBXTextBookmark */; + 615E2397115F023B00B0ACA1 = 615E2397115F023B00B0ACA1 /* PBXTextBookmark */; + 615F12CE11655B21002444F2 = 615F12CE11655B21002444F2 /* PBXTextBookmark */; + 615F12CF11655B21002444F2 = 615F12CF11655B21002444F2 /* PBXTextBookmark */; + 615F12FB116560D9002444F2 = 615F12FB116560D9002444F2 /* PBXTextBookmark */; + 615F1316116561BE002444F2 = 615F1316116561BE002444F2 /* PBXTextBookmark */; + 615F134D11656569002444F2 = 615F134D11656569002444F2 /* PBXTextBookmark */; + 615F147F11659AC5002444F2 = 615F147F11659AC5002444F2 /* PBXTextBookmark */; + 615F148B11659BC2002444F2 = 615F148B11659BC2002444F2 /* PBXTextBookmark */; + 615F14AA11659E9A002444F2 = 615F14AA11659E9A002444F2 /* PBXTextBookmark */; + 615F154E1165A976002444F2 = 615F154E1165A976002444F2 /* PBXTextBookmark */; + 615F157111661DA5002444F2 = 615F157111661DA5002444F2 /* PBXTextBookmark */; + 615F15B6116629A0002444F2 = 615F15B6116629A0002444F2 /* PBXTextBookmark */; + 615F15B7116629A0002444F2 = 615F15B7116629A0002444F2 /* PBXTextBookmark */; + 615F15B8116629A0002444F2 = 615F15B8116629A0002444F2 /* PBXTextBookmark */; + 615F15B9116629A0002444F2 = 615F15B9116629A0002444F2 /* PBXTextBookmark */; + 615F15BB116629A0002444F2 = 615F15BB116629A0002444F2 /* PBXTextBookmark */; + 615F15DC11662BE8002444F2 = 615F15DC11662BE8002444F2 /* PBXTextBookmark */; + 615F162511663A99002444F2 = 615F162511663A99002444F2 /* PBXTextBookmark */; + 615F165211663FA7002444F2 = 615F165211663FA7002444F2 /* PBXTextBookmark */; + 615F166F11664BE1002444F2 = 615F166F11664BE1002444F2 /* PBXTextBookmark */; + 615F174311668823002444F2 = 615F174311668823002444F2 /* PBXTextBookmark */; + 615F17D511668C5A002444F2 = 615F17D511668C5A002444F2 /* PBXTextBookmark */; + 615F180A11668DA5002444F2 = 615F180A11668DA5002444F2 /* PBXTextBookmark */; + 615F19331166A409002444F2 = 615F19331166A409002444F2 /* PBXTextBookmark */; + 615F198C1166A71E002444F2 = 615F198C1166A71E002444F2 /* PBXBookmark */; + 615F198D1166A71E002444F2 = 615F198D1166A71E002444F2 /* PBXTextBookmark */; + 615F198E1166A71E002444F2 = 615F198E1166A71E002444F2 /* PBXTextBookmark */; + 615F198F1166A71E002444F2 = 615F198F1166A71E002444F2 /* PBXTextBookmark */; + 615F19911166A71E002444F2 = 615F19911166A71E002444F2 /* PBXTextBookmark */; + 615F19AA1166A803002444F2 = 615F19AA1166A803002444F2 /* PBXTextBookmark */; + 615F1BB81166B565002444F2 = 615F1BB81166B565002444F2 /* PBXTextBookmark */; + 615F1E0B1166B68C002444F2 = 615F1E0B1166B68C002444F2 /* PBXBookmark */; + 615F1E0D1166B68C002444F2 = 615F1E0D1166B68C002444F2 /* PBXBookmark */; + 615F1E0F1166B68C002444F2 = 615F1E0F1166B68C002444F2 /* PBXBookmark */; + 615F1E111166B68C002444F2 = 615F1E111166B68C002444F2 /* PBXBookmark */; + 615F1E131166B68C002444F2 = 615F1E131166B68C002444F2 /* PBXBookmark */; + 615F1E151166B68C002444F2 = 615F1E151166B68C002444F2 /* PBXBookmark */; + 615F1E171166B68C002444F2 = 615F1E171166B68C002444F2 /* PBXBookmark */; + 615F1E191166B68C002444F2 = 615F1E191166B68C002444F2 /* PBXBookmark */; + 615F1E1B1166B68C002444F2 = 615F1E1B1166B68C002444F2 /* PBXBookmark */; + 615F1E1D1166B68C002444F2 = 615F1E1D1166B68C002444F2 /* PBXBookmark */; + 615F1E1F1166B68C002444F2 = 615F1E1F1166B68C002444F2 /* PBXBookmark */; + 615F1E211166B68C002444F2 = 615F1E211166B68C002444F2 /* PBXBookmark */; + 615F1E231166B68C002444F2 = 615F1E231166B68C002444F2 /* PBXBookmark */; + 615F1E251166B68C002444F2 = 615F1E251166B68C002444F2 /* PBXBookmark */; + 615F1E271166B68C002444F2 = 615F1E271166B68C002444F2 /* PBXBookmark */; + 615F1E291166B68C002444F2 = 615F1E291166B68C002444F2 /* PBXBookmark */; + 615F1E2B1166B68C002444F2 = 615F1E2B1166B68C002444F2 /* PBXBookmark */; + 615F1E2D1166B68C002444F2 = 615F1E2D1166B68C002444F2 /* PBXBookmark */; + 615F1E2F1166B68C002444F2 = 615F1E2F1166B68C002444F2 /* PBXBookmark */; + 615F1E311166B68C002444F2 = 615F1E311166B68C002444F2 /* PBXBookmark */; + 615F1E331166B68C002444F2 = 615F1E331166B68C002444F2 /* PBXBookmark */; + 615F1E351166B68C002444F2 = 615F1E351166B68C002444F2 /* PBXBookmark */; + 615F1E371166B68C002444F2 = 615F1E371166B68C002444F2 /* PBXBookmark */; + 615F1E391166B68C002444F2 = 615F1E391166B68C002444F2 /* PBXBookmark */; + 615F1E3B1166B68C002444F2 = 615F1E3B1166B68C002444F2 /* PBXBookmark */; + 615F1E3D1166B68C002444F2 = 615F1E3D1166B68C002444F2 /* PBXBookmark */; + 615F1E3F1166B68C002444F2 = 615F1E3F1166B68C002444F2 /* PBXBookmark */; + 615F1E411166B68C002444F2 = 615F1E411166B68C002444F2 /* PBXBookmark */; + 615F1E431166B68C002444F2 = 615F1E431166B68C002444F2 /* PBXBookmark */; + 615F1E451166B68C002444F2 = 615F1E451166B68C002444F2 /* PBXBookmark */; + 615F1E471166B68C002444F2 = 615F1E471166B68C002444F2 /* PBXBookmark */; + 615F1E491166B68C002444F2 = 615F1E491166B68C002444F2 /* PBXBookmark */; + 615F21921166B73B002444F2 = 615F21921166B73B002444F2 /* 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 */; + 618AFC07115BE92A003D411B = 618AFC07115BE92A003D411B /* PBXBookmark */; + 6194CC0711505FCF00A4BA5C = 6194CC0711505FCF00A4BA5C /* PlistBookmark */; + 61A117421168280200359010 /* PBXTextBookmark */ = 61A117421168280200359010 /* PBXTextBookmark */; + 61A117431168280200359010 /* PBXTextBookmark */ = 61A117431168280200359010 /* PBXTextBookmark */; + 61A117461168280200359010 /* PBXTextBookmark */ = 61A117461168280200359010 /* PBXTextBookmark */; + 61A118231168323000359010 /* PBXTextBookmark */ = 61A118231168323000359010 /* PBXTextBookmark */; + 61A118241168323000359010 /* PBXTextBookmark */ = 61A118241168323000359010 /* PBXTextBookmark */; + 61A118251168323000359010 /* PBXTextBookmark */ = 61A118251168323000359010 /* PBXTextBookmark */; + 61A118261168323000359010 /* PBXTextBookmark */ = 61A118261168323000359010 /* PBXTextBookmark */; + 61A118291168323000359010 /* PBXTextBookmark */ = 61A118291168323000359010 /* PBXTextBookmark */; + 61A1182A1168323000359010 /* PBXTextBookmark */ = 61A1182A1168323000359010 /* PBXTextBookmark */; + 61A1182B1168323000359010 /* PBXTextBookmark */ = 61A1182B1168323000359010 /* PBXTextBookmark */; + 61A1182F1168325800359010 /* PBXTextBookmark */ = 61A1182F1168325800359010 /* PBXTextBookmark */; + 61A118301168325800359010 /* PBXTextBookmark */ = 61A118301168325800359010 /* PBXTextBookmark */; + 61A118381168340700359010 /* PBXBookmark */ = 61A118381168340700359010 /* PBXBookmark */; + 61A1183B116834FC00359010 /* PBXTextBookmark */ = 61A1183B116834FC00359010 /* PBXTextBookmark */; + 61A1183E116834FC00359010 /* PBXTextBookmark */ = 61A1183E116834FC00359010 /* PBXTextBookmark */; + 61A1183F116834FC00359010 /* PBXTextBookmark */ = 61A1183F116834FC00359010 /* PBXTextBookmark */; + 61A11844116836A600359010 /* PBXBookmark */ = 61A11844116836A600359010 /* PBXBookmark */; + 61A1186B1168391A00359010 /* PBXTextBookmark */ = 61A1186B1168391A00359010 /* PBXTextBookmark */; + 61A1186C1168391A00359010 /* PBXTextBookmark */ = 61A1186C1168391A00359010 /* PBXTextBookmark */; + 61A1186E1168391A00359010 /* PBXTextBookmark */ = 61A1186E1168391A00359010 /* PBXTextBookmark */; + 61A118721168391A00359010 /* PBXTextBookmark */ = 61A118721168391A00359010 /* PBXTextBookmark */; + 61A11875116839F400359010 /* PBXTextBookmark */ = 61A11875116839F400359010 /* PBXTextBookmark */; + 61A11876116839F400359010 /* PBXTextBookmark */ = 61A11876116839F400359010 /* PBXTextBookmark */; + 61A118BB11683B4100359010 /* PBXTextBookmark */ = 61A118BB11683B4100359010 /* PBXTextBookmark */; + 61A118BC11683B4100359010 /* PBXTextBookmark */ = 61A118BC11683B4100359010 /* PBXTextBookmark */; + 61A118C511683BBB00359010 /* PBXTextBookmark */ = 61A118C511683BBB00359010 /* PBXTextBookmark */; + 61A118C611683BBB00359010 /* PBXTextBookmark */ = 61A118C611683BBB00359010 /* PBXTextBookmark */; + 61A118C811683C0000359010 /* PBXBookmark */ = 61A118C811683C0000359010 /* PBXBookmark */; + 61A118D811683CD700359010 /* PBXTextBookmark */ = 61A118D811683CD700359010 /* PBXTextBookmark */; + 61A118DB11683CD700359010 /* PBXTextBookmark */ = 61A118DB11683CD700359010 /* PBXTextBookmark */; + 61A118DC11683CD700359010 /* PBXTextBookmark */ = 61A118DC11683CD700359010 /* PBXTextBookmark */; + 61A118E111683D2500359010 /* PBXTextBookmark */ = 61A118E111683D2500359010 /* PBXTextBookmark */; + 61A118E211683D2500359010 /* PBXTextBookmark */ = 61A118E211683D2500359010 /* PBXTextBookmark */; + 61A118E311683D2500359010 /* PBXTextBookmark */ = 61A118E311683D2500359010 /* PBXTextBookmark */; + 61A118E611683D7800359010 /* PBXTextBookmark */ = 61A118E611683D7800359010 /* PBXTextBookmark */; + 61A118E711683D7800359010 /* PBXTextBookmark */ = 61A118E711683D7800359010 /* PBXTextBookmark */; + 61A118E811683D7800359010 /* PBXTextBookmark */ = 61A118E811683D7800359010 /* PBXTextBookmark */; + 61A118FD11683FAD00359010 /* PBXTextBookmark */ = 61A118FD11683FAD00359010 /* PBXTextBookmark */; + 61A1190011683FAD00359010 /* PBXTextBookmark */ = 61A1190011683FAD00359010 /* PBXTextBookmark */; + 61A1190111683FAD00359010 /* PBXTextBookmark */ = 61A1190111683FAD00359010 /* PBXTextBookmark */; + 61A1190211683FAD00359010 /* PBXTextBookmark */ = 61A1190211683FAD00359010 /* PBXTextBookmark */; + 61A1190511683FAD00359010 /* PBXTextBookmark */ = 61A1190511683FAD00359010 /* PBXTextBookmark */; + 61A1190611683FAD00359010 /* PBXTextBookmark */ = 61A1190611683FAD00359010 /* PBXTextBookmark */; + 61A1190711683FAD00359010 /* PBXTextBookmark */ = 61A1190711683FAD00359010 /* PBXTextBookmark */; + 61A1190811683FAD00359010 /* PBXTextBookmark */ = 61A1190811683FAD00359010 /* PBXTextBookmark */; + 61A1190B11683FFA00359010 /* PBXTextBookmark */ = 61A1190B11683FFA00359010 /* PBXTextBookmark */; + 61A1190C11683FFA00359010 /* PBXTextBookmark */ = 61A1190C11683FFA00359010 /* PBXTextBookmark */; + 61A1190D11683FFA00359010 /* PBXTextBookmark */ = 61A1190D11683FFA00359010 /* PBXTextBookmark */; + 61A1190E11683FFA00359010 /* PBXTextBookmark */ = 61A1190E11683FFA00359010 /* PBXTextBookmark */; + 61A119171168410F00359010 /* PBXTextBookmark */ = 61A119171168410F00359010 /* PBXTextBookmark */; + 61A119181168410F00359010 /* PBXTextBookmark */ = 61A119181168410F00359010 /* PBXTextBookmark */; + 61A119191168410F00359010 /* PBXTextBookmark */ = 61A119191168410F00359010 /* PBXTextBookmark */; + 61A11930116841E100359010 /* PBXTextBookmark */ = 61A11930116841E100359010 /* PBXTextBookmark */; + 61A11931116841E100359010 /* PBXTextBookmark */ = 61A11931116841E100359010 /* PBXTextBookmark */; + 61A11932116841E100359010 /* PBXTextBookmark */ = 61A11932116841E100359010 /* PBXTextBookmark */; + 61A119431168430E00359010 /* PBXTextBookmark */ = 61A119431168430E00359010 /* PBXTextBookmark */; + 61A119441168430E00359010 /* PBXTextBookmark */ = 61A119441168430E00359010 /* PBXTextBookmark */; + 61A119451168430E00359010 /* PBXTextBookmark */ = 61A119451168430E00359010 /* PBXTextBookmark */; + 61A1195D1168479600359010 /* PBXTextBookmark */ = 61A1195D1168479600359010 /* PBXTextBookmark */; + 61A1195E1168479600359010 /* PBXTextBookmark */ = 61A1195E1168479600359010 /* PBXTextBookmark */; + 61A1195F1168479600359010 /* PBXTextBookmark */ = 61A1195F1168479600359010 /* PBXTextBookmark */; + 61A1197B1168497B00359010 /* PBXTextBookmark */ = 61A1197B1168497B00359010 /* PBXTextBookmark */; + 61A1197C1168497B00359010 /* PBXTextBookmark */ = 61A1197C1168497B00359010 /* PBXTextBookmark */; + 61A1197D1168497B00359010 /* PBXTextBookmark */ = 61A1197D1168497B00359010 /* PBXTextBookmark */; + 61A1199111684A4F00359010 /* PBXTextBookmark */ = 61A1199111684A4F00359010 /* PBXTextBookmark */; + 61A1199211684A4F00359010 /* PBXTextBookmark */ = 61A1199211684A4F00359010 /* PBXTextBookmark */; + 61A1199311684A4F00359010 /* PBXTextBookmark */ = 61A1199311684A4F00359010 /* PBXTextBookmark */; + 61A1199711684B3200359010 /* PBXBookmark */ = 61A1199711684B3200359010 /* PBXBookmark */; + 61A119A511684F6C00359010 /* PBXBookmark */ = 61A119A511684F6C00359010 /* PBXBookmark */; + 61A119A611684F6D00359010 /* PBXTextBookmark */ = 61A119A611684F6D00359010 /* PBXTextBookmark */; + 61A119A911684F6D00359010 /* PBXTextBookmark */ = 61A119A911684F6D00359010 /* PBXTextBookmark */; + 61A119AA11684F6D00359010 /* PBXTextBookmark */ = 61A119AA11684F6D00359010 /* PBXTextBookmark */; + 61A119AB11684F6D00359010 /* PBXTextBookmark */ = 61A119AB11684F6D00359010 /* PBXTextBookmark */; + 61A119AE11684F6D00359010 /* PBXTextBookmark */ = 61A119AE11684F6D00359010 /* PBXTextBookmark */; + 61A119AF11684F6D00359010 /* PBXTextBookmark */ = 61A119AF11684F6D00359010 /* PBXTextBookmark */; + 61A119C11168500F00359010 /* XCBuildMessageTextBookmark */ = 61A119C11168500F00359010 /* XCBuildMessageTextBookmark */; + 61A119C31168502900359010 /* XCBuildMessageTextBookmark */ = 61A119C31168502900359010 /* XCBuildMessageTextBookmark */; + 61A119D71168515100359010 /* PBXTextBookmark */ = 61A119D71168515100359010 /* PBXTextBookmark */; + 61A119D81168515100359010 /* PBXTextBookmark */ = 61A119D81168515100359010 /* PBXTextBookmark */; + 61A119D91168515100359010 /* PBXTextBookmark */ = 61A119D91168515100359010 /* PBXTextBookmark */; + 61A119DC1168515100359010 /* PBXTextBookmark */ = 61A119DC1168515100359010 /* PBXTextBookmark */; + 61A119DD1168515100359010 /* PBXTextBookmark */ = 61A119DD1168515100359010 /* PBXTextBookmark */; + 61A119E01168515100359010 /* PBXTextBookmark */ = 61A119E01168515100359010 /* PBXTextBookmark */; + 61A119E31168515100359010 /* PBXTextBookmark */ = 61A119E31168515100359010 /* PBXTextBookmark */; + 61A119E41168515100359010 /* PBXTextBookmark */ = 61A119E41168515100359010 /* PBXTextBookmark */; + 61A119E51168515100359010 /* PBXTextBookmark */ = 61A119E51168515100359010 /* PBXTextBookmark */; + 61A119E61168515100359010 /* PBXTextBookmark */ = 61A119E61168515100359010 /* PBXTextBookmark */; + 61A119E71168515100359010 /* PBXTextBookmark */ = 61A119E71168515100359010 /* PBXTextBookmark */; + 61A119FD1168533300359010 /* PBXTextBookmark */ = 61A119FD1168533300359010 /* PBXTextBookmark */; + 61A119FE1168533300359010 /* PBXTextBookmark */ = 61A119FE1168533300359010 /* PBXTextBookmark */; + 61A119FF1168533300359010 /* PBXTextBookmark */ = 61A119FF1168533300359010 /* PBXTextBookmark */; + 61A11A001168533300359010 /* PBXTextBookmark */ = 61A11A001168533300359010 /* PBXTextBookmark */; + 61A11A031168533300359010 /* PBXTextBookmark */ = 61A11A031168533300359010 /* PBXTextBookmark */; + 61A11A041168533300359010 /* PBXTextBookmark */ = 61A11A041168533300359010 /* PBXTextBookmark */; + 61A11A051168533300359010 /* PBXTextBookmark */ = 61A11A051168533300359010 /* PBXTextBookmark */; + 61A11A061168533300359010 /* PBXTextBookmark */ = 61A11A061168533300359010 /* PBXTextBookmark */; + 61A11A071168533300359010 /* PBXTextBookmark */ = 61A11A071168533300359010 /* PBXTextBookmark */; + 61A11A081168533300359010 /* PBXTextBookmark */ = 61A11A081168533300359010 /* PBXTextBookmark */; + 61A11A091168533300359010 /* PBXTextBookmark */ = 61A11A091168533300359010 /* PBXTextBookmark */; + 61A11A0A1168533300359010 /* PBXTextBookmark */ = 61A11A0A1168533300359010 /* PBXTextBookmark */; + 61A11A111168541700359010 /* PBXTextBookmark */ = 61A11A111168541700359010 /* PBXTextBookmark */; + 61A11A121168541700359010 /* PBXTextBookmark */ = 61A11A121168541700359010 /* PBXTextBookmark */; + 61A11A131168541700359010 /* PBXTextBookmark */ = 61A11A131168541700359010 /* PBXTextBookmark */; + 61A11A141168541700359010 /* PBXTextBookmark */ = 61A11A141168541700359010 /* PBXTextBookmark */; + 61A11A151168541700359010 /* PBXTextBookmark */ = 61A11A151168541700359010 /* PBXTextBookmark */; + 61A11A161168541700359010 /* PBXTextBookmark */ = 61A11A161168541700359010 /* PBXTextBookmark */; + 61A11A171168541700359010 /* PBXTextBookmark */ = 61A11A171168541700359010 /* PBXTextBookmark */; + 61A11A181168541700359010 /* PBXTextBookmark */ = 61A11A181168541700359010 /* PBXTextBookmark */; + 61A11A191168541700359010 /* PBXTextBookmark */ = 61A11A191168541700359010 /* PBXTextBookmark */; + 61A11A1A1168541700359010 /* PBXTextBookmark */ = 61A11A1A1168541700359010 /* PBXTextBookmark */; + 61A11A1D1168546800359010 /* PBXTextBookmark */ = 61A11A1D1168546800359010 /* PBXTextBookmark */; + 61A11A1E1168546800359010 /* PBXTextBookmark */ = 61A11A1E1168546800359010 /* PBXTextBookmark */; + 61A11A1F1168546800359010 /* PBXTextBookmark */ = 61A11A1F1168546800359010 /* PBXTextBookmark */; + 61A11A201168546800359010 /* PBXTextBookmark */ = 61A11A201168546800359010 /* PBXTextBookmark */; + 61A11A211168546800359010 /* PBXTextBookmark */ = 61A11A211168546800359010 /* PBXTextBookmark */; + 61A11A221168546800359010 /* PBXTextBookmark */ = 61A11A221168546800359010 /* PBXTextBookmark */; + 61A11A231168546800359010 /* PBXTextBookmark */ = 61A11A231168546800359010 /* PBXTextBookmark */; + 61A11A241168546800359010 /* PBXTextBookmark */ = 61A11A241168546800359010 /* PBXTextBookmark */; + 61A11A251168546800359010 /* PBXTextBookmark */ = 61A11A251168546800359010 /* PBXTextBookmark */; + 61A11A261168546800359010 /* PBXTextBookmark */ = 61A11A261168546800359010 /* PBXTextBookmark */; + 61A11A291168549200359010 /* PBXTextBookmark */ = 61A11A291168549200359010 /* PBXTextBookmark */; + 61A11A2A1168549200359010 /* PBXTextBookmark */ = 61A11A2A1168549200359010 /* PBXTextBookmark */; + 61A11A2B1168549200359010 /* PBXTextBookmark */ = 61A11A2B1168549200359010 /* PBXTextBookmark */; + 61A11A2C1168549200359010 /* PBXTextBookmark */ = 61A11A2C1168549200359010 /* PBXTextBookmark */; + 61A11A2D1168549200359010 /* PBXTextBookmark */ = 61A11A2D1168549200359010 /* PBXTextBookmark */; + 61A11A2E1168549200359010 /* PBXTextBookmark */ = 61A11A2E1168549200359010 /* PBXTextBookmark */; + 61A11A2F1168549200359010 /* PBXTextBookmark */ = 61A11A2F1168549200359010 /* PBXTextBookmark */; + 61A11A301168549200359010 /* PBXTextBookmark */ = 61A11A301168549200359010 /* PBXTextBookmark */; + 61A11A431168569A00359010 /* PBXTextBookmark */ = 61A11A431168569A00359010 /* PBXTextBookmark */; + 61A11A441168569A00359010 /* PBXTextBookmark */ = 61A11A441168569A00359010 /* PBXTextBookmark */; + 61A11A451168569A00359010 /* PBXTextBookmark */ = 61A11A451168569A00359010 /* PBXTextBookmark */; + 61A11A461168569A00359010 /* PBXTextBookmark */ = 61A11A461168569A00359010 /* PBXTextBookmark */; + 61A11A471168569A00359010 /* PBXTextBookmark */ = 61A11A471168569A00359010 /* PBXTextBookmark */; + 61A11A481168569A00359010 /* PBXTextBookmark */ = 61A11A481168569A00359010 /* PBXTextBookmark */; + 61A11A491168569A00359010 /* PBXTextBookmark */ = 61A11A491168569A00359010 /* PBXTextBookmark */; + 61A11A5B1168D33A00359010 /* PBXTextBookmark */ = 61A11A5B1168D33A00359010 /* PBXTextBookmark */; + 61A11A5E1168D33A00359010 /* PBXTextBookmark */ = 61A11A5E1168D33A00359010 /* PBXTextBookmark */; + 61A11A5F1168D33A00359010 /* PBXTextBookmark */ = 61A11A5F1168D33A00359010 /* PBXTextBookmark */; + 61A11A601168D33A00359010 /* PBXTextBookmark */ = 61A11A601168D33A00359010 /* PBXTextBookmark */; + 61A11A611168D33A00359010 /* PBXTextBookmark */ = 61A11A611168D33A00359010 /* PBXTextBookmark */; + 61A11A621168D33A00359010 /* PBXTextBookmark */ = 61A11A621168D33A00359010 /* PBXTextBookmark */; + 61A11A631168D33A00359010 /* PBXTextBookmark */ = 61A11A631168D33A00359010 /* PBXTextBookmark */; + 61A11A641168D33A00359010 /* PBXTextBookmark */ = 61A11A641168D33A00359010 /* PBXTextBookmark */; + 61A11A691168D37B00359010 /* PBXTextBookmark */ = 61A11A691168D37B00359010 /* PBXTextBookmark */; + 61A11A6A1168D37B00359010 /* PBXTextBookmark */ = 61A11A6A1168D37B00359010 /* PBXTextBookmark */; + 61A11A6B1168D37B00359010 /* PBXTextBookmark */ = 61A11A6B1168D37B00359010 /* PBXTextBookmark */; + 61A11A6C1168D37B00359010 /* PBXTextBookmark */ = 61A11A6C1168D37B00359010 /* PBXTextBookmark */; + 61A11A6D1168D37B00359010 /* PBXTextBookmark */ = 61A11A6D1168D37B00359010 /* PBXTextBookmark */; + 61A11A6E1168D37B00359010 /* PBXTextBookmark */ = 61A11A6E1168D37B00359010 /* PBXTextBookmark */; + 61A11A6F1168D37B00359010 /* PBXTextBookmark */ = 61A11A6F1168D37B00359010 /* PBXTextBookmark */; + 61A11A771168D3D600359010 /* PBXTextBookmark */ = 61A11A771168D3D600359010 /* PBXTextBookmark */; + 61A11A781168D3D600359010 /* PBXTextBookmark */ = 61A11A781168D3D600359010 /* PBXTextBookmark */; + 61A11A791168D3D600359010 /* PBXTextBookmark */ = 61A11A791168D3D600359010 /* PBXTextBookmark */; + 61A11A7A1168D3D600359010 /* PBXTextBookmark */ = 61A11A7A1168D3D600359010 /* PBXTextBookmark */; + 61A11A7B1168D3D600359010 /* PBXTextBookmark */ = 61A11A7B1168D3D600359010 /* PBXTextBookmark */; + 61A11A7C1168D3D600359010 /* PBXTextBookmark */ = 61A11A7C1168D3D600359010 /* PBXTextBookmark */; + 61A11A801168D3EF00359010 /* PBXTextBookmark */ = 61A11A801168D3EF00359010 /* PBXTextBookmark */; + 61A11A811168D3EF00359010 /* PBXTextBookmark */ = 61A11A811168D3EF00359010 /* PBXTextBookmark */; + 61A11A821168D3EF00359010 /* PBXTextBookmark */ = 61A11A821168D3EF00359010 /* PBXTextBookmark */; + 61A11A831168D3EF00359010 /* PBXTextBookmark */ = 61A11A831168D3EF00359010 /* PBXTextBookmark */; + 61A11A841168D3EF00359010 /* PBXTextBookmark */ = 61A11A841168D3EF00359010 /* PBXTextBookmark */; + 61A11A851168D3EF00359010 /* PBXTextBookmark */ = 61A11A851168D3EF00359010 /* PBXTextBookmark */; + 61A11A891168D57100359010 /* PBXTextBookmark */ = 61A11A891168D57100359010 /* PBXTextBookmark */; + 61A11A8A1168D57100359010 /* PBXTextBookmark */ = 61A11A8A1168D57100359010 /* PBXTextBookmark */; + 61A11A8B1168D57100359010 /* PBXTextBookmark */ = 61A11A8B1168D57100359010 /* PBXTextBookmark */; + 61A11A8C1168D57100359010 /* PBXTextBookmark */ = 61A11A8C1168D57100359010 /* PBXTextBookmark */; + 61A11A8D1168D57100359010 /* PBXTextBookmark */ = 61A11A8D1168D57100359010 /* PBXTextBookmark */; + 61A11A8E1168D57100359010 /* PBXTextBookmark */ = 61A11A8E1168D57100359010 /* PBXTextBookmark */; + 61A11A8F1168D57100359010 /* PBXTextBookmark */ = 61A11A8F1168D57100359010 /* PBXTextBookmark */; + 61A11A901168D57100359010 /* PBXTextBookmark */ = 61A11A901168D57100359010 /* PBXTextBookmark */; + 61A11A951168D5A000359010 /* PBXTextBookmark */ = 61A11A951168D5A000359010 /* PBXTextBookmark */; + 61A11A961168D5A000359010 /* PBXTextBookmark */ = 61A11A961168D5A000359010 /* PBXTextBookmark */; + 61A11A971168D5A000359010 /* PBXTextBookmark */ = 61A11A971168D5A000359010 /* PBXTextBookmark */; + 61A11A9A1168D5A000359010 /* PBXTextBookmark */ = 61A11A9A1168D5A000359010 /* PBXTextBookmark */; + 61A11A9B1168D5A000359010 /* PBXTextBookmark */ = 61A11A9B1168D5A000359010 /* PBXTextBookmark */; + 61A11A9C1168D5A000359010 /* PBXTextBookmark */ = 61A11A9C1168D5A000359010 /* PBXTextBookmark */; + 61A11A9D1168D5A000359010 /* PBXTextBookmark */ = 61A11A9D1168D5A000359010 /* PBXTextBookmark */; + 61A11A9E1168D5A000359010 /* PBXTextBookmark */ = 61A11A9E1168D5A000359010 /* PBXTextBookmark */; + 61A11A9F1168D5A000359010 /* PBXTextBookmark */ = 61A11A9F1168D5A000359010 /* PBXTextBookmark */; + 61A11AA41168D71300359010 /* PBXTextBookmark */ = 61A11AA41168D71300359010 /* PBXTextBookmark */; + 61A11AA51168D71300359010 /* PBXTextBookmark */ = 61A11AA51168D71300359010 /* PBXTextBookmark */; + 61A11AA81168D71300359010 /* PBXTextBookmark */ = 61A11AA81168D71300359010 /* PBXTextBookmark */; + 61A11AAA1168D71300359010 /* PBXTextBookmark */ = 61A11AAA1168D71300359010 /* PBXTextBookmark */; + 61A11AAC1168D71300359010 /* PBXTextBookmark */ = 61A11AAC1168D71300359010 /* PBXTextBookmark */; + 61A11AAD1168D71300359010 /* PBXTextBookmark */ = 61A11AAD1168D71300359010 /* PBXTextBookmark */; + 61A11AAE1168D71300359010 /* PBXTextBookmark */ = 61A11AAE1168D71300359010 /* PBXTextBookmark */; + 61A11AAF1168D71300359010 /* PBXTextBookmark */ = 61A11AAF1168D71300359010 /* PBXTextBookmark */; + 61A11AB01168D71300359010 /* PBXTextBookmark */ = 61A11AB01168D71300359010 /* PBXTextBookmark */; + 61A11AB51168D77400359010 /* PBXTextBookmark */ = 61A11AB51168D77400359010 /* PBXTextBookmark */; + 61A11AB61168D77400359010 /* PBXTextBookmark */ = 61A11AB61168D77400359010 /* PBXTextBookmark */; + 61A11AB71168D77400359010 /* PBXTextBookmark */ = 61A11AB71168D77400359010 /* PBXTextBookmark */; + 61A11AB81168D77400359010 /* PBXTextBookmark */ = 61A11AB81168D77400359010 /* PBXTextBookmark */; + 61A11AB91168D77400359010 /* PBXTextBookmark */ = 61A11AB91168D77400359010 /* PBXTextBookmark */; + 61A11ABA1168D77400359010 /* PBXTextBookmark */ = 61A11ABA1168D77400359010 /* PBXTextBookmark */; + 61A11ABB1168D77400359010 /* PBXTextBookmark */ = 61A11ABB1168D77400359010 /* PBXTextBookmark */; + 61A11AC41168DA4200359010 /* PBXTextBookmark */ = 61A11AC41168DA4200359010 /* PBXTextBookmark */; + 61A11AC51168DA4200359010 /* PBXTextBookmark */ = 61A11AC51168DA4200359010 /* PBXTextBookmark */; + 61A11AC61168DA4200359010 /* PBXTextBookmark */ = 61A11AC61168DA4200359010 /* PBXTextBookmark */; + 61A11ACA1168DAB700359010 /* PBXTextBookmark */ = 61A11ACA1168DAB700359010 /* PBXTextBookmark */; + 61A11ACB1168DAB700359010 /* PBXTextBookmark */ = 61A11ACB1168DAB700359010 /* PBXTextBookmark */; + 61A11ACC1168DAB700359010 /* PBXTextBookmark */ = 61A11ACC1168DAB700359010 /* PBXTextBookmark */; + 61A11AD11168DB2C00359010 /* PBXTextBookmark */ = 61A11AD11168DB2C00359010 /* PBXTextBookmark */; + 61A11AD21168DB2C00359010 /* PBXTextBookmark */ = 61A11AD21168DB2C00359010 /* PBXTextBookmark */; + 61A11AD31168DB2C00359010 /* PBXTextBookmark */ = 61A11AD31168DB2C00359010 /* PBXTextBookmark */; + 61A11ADB1168DB5000359010 /* PBXTextBookmark */ = 61A11ADB1168DB5000359010 /* PBXTextBookmark */; + 61A11ADC1168DB5000359010 /* PBXTextBookmark */ = 61A11ADC1168DB5000359010 /* PBXTextBookmark */; + 61A11ADD1168DB5000359010 /* PBXTextBookmark */ = 61A11ADD1168DB5000359010 /* PBXTextBookmark */; + 61A11AE51168DC9A00359010 /* PBXTextBookmark */ = 61A11AE51168DC9A00359010 /* PBXTextBookmark */; + 61A11AE61168DC9A00359010 /* PBXTextBookmark */ = 61A11AE61168DC9A00359010 /* PBXTextBookmark */; + 61A11AE71168DC9A00359010 /* PBXTextBookmark */ = 61A11AE71168DC9A00359010 /* PBXTextBookmark */; + 61A11AE81169054200359010 /* PBXBookmark */ = 61A11AE81169054200359010 /* PBXBookmark */; + 61A11AEE1169069300359010 /* PBXBookmark */ = 61A11AEE1169069300359010 /* PBXBookmark */; + 61A11B0711691E2400359010 /* PBXTextBookmark */ = 61A11B0711691E2400359010 /* PBXTextBookmark */; + 61A11B0811691E2400359010 /* PBXTextBookmark */ = 61A11B0811691E2400359010 /* PBXTextBookmark */; + 61A11B0B11691E2400359010 /* PBXTextBookmark */ = 61A11B0B11691E2400359010 /* PBXTextBookmark */; + 61A11B0E11691E2400359010 /* PBXTextBookmark */ = 61A11B0E11691E2400359010 /* PBXTextBookmark */; + 61A11B0F11691E2400359010 /* PBXTextBookmark */ = 61A11B0F11691E2400359010 /* PBXTextBookmark */; + 61A11B1011691E2400359010 /* PBXTextBookmark */ = 61A11B1011691E2400359010 /* PBXTextBookmark */; + 61A11B1111691E2400359010 /* PBXTextBookmark */ = 61A11B1111691E2400359010 /* PBXTextBookmark */; + 61A11B1411691E2400359010 /* PBXTextBookmark */ = 61A11B1411691E2400359010 /* PBXTextBookmark */; + 61A11B1511691E5F00359010 /* PBXTextBookmark */ = 61A11B1511691E5F00359010 /* PBXTextBookmark */; + 61A11B1611691E5F00359010 /* PBXTextBookmark */ = 61A11B1611691E5F00359010 /* PBXTextBookmark */; + 61A11B1711691E5F00359010 /* PBXTextBookmark */ = 61A11B1711691E5F00359010 /* PBXTextBookmark */; + 61A11B1811691E5F00359010 /* PBXTextBookmark */ = 61A11B1811691E5F00359010 /* PBXTextBookmark */; + 61A11B1911691E5F00359010 /* PBXTextBookmark */ = 61A11B1911691E5F00359010 /* PBXTextBookmark */; + 61A11B1A11691E6700359010 /* PBXTextBookmark */ = 61A11B1A11691E6700359010 /* PBXTextBookmark */; + 61A11B1B11691E6700359010 /* PBXTextBookmark */ = 61A11B1B11691E6700359010 /* PBXTextBookmark */; + 61A11B1C11691E6700359010 /* PBXTextBookmark */ = 61A11B1C11691E6700359010 /* PBXTextBookmark */; + 61A11B1D11691E6700359010 /* PBXTextBookmark */ = 61A11B1D11691E6700359010 /* PBXTextBookmark */; + 61A11B1E11691E6700359010 /* PBXTextBookmark */ = 61A11B1E11691E6700359010 /* PBXTextBookmark */; + 61A11B2111691EE400359010 /* PBXTextBookmark */ = 61A11B2111691EE400359010 /* PBXTextBookmark */; + 61A11B2211691EE400359010 /* PBXTextBookmark */ = 61A11B2211691EE400359010 /* PBXTextBookmark */; + 61A11B2311691EE400359010 /* PBXTextBookmark */ = 61A11B2311691EE400359010 /* PBXTextBookmark */; + 61A11B2411691EE400359010 /* PBXTextBookmark */ = 61A11B2411691EE400359010 /* PBXTextBookmark */; + 61A11B2511691EE400359010 /* PBXTextBookmark */ = 61A11B2511691EE400359010 /* PBXTextBookmark */; + 61A11B2611691EF100359010 /* XCBuildMessageTextBookmark */ = 61A11B2611691EF100359010 /* XCBuildMessageTextBookmark */; + 61A11B2911691EFE00359010 /* XCBuildMessageTextBookmark */ = 61A11B2911691EFE00359010 /* XCBuildMessageTextBookmark */; + 61A11B2C11691F0B00359010 /* PBXTextBookmark */ = 61A11B2C11691F0B00359010 /* PBXTextBookmark */; + 61A11B2D11691F0B00359010 /* PBXTextBookmark */ = 61A11B2D11691F0B00359010 /* PBXTextBookmark */; + 61A11B2E11691F0B00359010 /* PBXTextBookmark */ = 61A11B2E11691F0B00359010 /* PBXTextBookmark */; + 61A11B2F11691F0B00359010 /* PBXTextBookmark */ = 61A11B2F11691F0B00359010 /* PBXTextBookmark */; + 61A11B3011691F0B00359010 /* PBXTextBookmark */ = 61A11B3011691F0B00359010 /* PBXTextBookmark */; + 61A11B451169210B00359010 /* PBXTextBookmark */ = 61A11B451169210B00359010 /* PBXTextBookmark */; + 61A11B481169210B00359010 /* PBXTextBookmark */ = 61A11B481169210B00359010 /* PBXTextBookmark */; + 61A11B491169210B00359010 /* PBXTextBookmark */ = 61A11B491169210B00359010 /* PBXTextBookmark */; + 61A11B4A1169210B00359010 /* PBXTextBookmark */ = 61A11B4A1169210B00359010 /* PBXTextBookmark */; + 61A11B4B1169210B00359010 /* PBXTextBookmark */ = 61A11B4B1169210B00359010 /* PBXTextBookmark */; + 61A11B4C1169210B00359010 /* PBXTextBookmark */ = 61A11B4C1169210B00359010 /* PBXTextBookmark */; + 61A11B4D1169210B00359010 /* PBXTextBookmark */ = 61A11B4D1169210B00359010 /* PBXTextBookmark */; + 61A11B54116922FF00359010 /* PBXBookmark */ = 61A11B54116922FF00359010 /* PBXBookmark */; + 61A11B55116922FF00359010 /* PBXTextBookmark */ = 61A11B55116922FF00359010 /* PBXTextBookmark */; + 61A11B56116922FF00359010 /* PBXTextBookmark */ = 61A11B56116922FF00359010 /* PBXTextBookmark */; + 61A11B5A1169235C00359010 /* PBXBookmark */ = 61A11B5A1169235C00359010 /* PBXBookmark */; + 61A11B5B1169235C00359010 /* PBXTextBookmark */ = 61A11B5B1169235C00359010 /* PBXTextBookmark */; + 61A11B5C1169235C00359010 /* PBXTextBookmark */ = 61A11B5C1169235C00359010 /* PBXTextBookmark */; + 61A11B5D1169240500359010 /* PBXBookmark */ = 61A11B5D1169240500359010 /* PBXBookmark */; + 61A11B5E1169240500359010 /* PBXTextBookmark */ = 61A11B5E1169240500359010 /* PBXTextBookmark */; + 61A11B5F1169240500359010 /* PBXTextBookmark */ = 61A11B5F1169240500359010 /* PBXTextBookmark */; + 61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */; + 61CCBF1E116162CA00833FE8 = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */; + 61CCBF451161637F00833FE8 = 61CCBF451161637F00833FE8 /* PBXTextBookmark */; + 61CCBF461161637F00833FE8 = 61CCBF461161637F00833FE8 /* PBXTextBookmark */; + 61CCBF471161637F00833FE8 = 61CCBF471161637F00833FE8 /* PBXTextBookmark */; + 61CCBF791161657400833FE8 = 61CCBF791161657400833FE8 /* 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 */; + 61CCBFD81161833800833FE8 = 61CCBFD81161833800833FE8 /* PBXTextBookmark */; + 61CCBFD91161833800833FE8 = 61CCBFD91161833800833FE8 /* PBXTextBookmark */; + 61CCBFDA1161833800833FE8 = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */; + 61CCBFDB1161833800833FE8 = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */; + 61CCBFDC1161833800833FE8 = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */; + 61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */; + 61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */; + 61CE2514115E74CC0098C467 = 61CE2514115E74CC0098C467 /* PBXBookmark */; + 61CE2515115E74CC0098C467 = 61CE2515115E74CC0098C467 /* PBXTextBookmark */; + 61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */; + 61CE2577115E78900098C467 = 61CE2577115E78900098C467 /* PBXTextBookmark */; + 61CE2578115E78900098C467 = 61CE2578115E78900098C467 /* PBXTextBookmark */; + 61CE25B4115E7C940098C467 = 61CE25B4115E7C940098C467 /* PBXTextBookmark */; + 61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */; }; sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */; userBuildSettings = { @@ -241,44 +500,6 @@ sepNavVisRange = "{106, 119}"; }; }; - 6100DA6E115446B000F455E0 /* iHedgewars */ = { - activeExec = 0; - executables = ( - 6100DAD3115446B000F455E0 /* iHedgewars */, - ); - }; - 6100DAD3115446B000F455E0 /* iHedgewars */ = { - isa = PBXExecutable; - activeArgIndices = ( - ); - argumentStrings = ( - ); - autoAttachOnCrash = 1; - breakpointsEnabled = 1; - configStateDict = { - }; - customDataFormattersEnabled = 1; - dataTipCustomDataFormattersEnabled = 1; - dataTipShowTypeColumn = 1; - dataTipSortType = 0; - debuggerPlugin = GDBDebugging; - disassemblyDisplayState = 0; - dylibVariantSuffix = ""; - enableDebugStr = 1; - environmentEntries = ( - ); - executableSystemSymbolLevel = 0; - executableUserSymbolLevel = 0; - libgmallocEnabled = 0; - name = iHedgewars; - savedGlobals = { - }; - showTypeColumn = 0; - sourceDirectories = ( - ); - variableFormatDictionary = { - }; - }; 611FD81D1155111700C2203D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 6179885B114AA48A00BA94A9 /* SDL_image.h */; @@ -401,6 +622,13 @@ vrLen = 295; vrLoc = 763; }; + 611FDB631155BFFF00C2203D /* Default.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = Default.png; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/Default.png; + sourceTree = ""; + }; 611FDB6B1155C0B300C2203D /* PBXBookmark */ = { isa = PBXBookmark; fRef = 611FDB631155BFFF00C2203D /* Default.png */; @@ -608,6 +836,12 @@ vrLoc = 0; }; 615F159C1166216A002444F2 /* TeamSettingsViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = TeamSettingsViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/TeamSettingsViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {836, 565}}"; sepNavSelRange = "{328, 0}"; @@ -615,14 +849,26 @@ }; }; 615F159D1166216A002444F2 /* TeamSettingsViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = TeamSettingsViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/TeamSettingsViewController.m; + sourceTree = ""; uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 2145}}"; - sepNavSelRange = "{4393, 0}"; - sepNavVisRange = "{3602, 1564}"; + sepNavIntBoundsRect = "{{0, 0}, {810, 2093}}"; + sepNavSelRange = "{939, 0}"; + sepNavVisRange = "{279, 839}"; sepNavWindowFrame = "{{366, 119}, {895, 693}}"; }; }; 615F15AC116628CC002444F2 /* SingleTeamViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = SingleTeamViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/SingleTeamViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {836, 542}}"; sepNavSelRange = "{325, 24}"; @@ -630,10 +876,16 @@ }; }; 615F15AD116628CC002444F2 /* SingleTeamViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = SingleTeamViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/SingleTeamViewController.m; + sourceTree = ""; uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 2704}}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 2782}}"; sepNavSelRange = "{5604, 0}"; - sepNavVisRange = "{4612, 1359}"; + sepNavVisRange = "{4663, 1308}"; sepNavWindowFrame = "{{129, 279}, {895, 693}}"; }; }; @@ -728,6 +980,12 @@ vrLoc = 53; }; 615F16DA11668358002444F2 /* HogHatViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = HogHatViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/HogHatViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {836, 565}}"; sepNavSelRange = "{258, 0}"; @@ -735,11 +993,17 @@ }; }; 615F16DB11668358002444F2 /* HogHatViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = HogHatViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/HogHatViewController.m; + sourceTree = ""; uiCtxt = { sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{4910, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{4961, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{5011, 12}\";\n s = 1;\n }\n );\n r = \"{0, 5820}\";\n s = 0;\n}"; - sepNavIntBoundsRect = "{{0, 0}, {1048, 2626}}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 2418}}"; sepNavSelRange = "{5516, 0}"; - sepNavVisRange = "{4678, 550}"; + sepNavVisRange = "{3593, 651}"; sepNavWindowFrame = "{{515, 111}, {895, 693}}"; }; }; @@ -784,20 +1048,18 @@ vrLoc = 4626; }; 615F19841166A6AB002444F2 /* untitled.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = untitled.h; + path = /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/untitled.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {532, 182}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 41}"; }; }; - 615F19851166A6AB002444F2 /* untitled.m */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1146, 754}}"; - sepNavSelRange = "{360, 219}"; - sepNavVisRange = "{0, 1042}"; - sepNavWindowFrame = "{{222, 291}, {895, 693}}"; - }; - }; 615F198C1166A71E002444F2 /* PBXBookmark */ = { isa = PBXBookmark; fRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */; @@ -1255,7 +1517,7 @@ argumentStrings = ( ); autoAttachOnCrash = 1; - breakpointsEnabled = 0; + breakpointsEnabled = 1; configStateDict = { }; customDataFormattersEnabled = 1; @@ -1344,9 +1606,9 @@ }; 617987EB114AA34C00BA94A9 /* options.inc */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 572}}"; + sepNavIntBoundsRect = "{{0, 0}, {862, 572}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 49}"; + sepNavVisRange = "{317, 874}"; sepNavWindowFrame = "{{864, 517}, {921, 605}}"; }; }; @@ -1535,9 +1797,9 @@ }; 61798805114AA34C00BA94A9 /* uMisc.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1034, 9659}}"; - sepNavSelRange = "{19704, 6}"; - sepNavVisRange = "{18808, 1596}"; + sepNavIntBoundsRect = "{{0, 0}, {1034, 10127}}"; + sepNavSelRange = "{16907, 0}"; + sepNavVisRange = "{15663, 1986}"; sepNavWindowFrame = "{{84, 143}, {938, 967}}"; }; }; @@ -1615,9 +1877,10 @@ }; 61798852114AA44900BA94A9 /* config.inc */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {620, 286}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 664}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 874}"; + sepNavVisRange = "{0, 871}"; + sepNavWindowFrame = "{{753, -247}, {1058, 792}}"; }; }; 61798856114AA48A00BA94A9 /* CGPointUtils.c */ = { @@ -1666,18 +1929,18 @@ }; 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1004, 611}}"; - sepNavSelRange = "{1430, 0}"; - sepNavVisRange = "{1109, 510}"; - sepNavWindowFrame = "{{156, 236}, {803, 674}}"; + sepNavIntBoundsRect = "{{0, 0}, {744, 754}}"; + sepNavSelRange = "{1258, 0}"; + sepNavVisRange = "{745, 1228}"; + sepNavWindowFrame = "{{471, 203}, {803, 674}}"; }; }; 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {796, 1898}}"; - sepNavSelRange = "{3476, 0}"; - sepNavVisRange = "{1912, 1246}"; - sepNavWindowFrame = "{{156, 236}, {803, 674}}"; + sepNavIntBoundsRect = "{{0, 0}, {845, 2093}}"; + sepNavSelRange = "{2443, 57}"; + sepNavVisRange = "{1935, 1195}"; + sepNavWindowFrame = "{{567, 167}, {803, 674}}"; }; }; 61798867114AA4AA00BA94A9 /* SDL_uikitwindow.h */ = { @@ -1698,20 +1961,26 @@ 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {716, 495}}"; - sepNavSelRange = "{354, 0}"; - sepNavVisRange = "{0, 692}"; - sepNavWindowFrame = "{{525, 308}, {775, 623}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 515}"; + sepNavWindowFrame = "{{852, 335}, {775, 623}}"; }; }; 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {901, 2431}}"; - sepNavSelRange = "{1601, 0}"; - sepNavVisRange = "{1080, 935}"; - sepNavWindowFrame = "{{525, 308}, {775, 623}}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 2600}}"; + sepNavSelRange = "{1076, 0}"; + sepNavVisRange = "{787, 2320}"; + sepNavWindowFrame = "{{260, 136}, {1058, 792}}"; }; }; 61798871114AA4D000BA94A9 /* SchemeEditViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = SchemeEditViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/SchemeEditViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {719, 273}}"; sepNavSelRange = "{0, 0}"; @@ -1719,6 +1988,12 @@ }; }; 61798872114AA4D000BA94A9 /* SchemeEditViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = SchemeEditViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/SchemeEditViewController.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1146, 936}}"; sepNavSelRange = "{1129, 0}"; @@ -1727,6 +2002,12 @@ }; }; 61798874114AA4D000BA94A9 /* SettingsViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = SettingsViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/SettingsViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {551, 494}}"; sepNavSelRange = "{0, 0}"; @@ -1735,6 +2016,12 @@ }; }; 61798875114AA4D000BA94A9 /* SettingsViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = SettingsViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/SettingsViewController.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {901, 4173}}"; sepNavSelRange = "{6297, 0}"; @@ -1743,6 +2030,12 @@ }; }; 61798877114AA4D000BA94A9 /* TeamEditViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = TeamEditViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/TeamEditViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {532, 195}}"; sepNavSelRange = "{0, 0}"; @@ -1750,6 +2043,12 @@ }; }; 61798878114AA4D000BA94A9 /* TeamEditViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = TeamEditViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/TeamEditViewController.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1146, 816}}"; sepNavSelRange = "{1057, 0}"; @@ -1758,6 +2057,12 @@ }; }; 6179887A114AA4D000BA94A9 /* TeamMenuViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = TeamMenuViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/TeamMenuViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {532, 195}}"; sepNavSelRange = "{0, 0}"; @@ -1765,6 +2070,12 @@ }; }; 6179887B114AA4D000BA94A9 /* TeamMenuViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = TeamMenuViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/TeamMenuViewController.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {532, 806}}"; sepNavSelRange = "{0, 0}"; @@ -1798,6 +2109,11 @@ vrLen = 874; vrLoc = 0; }; + 61798A1F114ADD2600BA94A9 /* backgroundCenter.png */ = { + uiCtxt = { + sepNavWindowFrame = "{{38, 360}, {1058, 792}}"; + }; + }; 6179928B114AE0C800BA94A9 /* UpdateDataFolder */ = { activeExec = 0; }; @@ -1809,6 +2125,11 @@ isa = PBXBookmark; fRef = 61798A21114ADD2600BA94A9 /* backgroundRight.png */; }; + 6179934E114BD5AB00BA94A9 /* menuCorner.png */ = { + uiCtxt = { + sepNavWindowFrame = "{{15, 381}, {1058, 792}}"; + }; + }; 6179937111501D7800BA94A9 /* PBXBookmark */ = { isa = PBXBookmark; fRef = 61798A1E114ADD2600BA94A9 /* backgroundBottom.png */; @@ -1845,6 +2166,2650 @@ rLen = 0; rLoc = 9223372036854775808; }; + 61A117421168280200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F16DB11668358002444F2 /* HogHatViewController.m */; + name = "HogHatViewController.m: 177"; + rLen = 0; + rLoc = 5573; + rType = 0; + vrLen = 651; + vrLoc = 3593; + }; + 61A117431168280200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 13"; + rLen = 0; + rLoc = 267; + rType = 0; + vrLen = 764; + vrLoc = 1617; + }; + 61A117461168280200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 178"; + rLen = 0; + rLoc = 5604; + rType = 0; + vrLen = 1306; + vrLoc = 4663; + }; + 61A118231168323000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 13"; + rLen = 0; + rLoc = 267; + rType = 0; + vrLen = 798; + vrLoc = 1583; + }; + 61A118241168323000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */; + name = "TeamSettingsViewController.m: 29"; + rLen = 0; + rLoc = 939; + rType = 0; + vrLen = 839; + vrLoc = 279; + }; + 61A118251168323000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 31"; + rLen = 0; + rLoc = 1096; + rType = 0; + vrLen = 1283; + vrLoc = 753; + }; + 61A118261168323000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */; + name = "SplitViewRootController.h: 14"; + rLen = 0; + rLoc = 299; + rType = 0; + vrLen = 442; + vrLoc = 0; + }; + 61A118291168323000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 15"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 692; + vrLoc = 0; + }; + 61A1182A1168323000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 22"; + rLen = 0; + rLoc = 242; + rType = 0; + vrLen = 1275; + vrLoc = 0; + }; + 61A1182B1168323000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 158"; + rLen = 0; + rLoc = 242; + rType = 0; + vrLen = 1418; + vrLoc = 4322; + }; + 61A1182F1168325800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */; + name = "SplitViewRootController.h: 14"; + rLen = 0; + rLoc = 299; + rType = 0; + vrLen = 442; + vrLoc = 0; + }; + 61A118301168325800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 158"; + rLen = 0; + rLoc = 242; + rType = 0; + vrLen = 1418; + vrLoc = 4322; + }; + 61A118381168340700359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61CE24EB115E71C20098C467 /* OverlayViewController.m */; + }; + 61A1183B116834FC00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */; + name = "SplitViewRootController.h: 14"; + rLen = 0; + rLoc = 299; + rType = 0; + vrLen = 606; + vrLoc = 0; + }; + 61A1183E116834FC00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EB115E71C20098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 44"; + rLen = 0; + rLoc = 1489; + rType = 0; + vrLen = 2155; + vrLoc = 0; + }; + 61A1183F116834FC00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 158"; + rLen = 0; + rLoc = 242; + rType = 0; + vrLen = 1418; + vrLoc = 4322; + }; + 61A11844116836A600359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + }; + 61A1186B1168391A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */; + name = "SplitViewRootController.h: 14"; + rLen = 0; + rLoc = 299; + rType = 0; + vrLen = 606; + vrLoc = 0; + }; + 61A1186C1168391A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186D1168391A00359010 /* MainMenuViewController.h */; + rLen = 0; + rLoc = 9223372036854776071; + rType = 0; + }; + 61A1186D1168391A00359010 /* MainMenuViewController.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = MainMenuViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/MainMenuViewController.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {551, 364}}"; + sepNavSelRange = "{691, 0}"; + sepNavVisRange = "{148, 539}"; + }; + }; + 61A1186E1168391A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 539; + vrLoc = 148; + }; + 61A1186F1168391A00359010 /* MainMenuViewController.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = MainMenuViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/MainMenuViewController.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {551, 364}}"; + sepNavSelRange = "{691, 0}"; + sepNavVisRange = "{148, 115}"; + }; + }; + 61A118721168391A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 268"; + rLen = 0; + rLoc = 8751; + rType = 0; + vrLen = 2152; + vrLoc = 0; + }; + 61A11875116839F400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186D1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 543; + vrLoc = 148; + }; + 61A11876116839F400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 268"; + rLen = 0; + rLoc = 8751; + rType = 0; + vrLen = 2155; + vrLoc = 0; + }; + 61A118BB11683B4100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186D1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 539; + vrLoc = 148; + }; + 61A118BC11683B4100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 268"; + rLen = 0; + rLoc = 8751; + rType = 0; + vrLen = 2152; + vrLoc = 0; + }; + 61A118C511683BBB00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186D1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 539; + vrLoc = 148; + }; + 61A118C611683BBB00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 268"; + rLen = 0; + rLoc = 8751; + rType = 0; + vrLen = 2152; + vrLoc = 0; + }; + 61A118C811683C0000359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + }; + 61A118D811683CD700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A118DB11683CD700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 120"; + rLen = 0; + rLoc = 4224; + rType = 0; + vrLen = 1737; + vrLoc = 3461; + }; + 61A118DC11683CD700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 268"; + rLen = 0; + rLoc = 8751; + rType = 0; + vrLen = 2316; + vrLoc = 406; + }; + 61A118E111683D2500359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A118E211683D2500359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 120"; + rLen = 0; + rLoc = 4224; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A118E311683D2500359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 268"; + rLen = 0; + rLoc = 8751; + rType = 0; + vrLen = 2395; + vrLoc = 406; + }; + 61A118E611683D7800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A118E711683D7800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 120"; + rLen = 0; + rLoc = 4224; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A118E811683D7800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 268"; + rLen = 0; + rLoc = 8751; + rType = 0; + vrLen = 2395; + vrLoc = 406; + }; + 61A118FD11683FAD00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A1190011683FAD00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 35"; + rLen = 0; + rLoc = 859; + rType = 0; + vrLen = 844; + vrLoc = 0; + }; + 61A1190111683FAD00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 268"; + rLen = 0; + rLoc = 8751; + rType = 0; + vrLen = 2113; + vrLoc = 3577; + }; + 61A1190211683FAD00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2113; + vrLoc = 3577; + }; + 61A1190511683FAD00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */; + name = "SplitViewRootController.h: 19"; + rLen = 0; + rLoc = 514; + rType = 0; + vrLen = 703; + vrLoc = 0; + }; + 61A1190611683FAD00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 14"; + rLen = 0; + rLoc = 338; + rType = 0; + vrLen = 2359; + vrLoc = 156; + }; + 61A1190711683FAD00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 35"; + rLen = 0; + rLoc = 1246; + rType = 0; + vrLen = 2462; + vrLoc = 0; + }; + 61A1190811683FAD00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 120"; + rLen = 0; + rLoc = 4224; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A1190B11683FFA00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A1190C11683FFA00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2063; + vrLoc = 3492; + }; + 61A1190D11683FFA00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 35"; + rLen = 0; + rLoc = 1246; + rType = 0; + vrLen = 2426; + vrLoc = 0; + }; + 61A1190E11683FFA00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 120"; + rLen = 0; + rLoc = 4224; + rType = 0; + vrLen = 1737; + vrLoc = 3461; + }; + 61A119171168410F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A119181168410F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2063; + vrLoc = 3492; + }; + 61A119191168410F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 120"; + rLen = 0; + rLoc = 4224; + rType = 0; + vrLen = 1737; + vrLoc = 3461; + }; + 61A11930116841E100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11931116841E100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2154; + vrLoc = 3492; + }; + 61A11932116841E100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 120"; + rLen = 0; + rLoc = 4224; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A119431168430E00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A119441168430E00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A119451168430E00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2154; + vrLoc = 3492; + }; + 61A1195D1168479600359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A1195E1168479600359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A1195F1168479600359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2154; + vrLoc = 3492; + }; + 61A1197B1168497B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A1197C1168497B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A1197D1168497B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2154; + vrLoc = 3492; + }; + 61A1199111684A4F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A1199211684A4F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A1199311684A4F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2154; + vrLoc = 3492; + }; + 61A1199711684B3200359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + }; + 61A119A511684F6C00359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + }; + 61A119A611684F6D00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A119A911684F6D00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 40"; + rLen = 0; + rLoc = 1430; + rType = 0; + vrLen = 1473; + vrLoc = 146; + }; + 61A119AA11684F6D00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A119AB11684F6D00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A119AE11684F6D00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A119AF11684F6D00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2154; + vrLoc = 3492; + }; + 61A119C11168500F00359010 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Expected specifier-qualifier-list before 'UIPopoverController'"; + fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 21; + rType = 1; + }; + 61A119C31168502900359010 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "'splitViewRootController' undeclared (first use in this function)"; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 64; + rType = 1; + }; + 61A119D71168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A119D81168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 149"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2154; + vrLoc = 3492; + }; + 61A119D91168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 158"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 1967; + vrLoc = 3492; + }; + 61A119DC1168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 13"; + rLen = 0; + rLoc = 256; + rType = 0; + vrLen = 844; + vrLoc = 0; + }; + 61A119DD1168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 14"; + rLen = 0; + rLoc = 302; + rType = 0; + vrLen = 834; + vrLoc = 0; + }; + 61A119E01168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; + name = "DetailViewController.h: 19"; + rLen = 0; + rLoc = 494; + rType = 0; + vrLen = 565; + vrLoc = 0; + }; + 61A119E31168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */; + name = "SplitViewRootController.h: 4"; + rLen = 0; + rLoc = 55; + rType = 0; + vrLen = 703; + vrLoc = 0; + }; + 61A119E41168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2383; + vrLoc = 262; + }; + 61A119E51168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 57"; + rLen = 0; + rLoc = 1972; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A119E61168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1737; + vrLoc = 3461; + }; + 61A119E71168515100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A119FD1168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A119FE1168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 14"; + rLen = 0; + rLoc = 302; + rType = 0; + vrLen = 834; + vrLoc = 0; + }; + 61A119FF1168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + rLen = 0; + rLoc = 9223372036854775699; + rType = 0; + }; + 61A11A001168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 160"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 1871; + vrLoc = 3492; + }; + 61A11A031168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */; + name = "SplitViewRootController.h: 19"; + rLen = 0; + rLoc = 490; + rType = 0; + vrLen = 685; + vrLoc = 0; + }; + 61A11A041168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 34"; + rLen = 0; + rLoc = 1161; + rType = 0; + vrLen = 2407; + vrLoc = 262; + }; + 61A11A051168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 52"; + rLen = 0; + rLoc = 2354; + rType = 0; + vrLen = 1906; + vrLoc = 1572; + }; + 61A11A061168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; + name = "DetailViewController.h: 19"; + rLen = 0; + rLoc = 494; + rType = 0; + vrLen = 565; + vrLoc = 0; + }; + 61A11A071168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2396; + vrLoc = 262; + }; + 61A11A081168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 57"; + rLen = 0; + rLoc = 1972; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A091168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1737; + vrLoc = 3461; + }; + 61A11A0A1168533300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A111168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A11A121168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 14"; + rLen = 0; + rLoc = 302; + rType = 0; + vrLen = 834; + vrLoc = 0; + }; + 61A11A131168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 156"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 1869; + vrLoc = 3492; + }; + 61A11A141168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 158"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 1891; + vrLoc = 3476; + }; + 61A11A151168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 52"; + rLen = 0; + rLoc = 2354; + rType = 0; + vrLen = 2463; + vrLoc = 558; + }; + 61A11A161168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; + name = "DetailViewController.h: 19"; + rLen = 0; + rLoc = 494; + rType = 0; + vrLen = 565; + vrLoc = 0; + }; + 61A11A171168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2396; + vrLoc = 262; + }; + 61A11A181168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 57"; + rLen = 0; + rLoc = 1972; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A191168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1737; + vrLoc = 3461; + }; + 61A11A1A1168541700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A1D1168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A11A1E1168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 18"; + rLen = 0; + rLoc = 403; + rType = 0; + vrLen = 859; + vrLoc = 0; + }; + 61A11A1F1168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 160"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 2004; + vrLoc = 3476; + }; + 61A11A201168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 144"; + rLen = 0; + rLoc = 4408; + rType = 0; + vrLen = 1971; + vrLoc = 3492; + }; + 61A11A211168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 52"; + rLen = 0; + rLoc = 2354; + rType = 0; + vrLen = 2463; + vrLoc = 558; + }; + 61A11A221168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; + name = "DetailViewController.h: 19"; + rLen = 0; + rLoc = 494; + rType = 0; + vrLen = 565; + vrLoc = 0; + }; + 61A11A231168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2396; + vrLoc = 262; + }; + 61A11A241168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 57"; + rLen = 0; + rLoc = 1972; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A251168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1737; + vrLoc = 3461; + }; + 61A11A261168546800359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A291168549200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11A2A1168549200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 159"; + rLen = 0; + rLoc = 5135; + rType = 0; + vrLen = 1716; + vrLoc = 4792; + }; + 61A11A2B1168549200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 52"; + rLen = 0; + rLoc = 2354; + rType = 0; + vrLen = 2466; + vrLoc = 558; + }; + 61A11A2C1168549200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; + name = "DetailViewController.h: 19"; + rLen = 0; + rLoc = 494; + rType = 0; + vrLen = 565; + vrLoc = 0; + }; + 61A11A2D1168549200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2398; + vrLoc = 262; + }; + 61A11A2E1168549200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 57"; + rLen = 0; + rLoc = 1972; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A2F1168549200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 117"; + rLen = 23; + rLoc = 3959; + rType = 0; + vrLen = 1739; + vrLoc = 3461; + }; + 61A11A301168549200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A431168569A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A11A441168569A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; + name = "DetailViewController.h: 22"; + rLen = 0; + rLoc = 527; + rType = 0; + vrLen = 650; + vrLoc = 0; + }; + 61A11A451168569A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 121"; + rLen = 0; + rLoc = 4090; + rType = 0; + vrLen = 1489; + vrLoc = 0; + }; + 61A11A461168569A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 121"; + rLen = 0; + rLoc = 4090; + rType = 0; + vrLen = 1475; + vrLoc = 0; + }; + 61A11A471168569A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2396; + vrLoc = 262; + }; + 61A11A481168569A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A491168569A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {999, 664}}"; + sepNavSelRange = "{218, 0}"; + sepNavVisRange = "{0, 367}"; + }; + }; + 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {999, 1638}}"; + sepNavSelRange = "{299, 0}"; + sepNavVisRange = "{0, 1306}"; + sepNavWindowFrame = "{{84, 318}, {1058, 792}}"; + }; + }; + 61A11A5B1168D33A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11A5E1168D33A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 18"; + rLen = 0; + rLoc = 403; + rType = 0; + vrLen = 859; + vrLoc = 0; + }; + 61A11A5F1168D33A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 142"; + rLen = 25; + rLoc = 4229; + rType = 0; + vrLen = 2210; + vrLoc = 3792; + }; + 61A11A601168D33A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 142"; + rLen = 25; + rLoc = 4229; + rType = 0; + vrLen = 2157; + vrLoc = 0; + }; + 61A11A611168D33A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 109"; + rLen = 20; + rLoc = 3305; + rType = 0; + vrLen = 2290; + vrLoc = 2182; + }; + 61A11A621168D33A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A631168D33A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2398; + vrLoc = 262; + }; + 61A11A641168D33A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A651168D37800359010 /* OverlayViewController.m:144 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + functionName = "-showPopover"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 144; + location = HedgewarsMobile; + modificationTime = 292102915.039599; + originalNumberOfMultipleMatches = 1; + state = 1; + }; + 61A11A671168D37900359010 /* OverlayViewController.m:147 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + functionName = "-showPopover"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 147; + location = HedgewarsMobile; + modificationTime = 292102915.039659; + originalNumberOfMultipleMatches = 1; + state = 1; + }; + 61A11A691168D37B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A11A6A1168D37B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 142"; + rLen = 25; + rLoc = 4229; + rType = 0; + vrLen = 2215; + vrLoc = 3718; + }; + 61A11A6B1168D37B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 142"; + rLen = 25; + rLoc = 4229; + rType = 0; + vrLen = 2215; + vrLoc = 3718; + }; + 61A11A6C1168D37B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 109"; + rLen = 20; + rLoc = 3305; + rType = 0; + vrLen = 2290; + vrLoc = 2182; + }; + 61A11A6D1168D37B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A6E1168D37B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2396; + vrLoc = 262; + }; + 61A11A6F1168D37B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A771168D3D600359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A11A781168D3D600359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 109"; + rLen = 20; + rLoc = 3305; + rType = 0; + vrLen = 2290; + vrLoc = 2182; + }; + 61A11A791168D3D600359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 142"; + rLen = 25; + rLoc = 4229; + rType = 0; + vrLen = 2215; + vrLoc = 3718; + }; + 61A11A7A1168D3D600359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A7B1168D3D600359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2396; + vrLoc = 262; + }; + 61A11A7C1168D3D600359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A801168D3EF00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A11A811168D3EF00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 146"; + rLen = 0; + rLoc = 4444; + rType = 0; + vrLen = 2185; + vrLoc = 3718; + }; + 61A11A821168D3EF00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 109"; + rLen = 20; + rLoc = 3305; + rType = 0; + vrLen = 2290; + vrLoc = 2182; + }; + 61A11A831168D3EF00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A841168D3EF00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2396; + vrLoc = 262; + }; + 61A11A851168D3EF00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A891168D57100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A11A8A1168D57100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 18"; + rLen = 0; + rLoc = 403; + rType = 0; + vrLen = 859; + vrLoc = 0; + }; + 61A11A8B1168D57100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 146"; + rLen = 0; + rLoc = 4444; + rType = 0; + vrLen = 2197; + vrLoc = 3718; + }; + 61A11A8C1168D57100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 151"; + rLen = 0; + rLoc = 4792; + rType = 0; + vrLen = 2172; + vrLoc = 3718; + }; + 61A11A8D1168D57100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 109"; + rLen = 20; + rLoc = 3305; + rType = 0; + vrLen = 2290; + vrLoc = 2182; + }; + 61A11A8E1168D57100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A8F1168D57100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2396; + vrLoc = 262; + }; + 61A11A901168D57100359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11A951168D5A000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11A961168D5A000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 109"; + rLen = 20; + rLoc = 3305; + rType = 0; + vrLen = 2290; + vrLoc = 2182; + }; + 61A11A971168D5A000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 151"; + rLen = 0; + rLoc = 4792; + rType = 0; + vrLen = 2197; + vrLoc = 3718; + }; + 61A11A9A1168D5A000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 82"; + rLen = 0; + rLoc = 2439; + rType = 0; + vrLen = 1294; + vrLoc = 1935; + }; + 61A11A9B1168D5A000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + rLen = 0; + rLoc = 9223372036854775807; + rType = 0; + }; + 61A11A9C1168D5A000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 48"; + rLen = 12; + rLoc = 1628; + rType = 0; + vrLen = 1300; + vrLoc = 673; + }; + 61A11A9D1168D5A000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11A9E1168D5A000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2398; + vrLoc = 262; + }; + 61A11A9F1168D5A000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11AA41168D71300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11AA51168D71300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 146"; + rLen = 0; + rLoc = 4441; + rType = 0; + vrLen = 2196; + vrLoc = 3718; + }; + 61A11AA81168D71300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AA91168D71300359010 /* AvailabilityInternal.h */; + rLen = 1; + rLoc = 52; + rType = 1; + }; + 61A11AA91168D71300359010 /* AvailabilityInternal.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = AvailabilityInternal.h; + path = /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.2.sdk/usr/include/AvailabilityInternal.h; + sourceTree = ""; + uiCtxt = { + sepNavWindowFrame = "{{107, 297}, {1058, 792}}"; + }; + }; + 61A11AAA1168D71300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AAB1168D71300359010 /* AvailabilityInternal.h */; + name = "AvailabilityInternal.h: 45"; + rLen = 0; + rLoc = 1891; + rType = 0; + vrLen = 2506; + vrLoc = 1113; + }; + 61A11AAB1168D71300359010 /* AvailabilityInternal.h */ = { + isa = PBXFileReference; + name = AvailabilityInternal.h; + path = /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.2.sdk/usr/include/AvailabilityInternal.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {999, 4745}}"; + sepNavSelRange = "{1891, 0}"; + sepNavVisRange = "{1113, 2506}"; + }; + }; + 61A11AAC1168D71300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 109"; + rLen = 0; + rLoc = 3308; + rType = 0; + vrLen = 2290; + vrLoc = 2182; + }; + 61A11AAD1168D71300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 48"; + rLen = 12; + rLoc = 1628; + rType = 0; + vrLen = 1300; + vrLoc = 673; + }; + 61A11AAE1168D71300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11AAF1168D71300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2398; + vrLoc = 262; + }; + 61A11AB01168D71300359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11AB51168D77400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11AB61168D77400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 110"; + rLen = 0; + rLoc = 3325; + rType = 0; + vrLen = 2259; + vrLoc = 2182; + }; + 61A11AB71168D77400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 146"; + rLen = 20; + rLoc = 4438; + rType = 0; + vrLen = 2196; + vrLoc = 3718; + }; + 61A11AB81168D77400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 48"; + rLen = 12; + rLoc = 1628; + rType = 0; + vrLen = 1300; + vrLoc = 673; + }; + 61A11AB91168D77400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11ABA1168D77400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 65"; + rLen = 0; + rLoc = 2598; + rType = 0; + vrLen = 2398; + vrLoc = 262; + }; + 61A11ABB1168D77400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11AC01168D8B600359010 /* SplitViewRootController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {999, 1183}}"; + sepNavSelRange = "{2614, 0}"; + sepNavVisRange = "{263, 2437}"; + sepNavWindowFrame = "{{83, 130}, {1058, 792}}"; + }; + }; + 61A11AC41168DA4200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11AC51168DA4200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11AC61168DA4200359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11AC81168DA9400359010 /* MasterViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1048, 1677}}"; + sepNavSelRange = "{3389, 0}"; + sepNavVisRange = "{2898, 1640}"; + sepNavWindowFrame = "{{719, 139}, {1058, 792}}"; + }; + }; + 61A11ACA1168DAB700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11ACB1168DAB700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11ACC1168DAB700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {999, 2184}}"; + sepNavSelRange = "{1115, 0}"; + sepNavVisRange = "{0, 1718}"; + sepNavWindowFrame = "{{245, 171}, {1058, 792}}"; + }; + }; + 61A11AD11168DB2C00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11AD21168DB2C00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11AD31168DB2C00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11AD41168DB3700359010 /* DetailViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {999, 641}}"; + sepNavSelRange = "{583, 0}"; + sepNavVisRange = "{0, 642}"; + sepNavWindowFrame = "{{734, 254}, {1058, 792}}"; + }; + }; + 61A11AD51168DB3700359010 /* DetailViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1503, 1807}}"; + sepNavSelRange = "{4789, 0}"; + sepNavVisRange = "{0, 1489}"; + sepNavWindowFrame = "{{734, 254}, {1058, 792}}"; + }; + }; + 61A11ADB1168DB5000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 59; + vrLoc = 148; + }; + 61A11ADC1168DB5000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11ADD1168DB5000359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {999, 2613}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1810}"; + }; + }; + 61A11AE51168DC9A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11AE61168DC9A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 28"; + rLen = 0; + rLoc = 1045; + rType = 0; + vrLen = 1228; + vrLoc = 745; + }; + 61A11AE71168DC9A00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 427; + vrLoc = 0; + }; + 61A11AE81169054200359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; + }; + 61A11AEE1169069300359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + }; + 61A11B0711691E2400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11B0811691E2400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11B0B11691E2400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; + name = "MasterViewController.m: 91"; + rLen = 0; + rLoc = 3337; + rType = 0; + vrLen = 1726; + vrLoc = 0; + }; + 61A11B0E11691E2400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 18"; + rLen = 0; + rLoc = 415; + rType = 0; + vrLen = 515; + vrLoc = 0; + }; + 61A11B0F11691E2400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 171"; + rLen = 0; + rLoc = 6718; + rType = 0; + vrLen = 1921; + vrLoc = 5108; + }; + 61A11B1011691E2400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 42"; + rLen = 0; + rLoc = 891; + rType = 0; + vrLen = 1862; + vrLoc = 319; + }; + 61A11B1111691E2400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 515; + vrLoc = 0; + }; + 61A11B1411691E2400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1810; + vrLoc = 0; + }; + 61A11B1511691E5F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11B1611691E5F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 41"; + rLen = 0; + rLoc = 886; + rType = 0; + vrLen = 1845; + vrLoc = 522; + }; + 61A11B1711691E5F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; + name = "MasterViewController.m: 91"; + rLen = 0; + rLoc = 3337; + rType = 0; + vrLen = 1726; + vrLoc = 0; + }; + 61A11B1811691E5F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 515; + vrLoc = 0; + }; + 61A11B1911691E5F00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1810; + vrLoc = 0; + }; + 61A11B1A11691E6700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11B1B11691E6700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 41"; + rLen = 0; + rLoc = 886; + rType = 0; + vrLen = 1845; + vrLoc = 522; + }; + 61A11B1C11691E6700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; + name = "MasterViewController.m: 91"; + rLen = 0; + rLoc = 3337; + rType = 0; + vrLen = 1726; + vrLoc = 0; + }; + 61A11B1D11691E6700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 515; + vrLoc = 0; + }; + 61A11B1E11691E6700359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1810; + vrLoc = 0; + }; + 61A11B2111691EE400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11B2211691EE400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 41"; + rLen = 0; + rLoc = 886; + rType = 0; + vrLen = 1823; + vrLoc = 5612; + }; + 61A11B2311691EE400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; + name = "MasterViewController.m: 91"; + rLen = 0; + rLoc = 3337; + rType = 0; + vrLen = 1726; + vrLoc = 0; + }; + 61A11B2411691EE400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 515; + vrLoc = 0; + }; + 61A11B2511691EE400359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1810; + vrLoc = 0; + }; + 61A11B2611691EF100359010 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Expected expression before 'NSThread'"; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 48; + rType = 1; + }; + 61A11B2911691EFE00359010 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Expected ']' before ';' token"; + fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 100; + rType = 1; + }; + 61A11B2C11691F0B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11B2D11691F0B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; + name = "MasterViewController.m: 101"; + rLen = 0; + rLoc = 3854; + rType = 0; + vrLen = 1650; + vrLoc = 2887; + }; + 61A11B2E11691F0B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 48"; + rLen = 0; + rLoc = 1078; + rType = 0; + vrLen = 1957; + vrLoc = 633; + }; + 61A11B2F11691F0B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 515; + vrLoc = 0; + }; + 61A11B3011691F0B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1810; + vrLoc = 0; + }; + 61A11B451169210B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A1186F1168391A00359010 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 28"; + rLen = 0; + rLoc = 691; + rType = 0; + vrLen = 115; + vrLoc = 148; + }; + 61A11B481169210B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */; + name = "DetailViewController.m: 136"; + rLen = 0; + rLoc = 4787; + rType = 0; + vrLen = 1917; + vrLoc = 2877; + }; + 61A11B491169210B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AD41168DB3700359010 /* DetailViewController.h */; + rLen = 0; + rLoc = 642; + rType = 0; + }; + 61A11B4A1169210B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AD41168DB3700359010 /* DetailViewController.h */; + name = "DetailViewController.h: 22"; + rLen = 0; + rLoc = 499; + rType = 0; + vrLen = 687; + vrLoc = 0; + }; + 61A11B4B1169210B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */; + name = "MasterViewController.m: 123"; + rLen = 128; + rLoc = 4402; + rType = 0; + vrLen = 1640; + vrLoc = 2898; + }; + 61A11B4C1169210B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 46"; + rLen = 0; + rLoc = 1076; + rType = 0; + vrLen = 2320; + vrLoc = 787; + }; + 61A11B4D1169210B00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1810; + vrLoc = 0; + }; + 61A11B54116922FF00359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 615F21901166B73B002444F2 /* amGirder.png */; + }; + 61A11B55116922FF00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 46"; + rLen = 0; + rLoc = 1076; + rType = 0; + vrLen = 2320; + vrLoc = 787; + }; + 61A11B56116922FF00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1810; + vrLoc = 0; + }; + 61A11B5A1169235C00359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 615F21901166B73B002444F2 /* amGirder.png */; + }; + 61A11B5B1169235C00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 46"; + rLen = 0; + rLoc = 1076; + rType = 0; + vrLen = 2320; + vrLoc = 787; + }; + 61A11B5C1169235C00359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1810; + vrLoc = 0; + }; + 61A11B5D1169240500359010 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 615F21901166B73B002444F2 /* amGirder.png */; + }; + 61A11B5E1169240500359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 46"; + rLen = 0; + rLoc = 1076; + rType = 0; + vrLen = 2320; + vrLoc = 787; + }; + 61A11B5F1169240500359010 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1810; + vrLoc = 0; + }; 61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798800114AA34C00BA94A9 /* uLandGraphics.pas */; @@ -2070,22 +5035,40 @@ fRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; }; 61CE24EA115E71C20098C467 /* OverlayViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = OverlayViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/OverlayViewController.h; + sourceTree = ""; uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 455}}"; - sepNavSelRange = "{257, 0}"; - sepNavVisRange = "{0, 91}"; + sepNavIntBoundsRect = "{{0, 0}, {879, 839}}"; + sepNavSelRange = "{844, 0}"; + sepNavVisRange = "{0, 844}"; sepNavWindowFrame = "{{15, 206}, {938, 967}}"; }; }; 61CE24EB115E71C20098C467 /* OverlayViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = OverlayViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/OverlayViewController.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {915, 3419}}"; - sepNavSelRange = "{700, 181}"; - sepNavVisRange = "{406, 913}"; - sepNavWindowFrame = "{{586, 162}, {938, 967}}"; + sepNavSelRange = "{0, 8495}"; + sepNavVisRange = "{0, 2155}"; + sepNavWindowFrame = "{{632, 132}, {938, 967}}"; }; }; 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = PopupMenuViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/PopupMenuViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {838, 564}}"; sepNavSelRange = "{0, 0}"; @@ -2094,27 +5077,33 @@ }; }; 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = PopupMenuViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/PopupMenuViewController.m; + sourceTree = ""; uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {838, 1534}}"; + sepNavIntBoundsRect = "{{0, 0}, {838, 1508}}"; sepNavSelRange = "{3509, 0}"; - sepNavVisRange = "{1105, 1225}"; + sepNavVisRange = "{717, 1388}"; sepNavWindowFrame = "{{530, 457}, {897, 692}}"; }; }; 61CE250B115E749A0098C467 /* OverlayViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {879, 814}}"; - sepNavSelRange = "{664, 0}"; - sepNavVisRange = "{0, 718}"; - sepNavWindowFrame = "{{1103, 125}, {938, 967}}"; + sepNavIntBoundsRect = "{{0, 0}, {879, 839}}"; + sepNavSelRange = "{403, 0}"; + sepNavVisRange = "{0, 859}"; + sepNavWindowFrame = "{{982, 125}, {938, 967}}"; }; }; 61CE250C115E749A0098C467 /* OverlayViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {936, 3510}}"; - sepNavSelRange = "{4169, 0}"; - sepNavVisRange = "{0, 369}"; - sepNavWindowFrame = "{{737, 168}, {938, 967}}"; + sepNavIntBoundsRect = "{{0, 0}, {1090, 3666}}"; + sepNavSelRange = "{3955, 0}"; + sepNavVisRange = "{3718, 1863}"; + sepNavWindowFrame = "{{819, 136}, {938, 967}}"; }; }; 61CE2514115E74CC0098C467 /* PBXBookmark */ = { @@ -2160,7 +5149,7 @@ fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; name = "OverlayViewController.m: 129"; rLen = 0; - rLoc = 3947; + rLoc = 391; rType = 0; vrLen = 488; vrLoc = 3790; @@ -2176,38 +5165,68 @@ vrLoc = 0; }; 61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = MainMenuViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/MainMenuViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {868, 717}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 427}"; - sepNavWindowFrame = "{{275, 284}, {927, 845}}"; + sepNavWindowFrame = "{{525, 213}, {927, 845}}"; }; }; 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = MainMenuViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/MainMenuViewController.m; + sourceTree = ""; uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {868, 2353}}"; - sepNavSelRange = "{6573, 0}"; - sepNavVisRange = "{5233, 1890}"; - sepNavWindowFrame = "{{681, 203}, {927, 845}}"; + sepNavIntBoundsRect = "{{0, 0}, {868, 2860}}"; + sepNavSelRange = "{172, 0}"; + sepNavVisRange = "{0, 1342}"; + sepNavWindowFrame = "{{721, 173}, {927, 845}}"; }; }; 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = SplitViewRootController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/SplitViewRootController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {868, 717}}"; - sepNavSelRange = "{276, 16}"; - sepNavVisRange = "{0, 693}"; + sepNavSelRange = "{55, 0}"; + sepNavVisRange = "{0, 685}"; sepNavWindowFrame = "{{213, 231}, {927, 845}}"; }; }; 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = SplitViewRootController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/SplitViewRootController.m; + sourceTree = ""; uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1004, 1066}}"; - sepNavSelRange = "{2324, 0}"; - sepNavVisRange = "{855, 1122}"; - sepNavWindowFrame = "{{60, 191}, {927, 845}}"; + sepNavIntBoundsRect = "{{0, 0}, {971, 1183}}"; + sepNavSelRange = "{2598, 0}"; + sepNavVisRange = "{262, 2398}"; + sepNavWindowFrame = "{{213, 231}, {927, 845}}"; }; }; 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = MasterViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/MasterViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {586, 325}}"; sepNavSelRange = "{0, 0}"; @@ -2216,6 +5235,12 @@ }; }; 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = MasterViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/MasterViewController.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1048, 1638}}"; sepNavSelRange = "{1543, 0}"; @@ -2224,19 +5249,31 @@ }; }; 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = DetailViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/DetailViewController.h; + sourceTree = ""; uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {838, 312}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{53, 124}"; + sepNavIntBoundsRect = "{{0, 0}, {868, 717}}"; + sepNavSelRange = "{527, 0}"; + sepNavVisRange = "{0, 650}"; sepNavWindowFrame = "{{364, 237}, {927, 845}}"; }; }; 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = DetailViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/iPad/DetailViewController.m; + sourceTree = ""; uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 1768}}"; - sepNavSelRange = "{267, 0}"; - sepNavVisRange = "{190, 134}"; - sepNavWindowFrame = "{{543, 159}, {927, 845}}"; + sepNavIntBoundsRect = "{{0, 0}, {868, 1833}}"; + sepNavSelRange = "{1272, 0}"; + sepNavVisRange = "{754, 1625}"; + sepNavWindowFrame = "{{364, 237}, {927, 845}}"; }; }; 928301160F10CAFC00CC5A3C /* fpc */ = {