# HG changeset patch # User koda # Date 1269710835 0 # Node ID 97dc65a47b15a6b1fefe56f69b936d9e691cef11 # Parent 831bd0f7050ded3719d3f409e657133ce8ee60b5 branch ipad/iphone files to keep compatibility between versions diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/OverlayViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/OverlayViewController.xib Sat Mar 27 17:27:15 2010 +0000 @@ -0,0 +1,699 @@ + + + + 768 + 10C540 + 762 + 1038.25 + 458.00 +

+ 0 + IBCocoaTouchFramework +

+ YES + ../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 3 +

+ 87 + + diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Sat Mar 27 17:22:33 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Sat Mar 27 17:27:15 2010 +0000 @@ -24,20 +24,20 @@ #import "SDL_video.h" @class MainMenuViewController; -@class overlayViewController; +@class OverlayViewController; @interface SDLUIKitDelegate:NSObject { SDL_Window *window; UIWindow *uiwindow; MainMenuViewController *viewController; - overlayViewController *overlayController; + OverlayViewController *overlayController; BOOL isInGame; } @property (readwrite, assign) SDL_Window *window; @property (readwrite, retain) UIWindow *uiwindow; @property (nonatomic, retain) MainMenuViewController *viewController; -@property (nonatomic, retain) overlayViewController *overlayController; +@property (nonatomic, retain) OverlayViewController *overlayController; +(SDLUIKitDelegate *)sharedAppDelegate; -(NSString *)dataFilePath:(NSString *)fileName; diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Sat Mar 27 17:22:33 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Sat Mar 27 17:27:15 2010 +0000 @@ -29,7 +29,7 @@ #import "GameSetup.h" #import "PascalImports.h" #import "MainMenuViewController.h" -#import "overlayViewController.h" +#import "OverlayViewController.h" #ifdef main #undef main @@ -77,7 +77,7 @@ [setup release]; // overlay with controls, become visible after 2 seconds - overlayController = [[overlayViewController alloc] initWithNibName:@"overlayViewController" bundle:nil]; + overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController" bundle:nil]; [uiwindow addSubview:overlayController.view]; [overlayController release]; @@ -100,8 +100,9 @@ // override the direct execution of SDL_main to allow us to implement the frontend (even using a nib) -(void) applicationDidFinishLaunching:(UIApplication *)application { - [application setStatusBarHidden:YES animated:NO]; - [application setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO]; + //[application setStatusBarHidden:YES animated:NO]; + [application setStatusBarHidden:YES withAnimation:NO]; + [application setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO]; self.uiwindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; self.uiwindow.backgroundColor = [UIColor blackColor]; diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/SchemeEditViewController.m --- a/cocoaTouch/SchemeEditViewController.m Sat Mar 27 17:22:33 2010 +0000 +++ b/cocoaTouch/SchemeEditViewController.m Sat Mar 27 17:27:15 2010 +0000 @@ -27,14 +27,11 @@ [super viewDidLoad]; } - -/* // Override to allow orientations other than the default portrait orientation. - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationPortrait); + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); } -*/ - (void)didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/TeamEditViewController.m --- a/cocoaTouch/TeamEditViewController.m Sat Mar 27 17:22:33 2010 +0000 +++ b/cocoaTouch/TeamEditViewController.m Sat Mar 27 17:27:15 2010 +0000 @@ -28,13 +28,11 @@ } */ -/* // Override to allow orientations other than the default portrait orientation. - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationPortrait); + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); } -*/ - (void)didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/TeamMenuViewController.m --- a/cocoaTouch/TeamMenuViewController.m Sat Mar 27 17:22:33 2010 +0000 +++ b/cocoaTouch/TeamMenuViewController.m Sat Mar 27 17:27:15 2010 +0000 @@ -28,13 +28,11 @@ } */ -/* // Override to allow orientations other than the default portrait orientation. - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationPortrait); + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); } -*/ - (void)didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/iPad/OverlayViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/OverlayViewController.h Sat Mar 27 17:27:15 2010 +0000 @@ -0,0 +1,34 @@ +// +// 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 831bd0f7050d -r 97dc65a47b15 cocoaTouch/iPad/OverlayViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/OverlayViewController.m Sat Mar 27 17:27:15 2010 +0000 @@ -0,0 +1,285 @@ +// +// 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]; +} + +-(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]; + UIActionSheet *actionSheet; + 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_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: + 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] initWithNibName:@"PopupMenuViewController" bundle:nil]; + + menuPopover = [[UIPopoverController alloc] initWithContentViewController:popupMenu]; + [menuPopover setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; + + /*UIButton *button = [UIButton buttonWithType:UIButtonTypeRoundedRect]; + button.frame= CGRectMake(960, 0, 64, 64); + button.titleLabel.text=@"UUUUUUUF"; + [self.view addSubview:button];*/ + + [menuPopover presentPopoverFromRect:CGRectMake(960, 0, 220, 32) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionUp animated:YES]; + //UIBarButtonItem *sender = [[useless items] objectAtIndex:1]; + //[self.popoverController presentPopoverFromBarButtonItem:sender permittedArrowDirections:UIPopoverArrowDirectionDown 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 - +#define kMinimumPinchDelta 50 +#define kMinimumGestureLength 10 +#define kMaximumVariance 3 + +-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { + NSArray *twoTouches; + UITouch *touch = [touches anyObject]; + + 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, 320 - (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]; + + switch ([touches count]) { + case 1: + currentPosition = [touch locationInView:self.view]; + // panning + SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window, + (int)gestureStartPoint.y, 320 - (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 831bd0f7050d -r 97dc65a47b15 cocoaTouch/iPad/OverlayViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/OverlayViewController.xib Sat Mar 27 17:27:15 2010 +0000 @@ -0,0 +1,718 @@ + + + + 800 + 10C540 + 762 + 1038.25 + 458.00 +

+ 0 + IBIPadFramework +

+ YES + ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 3 +

+ 87 + + diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/iPad/PopupMenuViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/PopupMenuViewController.h Sat Mar 27 17:27:15 2010 +0000 @@ -0,0 +1,20 @@ +// +// popupMenuViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 25/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface PopupMenuViewController : UIViewController { + UITableView *menuTable; + NSArray *menuList; + BOOL isPaused; +} +@property (nonatomic,retain) IBOutlet UITableView * menuTable; +@property (nonatomic,retain) NSArray *menuList; + +@end diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/iPad/PopupMenuViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/PopupMenuViewController.m Sat Mar 27 17:27:15 2010 +0000 @@ -0,0 +1,132 @@ + // +// popupMenuViewController.m +// HedgewarsMobile +// +// Created by Vittorio on 25/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "PopupMenuViewController.h" +#import "PascalImports.h" + +@implementation PopupMenuViewController +@synthesize menuTable, menuList; + +/* + // 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]; +} +*/ + + +-(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; + menuTable.allowsSelection = YES; + menuList = [[NSArray alloc] initWithObjects: + NSLocalizedString(@"Pause Game", @""), + NSLocalizedString(@"Chat", @""), + NSLocalizedString(@"End Game", @""), + nil]; + [super viewDidLoad]; +} + + +-(void) dealloc { + [menuList release]; + [menuTable 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(); + break; + case 2: + 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]; + + if (!isPaused) + HW_pause(); + break; + default: + NSLog(@"Warning: unset case value in section!"); + break; + } +} + +-(void) tableView:(UITableView *)aTableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath { + [aTableView deselectRowAtIndexPath: indexPath animated:YES]; +} + +-(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 831bd0f7050d -r 97dc65a47b15 cocoaTouch/iPad/PopupMenuViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/PopupMenuViewController.xib Sat Mar 27 17:27:15 2010 +0000 @@ -0,0 +1,220 @@ + + + + 800 + 10C540 + 762 + 1038.25 + 458.00 +

+ 0 + IBIPadFramework +

+ YES + ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 3 + 87 + + diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/iPad/overlayViewController.xib --- a/cocoaTouch/iPad/overlayViewController.xib Sat Mar 27 17:22:33 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,718 +0,0 @@ - - - - 800 - 10C540 - 762 - 1038.25 - 458.00 -

- 0 - IBIPadFramework -

- YES - ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 -

- 87 - - diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/iPad/popupMenuViewController.xib --- a/cocoaTouch/iPad/popupMenuViewController.xib Sat Mar 27 17:22:33 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,220 +0,0 @@ - - - - 800 - 10C540 - 762 - 1038.25 - 458.00 -

- 0 - IBIPadFramework -

- YES - ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - 87 - - diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/overlayViewController.h --- a/cocoaTouch/overlayViewController.h Sat Mar 27 17:22:33 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 831bd0f7050d -r 97dc65a47b15 cocoaTouch/overlayViewController.m --- a/cocoaTouch/overlayViewController.m Sat Mar 27 17:22:33 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,285 +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]; -} - --(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]; - UIActionSheet *actionSheet; - 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_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: - 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] initWithNibName:@"popupMenuViewController" bundle:nil]; - - menuPopover = [[UIPopoverController alloc] initWithContentViewController:popupMenu]; - [menuPopover setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; - - /*UIButton *button = [UIButton buttonWithType:UIButtonTypeRoundedRect]; - button.frame= CGRectMake(960, 0, 64, 64); - button.titleLabel.text=@"UUUUUUUF"; - [self.view addSubview:button];*/ - - [menuPopover presentPopoverFromRect:CGRectMake(960, 0, 220, 32) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionUp animated:YES]; - //UIBarButtonItem *sender = [[useless items] objectAtIndex:1]; - //[self.popoverController presentPopoverFromBarButtonItem:sender permittedArrowDirections:UIPopoverArrowDirectionDown 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 - -#define kMinimumPinchDelta 50 -#define kMinimumGestureLength 10 -#define kMaximumVariance 3 - --(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - NSArray *twoTouches; - UITouch *touch = [touches anyObject]; - - 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, 320 - (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]; - - switch ([touches count]) { - case 1: - currentPosition = [touch locationInView:self.view]; - // panning - SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window, - (int)gestureStartPoint.y, 320 - (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 831bd0f7050d -r 97dc65a47b15 cocoaTouch/overlayViewController.xib --- a/cocoaTouch/overlayViewController.xib Sat Mar 27 17:22:33 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,676 +0,0 @@ - - - - 768 - 10C540 - 762 - 1038.25 - 458.00 -

- 0 - IBCocoaTouchFramework -

- YES - ../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 -

- 87 - - diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/popupMenuViewController.h --- a/cocoaTouch/popupMenuViewController.h Sat Mar 27 17:22:33 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -// -// popupMenuViewController.h -// HedgewarsMobile -// -// Created by Vittorio on 25/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface popupMenuViewController : UIViewController { - UITableView *menuTable; - NSArray *menuList; - BOOL isPaused; -} -@property (nonatomic,retain) IBOutlet UITableView * menuTable; -@property (nonatomic,retain) NSArray *menuList; - -@end diff -r 831bd0f7050d -r 97dc65a47b15 cocoaTouch/popupMenuViewController.m --- a/cocoaTouch/popupMenuViewController.m Sat Mar 27 17:22:33 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,128 +0,0 @@ - // -// popupMenuViewController.m -// HedgewarsMobile -// -// Created by Vittorio on 25/03/10. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "popupMenuViewController.h" -#import "PascalImports.h" - -@implementation popupMenuViewController -@synthesize menuTable, menuList; - -/* - // 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]; -} -*/ - - --(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; - menuTable.allowsSelection = YES; - menuList = [[NSArray alloc] initWithObjects:NSLocalizedString(@"Pause Game", @""), NSLocalizedString(@"Chat", @""), NSLocalizedString(@"End Game", @""),nil]; - [super viewDidLoad]; -} - - --(void) dealloc { - [menuList release]; - [menuTable 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(); - break; - case 2: - 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]; - - if (!isPaused) - HW_pause(); - break; - default: - NSLog(@"Warning: unset case value in section!"); - break; - } -} - --(void) tableView:(UITableView *)aTableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath { - [aTableView deselectRowAtIndexPath: indexPath animated:YES]; -} - --(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 831bd0f7050d -r 97dc65a47b15 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Sat Mar 27 17:22:33 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Sat Mar 27 17:27:15 2010 +0000 @@ -89,7 +89,6 @@ 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 */; }; - 6100DABC115446B000F455E0 /* overlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6179939E1150226700BA94A9 /* overlayViewController.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 */; }; @@ -111,8 +110,6 @@ 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 */; }; - 611FDB3C1155BB9E00C2203D /* overlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611FDB3B1155BB9E00C2203D /* overlayViewController.xib */; }; - 611FDB5E1155BDE400C2203D /* overlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611FDB5D1155BDE400C2203D /* overlayViewController.xib */; }; 611FDB641155BFFF00C2203D /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FDB631155BFFF00C2203D /* Default.png */; }; 61798816114AA34C00BA94A9 /* hwengine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */; }; 61798818114AA34C00BA94A9 /* hwLibrary.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; }; @@ -194,11 +191,14 @@ 6179936C11501D3D00BA94A9 /* arrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936811501D3D00BA94A9 /* arrowLeft.png */; }; 6179936D11501D3D00BA94A9 /* arrowRight.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936911501D3D00BA94A9 /* arrowRight.png */; }; 6179936E11501D3D00BA94A9 /* arrowUp.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936A11501D3D00BA94A9 /* arrowUp.png */; }; - 617993A01150226700BA94A9 /* overlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; }; 617995321150403800BA94A9 /* joyPush.png in Resources */ = {isa = PBXBuildFile; fileRef = 617995311150403800BA94A9 /* joyPush.png */; }; - 618AFBEF115BE8AE003D411B /* popupMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; }; - 618AFBF1115BE8B6003D411B /* popupMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 618AFBF0115BE8B6003D411B /* popupMenuViewController.xib */; }; 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 */; }; + 61CE2504115E73210098C467 /* PopupMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61CE2502115E73210098C467 /* PopupMenuViewController.xib */; }; + 61CE250D115E749A0098C467 /* OverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; }; + 61CE2511115E74C90098C467 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61CE2510115E74C90098C467 /* OverlayViewController.xib */; }; 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 */; }; @@ -290,8 +290,6 @@ 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; }; - 611FDB3B1155BB9E00C2203D /* overlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = overlayViewController.xib; path = ../../cocoaTouch/iPad/overlayViewController.xib; sourceTree = SOURCE_ROOT; }; - 611FDB5D1155BDE400C2203D /* overlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = overlayViewController.xib; path = ../../cocoaTouch/overlayViewController.xib; sourceTree = SOURCE_ROOT; }; 611FDB631155BFFF00C2203D /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../../cocoaTouch/iPad/Default.png; sourceTree = SOURCE_ROOT; }; 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; }; @@ -390,13 +388,17 @@ 6179936811501D3D00BA94A9 /* arrowLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowLeft.png; path = ../../cocoaTouch/resources/arrowLeft.png; sourceTree = SOURCE_ROOT; }; 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; }; - 6179939D1150226700BA94A9 /* overlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlayViewController.h; path = ../../cocoaTouch/overlayViewController.h; sourceTree = SOURCE_ROOT; }; - 6179939E1150226700BA94A9 /* overlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = overlayViewController.m; path = ../../cocoaTouch/overlayViewController.m; sourceTree = SOURCE_ROOT; }; 617995311150403800BA94A9 /* joyPush.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyPush.png; path = ../../cocoaTouch/resources/joyPush.png; sourceTree = SOURCE_ROOT; }; - 618AFBED115BE8AE003D411B /* popupMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = popupMenuViewController.h; path = ../../cocoaTouch/popupMenuViewController.h; sourceTree = SOURCE_ROOT; }; - 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = popupMenuViewController.m; path = ../../cocoaTouch/popupMenuViewController.m; sourceTree = SOURCE_ROOT; }; - 618AFBF0115BE8B6003D411B /* popupMenuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = popupMenuViewController.xib; path = ../../cocoaTouch/iPad/popupMenuViewController.xib; 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; }; + 61CE2502115E73210098C467 /* PopupMenuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = PopupMenuViewController.xib; path = ../../cocoaTouch/iPad/PopupMenuViewController.xib; 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; }; @@ -554,16 +556,12 @@ 6100DAD4115446B000F455E0 /* Resources-iPad */ = { isa = PBXGroup; children = ( + 61CE2509115E74260098C467 /* XIB */, 611FDB631155BFFF00C2203D /* Default.png */, 611FD9C81155A1F200C2203D /* Background.png */, 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */, 611FD9D11155A41000C2203D /* Multiplayer.png */, 611FD9CF1155A40700C2203D /* NetworkPlay.png */, - 61FA7667115DAB1B00DA6ED0 /* DetailViewController.xib */, - 611FD990115590E700C2203D /* MainMenuViewController.xib */, - 611FD992115590E700C2203D /* SettingsViewController.xib */, - 611FDB3B1155BB9E00C2203D /* overlayViewController.xib */, - 618AFBF0115BE8B6003D411B /* popupMenuViewController.xib */, ); name = "Resources-iPad"; sourceTree = ""; @@ -571,12 +569,12 @@ 6100DB1711544E8400F455E0 /* XIB */ = { isa = PBXGroup; children = ( + 61CE2510115E74C90098C467 /* OverlayViewController.xib */, 61798870114AA4D000BA94A9 /* MainMenuViewController.xib */, 61798873114AA4D000BA94A9 /* SchemeEditViewController.xib */, 61798876114AA4D000BA94A9 /* SettingsViewController.xib */, 61798879114AA4D000BA94A9 /* TeamEditViewController.xib */, 6179887C114AA4D000BA94A9 /* TeamMenuViewController.xib */, - 611FDB5D1155BDE400C2203D /* overlayViewController.xib */, ); name = XIB; path = Classes; @@ -606,6 +604,8 @@ 61798878114AA4D000BA94A9 /* TeamEditViewController.m */, 6179887A114AA4D000BA94A9 /* TeamMenuViewController.h */, 6179887B114AA4D000BA94A9 /* TeamMenuViewController.m */, + 61CE250B115E749A0098C467 /* OverlayViewController.h */, + 61CE250C115E749A0098C467 /* OverlayViewController.m */, ); name = "iPhone Frontend"; sourceTree = ""; @@ -692,6 +692,18 @@ name = buttons; sourceTree = ""; }; + 61CE2509115E74260098C467 /* XIB */ = { + isa = PBXGroup; + children = ( + 61FA7667115DAB1B00DA6ED0 /* DetailViewController.xib */, + 611FD990115590E700C2203D /* MainMenuViewController.xib */, + 611FD992115590E700C2203D /* SettingsViewController.xib */, + 61CE2501115E73210098C467 /* OverlayViewController.xib */, + 61CE2502115E73210098C467 /* PopupMenuViewController.xib */, + ); + name = XIB; + sourceTree = ""; + }; 61FA7620115DA0EA00DA6ED0 /* iPad Frontend */ = { isa = PBXGroup; children = ( @@ -711,10 +723,10 @@ 61FA766A115DAB2A00DA6ED0 /* Overlay */ = { isa = PBXGroup; children = ( - 618AFBED115BE8AE003D411B /* popupMenuViewController.h */, - 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */, - 6179939D1150226700BA94A9 /* overlayViewController.h */, - 6179939E1150226700BA94A9 /* overlayViewController.m */, + 61CE24EA115E71C20098C467 /* OverlayViewController.h */, + 61CE24EB115E71C20098C467 /* OverlayViewController.m */, + 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */, + 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */, ); name = Overlay; sourceTree = ""; @@ -920,7 +932,7 @@ 6179936D11501D3D00BA94A9 /* arrowRight.png in Resources */, 6179936E11501D3D00BA94A9 /* arrowUp.png in Resources */, 617995321150403800BA94A9 /* joyPush.png in Resources */, - 611FDB5E1155BDE400C2203D /* overlayViewController.xib in Resources */, + 61CE2511115E74C90098C467 /* OverlayViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -954,10 +966,10 @@ 611FD9CC1155A28C00C2203D /* HedgewarsTitle.png in Resources */, 611FD9D01155A40700C2203D /* NetworkPlay.png in Resources */, 611FD9D21155A41000C2203D /* Multiplayer.png in Resources */, - 611FDB3C1155BB9E00C2203D /* overlayViewController.xib in Resources */, 611FDB641155BFFF00C2203D /* Default.png in Resources */, - 618AFBF1115BE8B6003D411B /* popupMenuViewController.xib in Resources */, 61FA7669115DAB1B00DA6ED0 /* DetailViewController.xib in Resources */, + 61CE2503115E73210098C467 /* OverlayViewController.xib in Resources */, + 61CE2504115E73210098C467 /* PopupMenuViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1086,7 +1098,7 @@ 61798883114AA4D000BA94A9 /* TeamEditViewController.m in Sources */, 61798885114AA4D000BA94A9 /* TeamMenuViewController.m in Sources */, 61798889114AA4E600BA94A9 /* GameSetup.m in Sources */, - 617993A01150226700BA94A9 /* overlayViewController.m in Sources */, + 61CE250D115E749A0098C467 /* OverlayViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1138,12 +1150,12 @@ 6100DAB9115446B000F455E0 /* TeamEditViewController.m in Sources */, 6100DABA115446B000F455E0 /* TeamMenuViewController.m in Sources */, 6100DABB115446B000F455E0 /* GameSetup.m in Sources */, - 6100DABC115446B000F455E0 /* overlayViewController.m in Sources */, - 618AFBEF115BE8AE003D411B /* popupMenuViewController.m in Sources */, 61FA761F115DA0DB00DA6ED0 /* MainMenuViewController.m in Sources */, 61FA7647115DA6A300DA6ED0 /* SplitViewRootController.m in Sources */, 61FA765D115DAACC00DA6ED0 /* MasterViewController.m in Sources */, 61FA7668115DAB1B00DA6ED0 /* DetailViewController.m in Sources */, + 61CE24EE115E71C20098C467 /* OverlayViewController.m in Sources */, + 61CE24EF115E71C20098C467 /* PopupMenuViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff -r 831bd0f7050d -r 97dc65a47b15 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sat Mar 27 17:22:33 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sat Mar 27 17:27:15 2010 +0000 @@ -265,21 +265,27 @@ 29B97314FDCFA39411CA2CEA 080E96DDFE201D6D7F000001 - 61FA7620115DA0EA00DA6ED0 + 6179886C114AA4B900BA94A9 + 29B97317FDCFA39411CA2CEA + 6100DB1711544E8400F455E0 1C37FBAC04509CD000000102 + 61CE253B115E76BB0098C467 + 61CE253C115E76BB0098C467 + 61CE254E115E77C50098C467 + 61CE254F115E77C50098C467 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 6 - 5 - 2 - 0 + 85 + 45 + 42 + 41 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 558}} + {{0, 1145}, {186, 558}} PBXTopSmartGroupGIDs @@ -314,7 +320,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - popupMenuViewController.h + uKeys.pas PBXSplitModuleInNavigatorKey Split0 @@ -322,11 +328,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - popupMenuViewController.h + uKeys.pas _historyCapacity 0 bookmark - 61CE24E8115E64BD0098C467 + 61CE2584115E78FB0098C467 history 6179889C114AA5BD00BA94A9 @@ -336,10 +342,8 @@ 61799343114B297000BA94A9 61799354114BD5C300BA94A9 6179937111501D7800BA94A9 - 6179937311501D7800BA94A9 6179937411501D7800BA94A9 6179937511501D7800BA94A9 - 6179937711501D7800BA94A9 6179938511501FFA00BA94A9 6179943111502CEA00BA94A9 6194CC0711505FCF00A4BA5C @@ -360,7 +364,6 @@ 611FD95811551C3700C2203D 611FD95911551C3700C2203D 611FD96611551E8000C2203D - 611FD9D51155A4B900C2203D 611FDAC41155B77500C2203D 611FDADF1155B83200C2203D 611FDB471155BCE500C2203D @@ -380,13 +383,7 @@ 618AFC07115BE92A003D411B 618AFC14115BEA91003D411B 61FA748B115D739000DA6ED0 - 61FA74C5115D76A000DA6ED0 - 61FA7619115DA0CC00DA6ED0 - 61FA761A115DA0CC00DA6ED0 61FA7625115DA22500DA6ED0 - 61FA762C115DA2A900DA6ED0 - 61FA762D115DA2A900DA6ED0 - 61FA762E115DA2A900DA6ED0 61FA766D115DAB4C00DA6ED0 61FA766F115DAB4C00DA6ED0 61CE23E7115E49560098C467 @@ -396,10 +393,22 @@ 61CE2461115E56FD0098C467 61CE24D4115E5E630098C467 61CE24D5115E5E630098C467 - 61CE24DB115E641F0098C467 61CE24DC115E641F0098C467 61CE24E0115E648D0098C467 - 61CE24E1115E648D0098C467 + 61CE24FB115E72A80098C467 + 61CE24FC115E72A80098C467 + 61CE24FD115E72A80098C467 + 61CE24FE115E72A80098C467 + 61CE2514115E74CC0098C467 + 61CE2515115E74CC0098C467 + 61CE251F115E75A70098C467 + 61CE2550115E77C50098C467 + 61CE2551115E77C50098C467 + 61CE2552115E77C50098C467 + 61CE2576115E78900098C467 + 61CE2577115E78900098C467 + 61CE2578115E78900098C467 + 61CE2579115E78900098C467 SplitCount @@ -599,7 +608,7 @@ 5 WindowOrderList - 61CE24E9115E64BD0098C467 + 61CE2555115E77C50098C467 61CE23D9115E46190098C467 61CE23DA115E46190098C467 1C78EAAD065D492600B07095 @@ -636,14 +645,14 @@ GeometryConfiguration Frame - {{0, 0}, {757, 232}} + {{0, 0}, {847, 230}} RubberWindowFrame - 330 339 757 563 0 0 1920 1178 + 330 341 847 561 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 232pt + 230pt BecomeActive @@ -662,9 +671,9 @@ GeometryConfiguration Frame - {{0, 237}, {757, 285}} + {{0, 235}, {847, 285}} RubberWindowFrame - 330 339 757 563 0 0 1920 1178 + 330 341 847 561 0 0 1920 1178 Module PBXBuildResultsModule @@ -673,7 +682,7 @@ Proportion - 522pt + 520pt Name @@ -696,7 +705,7 @@ WindowContentMinSize 486 300 WindowString - 330 339 757 563 0 0 1920 1178 + 330 341 847 561 0 0 1920 1178 WindowToolGUID 61798848114AA42600BA94A9 WindowToolIsVisible diff -r 831bd0f7050d -r 97dc65a47b15 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sat Mar 27 17:22:33 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sat Mar 27 17:27:15 2010 +0000 @@ -12,7 +12,7 @@ activeSDKPreference = iphonesimulator3.2; activeTarget = 6100DA6E115446B000F455E0 /* iHedgewars */; addToTargets = ( - 6100DA6E115446B000F455E0 /* iHedgewars */, + 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */, ); breakpoints = ( ); @@ -297,6 +297,72 @@ 61CE24E5115E648D0098C467 /* PBXTextBookmark */ = 61CE24E5115E648D0098C467 /* PBXTextBookmark */; 61CE24E6115E64990098C467 /* PBXTextBookmark */ = 61CE24E6115E64990098C467 /* PBXTextBookmark */; 61CE24E8115E64BD0098C467 /* PBXTextBookmark */ = 61CE24E8115E64BD0098C467 /* PBXTextBookmark */; + 61CE24F9115E729D0098C467 /* XCBuildMessageTextBookmark */ = 61CE24F9115E729D0098C467 /* XCBuildMessageTextBookmark */; + 61CE24FA115E729D0098C467 /* PBXTextBookmark */ = 61CE24FA115E729D0098C467 /* PBXTextBookmark */; + 61CE24FB115E72A80098C467 /* PBXTextBookmark */ = 61CE24FB115E72A80098C467 /* PBXTextBookmark */; + 61CE24FC115E72A80098C467 /* PBXTextBookmark */ = 61CE24FC115E72A80098C467 /* PBXTextBookmark */; + 61CE24FD115E72A80098C467 /* PBXTextBookmark */ = 61CE24FD115E72A80098C467 /* PBXTextBookmark */; + 61CE24FE115E72A80098C467 /* PBXTextBookmark */ = 61CE24FE115E72A80098C467 /* PBXTextBookmark */; + 61CE24FF115E72A80098C467 /* XCBuildMessageTextBookmark */ = 61CE24FF115E72A80098C467 /* XCBuildMessageTextBookmark */; + 61CE2500115E72A80098C467 /* PBXTextBookmark */ = 61CE2500115E72A80098C467 /* PBXTextBookmark */; + 61CE250A115E742D0098C467 /* PBXTextBookmark */ = 61CE250A115E742D0098C467 /* PBXTextBookmark */; + 61CE250F115E74AE0098C467 /* PBXBookmark */ = 61CE250F115E74AE0098C467 /* PBXBookmark */; + 61CE2513115E74CC0098C467 /* PBXTextBookmark */ = 61CE2513115E74CC0098C467 /* PBXTextBookmark */; + 61CE2514115E74CC0098C467 /* PBXBookmark */ = 61CE2514115E74CC0098C467 /* PBXBookmark */; + 61CE2515115E74CC0098C467 /* PBXTextBookmark */ = 61CE2515115E74CC0098C467 /* PBXTextBookmark */; + 61CE2516115E74CC0098C467 /* PBXTextBookmark */ = 61CE2516115E74CC0098C467 /* PBXTextBookmark */; + 61CE2517115E74CC0098C467 /* PBXBookmark */ = 61CE2517115E74CC0098C467 /* PBXBookmark */; + 61CE251A115E74CC0098C467 /* PBXTextBookmark */ = 61CE251A115E74CC0098C467 /* PBXTextBookmark */; + 61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */; + 61CE2520115E75A70098C467 /* PBXTextBookmark */ = 61CE2520115E75A70098C467 /* PBXTextBookmark */; + 61CE2521115E75A70098C467 /* PBXTextBookmark */ = 61CE2521115E75A70098C467 /* PBXTextBookmark */; + 61CE2522115E75A70098C467 /* XCBuildMessageTextBookmark */ = 61CE2522115E75A70098C467 /* XCBuildMessageTextBookmark */; + 61CE2523115E75A70098C467 /* PBXTextBookmark */ = 61CE2523115E75A70098C467 /* PBXTextBookmark */; + 61CE2524115E75A70098C467 /* PBXTextBookmark */ = 61CE2524115E75A70098C467 /* PBXTextBookmark */; + 61CE2525115E75A70098C467 /* PBXTextBookmark */ = 61CE2525115E75A70098C467 /* PBXTextBookmark */; + 61CE2526115E75A70098C467 /* PBXTextBookmark */ = 61CE2526115E75A70098C467 /* PBXTextBookmark */; + 61CE252B115E75D50098C467 /* PBXTextBookmark */ = 61CE252B115E75D50098C467 /* PBXTextBookmark */; + 61CE252C115E75D50098C467 /* PBXTextBookmark */ = 61CE252C115E75D50098C467 /* PBXTextBookmark */; + 61CE252F115E76250098C467 /* PBXTextBookmark */ = 61CE252F115E76250098C467 /* PBXTextBookmark */; + 61CE2530115E76250098C467 /* PBXTextBookmark */ = 61CE2530115E76250098C467 /* PBXTextBookmark */; + 61CE2533115E76B30098C467 /* PBXTextBookmark */ = 61CE2533115E76B30098C467 /* PBXTextBookmark */; + 61CE2534115E76B30098C467 /* PBXTextBookmark */ = 61CE2534115E76B30098C467 /* PBXTextBookmark */; + 61CE2535115E76B30098C467 /* PBXTextBookmark */ = 61CE2535115E76B30098C467 /* PBXTextBookmark */; + 61CE2536115E76B30098C467 /* PBXTextBookmark */ = 61CE2536115E76B30098C467 /* PBXTextBookmark */; + 61CE2537115E76B30098C467 /* PBXTextBookmark */ = 61CE2537115E76B30098C467 /* PBXTextBookmark */; + 61CE2538115E76B30098C467 /* XCBuildMessageTextBookmark */ = 61CE2538115E76B30098C467 /* XCBuildMessageTextBookmark */; + 61CE2539115E76B30098C467 /* PBXTextBookmark */ = 61CE2539115E76B30098C467 /* PBXTextBookmark */; + 61CE253D115E76BB0098C467 /* PBXTextBookmark */ = 61CE253D115E76BB0098C467 /* PBXTextBookmark */; + 61CE253E115E76BB0098C467 /* PBXTextBookmark */ = 61CE253E115E76BB0098C467 /* PBXTextBookmark */; + 61CE253F115E76BB0098C467 /* PBXTextBookmark */ = 61CE253F115E76BB0098C467 /* PBXTextBookmark */; + 61CE254B115E77B60098C467 /* XCBuildMessageTextBookmark */ = 61CE254B115E77B60098C467 /* XCBuildMessageTextBookmark */; + 61CE2550115E77C50098C467 /* PBXTextBookmark */ = 61CE2550115E77C50098C467 /* PBXTextBookmark */; + 61CE2551115E77C50098C467 /* PBXTextBookmark */ = 61CE2551115E77C50098C467 /* PBXTextBookmark */; + 61CE2552115E77C50098C467 /* PBXTextBookmark */ = 61CE2552115E77C50098C467 /* PBXTextBookmark */; + 61CE2553115E77C50098C467 /* PBXTextBookmark */ = 61CE2553115E77C50098C467 /* PBXTextBookmark */; + 61CE2554115E77C50098C467 /* PBXTextBookmark */ = 61CE2554115E77C50098C467 /* PBXTextBookmark */; + 61CE2557115E77C50098C467 /* PBXTextBookmark */ = 61CE2557115E77C50098C467 /* PBXTextBookmark */; + 61CE255C115E77D80098C467 /* PBXTextBookmark */ = 61CE255C115E77D80098C467 /* PBXTextBookmark */; + 61CE255D115E77D80098C467 /* PBXTextBookmark */ = 61CE255D115E77D80098C467 /* PBXTextBookmark */; + 61CE2570115E78860098C467 /* PBXTextBookmark */ = 61CE2570115E78860098C467 /* PBXTextBookmark */; + 61CE2571115E78860098C467 /* PBXTextBookmark */ = 61CE2571115E78860098C467 /* PBXTextBookmark */; + 61CE2572115E78860098C467 /* PBXTextBookmark */ = 61CE2572115E78860098C467 /* PBXTextBookmark */; + 61CE2573115E78860098C467 /* PBXTextBookmark */ = 61CE2573115E78860098C467 /* PBXTextBookmark */; + 61CE2574115E78860098C467 /* XCBuildMessageTextBookmark */ = 61CE2574115E78860098C467 /* XCBuildMessageTextBookmark */; + 61CE2575115E78860098C467 /* PBXTextBookmark */ = 61CE2575115E78860098C467 /* PBXTextBookmark */; + 61CE2576115E78900098C467 /* PBXTextBookmark */ = 61CE2576115E78900098C467 /* PBXTextBookmark */; + 61CE2577115E78900098C467 /* PBXTextBookmark */ = 61CE2577115E78900098C467 /* PBXTextBookmark */; + 61CE2578115E78900098C467 /* PBXTextBookmark */ = 61CE2578115E78900098C467 /* PBXTextBookmark */; + 61CE2579115E78900098C467 /* XCBuildMessageTextBookmark */ = 61CE2579115E78900098C467 /* XCBuildMessageTextBookmark */; + 61CE257A115E78900098C467 /* PBXTextBookmark */ = 61CE257A115E78900098C467 /* PBXTextBookmark */; + 61CE257B115E78900098C467 /* PBXTextBookmark */ = 61CE257B115E78900098C467 /* PBXTextBookmark */; + 61CE257C115E78D60098C467 /* PBXTextBookmark */ = 61CE257C115E78D60098C467 /* PBXTextBookmark */; + 61CE257D115E78D60098C467 /* XCBuildMessageTextBookmark */ = 61CE257D115E78D60098C467 /* XCBuildMessageTextBookmark */; + 61CE257E115E78D60098C467 /* PBXTextBookmark */ = 61CE257E115E78D60098C467 /* PBXTextBookmark */; + 61CE2581115E78F70098C467 /* PBXTextBookmark */ = 61CE2581115E78F70098C467 /* PBXTextBookmark */; + 61CE2582115E78F70098C467 /* XCBuildMessageTextBookmark */ = 61CE2582115E78F70098C467 /* XCBuildMessageTextBookmark */; + 61CE2583115E78F70098C467 /* PBXTextBookmark */ = 61CE2583115E78F70098C467 /* PBXTextBookmark */; + 61CE2584115E78FB0098C467 /* PBXTextBookmark */ = 61CE2584115E78FB0098C467 /* PBXTextBookmark */; 61E2F07F1156B170002D33C1 = 61E2F07F1156B170002D33C1 /* PBXTextBookmark */; 61E2F0801156B170002D33C1 = 61E2F0801156B170002D33C1 /* PBXTextBookmark */; 61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */; @@ -445,8 +511,8 @@ isa = PBXTextBookmark; fRef = 61798872114AA4D000BA94A9 /* SchemeEditViewController.m */; name = "SchemeEditViewController.m: 33"; - rLen = 209; - rLoc = 918; + rLen = 0; + rLoc = 835; rType = 0; vrLen = 189; vrLoc = 0; @@ -574,8 +640,8 @@ isa = PBXTextBookmark; fRef = 61798878114AA4D000BA94A9 /* TeamEditViewController.m */; name = "TeamEditViewController.m: 33"; - rLen = 209; - rLoc = 845; + rLen = 0; + rLoc = 764; rType = 0; vrLen = 295; vrLoc = 763; @@ -808,9 +874,9 @@ }; 617987FE114AA34C00BA94A9 /* uKeys.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {696, 6877}}"; + sepNavIntBoundsRect = "{{0, 0}, {532, 6877}}"; sepNavSelRange = "{2954, 0}"; - sepNavVisRange = "{2760, 342}"; + sepNavVisRange = "{2887, 172}"; sepNavWindowFrame = "{{674, 505}, {921, 605}}"; }; }; @@ -885,9 +951,9 @@ }; 61798859114AA48A00BA94A9 /* IMG.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {558, 1807}}"; + sepNavIntBoundsRect = "{{0, 0}, {786, 1820}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{1032, 295}"; + sepNavVisRange = "{0, 776}"; }; }; 6179885A114AA48A00BA94A9 /* PascalImports.h */ = { @@ -907,17 +973,17 @@ }; 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {744, 598}}"; - sepNavSelRange = "{1014, 0}"; - sepNavVisRange = "{79, 1521}"; - sepNavWindowFrame = "{{715, 378}, {803, 674}}"; + sepNavIntBoundsRect = "{{0, 0}, {786, 585}}"; + sepNavSelRange = "{603, 0}"; + sepNavVisRange = "{937, 373}"; + sepNavWindowFrame = "{{841, 168}, {803, 674}}"; }; }; 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {796, 1729}}"; - sepNavSelRange = "{3256, 0}"; - sepNavVisRange = "{2807, 917}"; + sepNavIntBoundsRect = "{{0, 0}, {796, 1924}}"; + sepNavSelRange = "{3259, 0}"; + sepNavVisRange = "{2775, 1690}"; sepNavWindowFrame = "{{841, 168}, {803, 674}}"; }; }; @@ -931,17 +997,17 @@ }; 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {551, 377}}"; + sepNavIntBoundsRect = "{{0, 0}, {532, 416}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 207}"; - sepNavWindowFrame = "{{199, 382}, {775, 623}}"; + sepNavVisRange = "{0, 148}"; + sepNavWindowFrame = "{{525, 308}, {775, 623}}"; }; }; 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {901, 2249}}"; + sepNavIntBoundsRect = "{{0, 0}, {957, 2262}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 216}"; + sepNavVisRange = "{85, 1239}"; sepNavWindowFrame = "{{525, 308}, {775, 623}}"; }; }; @@ -954,9 +1020,10 @@ }; 61798872114AA4D000BA94A9 /* SchemeEditViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1146, 845}}"; - sepNavSelRange = "{918, 209}"; - sepNavVisRange = "{0, 189}"; + sepNavIntBoundsRect = "{{0, 0}, {1146, 936}}"; + sepNavSelRange = "{1129, 0}"; + sepNavVisRange = "{0, 1678}"; + sepNavWindowFrame = "{{508, 144}, {938, 967}}"; }; }; 61798874114AA4D000BA94A9 /* SettingsViewController.h */ = { @@ -968,9 +1035,9 @@ }; 61798875114AA4D000BA94A9 /* SettingsViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {696, 4264}}"; - sepNavSelRange = "{2739, 0}"; - sepNavVisRange = "{2736, 446}"; + sepNavIntBoundsRect = "{{0, 0}, {868, 4251}}"; + sepNavSelRange = "{2443, 294}"; + sepNavVisRange = "{1975, 1372}"; sepNavWindowFrame = "{{38, 307}, {927, 845}}"; }; }; @@ -983,9 +1050,10 @@ }; 61798878114AA4D000BA94A9 /* TeamEditViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1146, 676}}"; - sepNavSelRange = "{845, 209}"; - sepNavVisRange = "{763, 295}"; + sepNavIntBoundsRect = "{{0, 0}, {1146, 816}}"; + sepNavSelRange = "{1057, 0}"; + sepNavVisRange = "{0, 1408}"; + sepNavWindowFrame = "{{15, 206}, {938, 967}}"; }; }; 6179887A114AA4D000BA94A9 /* TeamMenuViewController.h */ = { @@ -995,6 +1063,14 @@ sepNavVisRange = "{0, 174}"; }; }; + 6179887B114AA4D000BA94A9 /* TeamMenuViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {532, 806}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 148}"; + sepNavWindowFrame = "{{38, 185}, {938, 967}}"; + }; + }; 61798887114AA4E600BA94A9 /* GameSetup.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1209, 758}}"; @@ -1086,6 +1162,12 @@ fRef = 6179934E114BD5AB00BA94A9 /* menuCorner.png */; }; 6179939D1150226700BA94A9 /* overlayViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = overlayViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/overlayViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {868, 565}}"; sepNavSelRange = "{306, 11}"; @@ -1094,6 +1176,12 @@ }; }; 6179939E1150226700BA94A9 /* overlayViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = overlayViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/overlayViewController.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1062, 3731}}"; sepNavSelRange = "{6036, 0}"; @@ -1106,6 +1194,12 @@ fRef = 6179936711501D3D00BA94A9 /* arrowDown.png */; }; 618AFBED115BE8AE003D411B /* popupMenuViewController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = popupMenuViewController.h; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/popupMenuViewController.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {873, 273}}"; sepNavSelRange = "{225, 0}"; @@ -1114,6 +1208,12 @@ }; }; 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = popupMenuViewController.m; + path = /Users/vittorio/hedgewars/trunk/cocoaTouch/popupMenuViewController.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {810, 1612}}"; sepNavSelRange = "{3799, 0}"; @@ -2612,6 +2712,679 @@ vrLen = 222; vrLoc = 156; }; + 61CE24EA115E71C20098C467 /* OverlayViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {551, 468}}"; + sepNavSelRange = "{281, 0}"; + sepNavVisRange = "{150, 169}"; + }; + }; + 61CE24EB115E71C20098C467 /* OverlayViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {915, 3718}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 154}"; + sepNavWindowFrame = "{{38, 185}, {938, 967}}"; + }; + }; + 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {879, 839}}"; + sepNavSelRange = "{193, 23}"; + sepNavVisRange = "{0, 495}"; + }; + }; + 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {532, 1768}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 160}"; + sepNavWindowFrame = "{{15, 206}, {938, 967}}"; + }; + }; + 61CE24F9115E729D0098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "6: Local variable \"pkbd\" is assigned but never used"; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 104; + rType = 1; + }; + 61CE24FA115E729D0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 342; + vrLoc = 2760; + }; + 61CE24FB115E72A80098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 291; + vrLoc = 262; + }; + 61CE24FC115E72A80098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */; + name = "PopupMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 156; + vrLoc = 0; + }; + 61CE24FD115E72A80098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */; + name = "PopupMenuViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 160; + vrLoc = 0; + }; + 61CE24FE115E72A80098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 80"; + rLen = 0; + rLoc = 2468; + rType = 0; + vrLen = 401; + vrLoc = 3082; + }; + 61CE24FF115E72A80098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "6: Local variable \"pkbd\" is assigned but never used"; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 104; + rType = 1; + }; + 61CE2500115E72A80098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 172; + vrLoc = 2887; + }; + 61CE250A115E742D0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 172; + vrLoc = 2887; + }; + 61CE250B115E749A0098C467 /* OverlayViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {532, 416}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 150}"; + sepNavWindowFrame = "{{140, 30}, {938, 967}}"; + }; + }; + 61CE250C115E749A0098C467 /* OverlayViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {866, 3471}}"; + sepNavSelRange = "{3987, 0}"; + sepNavVisRange = "{3526, 689}"; + sepNavWindowFrame = "{{737, 168}, {938, 967}}"; + }; + }; + 61CE250F115E74AE0098C467 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + }; + 61CE2513115E74CC0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 172; + vrLoc = 2887; + }; + 61CE2514115E74CC0098C467 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798A2B114ADD2600BA94A9 /* title.png */; + }; + 61CE2515115E74CC0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */; + name = "MainMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 148; + vrLoc = 0; + }; + 61CE2516115E74CC0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 154; + vrLoc = 0; + }; + 61CE2517115E74CC0098C467 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798A28114ADD2600BA94A9 /* playButton.png */; + }; + 61CE251A115E74CC0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 2027; + vrLoc = 3013; + }; + 61CE251F115E75A70098C467 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798A28114ADD2600BA94A9 /* playButton.png */; + }; + 61CE2520115E75A70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 154; + vrLoc = 0; + }; + 61CE2521115E75A70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 5"; + rLen = 0; + rLoc = 77; + rType = 0; + vrLen = 154; + vrLoc = 0; + }; + 61CE2522115E75A70098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "6: Local variable \"pkbd\" is assigned but never used"; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 104; + rType = 1; + }; + 61CE2523115E75A70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 172; + vrLoc = 2887; + }; + 61CE2524115E75A70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 27"; + rLen = 0; + rLoc = 663; + rType = 0; + vrLen = 742; + vrLoc = 0; + }; + 61CE2525115E75A70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 389; + rType = 0; + vrLen = 2308; + vrLoc = 5738; + }; + 61CE2526115E75A70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 389; + rType = 0; + vrLen = 1803; + vrLoc = 2531; + }; + 61CE252B115E75D50098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 119; + vrLoc = 2887; + }; + 61CE252C115E75D50098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 389; + rType = 0; + vrLen = 1802; + vrLoc = 2504; + }; + 61CE252F115E76250098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 172; + vrLoc = 2887; + }; + 61CE2530115E76250098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 389; + rType = 0; + vrLen = 1803; + vrLoc = 2504; + }; + 61CE2533115E76B30098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 57"; + rLen = 0; + rLoc = 1802; + rType = 0; + vrLen = 482; + vrLoc = 1560; + }; + 61CE2534115E76B30098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 381; + vrLoc = 2791; + }; + 61CE2535115E76B30098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798859114AA48A00BA94A9 /* IMG.c */; + name = "IMG.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 776; + vrLoc = 0; + }; + 61CE2536115E76B30098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 14"; + rLen = 0; + rLoc = 603; + rType = 0; + vrLen = 519; + vrLoc = 983; + }; + 61CE2537115E76B30098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 48"; + rLen = 0; + rLoc = 1523; + rType = 0; + vrLen = 377; + vrLoc = 790; + }; + 61CE2538115E76B30098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Expected specifier-qualifier-list before 'UIPopoverController'"; + fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 20; + rType = 1; + }; + 61CE2539115E76B30098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 21"; + rLen = 0; + rLoc = 446; + rType = 0; + vrLen = 319; + vrLoc = 0; + }; + 61CE253D115E76BB0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 172; + vrLoc = 2887; + }; + 61CE253E115E76BB0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 5"; + rLen = 0; + rLoc = 77; + rType = 0; + vrLen = 154; + vrLoc = 0; + }; + 61CE253F115E76BB0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 5"; + rLen = 0; + rLoc = 77; + rType = 0; + vrLen = 154; + vrLoc = 0; + }; + 61CE254B115E77B60098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Compile /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/../../cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m"; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 0; + rLoc = 103; + rType = 1; + }; + 61CE2550115E77C50098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 5"; + rLen = 0; + rLoc = 77; + rType = 0; + vrLen = 154; + vrLoc = 0; + }; + 61CE2551115E77C50098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 14"; + rLen = 0; + rLoc = 281; + rType = 0; + vrLen = 169; + vrLoc = 150; + }; + 61CE2552115E77C50098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EB115E71C20098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 154; + vrLoc = 0; + }; + 61CE2553115E77C50098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 154; + vrLoc = 0; + }; + 61CE2554115E77C50098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 154; + vrLoc = 0; + }; + 61CE2557115E77C50098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 32"; + rLen = 0; + rLoc = 1141; + rType = 0; + vrLen = 1349; + vrLoc = 395; + }; + 61CE255C115E77D80098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 150; + vrLoc = 0; + }; + 61CE255D115E77D80098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 32"; + rLen = 0; + rLoc = 1141; + rType = 0; + vrLen = 1349; + vrLoc = 395; + }; + 61CE2570115E78860098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 14"; + rLen = 0; + rLoc = 281; + rType = 0; + vrLen = 319; + vrLoc = 0; + }; + 61CE2571115E78860098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 14"; + rLen = 0; + rLoc = 603; + rType = 0; + vrLen = 373; + vrLoc = 937; + }; + 61CE2572115E78860098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 130"; + rLen = 0; + rLoc = 3987; + rType = 0; + vrLen = 689; + vrLoc = 3526; + }; + 61CE2573115E78860098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 286; + vrLoc = 2886; + }; + 61CE2574115E78860098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "'setStatusBarHidden:animated:' is deprecated (declared at /Developer/Developer4iPad/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.2.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:207)"; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 102; + rType = 1; + }; + 61CE2575115E78860098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 103"; + rLen = 0; + rLoc = 3256; + rType = 0; + vrLen = 769; + vrLoc = 2955; + }; + 61CE2576115E78900098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 150; + vrLoc = 0; + }; + 61CE2577115E78900098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798875114AA4D000BA94A9 /* SettingsViewController.m */; + name = "SettingsViewController.m: 94"; + rLen = 0; + rLoc = 2739; + rType = 0; + vrLen = 167; + vrLoc = 2736; + }; + 61CE2578115E78900098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179887B114AA4D000BA94A9 /* TeamMenuViewController.m */; + name = "TeamMenuViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 148; + vrLoc = 0; + }; + 61CE2579115E78900098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "6: Local variable \"pkbd\" is assigned but never used"; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 104; + rType = 1; + }; + 61CE257A115E78900098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 172; + vrLoc = 2887; + }; + 61CE257B115E78900098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 32"; + rLen = 0; + rLoc = 1141; + rType = 0; + vrLen = 1347; + vrLoc = 395; + }; + 61CE257C115E78D60098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 286; + vrLoc = 2886; + }; + 61CE257D115E78D60098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "'setStatusBarHidden:animated:' is deprecated (declared at /Developer/Developer4iPad/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.2.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:207)"; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 102; + rType = 1; + }; + 61CE257E115E78D60098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 103"; + rLen = 18; + rLoc = 3272; + rType = 0; + vrLen = 712; + vrLoc = 3012; + }; + 61CE2581115E78F70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 103"; + rLen = 18; + rLoc = 3272; + rType = 0; + vrLen = 746; + vrLoc = 3012; + }; + 61CE2582115E78F70098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "6: Local variable \"pkbd\" is assigned but never used"; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 104; + rType = 1; + }; + 61CE2583115E78F70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 295; + vrLoc = 2855; + }; + 61CE2584115E78FB0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 172; + vrLoc = 2887; + }; 61E2F07F1156B170002D33C1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 617987FF114AA34C00BA94A9 /* uLand.pas */; @@ -2768,7 +3541,7 @@ }; 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {936, 793}}"; + sepNavIntBoundsRect = "{{0, 0}, {663, 806}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{262, 291}"; sepNavWindowFrame = "{{60, 197}, {927, 845}}";