# HG changeset patch # User koda # Date 1269711061 0 # Node ID f3e363a9b7db8478e57c575e48b05107ce1b9876 # Parent 97dc65a47b15a6b1fefe56f69b936d9e691cef11 complete previous commit (which broken my local copy as well) diff -r 97dc65a47b15 -r f3e363a9b7db cocoaTouch/OverlayViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/OverlayViewController.h Sat Mar 27 17:31:01 2010 +0000 @@ -0,0 +1,31 @@ +// +// overlayViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 16/03/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface OverlayViewController : UIViewController { + NSTimer *dimTimer; + + CGFloat initialDistanceForPinching; + CGPoint gestureStartPoint; +} + +@property (nonatomic,retain) NSTimer *dimTimer; + +-(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; + +-(void) dimOverlay; +-(void) showMenuAfterwards; + +@end diff -r 97dc65a47b15 -r f3e363a9b7db cocoaTouch/OverlayViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/OverlayViewController.m Sat Mar 27 17:31:01 2010 +0000 @@ -0,0 +1,253 @@ +// +// 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; + + +-(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 { + // 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; + } +} + +#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 97dc65a47b15 -r f3e363a9b7db project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sat Mar 27 17:27:15 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sat Mar 27 17:31:01 2010 +0000 @@ -269,23 +269,18 @@ 29B97317FDCFA39411CA2CEA 6100DB1711544E8400F455E0 1C37FBAC04509CD000000102 - 61CE253B115E76BB0098C467 - 61CE253C115E76BB0098C467 - 61CE254E115E77C50098C467 - 61CE254F115E77C50098C467 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 85 - 45 - 42 - 41 + 5 + 2 + 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 1145}, {186, 558}} + {{0, 0}, {186, 558}} PBXTopSmartGroupGIDs @@ -332,7 +327,7 @@ _historyCapacity 0 bookmark - 61CE2584115E78FB0098C467 + 61CE25C2115E7CE10098C467 history 6179889C114AA5BD00BA94A9 @@ -396,19 +391,18 @@ 61CE24DC115E641F0098C467 61CE24E0115E648D0098C467 61CE24FB115E72A80098C467 - 61CE24FC115E72A80098C467 61CE24FD115E72A80098C467 61CE24FE115E72A80098C467 61CE2514115E74CC0098C467 61CE2515115E74CC0098C467 61CE251F115E75A70098C467 - 61CE2550115E77C50098C467 61CE2551115E77C50098C467 61CE2552115E77C50098C467 - 61CE2576115E78900098C467 61CE2577115E78900098C467 61CE2578115E78900098C467 - 61CE2579115E78900098C467 + 61CE25B4115E7C940098C467 + 61CE25B5115E7C940098C467 + 61CE25C1115E7CE10098C467 SplitCount @@ -420,14 +414,14 @@ GeometryConfiguration Frame - {{0, 0}, {593, 125}} + {{0, 0}, {593, 109}} RubberWindowFrame 860 368 801 617 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 125pt + 109pt BecomeActive @@ -442,14 +436,14 @@ GeometryConfiguration Frame - {{0, 130}, {593, 446}} + {{0, 114}, {593, 462}} RubberWindowFrame 860 368 801 617 0 0 1920 1178 Module XCDetailModule Proportion - 446pt + 462pt Proportion @@ -468,9 +462,9 @@ TableOfContents - 61CE23BA115E44D70098C467 + 61CE25AC115E7BC20098C467 1CE0B1FE06471DED0097A5F4 - 61CE23BB115E44D70098C467 + 61CE25AD115E7BC20098C467 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -608,11 +602,6 @@ 5 WindowOrderList - 61CE2555115E77C50098C467 - 61CE23D9115E46190098C467 - 61CE23DA115E46190098C467 - 1C78EAAD065D492600B07095 - 1CD10A99069EF8BA00B06720 61798848114AA42600BA94A9 /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj @@ -696,7 +685,7 @@ TableOfContents 61798848114AA42600BA94A9 - 61CE23BD115E44D70098C467 + 61CE25AE115E7BC20098C467 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID diff -r 97dc65a47b15 -r f3e363a9b7db project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sat Mar 27 17:27:15 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sat Mar 27 17:31:01 2010 +0000 @@ -94,8 +94,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 291390660; - PBXWorkspaceStateSaveDate = 291390660; + PBXPerProjectTemplateStateSaveDate = 291404730; + PBXWorkspaceStateSaveDate = 291404730; }; perUserProjectItems = { 611FD81D1155111700C2203D = 611FD81D1155111700C2203D /* PBXTextBookmark */; @@ -145,224 +145,236 @@ 618AFC14115BEA91003D411B = 618AFC14115BEA91003D411B /* PBXTextBookmark */; 6194CC0711505FCF00A4BA5C = 6194CC0711505FCF00A4BA5C /* PlistBookmark */; 6194CCFC1151E00900A4BA5C = 6194CCFC1151E00900A4BA5C /* PBXTextBookmark */; - 61CE23B9115E44D70098C467 /* PBXTextBookmark */ = 61CE23B9115E44D70098C467 /* PBXTextBookmark */; - 61CE23BC115E44D70098C467 /* PBXTextBookmark */ = 61CE23BC115E44D70098C467 /* PBXTextBookmark */; - 61CE23D6115E46190098C467 /* PBXTextBookmark */ = 61CE23D6115E46190098C467 /* PBXTextBookmark */; - 61CE23D7115E46190098C467 /* XCBuildMessageTextBookmark */ = 61CE23D7115E46190098C467 /* XCBuildMessageTextBookmark */; - 61CE23D8115E46190098C467 /* PBXTextBookmark */ = 61CE23D8115E46190098C467 /* PBXTextBookmark */; - 61CE23DD115E46920098C467 /* PBXTextBookmark */ = 61CE23DD115E46920098C467 /* PBXTextBookmark */; - 61CE23DE115E46920098C467 /* XCBuildMessageTextBookmark */ = 61CE23DE115E46920098C467 /* XCBuildMessageTextBookmark */; - 61CE23DF115E46920098C467 /* PBXTextBookmark */ = 61CE23DF115E46920098C467 /* PBXTextBookmark */; - 61CE23E0115E46930098C467 /* PBXTextBookmark */ = 61CE23E0115E46930098C467 /* PBXTextBookmark */; - 61CE23E1115E46CB0098C467 /* PBXBookmark */ = 61CE23E1115E46CB0098C467 /* PBXBookmark */; - 61CE23E4115E46D60098C467 /* PBXBookmark */ = 61CE23E4115E46D60098C467 /* PBXBookmark */; - 61CE23E7115E49560098C467 /* PBXTextBookmark */ = 61CE23E7115E49560098C467 /* PBXTextBookmark */; - 61CE23E8115E49560098C467 /* PBXTextBookmark */ = 61CE23E8115E49560098C467 /* PBXTextBookmark */; - 61CE23E9115E49560098C467 /* PBXTextBookmark */ = 61CE23E9115E49560098C467 /* PBXTextBookmark */; - 61CE23EA115E49560098C467 /* PBXTextBookmark */ = 61CE23EA115E49560098C467 /* PBXTextBookmark */; - 61CE23EB115E49560098C467 /* PBXTextBookmark */ = 61CE23EB115E49560098C467 /* PBXTextBookmark */; - 61CE23EE115E49560098C467 /* PBXTextBookmark */ = 61CE23EE115E49560098C467 /* PBXTextBookmark */; - 61CE23F1115E49560098C467 /* PBXTextBookmark */ = 61CE23F1115E49560098C467 /* PBXTextBookmark */; - 61CE23F2115E496D0098C467 /* PBXBookmark */ = 61CE23F2115E496D0098C467 /* PBXBookmark */; - 61CE23F3115E49E70098C467 /* PBXTextBookmark */ = 61CE23F3115E49E70098C467 /* PBXTextBookmark */; - 61CE23F6115E49E70098C467 /* PBXTextBookmark */ = 61CE23F6115E49E70098C467 /* PBXTextBookmark */; - 61CE23F7115E49E70098C467 /* PBXTextBookmark */ = 61CE23F7115E49E70098C467 /* PBXTextBookmark */; - 61CE23F8115E49E70098C467 /* PBXTextBookmark */ = 61CE23F8115E49E70098C467 /* PBXTextBookmark */; - 61CE23F9115E4AF80098C467 /* PBXTextBookmark */ = 61CE23F9115E4AF80098C467 /* PBXTextBookmark */; - 61CE23FA115E4AF80098C467 /* PBXTextBookmark */ = 61CE23FA115E4AF80098C467 /* PBXTextBookmark */; - 61CE23FB115E4AF80098C467 /* PBXTextBookmark */ = 61CE23FB115E4AF80098C467 /* PBXTextBookmark */; - 61CE23FC115E4AF80098C467 /* PBXTextBookmark */ = 61CE23FC115E4AF80098C467 /* PBXTextBookmark */; - 61CE23FE115E4B290098C467 /* PBXTextBookmark */ = 61CE23FE115E4B290098C467 /* PBXTextBookmark */; - 61CE23FF115E4B290098C467 /* PBXBookmark */ = 61CE23FF115E4B290098C467 /* PBXBookmark */; - 61CE2400115E4B290098C467 /* PBXBookmark */ = 61CE2400115E4B290098C467 /* PBXBookmark */; - 61CE2401115E4B290098C467 /* PBXTextBookmark */ = 61CE2401115E4B290098C467 /* PBXTextBookmark */; - 61CE2402115E4B290098C467 /* PBXTextBookmark */ = 61CE2402115E4B290098C467 /* PBXTextBookmark */; - 61CE2403115E4B290098C467 /* PBXTextBookmark */ = 61CE2403115E4B290098C467 /* PBXTextBookmark */; - 61CE2407115E4EF50098C467 /* PBXBookmark */ = 61CE2407115E4EF50098C467 /* PBXBookmark */; - 61CE2408115E4EF50098C467 /* PBXTextBookmark */ = 61CE2408115E4EF50098C467 /* PBXTextBookmark */; - 61CE2409115E4EF50098C467 /* PBXTextBookmark */ = 61CE2409115E4EF50098C467 /* PBXTextBookmark */; - 61CE240A115E4EF50098C467 /* PBXTextBookmark */ = 61CE240A115E4EF50098C467 /* PBXTextBookmark */; - 61CE2410115E4F620098C467 /* PBXBookmark */ = 61CE2410115E4F620098C467 /* PBXBookmark */; - 61CE2411115E4F620098C467 /* XCBuildMessageTextBookmark */ = 61CE2411115E4F620098C467 /* XCBuildMessageTextBookmark */; - 61CE2412115E4F620098C467 /* PBXTextBookmark */ = 61CE2412115E4F620098C467 /* PBXTextBookmark */; - 61CE2413115E4F620098C467 /* PBXTextBookmark */ = 61CE2413115E4F620098C467 /* PBXTextBookmark */; - 61CE2414115E4F620098C467 /* PBXTextBookmark */ = 61CE2414115E4F620098C467 /* PBXTextBookmark */; - 61CE2415115E4F620098C467 /* PBXTextBookmark */ = 61CE2415115E4F620098C467 /* PBXTextBookmark */; - 61CE2416115E4F620098C467 /* PBXTextBookmark */ = 61CE2416115E4F620098C467 /* PBXTextBookmark */; - 61CE2417115E4F620098C467 /* PBXTextBookmark */ = 61CE2417115E4F620098C467 /* PBXTextBookmark */; - 61CE241B115E4FD60098C467 /* PBXTextBookmark */ = 61CE241B115E4FD60098C467 /* PBXTextBookmark */; - 61CE241C115E4FD60098C467 /* PBXTextBookmark */ = 61CE241C115E4FD60098C467 /* PBXTextBookmark */; - 61CE241D115E4FD60098C467 /* PBXTextBookmark */ = 61CE241D115E4FD60098C467 /* PBXTextBookmark */; - 61CE241E115E4FD60098C467 /* PBXTextBookmark */ = 61CE241E115E4FD60098C467 /* PBXTextBookmark */; - 61CE2425115E52930098C467 /* PBXTextBookmark */ = 61CE2425115E52930098C467 /* PBXTextBookmark */; - 61CE2428115E52930098C467 /* PBXBookmark */ = 61CE2428115E52930098C467 /* PBXBookmark */; - 61CE2429115E52930098C467 /* PBXTextBookmark */ = 61CE2429115E52930098C467 /* PBXTextBookmark */; - 61CE242B115E52930098C467 /* PBXTextBookmark */ = 61CE242B115E52930098C467 /* PBXTextBookmark */; - 61CE242C115E52930098C467 /* PBXTextBookmark */ = 61CE242C115E52930098C467 /* PBXTextBookmark */; - 61CE242F115E52930098C467 /* PBXBookmark */ = 61CE242F115E52930098C467 /* PBXBookmark */; - 61CE2430115E52930098C467 /* PBXTextBookmark */ = 61CE2430115E52930098C467 /* PBXTextBookmark */; - 61CE2431115E52930098C467 /* PBXTextBookmark */ = 61CE2431115E52930098C467 /* PBXTextBookmark */; - 61CE2432115E52930098C467 /* PBXTextBookmark */ = 61CE2432115E52930098C467 /* PBXTextBookmark */; - 61CE2433115E52930098C467 /* PBXTextBookmark */ = 61CE2433115E52930098C467 /* PBXTextBookmark */; - 61CE2435115E533B0098C467 /* PBXTextBookmark */ = 61CE2435115E533B0098C467 /* PBXTextBookmark */; - 61CE2436115E533B0098C467 /* PBXTextBookmark */ = 61CE2436115E533B0098C467 /* PBXTextBookmark */; - 61CE2437115E533B0098C467 /* XCBuildMessageTextBookmark */ = 61CE2437115E533B0098C467 /* XCBuildMessageTextBookmark */; - 61CE2438115E533B0098C467 /* PBXTextBookmark */ = 61CE2438115E533B0098C467 /* PBXTextBookmark */; - 61CE243C115E54510098C467 /* PBXTextBookmark */ = 61CE243C115E54510098C467 /* PBXTextBookmark */; - 61CE243D115E54510098C467 /* PBXTextBookmark */ = 61CE243D115E54510098C467 /* PBXTextBookmark */; - 61CE243E115E54510098C467 /* PBXTextBookmark */ = 61CE243E115E54510098C467 /* PBXTextBookmark */; - 61CE243F115E54510098C467 /* PBXTextBookmark */ = 61CE243F115E54510098C467 /* PBXTextBookmark */; - 61CE2442115E546E0098C467 /* PBXTextBookmark */ = 61CE2442115E546E0098C467 /* PBXTextBookmark */; - 61CE2443115E54730098C467 /* PBXTextBookmark */ = 61CE2443115E54730098C467 /* PBXTextBookmark */; - 61CE2444115E54730098C467 /* PBXTextBookmark */ = 61CE2444115E54730098C467 /* PBXTextBookmark */; - 61CE2445115E54730098C467 /* PBXTextBookmark */ = 61CE2445115E54730098C467 /* PBXTextBookmark */; - 61CE2446115E54730098C467 /* PBXTextBookmark */ = 61CE2446115E54730098C467 /* PBXTextBookmark */; - 61CE2449115E56300098C467 /* PBXTextBookmark */ = 61CE2449115E56300098C467 /* PBXTextBookmark */; - 61CE244A115E56300098C467 /* PBXTextBookmark */ = 61CE244A115E56300098C467 /* PBXTextBookmark */; - 61CE244B115E56300098C467 /* PBXTextBookmark */ = 61CE244B115E56300098C467 /* PBXTextBookmark */; - 61CE244C115E56300098C467 /* PBXTextBookmark */ = 61CE244C115E56300098C467 /* PBXTextBookmark */; - 61CE244D115E56300098C467 /* PBXTextBookmark */ = 61CE244D115E56300098C467 /* PBXTextBookmark */; - 61CE244E115E56300098C467 /* PBXTextBookmark */ = 61CE244E115E56300098C467 /* PBXTextBookmark */; - 61CE2452115E56540098C467 /* PBXTextBookmark */ = 61CE2452115E56540098C467 /* PBXTextBookmark */; - 61CE2453115E56540098C467 /* PBXTextBookmark */ = 61CE2453115E56540098C467 /* PBXTextBookmark */; - 61CE2454115E56540098C467 /* PBXTextBookmark */ = 61CE2454115E56540098C467 /* PBXTextBookmark */; - 61CE2455115E56540098C467 /* PBXTextBookmark */ = 61CE2455115E56540098C467 /* PBXTextBookmark */; - 61CE2460115E56FD0098C467 /* PBXTextBookmark */ = 61CE2460115E56FD0098C467 /* PBXTextBookmark */; - 61CE2461115E56FD0098C467 /* PBXTextBookmark */ = 61CE2461115E56FD0098C467 /* PBXTextBookmark */; - 61CE2462115E56FD0098C467 /* PBXTextBookmark */ = 61CE2462115E56FD0098C467 /* PBXTextBookmark */; - 61CE2463115E56FD0098C467 /* PBXTextBookmark */ = 61CE2463115E56FD0098C467 /* PBXTextBookmark */; - 61CE2464115E56FD0098C467 /* PBXTextBookmark */ = 61CE2464115E56FD0098C467 /* PBXTextBookmark */; - 61CE2465115E56FD0098C467 /* PBXTextBookmark */ = 61CE2465115E56FD0098C467 /* PBXTextBookmark */; - 61CE2466115E56FD0098C467 /* PBXTextBookmark */ = 61CE2466115E56FD0098C467 /* PBXTextBookmark */; - 61CE246A115E57100098C467 /* PBXTextBookmark */ = 61CE246A115E57100098C467 /* PBXTextBookmark */; - 61CE246B115E57100098C467 /* PBXTextBookmark */ = 61CE246B115E57100098C467 /* PBXTextBookmark */; - 61CE246C115E57100098C467 /* PBXTextBookmark */ = 61CE246C115E57100098C467 /* PBXTextBookmark */; - 61CE246D115E57100098C467 /* PBXTextBookmark */ = 61CE246D115E57100098C467 /* PBXTextBookmark */; - 61CE2470115E57390098C467 /* PBXTextBookmark */ = 61CE2470115E57390098C467 /* PBXTextBookmark */; - 61CE2471115E57390098C467 /* PBXTextBookmark */ = 61CE2471115E57390098C467 /* PBXTextBookmark */; - 61CE2472115E57390098C467 /* PBXTextBookmark */ = 61CE2472115E57390098C467 /* PBXTextBookmark */; - 61CE2473115E57390098C467 /* PBXTextBookmark */ = 61CE2473115E57390098C467 /* PBXTextBookmark */; - 61CE2481115E59E50098C467 /* PBXTextBookmark */ = 61CE2481115E59E50098C467 /* PBXTextBookmark */; - 61CE2482115E59E50098C467 /* PBXTextBookmark */ = 61CE2482115E59E50098C467 /* PBXTextBookmark */; - 61CE2483115E59E50098C467 /* PBXTextBookmark */ = 61CE2483115E59E50098C467 /* PBXTextBookmark */; - 61CE2484115E59E50098C467 /* XCBuildMessageTextBookmark */ = 61CE2484115E59E50098C467 /* XCBuildMessageTextBookmark */; - 61CE2485115E59E50098C467 /* PBXTextBookmark */ = 61CE2485115E59E50098C467 /* PBXTextBookmark */; - 61CE2486115E59E60098C467 /* PBXTextBookmark */ = 61CE2486115E59E60098C467 /* PBXTextBookmark */; - 61CE2489115E59E60098C467 /* PBXTextBookmark */ = 61CE2489115E59E60098C467 /* PBXTextBookmark */; - 61CE248A115E59E60098C467 /* PBXTextBookmark */ = 61CE248A115E59E60098C467 /* PBXTextBookmark */; - 61CE248B115E59E60098C467 /* PBXTextBookmark */ = 61CE248B115E59E60098C467 /* PBXTextBookmark */; - 61CE248E115E59E60098C467 /* PBXTextBookmark */ = 61CE248E115E59E60098C467 /* PBXTextBookmark */; - 61CE248F115E59E60098C467 /* PBXTextBookmark */ = 61CE248F115E59E60098C467 /* PBXTextBookmark */; - 61CE2490115E59E60098C467 /* PBXTextBookmark */ = 61CE2490115E59E60098C467 /* PBXTextBookmark */; - 61CE2491115E59E60098C467 /* PBXTextBookmark */ = 61CE2491115E59E60098C467 /* PBXTextBookmark */; - 61CE2492115E59F50098C467 /* PBXBookmark */ = 61CE2492115E59F50098C467 /* PBXBookmark */; - 61CE2495115E5A4C0098C467 /* PBXTextBookmark */ = 61CE2495115E5A4C0098C467 /* PBXTextBookmark */; - 61CE2496115E5A4C0098C467 /* PBXTextBookmark */ = 61CE2496115E5A4C0098C467 /* PBXTextBookmark */; - 61CE2499115E5A4C0098C467 /* PBXTextBookmark */ = 61CE2499115E5A4C0098C467 /* PBXTextBookmark */; - 61CE249A115E5A4C0098C467 /* PBXTextBookmark */ = 61CE249A115E5A4C0098C467 /* PBXTextBookmark */; - 61CE249D115E5AD70098C467 /* PBXTextBookmark */ = 61CE249D115E5AD70098C467 /* PBXTextBookmark */; - 61CE249E115E5AD70098C467 /* PBXTextBookmark */ = 61CE249E115E5AD70098C467 /* PBXTextBookmark */; - 61CE249F115E5AD70098C467 /* PBXTextBookmark */ = 61CE249F115E5AD70098C467 /* PBXTextBookmark */; - 61CE24A0115E5AD70098C467 /* PBXTextBookmark */ = 61CE24A0115E5AD70098C467 /* PBXTextBookmark */; - 61CE24A2115E5B6F0098C467 /* PBXTextBookmark */ = 61CE24A2115E5B6F0098C467 /* PBXTextBookmark */; - 61CE24A3115E5B6F0098C467 /* PBXTextBookmark */ = 61CE24A3115E5B6F0098C467 /* PBXTextBookmark */; - 61CE24A4115E5B6F0098C467 /* PBXTextBookmark */ = 61CE24A4115E5B6F0098C467 /* PBXTextBookmark */; - 61CE24A5115E5B6F0098C467 /* PBXTextBookmark */ = 61CE24A5115E5B6F0098C467 /* PBXTextBookmark */; - 61CE24A6115E5B6F0098C467 /* PBXTextBookmark */ = 61CE24A6115E5B6F0098C467 /* PBXTextBookmark */; - 61CE24A9115E5C770098C467 /* PBXTextBookmark */ = 61CE24A9115E5C770098C467 /* PBXTextBookmark */; - 61CE24AA115E5C770098C467 /* PBXTextBookmark */ = 61CE24AA115E5C770098C467 /* PBXTextBookmark */; - 61CE24AB115E5C770098C467 /* PBXTextBookmark */ = 61CE24AB115E5C770098C467 /* PBXTextBookmark */; - 61CE24AC115E5C770098C467 /* PBXTextBookmark */ = 61CE24AC115E5C770098C467 /* PBXTextBookmark */; - 61CE24AD115E5C770098C467 /* PBXTextBookmark */ = 61CE24AD115E5C770098C467 /* PBXTextBookmark */; - 61CE24AF115E5CDE0098C467 /* PBXTextBookmark */ = 61CE24AF115E5CDE0098C467 /* PBXTextBookmark */; - 61CE24B0115E5CDE0098C467 /* XCBuildMessageTextBookmark */ = 61CE24B0115E5CDE0098C467 /* XCBuildMessageTextBookmark */; - 61CE24B1115E5CDE0098C467 /* PBXTextBookmark */ = 61CE24B1115E5CDE0098C467 /* PBXTextBookmark */; - 61CE24B2115E5CDF0098C467 /* PBXTextBookmark */ = 61CE24B2115E5CDF0098C467 /* PBXTextBookmark */; - 61CE24B3115E5CDF0098C467 /* PBXTextBookmark */ = 61CE24B3115E5CDF0098C467 /* PBXTextBookmark */; - 61CE24B4115E5CDF0098C467 /* PBXTextBookmark */ = 61CE24B4115E5CDF0098C467 /* PBXTextBookmark */; - 61CE24B5115E5CE30098C467 /* PBXTextBookmark */ = 61CE24B5115E5CE30098C467 /* PBXTextBookmark */; - 61CE24B6115E5CE40098C467 /* PBXTextBookmark */ = 61CE24B6115E5CE40098C467 /* PBXTextBookmark */; - 61CE24B7115E5CE40098C467 /* PBXTextBookmark */ = 61CE24B7115E5CE40098C467 /* PBXTextBookmark */; - 61CE24B8115E5CE40098C467 /* PBXTextBookmark */ = 61CE24B8115E5CE40098C467 /* PBXTextBookmark */; - 61CE24D4115E5E630098C467 /* PBXTextBookmark */ = 61CE24D4115E5E630098C467 /* PBXTextBookmark */; - 61CE24D5115E5E630098C467 /* PBXTextBookmark */ = 61CE24D5115E5E630098C467 /* PBXTextBookmark */; - 61CE24D6115E5E630098C467 /* PBXTextBookmark */ = 61CE24D6115E5E630098C467 /* PBXTextBookmark */; - 61CE24DB115E641F0098C467 /* PBXTextBookmark */ = 61CE24DB115E641F0098C467 /* PBXTextBookmark */; - 61CE24DC115E641F0098C467 /* PBXTextBookmark */ = 61CE24DC115E641F0098C467 /* PBXTextBookmark */; - 61CE24DD115E641F0098C467 /* PBXTextBookmark */ = 61CE24DD115E641F0098C467 /* PBXTextBookmark */; - 61CE24DF115E64870098C467 /* PBXBookmark */ = 61CE24DF115E64870098C467 /* PBXBookmark */; - 61CE24E0115E648D0098C467 /* PBXTextBookmark */ = 61CE24E0115E648D0098C467 /* PBXTextBookmark */; - 61CE24E1115E648D0098C467 /* PBXTextBookmark */ = 61CE24E1115E648D0098C467 /* PBXTextBookmark */; - 61CE24E2115E648D0098C467 /* PBXTextBookmark */ = 61CE24E2115E648D0098C467 /* PBXTextBookmark */; - 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 */; + 61CE23B9115E44D70098C467 = 61CE23B9115E44D70098C467 /* PBXTextBookmark */; + 61CE23BC115E44D70098C467 = 61CE23BC115E44D70098C467 /* PBXTextBookmark */; + 61CE23D6115E46190098C467 = 61CE23D6115E46190098C467 /* PBXTextBookmark */; + 61CE23D7115E46190098C467 = 61CE23D7115E46190098C467 /* PBXTextBookmark */; + 61CE23D8115E46190098C467 = 61CE23D8115E46190098C467 /* PBXTextBookmark */; + 61CE23DD115E46920098C467 = 61CE23DD115E46920098C467 /* PBXTextBookmark */; + 61CE23DE115E46920098C467 = 61CE23DE115E46920098C467 /* PBXTextBookmark */; + 61CE23DF115E46920098C467 = 61CE23DF115E46920098C467 /* PBXTextBookmark */; + 61CE23E0115E46930098C467 = 61CE23E0115E46930098C467 /* PBXTextBookmark */; + 61CE23E1115E46CB0098C467 = 61CE23E1115E46CB0098C467 /* PBXBookmark */; + 61CE23E4115E46D60098C467 = 61CE23E4115E46D60098C467 /* PBXBookmark */; + 61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */; + 61CE23E8115E49560098C467 = 61CE23E8115E49560098C467 /* PBXTextBookmark */; + 61CE23E9115E49560098C467 = 61CE23E9115E49560098C467 /* PBXTextBookmark */; + 61CE23EA115E49560098C467 = 61CE23EA115E49560098C467 /* PBXTextBookmark */; + 61CE23EB115E49560098C467 = 61CE23EB115E49560098C467 /* PBXTextBookmark */; + 61CE23EE115E49560098C467 = 61CE23EE115E49560098C467 /* PBXTextBookmark */; + 61CE23F1115E49560098C467 = 61CE23F1115E49560098C467 /* PBXTextBookmark */; + 61CE23F2115E496D0098C467 = 61CE23F2115E496D0098C467 /* PBXBookmark */; + 61CE23F3115E49E70098C467 = 61CE23F3115E49E70098C467 /* PBXTextBookmark */; + 61CE23F6115E49E70098C467 = 61CE23F6115E49E70098C467 /* PBXTextBookmark */; + 61CE23F7115E49E70098C467 = 61CE23F7115E49E70098C467 /* PBXTextBookmark */; + 61CE23F8115E49E70098C467 = 61CE23F8115E49E70098C467 /* PBXTextBookmark */; + 61CE23F9115E4AF80098C467 = 61CE23F9115E4AF80098C467 /* PBXTextBookmark */; + 61CE23FA115E4AF80098C467 = 61CE23FA115E4AF80098C467 /* PBXTextBookmark */; + 61CE23FB115E4AF80098C467 = 61CE23FB115E4AF80098C467 /* PBXTextBookmark */; + 61CE23FC115E4AF80098C467 = 61CE23FC115E4AF80098C467 /* PBXTextBookmark */; + 61CE23FE115E4B290098C467 = 61CE23FE115E4B290098C467 /* PBXTextBookmark */; + 61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */; + 61CE2400115E4B290098C467 = 61CE2400115E4B290098C467 /* PBXBookmark */; + 61CE2401115E4B290098C467 = 61CE2401115E4B290098C467 /* PBXTextBookmark */; + 61CE2402115E4B290098C467 = 61CE2402115E4B290098C467 /* PBXTextBookmark */; + 61CE2403115E4B290098C467 = 61CE2403115E4B290098C467 /* PBXTextBookmark */; + 61CE2407115E4EF50098C467 = 61CE2407115E4EF50098C467 /* PBXBookmark */; + 61CE2408115E4EF50098C467 = 61CE2408115E4EF50098C467 /* PBXTextBookmark */; + 61CE2409115E4EF50098C467 = 61CE2409115E4EF50098C467 /* PBXTextBookmark */; + 61CE240A115E4EF50098C467 = 61CE240A115E4EF50098C467 /* PBXTextBookmark */; + 61CE2410115E4F620098C467 = 61CE2410115E4F620098C467 /* PBXBookmark */; + 61CE2411115E4F620098C467 = 61CE2411115E4F620098C467 /* PBXTextBookmark */; + 61CE2412115E4F620098C467 = 61CE2412115E4F620098C467 /* PBXTextBookmark */; + 61CE2413115E4F620098C467 = 61CE2413115E4F620098C467 /* PBXTextBookmark */; + 61CE2414115E4F620098C467 = 61CE2414115E4F620098C467 /* PBXTextBookmark */; + 61CE2415115E4F620098C467 = 61CE2415115E4F620098C467 /* PBXTextBookmark */; + 61CE2416115E4F620098C467 = 61CE2416115E4F620098C467 /* PBXTextBookmark */; + 61CE2417115E4F620098C467 = 61CE2417115E4F620098C467 /* PBXTextBookmark */; + 61CE241B115E4FD60098C467 = 61CE241B115E4FD60098C467 /* PBXTextBookmark */; + 61CE241C115E4FD60098C467 = 61CE241C115E4FD60098C467 /* PBXTextBookmark */; + 61CE241D115E4FD60098C467 = 61CE241D115E4FD60098C467 /* PBXTextBookmark */; + 61CE241E115E4FD60098C467 = 61CE241E115E4FD60098C467 /* PBXTextBookmark */; + 61CE2425115E52930098C467 = 61CE2425115E52930098C467 /* PBXTextBookmark */; + 61CE2428115E52930098C467 = 61CE2428115E52930098C467 /* PBXBookmark */; + 61CE2429115E52930098C467 = 61CE2429115E52930098C467 /* PBXTextBookmark */; + 61CE242B115E52930098C467 = 61CE242B115E52930098C467 /* PBXTextBookmark */; + 61CE242C115E52930098C467 = 61CE242C115E52930098C467 /* PBXTextBookmark */; + 61CE242F115E52930098C467 = 61CE242F115E52930098C467 /* PBXBookmark */; + 61CE2430115E52930098C467 = 61CE2430115E52930098C467 /* PBXTextBookmark */; + 61CE2431115E52930098C467 = 61CE2431115E52930098C467 /* PBXTextBookmark */; + 61CE2432115E52930098C467 = 61CE2432115E52930098C467 /* PBXTextBookmark */; + 61CE2433115E52930098C467 = 61CE2433115E52930098C467 /* PBXTextBookmark */; + 61CE2435115E533B0098C467 = 61CE2435115E533B0098C467 /* PBXTextBookmark */; + 61CE2436115E533B0098C467 = 61CE2436115E533B0098C467 /* PBXTextBookmark */; + 61CE2437115E533B0098C467 = 61CE2437115E533B0098C467 /* PBXTextBookmark */; + 61CE2438115E533B0098C467 = 61CE2438115E533B0098C467 /* PBXTextBookmark */; + 61CE243C115E54510098C467 = 61CE243C115E54510098C467 /* PBXTextBookmark */; + 61CE243D115E54510098C467 = 61CE243D115E54510098C467 /* PBXTextBookmark */; + 61CE243E115E54510098C467 = 61CE243E115E54510098C467 /* PBXTextBookmark */; + 61CE243F115E54510098C467 = 61CE243F115E54510098C467 /* PBXTextBookmark */; + 61CE2442115E546E0098C467 = 61CE2442115E546E0098C467 /* PBXTextBookmark */; + 61CE2443115E54730098C467 = 61CE2443115E54730098C467 /* PBXTextBookmark */; + 61CE2444115E54730098C467 = 61CE2444115E54730098C467 /* PBXTextBookmark */; + 61CE2445115E54730098C467 = 61CE2445115E54730098C467 /* PBXTextBookmark */; + 61CE2446115E54730098C467 = 61CE2446115E54730098C467 /* PBXTextBookmark */; + 61CE2449115E56300098C467 = 61CE2449115E56300098C467 /* PBXTextBookmark */; + 61CE244A115E56300098C467 = 61CE244A115E56300098C467 /* PBXTextBookmark */; + 61CE244B115E56300098C467 = 61CE244B115E56300098C467 /* PBXTextBookmark */; + 61CE244C115E56300098C467 = 61CE244C115E56300098C467 /* PBXTextBookmark */; + 61CE244D115E56300098C467 = 61CE244D115E56300098C467 /* PBXTextBookmark */; + 61CE244E115E56300098C467 = 61CE244E115E56300098C467 /* PBXTextBookmark */; + 61CE2452115E56540098C467 = 61CE2452115E56540098C467 /* PBXTextBookmark */; + 61CE2453115E56540098C467 = 61CE2453115E56540098C467 /* PBXTextBookmark */; + 61CE2454115E56540098C467 = 61CE2454115E56540098C467 /* PBXTextBookmark */; + 61CE2455115E56540098C467 = 61CE2455115E56540098C467 /* PBXTextBookmark */; + 61CE2460115E56FD0098C467 = 61CE2460115E56FD0098C467 /* PBXTextBookmark */; + 61CE2461115E56FD0098C467 = 61CE2461115E56FD0098C467 /* PBXTextBookmark */; + 61CE2462115E56FD0098C467 = 61CE2462115E56FD0098C467 /* PBXTextBookmark */; + 61CE2463115E56FD0098C467 = 61CE2463115E56FD0098C467 /* PBXTextBookmark */; + 61CE2464115E56FD0098C467 = 61CE2464115E56FD0098C467 /* PBXTextBookmark */; + 61CE2465115E56FD0098C467 = 61CE2465115E56FD0098C467 /* PBXTextBookmark */; + 61CE2466115E56FD0098C467 = 61CE2466115E56FD0098C467 /* PBXTextBookmark */; + 61CE246A115E57100098C467 = 61CE246A115E57100098C467 /* PBXTextBookmark */; + 61CE246B115E57100098C467 = 61CE246B115E57100098C467 /* PBXTextBookmark */; + 61CE246C115E57100098C467 = 61CE246C115E57100098C467 /* PBXTextBookmark */; + 61CE246D115E57100098C467 = 61CE246D115E57100098C467 /* PBXTextBookmark */; + 61CE2470115E57390098C467 = 61CE2470115E57390098C467 /* PBXTextBookmark */; + 61CE2471115E57390098C467 = 61CE2471115E57390098C467 /* PBXTextBookmark */; + 61CE2472115E57390098C467 = 61CE2472115E57390098C467 /* PBXTextBookmark */; + 61CE2473115E57390098C467 = 61CE2473115E57390098C467 /* PBXTextBookmark */; + 61CE2481115E59E50098C467 = 61CE2481115E59E50098C467 /* PBXTextBookmark */; + 61CE2482115E59E50098C467 = 61CE2482115E59E50098C467 /* PBXTextBookmark */; + 61CE2483115E59E50098C467 = 61CE2483115E59E50098C467 /* PBXTextBookmark */; + 61CE2484115E59E50098C467 = 61CE2484115E59E50098C467 /* PBXTextBookmark */; + 61CE2485115E59E50098C467 = 61CE2485115E59E50098C467 /* PBXTextBookmark */; + 61CE2486115E59E60098C467 = 61CE2486115E59E60098C467 /* PBXTextBookmark */; + 61CE2489115E59E60098C467 = 61CE2489115E59E60098C467 /* PBXTextBookmark */; + 61CE248A115E59E60098C467 = 61CE248A115E59E60098C467 /* PBXTextBookmark */; + 61CE248B115E59E60098C467 = 61CE248B115E59E60098C467 /* PBXTextBookmark */; + 61CE248E115E59E60098C467 = 61CE248E115E59E60098C467 /* PBXTextBookmark */; + 61CE248F115E59E60098C467 = 61CE248F115E59E60098C467 /* PBXTextBookmark */; + 61CE2490115E59E60098C467 = 61CE2490115E59E60098C467 /* PBXTextBookmark */; + 61CE2491115E59E60098C467 = 61CE2491115E59E60098C467 /* PBXTextBookmark */; + 61CE2492115E59F50098C467 = 61CE2492115E59F50098C467 /* PBXBookmark */; + 61CE2495115E5A4C0098C467 = 61CE2495115E5A4C0098C467 /* PBXTextBookmark */; + 61CE2496115E5A4C0098C467 = 61CE2496115E5A4C0098C467 /* PBXTextBookmark */; + 61CE2499115E5A4C0098C467 = 61CE2499115E5A4C0098C467 /* PBXTextBookmark */; + 61CE249A115E5A4C0098C467 = 61CE249A115E5A4C0098C467 /* PBXTextBookmark */; + 61CE249D115E5AD70098C467 = 61CE249D115E5AD70098C467 /* PBXTextBookmark */; + 61CE249E115E5AD70098C467 = 61CE249E115E5AD70098C467 /* PBXTextBookmark */; + 61CE249F115E5AD70098C467 = 61CE249F115E5AD70098C467 /* PBXTextBookmark */; + 61CE24A0115E5AD70098C467 = 61CE24A0115E5AD70098C467 /* PBXTextBookmark */; + 61CE24A2115E5B6F0098C467 = 61CE24A2115E5B6F0098C467 /* PBXTextBookmark */; + 61CE24A3115E5B6F0098C467 = 61CE24A3115E5B6F0098C467 /* PBXTextBookmark */; + 61CE24A4115E5B6F0098C467 = 61CE24A4115E5B6F0098C467 /* PBXTextBookmark */; + 61CE24A5115E5B6F0098C467 = 61CE24A5115E5B6F0098C467 /* PBXTextBookmark */; + 61CE24A6115E5B6F0098C467 = 61CE24A6115E5B6F0098C467 /* PBXTextBookmark */; + 61CE24A9115E5C770098C467 = 61CE24A9115E5C770098C467 /* PBXTextBookmark */; + 61CE24AA115E5C770098C467 = 61CE24AA115E5C770098C467 /* PBXTextBookmark */; + 61CE24AB115E5C770098C467 = 61CE24AB115E5C770098C467 /* PBXTextBookmark */; + 61CE24AC115E5C770098C467 = 61CE24AC115E5C770098C467 /* PBXTextBookmark */; + 61CE24AD115E5C770098C467 = 61CE24AD115E5C770098C467 /* PBXTextBookmark */; + 61CE24AF115E5CDE0098C467 = 61CE24AF115E5CDE0098C467 /* PBXTextBookmark */; + 61CE24B0115E5CDE0098C467 = 61CE24B0115E5CDE0098C467 /* PBXTextBookmark */; + 61CE24B1115E5CDE0098C467 = 61CE24B1115E5CDE0098C467 /* PBXTextBookmark */; + 61CE24B2115E5CDF0098C467 = 61CE24B2115E5CDF0098C467 /* PBXTextBookmark */; + 61CE24B3115E5CDF0098C467 = 61CE24B3115E5CDF0098C467 /* PBXTextBookmark */; + 61CE24B4115E5CDF0098C467 = 61CE24B4115E5CDF0098C467 /* PBXTextBookmark */; + 61CE24B5115E5CE30098C467 = 61CE24B5115E5CE30098C467 /* PBXTextBookmark */; + 61CE24B6115E5CE40098C467 = 61CE24B6115E5CE40098C467 /* PBXTextBookmark */; + 61CE24B7115E5CE40098C467 = 61CE24B7115E5CE40098C467 /* PBXTextBookmark */; + 61CE24B8115E5CE40098C467 = 61CE24B8115E5CE40098C467 /* PBXTextBookmark */; + 61CE24D4115E5E630098C467 = 61CE24D4115E5E630098C467 /* PBXTextBookmark */; + 61CE24D5115E5E630098C467 = 61CE24D5115E5E630098C467 /* PBXTextBookmark */; + 61CE24D6115E5E630098C467 = 61CE24D6115E5E630098C467 /* PBXTextBookmark */; + 61CE24DB115E641F0098C467 = 61CE24DB115E641F0098C467 /* PBXTextBookmark */; + 61CE24DC115E641F0098C467 = 61CE24DC115E641F0098C467 /* PBXTextBookmark */; + 61CE24DD115E641F0098C467 = 61CE24DD115E641F0098C467 /* PBXTextBookmark */; + 61CE24DF115E64870098C467 = 61CE24DF115E64870098C467 /* PBXBookmark */; + 61CE24E0115E648D0098C467 = 61CE24E0115E648D0098C467 /* PBXTextBookmark */; + 61CE24E1115E648D0098C467 = 61CE24E1115E648D0098C467 /* PBXTextBookmark */; + 61CE24E2115E648D0098C467 = 61CE24E2115E648D0098C467 /* PBXTextBookmark */; + 61CE24E5115E648D0098C467 = 61CE24E5115E648D0098C467 /* PBXTextBookmark */; + 61CE24E6115E64990098C467 = 61CE24E6115E64990098C467 /* PBXTextBookmark */; + 61CE24E8115E64BD0098C467 = 61CE24E8115E64BD0098C467 /* PBXTextBookmark */; + 61CE24F9115E729D0098C467 = 61CE24F9115E729D0098C467 /* PBXTextBookmark */; + 61CE24FA115E729D0098C467 = 61CE24FA115E729D0098C467 /* PBXTextBookmark */; + 61CE24FB115E72A80098C467 = 61CE24FB115E72A80098C467 /* PBXTextBookmark */; + 61CE24FC115E72A80098C467 = 61CE24FC115E72A80098C467 /* PBXTextBookmark */; + 61CE24FD115E72A80098C467 = 61CE24FD115E72A80098C467 /* PBXTextBookmark */; + 61CE24FE115E72A80098C467 = 61CE24FE115E72A80098C467 /* PBXTextBookmark */; + 61CE24FF115E72A80098C467 = 61CE24FF115E72A80098C467 /* PBXTextBookmark */; + 61CE2500115E72A80098C467 = 61CE2500115E72A80098C467 /* PBXTextBookmark */; + 61CE250A115E742D0098C467 = 61CE250A115E742D0098C467 /* PBXTextBookmark */; + 61CE250F115E74AE0098C467 = 61CE250F115E74AE0098C467 /* PBXBookmark */; + 61CE2513115E74CC0098C467 = 61CE2513115E74CC0098C467 /* PBXTextBookmark */; + 61CE2514115E74CC0098C467 = 61CE2514115E74CC0098C467 /* PBXBookmark */; + 61CE2515115E74CC0098C467 = 61CE2515115E74CC0098C467 /* PBXTextBookmark */; + 61CE2516115E74CC0098C467 = 61CE2516115E74CC0098C467 /* PBXTextBookmark */; + 61CE2517115E74CC0098C467 = 61CE2517115E74CC0098C467 /* PBXBookmark */; + 61CE251A115E74CC0098C467 = 61CE251A115E74CC0098C467 /* PBXTextBookmark */; + 61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */; + 61CE2520115E75A70098C467 = 61CE2520115E75A70098C467 /* PBXTextBookmark */; + 61CE2521115E75A70098C467 = 61CE2521115E75A70098C467 /* PBXTextBookmark */; + 61CE2522115E75A70098C467 = 61CE2522115E75A70098C467 /* PBXTextBookmark */; + 61CE2523115E75A70098C467 = 61CE2523115E75A70098C467 /* PBXTextBookmark */; + 61CE2524115E75A70098C467 = 61CE2524115E75A70098C467 /* PBXTextBookmark */; + 61CE2525115E75A70098C467 = 61CE2525115E75A70098C467 /* PBXTextBookmark */; + 61CE2526115E75A70098C467 = 61CE2526115E75A70098C467 /* PBXTextBookmark */; + 61CE252B115E75D50098C467 = 61CE252B115E75D50098C467 /* PBXTextBookmark */; + 61CE252C115E75D50098C467 = 61CE252C115E75D50098C467 /* PBXTextBookmark */; + 61CE252F115E76250098C467 = 61CE252F115E76250098C467 /* PBXTextBookmark */; + 61CE2530115E76250098C467 = 61CE2530115E76250098C467 /* PBXTextBookmark */; + 61CE2533115E76B30098C467 = 61CE2533115E76B30098C467 /* PBXTextBookmark */; + 61CE2534115E76B30098C467 = 61CE2534115E76B30098C467 /* PBXTextBookmark */; + 61CE2535115E76B30098C467 = 61CE2535115E76B30098C467 /* PBXTextBookmark */; + 61CE2536115E76B30098C467 = 61CE2536115E76B30098C467 /* PBXTextBookmark */; + 61CE2537115E76B30098C467 = 61CE2537115E76B30098C467 /* PBXTextBookmark */; + 61CE2538115E76B30098C467 = 61CE2538115E76B30098C467 /* PBXTextBookmark */; + 61CE2539115E76B30098C467 = 61CE2539115E76B30098C467 /* PBXTextBookmark */; + 61CE253D115E76BB0098C467 = 61CE253D115E76BB0098C467 /* PBXTextBookmark */; + 61CE253E115E76BB0098C467 = 61CE253E115E76BB0098C467 /* PBXTextBookmark */; + 61CE253F115E76BB0098C467 = 61CE253F115E76BB0098C467 /* PBXTextBookmark */; + 61CE254B115E77B60098C467 = 61CE254B115E77B60098C467 /* PBXTextBookmark */; + 61CE2550115E77C50098C467 = 61CE2550115E77C50098C467 /* PBXTextBookmark */; + 61CE2551115E77C50098C467 = 61CE2551115E77C50098C467 /* PBXTextBookmark */; + 61CE2552115E77C50098C467 = 61CE2552115E77C50098C467 /* PBXTextBookmark */; + 61CE2553115E77C50098C467 = 61CE2553115E77C50098C467 /* PBXTextBookmark */; + 61CE2554115E77C50098C467 = 61CE2554115E77C50098C467 /* PBXTextBookmark */; + 61CE2557115E77C50098C467 = 61CE2557115E77C50098C467 /* PBXTextBookmark */; + 61CE255C115E77D80098C467 = 61CE255C115E77D80098C467 /* PBXTextBookmark */; + 61CE255D115E77D80098C467 = 61CE255D115E77D80098C467 /* PBXTextBookmark */; + 61CE2570115E78860098C467 = 61CE2570115E78860098C467 /* PBXTextBookmark */; + 61CE2571115E78860098C467 = 61CE2571115E78860098C467 /* PBXTextBookmark */; + 61CE2572115E78860098C467 = 61CE2572115E78860098C467 /* PBXTextBookmark */; + 61CE2573115E78860098C467 = 61CE2573115E78860098C467 /* PBXTextBookmark */; + 61CE2574115E78860098C467 = 61CE2574115E78860098C467 /* PBXTextBookmark */; + 61CE2575115E78860098C467 = 61CE2575115E78860098C467 /* PBXTextBookmark */; + 61CE2576115E78900098C467 = 61CE2576115E78900098C467 /* PBXTextBookmark */; + 61CE2577115E78900098C467 = 61CE2577115E78900098C467 /* PBXTextBookmark */; + 61CE2578115E78900098C467 = 61CE2578115E78900098C467 /* PBXTextBookmark */; + 61CE2579115E78900098C467 = 61CE2579115E78900098C467 /* PBXTextBookmark */; + 61CE257A115E78900098C467 = 61CE257A115E78900098C467 /* PBXTextBookmark */; + 61CE257B115E78900098C467 = 61CE257B115E78900098C467 /* PBXTextBookmark */; + 61CE257C115E78D60098C467 = 61CE257C115E78D60098C467 /* PBXTextBookmark */; + 61CE257D115E78D60098C467 = 61CE257D115E78D60098C467 /* PBXTextBookmark */; + 61CE257E115E78D60098C467 = 61CE257E115E78D60098C467 /* PBXTextBookmark */; + 61CE2581115E78F70098C467 = 61CE2581115E78F70098C467 /* PBXTextBookmark */; + 61CE2582115E78F70098C467 = 61CE2582115E78F70098C467 /* PBXTextBookmark */; + 61CE2583115E78F70098C467 = 61CE2583115E78F70098C467 /* PBXTextBookmark */; + 61CE2584115E78FB0098C467 = 61CE2584115E78FB0098C467 /* PBXTextBookmark */; + 61CE25B4115E7C940098C467 /* PBXTextBookmark */ = 61CE25B4115E7C940098C467 /* PBXTextBookmark */; + 61CE25B5115E7C940098C467 /* PBXTextBookmark */ = 61CE25B5115E7C940098C467 /* PBXTextBookmark */; + 61CE25B6115E7C940098C467 /* XCBuildMessageTextBookmark */ = 61CE25B6115E7C940098C467 /* XCBuildMessageTextBookmark */; + 61CE25B7115E7C940098C467 /* PBXTextBookmark */ = 61CE25B7115E7C940098C467 /* PBXTextBookmark */; + 61CE25B9115E7CC70098C467 /* PBXTextBookmark */ = 61CE25B9115E7CC70098C467 /* PBXTextBookmark */; + 61CE25BA115E7CC70098C467 /* XCBuildMessageTextBookmark */ = 61CE25BA115E7CC70098C467 /* XCBuildMessageTextBookmark */; + 61CE25BB115E7CC70098C467 /* PBXTextBookmark */ = 61CE25BB115E7CC70098C467 /* PBXTextBookmark */; + 61CE25BE115E7CDB0098C467 /* PBXTextBookmark */ = 61CE25BE115E7CDB0098C467 /* PBXTextBookmark */; + 61CE25BF115E7CDB0098C467 /* XCBuildMessageTextBookmark */ = 61CE25BF115E7CDB0098C467 /* XCBuildMessageTextBookmark */; + 61CE25C0115E7CDB0098C467 /* PBXTextBookmark */ = 61CE25C0115E7CDB0098C467 /* PBXTextBookmark */; + 61CE25C1115E7CE10098C467 /* XCBuildMessageTextBookmark */ = 61CE25C1115E7CE10098C467 /* XCBuildMessageTextBookmark */; + 61CE25C2115E7CE10098C467 /* PBXTextBookmark */ = 61CE25C2115E7CE10098C467 /* PBXTextBookmark */; 61E2F07F1156B170002D33C1 = 61E2F07F1156B170002D33C1 /* PBXTextBookmark */; 61E2F0801156B170002D33C1 = 61E2F0801156B170002D33C1 /* PBXTextBookmark */; 61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */; @@ -876,7 +888,7 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {532, 6877}}"; sepNavSelRange = "{2954, 0}"; - sepNavVisRange = "{2887, 172}"; + sepNavVisRange = "{2888, 140}"; sepNavWindowFrame = "{{674, 505}, {921, 605}}"; }; }; @@ -1168,12 +1180,6 @@ name = overlayViewController.h; path = /Users/vittorio/hedgewars/trunk/cocoaTouch/overlayViewController.h; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {868, 565}}"; - sepNavSelRange = "{306, 11}"; - sepNavVisRange = "{0, 868}"; - sepNavWindowFrame = "{{381, 378}, {922, 717}}"; - }; }; 6179939E1150226700BA94A9 /* overlayViewController.m */ = { isa = PBXFileReference; @@ -1182,12 +1188,6 @@ name = overlayViewController.m; path = /Users/vittorio/hedgewars/trunk/cocoaTouch/overlayViewController.m; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1062, 3731}}"; - sepNavSelRange = "{6036, 0}"; - sepNavVisRange = "{4528, 1902}"; - sepNavWindowFrame = "{{969, 241}, {927, 718}}"; - }; }; 6179943111502CEA00BA94A9 /* PBXBookmark */ = { isa = PBXBookmark; @@ -1200,12 +1200,6 @@ name = popupMenuViewController.h; path = /Users/vittorio/hedgewars/trunk/cocoaTouch/popupMenuViewController.h; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {873, 273}}"; - sepNavSelRange = "{225, 0}"; - sepNavVisRange = "{156, 222}"; - sepNavWindowFrame = "{{304, 160}, {927, 845}}"; - }; }; 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */ = { isa = PBXFileReference; @@ -1214,12 +1208,6 @@ name = popupMenuViewController.m; path = /Users/vittorio/hedgewars/trunk/cocoaTouch/popupMenuViewController.m; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {810, 1612}}"; - sepNavSelRange = "{3799, 0}"; - sepNavVisRange = "{3345, 520}"; - sepNavWindowFrame = "{{304, 160}, {927, 845}}"; - }; }; 618AFC06115BE92A003D411B /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -1297,11 +1285,10 @@ vrLen = 218; vrLoc = 380; }; - 61CE23D7115E46190098C467 /* XCBuildMessageTextBookmark */ = { + 61CE23D7115E46190098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "38: Identifier not found \"sprTargetBee\""; fRef = 6179880F114AA34C00BA94A9 /* uWorld.pas */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 529; rType = 1; @@ -1326,11 +1313,10 @@ vrLen = 729; vrLoc = 16317; }; - 61CE23DE115E46920098C467 /* XCBuildMessageTextBookmark */ = { + 61CE23DE115E46920098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "42: Identifier not found \"sprHandBee\""; fRef = 617987FC114AA34C00BA94A9 /* uGears.pas */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 1251; rType = 1; @@ -1603,11 +1589,10 @@ isa = PBXBookmark; fRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */; }; - 61CE2411115E4F620098C467 /* XCBuildMessageTextBookmark */ = { + 61CE2411115E4F620098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "No declaration of property 'rootController' found in the interface"; fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 12; rType = 1; @@ -1820,11 +1805,10 @@ vrLen = 460; vrLoc = 0; }; - 61CE2437115E533B0098C467 /* XCBuildMessageTextBookmark */ = { + 61CE2437115E533B0098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "16: Identifier not found \"glBegin\""; fRef = 6179880F114AA34C00BA94A9 /* uWorld.pas */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 854; rType = 1; @@ -2209,11 +2193,10 @@ vrLen = 917; vrLoc = 2807; }; - 61CE2484115E59E50098C467 /* XCBuildMessageTextBookmark */ = { + 61CE2484115E59E50098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "'UIViewController' may not respond to '-dismissPopoverAnimated:'"; fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 118; rType = 1; @@ -2282,7 +2265,7 @@ isa = PBXTextBookmark; fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */; rLen = 0; - rLoc = 9223372036854775810; + rLoc = 9223372036854775808; rType = 0; }; 61CE2490115E59E60098C467 /* PBXTextBookmark */ = { @@ -2499,11 +2482,10 @@ vrLen = 520; vrLoc = 3345; }; - 61CE24B0115E5CDE0098C467 /* XCBuildMessageTextBookmark */ = { + 61CE24B0115E5CDE0098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "6: Local variable \"pkbd\" is assigned but never used"; fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 104; rType = 1; @@ -2729,24 +2711,23 @@ }; 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {879, 839}}"; - sepNavSelRange = "{193, 23}"; - sepNavVisRange = "{0, 495}"; + sepNavIntBoundsRect = "{{0, 0}, {873, 273}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{3, 152}"; }; }; 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 1768}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 160}"; + sepNavIntBoundsRect = "{{0, 0}, {1146, 1846}}"; + sepNavSelRange = "{805, 0}"; + sepNavVisRange = "{0, 1637}"; sepNavWindowFrame = "{{15, 206}, {938, 967}}"; }; }; - 61CE24F9115E729D0098C467 /* XCBuildMessageTextBookmark */ = { + 61CE24F9115E729D0098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "6: Local variable \"pkbd\" is assigned but never used"; fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 104; rType = 1; @@ -2801,11 +2782,10 @@ vrLen = 401; vrLoc = 3082; }; - 61CE24FF115E72A80098C467 /* XCBuildMessageTextBookmark */ = { + 61CE24FF115E72A80098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "6: Local variable \"pkbd\" is assigned but never used"; fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 104; rType = 1; @@ -2832,17 +2812,17 @@ }; 61CE250B115E749A0098C467 /* OverlayViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 416}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 150}"; - sepNavWindowFrame = "{{140, 30}, {938, 967}}"; + sepNavIntBoundsRect = "{{0, 0}, {879, 814}}"; + sepNavSelRange = "{664, 0}"; + sepNavVisRange = "{0, 718}"; + sepNavWindowFrame = "{{1103, 125}, {938, 967}}"; }; }; 61CE250C115E749A0098C467 /* OverlayViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {866, 3471}}"; - sepNavSelRange = "{3987, 0}"; - sepNavVisRange = "{3526, 689}"; + sepNavIntBoundsRect = "{{0, 0}, {936, 3510}}"; + sepNavSelRange = "{4169, 0}"; + sepNavVisRange = "{0, 369}"; sepNavWindowFrame = "{{737, 168}, {938, 967}}"; }; }; @@ -2922,11 +2902,10 @@ vrLen = 154; vrLoc = 0; }; - 61CE2522115E75A70098C467 /* XCBuildMessageTextBookmark */ = { + 61CE2522115E75A70098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "6: Local variable \"pkbd\" is assigned but never used"; fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 104; rType = 1; @@ -2946,7 +2925,7 @@ fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */; name = "OverlayViewController.h: 27"; rLen = 0; - rLoc = 663; + rLoc = 538; rType = 0; vrLen = 742; vrLoc = 0; @@ -3016,7 +2995,7 @@ fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; name = "OverlayViewController.m: 57"; rLen = 0; - rLoc = 1802; + rLoc = 1789; rType = 0; vrLen = 482; vrLoc = 1560; @@ -3061,11 +3040,10 @@ vrLen = 377; vrLoc = 790; }; - 61CE2538115E76B30098C467 /* XCBuildMessageTextBookmark */ = { + 61CE2538115E76B30098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "Expected specifier-qualifier-list before 'UIPopoverController'"; fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 20; rType = 1; @@ -3110,11 +3088,10 @@ vrLen = 154; vrLoc = 0; }; - 61CE254B115E77B60098C467 /* XCBuildMessageTextBookmark */ = { + 61CE254B115E77B60098C467 /* PBXTextBookmark */ = { 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; @@ -3224,7 +3201,7 @@ fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; name = "OverlayViewController.m: 130"; rLen = 0; - rLoc = 3987; + rLoc = 3947; rType = 0; vrLen = 689; vrLoc = 3526; @@ -3239,11 +3216,10 @@ vrLen = 286; vrLoc = 2886; }; - 61CE2574115E78860098C467 /* XCBuildMessageTextBookmark */ = { + 61CE2574115E78860098C467 /* PBXTextBookmark */ = { 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; @@ -3288,11 +3264,10 @@ vrLen = 148; vrLoc = 0; }; - 61CE2579115E78900098C467 /* XCBuildMessageTextBookmark */ = { + 61CE2579115E78900098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "6: Local variable \"pkbd\" is assigned but never used"; fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 104; rType = 1; @@ -3327,11 +3302,10 @@ vrLen = 286; vrLoc = 2886; }; - 61CE257D115E78D60098C467 /* XCBuildMessageTextBookmark */ = { + 61CE257D115E78D60098C467 /* PBXTextBookmark */ = { 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; @@ -3356,11 +3330,10 @@ vrLen = 746; vrLoc = 3012; }; - 61CE2582115E78F70098C467 /* XCBuildMessageTextBookmark */ = { + 61CE2582115E78F70098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "6: Local variable \"pkbd\" is assigned but never used"; fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; - fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; rLoc = 104; rType = 1; @@ -3385,6 +3358,122 @@ vrLen = 172; vrLoc = 2887; }; + 61CE25B4115E7C940098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 129"; + rLen = 0; + rLoc = 3947; + rType = 0; + vrLen = 488; + vrLoc = 3790; + }; + 61CE25B5115E7C940098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */; + name = "PopupMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 152; + vrLoc = 3; + }; + 61CE25B6115E7C940098C467 /* 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; + }; + 61CE25B7115E7C940098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 140; + vrLoc = 2888; + }; + 61CE25B9115E7CC70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 342; + vrLoc = 2760; + }; + 61CE25BA115E7CC70098C467 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Class 'OverlayViewController' does not implement the 'UIActionSheetDelegate' protocol"; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 130; + rType = 1; + }; + 61CE25BB115E7CC70098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 131"; + rLen = 0; + rLoc = 4169; + rType = 0; + vrLen = 369; + vrLoc = 0; + }; + 61CE25BE115E7CDB0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 131"; + rLen = 0; + rLoc = 4169; + rType = 0; + vrLen = 369; + vrLoc = 0; + }; + 61CE25BF115E7CDB0098C467 /* 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; + }; + 61CE25C0115E7CDB0098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 364; + vrLoc = 2695; + }; + 61CE25C1115E7CE10098C467 /* 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; + }; + 61CE25C2115E7CE10098C467 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; + name = "uKeys.pas: 105"; + rLen = 0; + rLoc = 2954; + rType = 0; + vrLen = 140; + vrLoc = 2888; + }; 61E2F07F1156B170002D33C1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 617987FF114AA34C00BA94A9 /* uLand.pas */;