# HG changeset patch
# User koda
# Date 1271431515 0
# Node ID 5d0ac8197eb71f93bbdce3eec1c82a2a8bf9e677
# Parent 967fd96f73739868500b40a38d0b7a734c266837
camera panning ftw
diff -r 967fd96f7373 -r 5d0ac8197eb7 cocoaTouch/OverlayViewController.h
--- a/cocoaTouch/OverlayViewController.h Fri Apr 16 14:37:28 2010 +0000
+++ b/cocoaTouch/OverlayViewController.h Fri Apr 16 15:25:15 2010 +0000
@@ -18,8 +18,8 @@
id popoverController;
#endif
PopoverMenuViewController *popupMenu;
-
BOOL isPopoverVisible;
+
CGFloat initialDistanceForPinching;
CGPoint gestureStartPoint;
}
diff -r 967fd96f7373 -r 5d0ac8197eb7 cocoaTouch/OverlayViewController.m
--- a/cocoaTouch/OverlayViewController.m Fri Apr 16 14:37:28 2010 +0000
+++ b/cocoaTouch/OverlayViewController.m Fri Apr 16 15:25:15 2010 +0000
@@ -228,28 +228,27 @@
#pragma mark Custom touch event handling
#define kMinimumPinchDelta 50
-#define kMinimumGestureLength 10
-#define kMaximumVariance 3
+
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
NSArray *twoTouches;
UITouch *touch = [touches anyObject];
- int width = [[UIScreen mainScreen] bounds].size.width;
if (isPopoverVisible) {
[self dismissPopover];
}
+
+ gestureStartPoint = [touch locationInView:self.view];
switch ([touches count]) {
case 1:
- gestureStartPoint = [touch locationInView:self.view];
initialDistanceForPinching = 0;
switch ([touch tapCount]) {
case 1:
NSLog(@"X:%d Y:%d", (int)gestureStartPoint.x, (int)gestureStartPoint.y );
- SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window,
- (int)gestureStartPoint.y, width - (int)gestureStartPoint.x);
- HW_click();
+ //SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window,
+ // (int)gestureStartPoint.y, width - (int)gestureStartPoint.x);
+ //HW_click();
break;
case 2:
HW_ammoMenu();
@@ -264,6 +263,8 @@
}
// pinching
+ gestureStartPoint.x = 0;
+ gestureStartPoint.y = 0;
twoTouches = [touches allObjects];
UITouch *first = [twoTouches objectAtIndex:0];
UITouch *second = [twoTouches objectAtIndex:1];
@@ -277,45 +278,59 @@
-(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.
+ // 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 {
+ int minimumGestureLength;
+ int logCoeff;
+
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ minimumGestureLength = 5;
+ logCoeff = 19;
+ } else {
+ minimumGestureLength = 3;
+ logCoeff = 3;
+ }
+
NSArray *twoTouches;
CGPoint currentPosition;
UITouch *touch = [touches anyObject];
- int width = [[UIScreen mainScreen] bounds].size.width;
switch ([touches count]) {
case 1:
currentPosition = [touch locationInView:self.view];
// panning
- SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window,
- (int)gestureStartPoint.y, width - (int)gestureStartPoint.x);
- // remember that we have x and y inverted
- /* temporarily disabling hog movements for camera panning testing
- CGFloat vertDiff = gestureStartPoint.x - currentPosition.x;
- CGFloat horizDiff = gestureStartPoint.y - currentPosition.y;
- CGFloat deltaX = fabsf(vertDiff);
- CGFloat deltaY = fabsf(horizDiff);
+ CGFloat deltaX = fabsf(gestureStartPoint.x - currentPosition.x);
+ CGFloat deltaY = fabsf(gestureStartPoint.y - currentPosition.y);
- 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();
- }
- */
+ if (deltaX >= minimumGestureLength) {
+ NSLog(@"Horizontal swipe detected, deltaX: %f deltaY: %f",deltaX, deltaY);
+ if (currentPosition.x > gestureStartPoint.x ) {
+ NSLog(@"Right movement");
+ HW_cursorRight(logCoeff*log(deltaX));
+ } else {
+ NSLog(@"Left movement");
+ HW_cursorLeft(logCoeff*log(deltaX));
+ }
+
+ }
+ if (deltaY >= minimumGestureLength) {
+ NSLog(@"Horizontal swipe detected, deltaX: %f deltaY: %f",deltaX, deltaY);
+ if (currentPosition.y < gestureStartPoint.y ) {
+ NSLog(@"Up movement");
+ HW_cursorUp(logCoeff*log(deltaY));
+ } else {
+ HW_cursorDown(logCoeff*log(deltaY));
+ NSLog(@"Down movement");
+ }
+ }
+
break;
case 2:
twoTouches = [touches allObjects];
diff -r 967fd96f7373 -r 5d0ac8197eb7 cocoaTouch/otherSrc/PascalImports.h
--- a/cocoaTouch/otherSrc/PascalImports.h Fri Apr 16 14:37:28 2010 +0000
+++ b/cocoaTouch/otherSrc/PascalImports.h Fri Apr 16 15:25:15 2010 +0000
@@ -43,6 +43,11 @@
void HW_tab(void);
void HW_pause(void);
+ void HW_cursorUp(int);
+ void HW_cursorDown(int);
+ void HW_cursorLeft(int);
+ void HW_cursorRight(int);
+
void HW_terminate(BOOL);
#ifdef __cplusplus
diff -r 967fd96f7373 -r 5d0ac8197eb7 hedgewars/PascalExports.pas
--- a/hedgewars/PascalExports.pas Fri Apr 16 14:37:28 2010 +0000
+++ b/hedgewars/PascalExports.pas Fri Apr 16 15:25:15 2010 +0000
@@ -109,13 +109,28 @@
pauseAction:= true;
end;
-procedure HW_whereIsHog; cdecl; export;
-//var Xcoord, Ycoord: LongInt;
+procedure HW_cursorUp(coefficient:LongInt); cdecl; export;
+begin
+ coeff:= coefficient;
+ cursorUp:= true;
+end;
+
+procedure HW_cursorDown(coefficient:LongInt); cdecl; export;
begin
- //Xcoord:= Gear^.dX + WorldDx;
- WriteLnToConsole('HW - hog is at x: ' + ' y:');
+ coeff:= coefficient;
+ cursorDown:= true;
+end;
- exit
+procedure HW_cursorLeft(coefficient:LongInt); cdecl; export;
+begin
+ coeff:= coefficient;
+ cursorLeft:= true;
+end;
+
+procedure HW_cursorRight(coefficient:LongInt); cdecl; export;
+begin
+ coeff:= coefficient;
+ cursorRight:= true;
end;
procedure HW_terminate(closeFrontend: boolean); cdecl; export;
diff -r 967fd96f7373 -r 5d0ac8197eb7 hedgewars/uKeys.pas
--- a/hedgewars/uKeys.pas Fri Apr 16 14:37:28 2010 +0000
+++ b/hedgewars/uKeys.pas Fri Apr 16 15:25:15 2010 +0000
@@ -60,6 +60,7 @@
DefaultBinds, CurrentBinds: TBinds;
+ coeff: LongInt;
{$IFDEF IPHONEOS}
leftClick: boolean;
middleClick: boolean;
@@ -81,6 +82,11 @@
theJoystick: PSDL_Joystick;
+ cursorUp: boolean;
+ cursorDown: boolean;
+ cursorLeft: boolean;
+ cursorRight: boolean;
+
procedure setiPhoneBinds;
{$ENDIF}
implementation
@@ -112,7 +118,7 @@
// move cursor/camera
// TODO: Scale on screen dimensions and/or axis value (game controller)?
-movecursor(5 * CursorMovementX, 5 * CursorMovementY);
+movecursor(coeff * CursorMovementX, coeff * CursorMovementY);
k:= SDL_GetMouseState(nil, nil);
@@ -326,7 +332,6 @@
DefaultBinds[KeyNameToCode('f12')]:= 'fullscr';
-
DefaultBinds[ 1]:= '/put';
DefaultBinds[ 3]:= 'ammomenu';
DefaultBinds[ 8]:= 'hjump';
@@ -340,6 +345,10 @@
DefaultBinds[26]:= '+right';
DefaultBinds[44]:= 'chat';
DefaultBinds[55]:= 'pause';
+DefaultBinds[66]:= '+cur_u';
+DefaultBinds[67]:= '+cur_d';
+DefaultBinds[68]:= '+cur_l';
+DefaultBinds[69]:= '+cur_r';
{$ELSE}
DefaultBinds[KeyNameToCode('up')]:= '+up';
DefaultBinds[KeyNameToCode('down')]:= '+down';
@@ -383,6 +392,11 @@
tkbdn[55]:= ord(pauseAction);
//tkbdn[100]:= ord(switchAction);
+ tkbdn[66]:= ord(cursorUp);
+ tkbdn[67]:= ord(cursorDown);
+ tkbdn[68]:= ord(cursorLeft);
+ tkbdn[69]:= ord(cursorRight);
+
leftClick:= false;
middleClick:= false;
rightClick:= false;
@@ -494,25 +508,38 @@
begin
wheelUp:= false;
wheelDown:= false;
+ coeff:= 5;
{$IFDEF IPHONEOS}
// this function is called by HW_allKeysUp so be careful
+
+ // mouse emulation
leftClick:= false;
middleClick:= false;
rightClick:= false;
+ // arrow key emulation
upKey:= false;
downKey:= false;
rightKey:= false;
leftKey:= false;
+ // action key emulation
backspaceKey:= false;
spaceKey:= false;
enterKey:= false;
tabKey:= false;
-
+
+ // other key emulation
chatAction:= false;
pauseAction:= false;
switchAction:= false;
+
+ // cursor emulation
+ cursorUp:= false;
+ cursorDown:= false;
+ cursorLeft:= false;
+ cursorRight:= false;
+
{$ENDIF}
end;
diff -r 967fd96f7373 -r 5d0ac8197eb7 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Fri Apr 16 14:37:28 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Fri Apr 16 15:25:15 2010 +0000
@@ -197,48 +197,7 @@
Notifications
OpenEditors
-
-
- Content
-
- PBXProjectModuleGUID
- 618BE70F11752C5200F22556
- PBXProjectModuleLabel
- SDL_mixer.h
- PBXSplitModuleInNavigatorKey
-
- Split0
-
- PBXProjectModuleGUID
- 618BE71011752C5200F22556
- PBXProjectModuleLabel
- SDL_mixer.h
- _historyCapacity
- 0
- bookmark
- 618BE74711752E6200F22556
- history
-
- 618BE71111752C5200F22556
-
-
- SplitCount
- 1
-
- StatusBarVisibility
-
-
- Geometry
-
- Frame
- {{0, 20}, {1002, 681}}
- PBXModuleWindowStatusBarHidden2
-
- RubberWindowFrame
- 107 367 1002 722 0 0 1920 1178
-
-
-
+
PerspectiveWidths
-1
@@ -315,21 +274,19 @@
618BE596117512A300F22556
29B97317FDCFA39411CA2CEA
1C37FBAC04509CD000000102
- 618BE6D11175291600F22556
1C37FAAC04509CD000000102
1C37FABC05509CD000000102
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 36
- 4
+ 3
2
0
PBXSmartGroupTreeModuleOutlineStateVisibleRectKey
- {{0, 164}, {244, 558}}
+ {{0, 0}, {244, 558}}
PBXTopSmartGroupGIDs
@@ -348,7 +305,7 @@
244
RubberWindowFrame
- 357 355 801 617 0 0 1920 1178
+ 469 489 801 617 0 0 1920 1178
Module
PBXSmartGroupTreeModule
@@ -364,7 +321,7 @@
PBXProjectModuleGUID
1CE0B20306471E060097A5F4
PBXProjectModuleLabel
- SDL_audiotypecvt.c
+ PascalExports.pas
PBXSplitModuleInNavigatorKey
Split0
@@ -372,11 +329,11 @@
PBXProjectModuleGUID
1CE0B20406471E060097A5F4
PBXProjectModuleLabel
- SDL_audiotypecvt.c
+ PascalExports.pas
_historyCapacity
0
bookmark
- 618BE74511752E6200F22556
+ 614A80E51178B99E00552546
history
6179889D114AA5BD00BA94A9
@@ -421,7 +378,6 @@
61697B9E1163478A00CCDF37
612D5C451165535400C6D842
612D616B1165536300C6D842
- 61430D3B1165551600E2C62D
61430D3D1165551600E2C62D
615F1316116561BE002444F2
615F134D11656569002444F2
@@ -556,7 +512,6 @@
617B280E117164FC004A76A2
61D96559117180D9001EB3B4
61D96591117182B1001EB3B4
- 618BE56311750F6B00F22556
618BE56511750F6B00F22556
618BE56611750F6B00F22556
618BE599117512E400F22556
@@ -573,7 +528,9 @@
618BE70511752C5200F22556
618BE70711752C5200F22556
618BE72C11752D7900F22556
- 618BE72D11752D7900F22556
+ 61F6AB931177BE470013254C
+ 61BD54C411789A020038D495
+ 61BD55FE1178B58F0038D495
SplitCount
@@ -585,14 +542,14 @@
GeometryConfiguration
Frame
- {{0, 0}, {535, 328}}
+ {{0, 0}, {535, 269}}
RubberWindowFrame
- 357 355 801 617 0 0 1920 1178
+ 469 489 801 617 0 0 1920 1178
Module
PBXNavigatorGroup
Proportion
- 328pt
+ 269pt
ContentConfiguration
@@ -605,14 +562,14 @@
GeometryConfiguration
Frame
- {{0, 333}, {535, 243}}
+ {{0, 274}, {535, 302}}
RubberWindowFrame
- 357 355 801 617 0 0 1920 1178
+ 469 489 801 617 0 0 1920 1178
Module
XCDetailModule
Proportion
- 243pt
+ 302pt
Proportion
@@ -631,9 +588,9 @@
TableOfContents
- 618BE52B11750CEC00F22556
+ 614A80C61178B6FD00552546
1CE0B1FE06471DED0097A5F4
- 618BE52C11750CEC00F22556
+ 614A80C71178B6FD00552546
1CE0B20306471E060097A5F4
1CE0B20506471E060097A5F4
@@ -771,20 +728,16 @@
5
WindowOrderList
- 618BE73011752D7900F22556
- 618BE6CB117528B200F22556
- 618BE5BE11751B1300F22556
- 618BE59E117512E400F22556
- 618BE57711750F6B00F22556
- 618BE57811750F6B00F22556
+ 614A80D41178B6FD00552546
+ 614A80D51178B6FD00552546
+ 1C78EAAD065D492600B07095
1CD10A99069EF8BA00B06720
61798848114AA42600BA94A9
- 618BE70F11752C5200F22556
- 1C78EAAD065D492600B07095
+ 61BD55441178A5610038D495
/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj
WindowString
- 357 355 801 617 0 0 1920 1178
+ 469 489 801 617 0 0 1920 1178
WindowToolsV3
@@ -805,7 +758,7 @@
PBXProjectModuleGUID
1CD0528F0623707200166675
PBXProjectModuleLabel
- VoicesViewController.m
+
StatusBarVisibility
@@ -863,7 +816,7 @@
TableOfContents
61798848114AA42600BA94A9
- 618BE52D11750CEC00F22556
+ 614A80CC1178B6FD00552546
1CD0528F0623707200166675
XCMainBuildResultsModuleGUID
@@ -987,13 +940,13 @@
TableOfContents
1CD10A99069EF8BA00B06720
- 618BE56F11750F6B00F22556
+ 614A80CD1178B6FD00552546
1C162984064C10D400B95A72
- 618BE57011750F6B00F22556
- 618BE57111750F6B00F22556
- 618BE57211750F6B00F22556
- 618BE57311750F6B00F22556
- 618BE57411750F6B00F22556
+ 614A80CE1178B6FD00552546
+ 614A80CF1178B6FD00552546
+ 614A80D01178B6FD00552546
+ 614A80D11178B6FD00552546
+ 614A80D21178B6FD00552546
ToolbarConfiguration
xcode.toolbar.config.debugV3
@@ -1157,7 +1110,7 @@
TableOfContents
1C78EAAD065D492600B07095
- 618BE57511750F6B00F22556
+ 614A80D31178B6FD00552546
1C78EAAC065D492600B07095
ToolbarConfiguration
@@ -1167,7 +1120,7 @@
WindowToolGUID
1C78EAAD065D492600B07095
WindowToolIsVisible
-
+
Identifier
diff -r 967fd96f7373 -r 5d0ac8197eb7 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Fri Apr 16 14:37:28 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Fri Apr 16 15:25:15 2010 +0000
@@ -7,9 +7,9 @@
);
};
29B97313FDCFA39411CA2CEA /* Project object */ = {
- activeBuildConfigurationName = Debug;
+ activeBuildConfigurationName = Release;
activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */;
- activeSDKPreference = iphonesimulator3.0;
+ activeSDKPreference = iphoneos3.0;
activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */;
addToTargets = (
1D6058900D05DD3D006BFB54 /* HedgewarsMobile */,
@@ -107,208 +107,231 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 292883685;
- PBXWorkspaceStateSaveDate = 292883685;
+ PBXPerProjectTemplateStateSaveDate = 293123475;
+ PBXWorkspaceStateSaveDate = 293123475;
};
perUserProjectItems = {
- 61056377116C0393003C420C /* PBXBookmark */ = 61056377116C0393003C420C /* PBXBookmark */;
- 610563DF116C15E5003C420C /* PBXTextBookmark */ = 610563DF116C15E5003C420C /* PBXTextBookmark */;
- 611B0AC6116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */;
- 611B0C42116BAF3A00112153 /* PBXTextBookmark */ = 611B0C42116BAF3A00112153 /* PBXTextBookmark */;
- 611FD81F1155111700C2203D /* PBXTextBookmark */ = 611FD81F1155111700C2203D /* PBXTextBookmark */;
- 611FD8201155111700C2203D /* PBXTextBookmark */ = 611FD8201155111700C2203D /* PBXTextBookmark */;
- 611FD95811551C3700C2203D /* PBXBookmark */ = 611FD95811551C3700C2203D /* PBXBookmark */;
- 611FD96611551E8000C2203D /* PBXBookmark */ = 611FD96611551E8000C2203D /* PBXBookmark */;
- 611FDB6C1155C0B300C2203D /* PBXBookmark */ = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
- 611FDB6D1155C0B300C2203D /* PBXBookmark */ = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
- 611FDBF71155D39400C2203D /* PBXTextBookmark */ = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
- 612D5C451165535400C6D842 /* PBXTextBookmark */ = 612D5C451165535400C6D842 /* PBXTextBookmark */;
- 612D616B1165536300C6D842 /* PBXTextBookmark */ = 612D616B1165536300C6D842 /* PBXTextBookmark */;
- 61430D3B1165551600E2C62D /* PBXTextBookmark */ = 61430D3B1165551600E2C62D /* PBXTextBookmark */;
- 61430D3D1165551600E2C62D /* PBXTextBookmark */ = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
- 61513435116C1B07001F16D1 /* PBXTextBookmark */ = 61513435116C1B07001F16D1 /* PBXTextBookmark */;
- 61513436116C1B07001F16D1 /* PBXTextBookmark */ = 61513436116C1B07001F16D1 /* PBXTextBookmark */;
- 6151348C116C2954001F16D1 /* PBXBookmark */ = 6151348C116C2954001F16D1 /* PBXBookmark */;
- 6151348D116C2954001F16D1 /* PBXBookmark */ = 6151348D116C2954001F16D1 /* PBXBookmark */;
- 6151348E116C2954001F16D1 /* PBXBookmark */ = 6151348E116C2954001F16D1 /* PBXBookmark */;
- 6151348F116C2954001F16D1 /* PlistBookmark */ = 6151348F116C2954001F16D1 /* PlistBookmark */;
- 6157F7BA116F3B2D005E4A26 /* PBXTextBookmark */ = 6157F7BA116F3B2D005E4A26 /* PBXTextBookmark */;
- 615F1316116561BE002444F2 /* PBXTextBookmark */ = 615F1316116561BE002444F2 /* PBXTextBookmark */;
- 615F134D11656569002444F2 /* PBXTextBookmark */ = 615F134D11656569002444F2 /* PBXTextBookmark */;
- 615F147F11659AC5002444F2 /* PBXTextBookmark */ = 615F147F11659AC5002444F2 /* PBXTextBookmark */;
- 615F198C1166A71E002444F2 /* PBXBookmark */ = 615F198C1166A71E002444F2 /* PBXBookmark */;
- 615F198E1166A71E002444F2 /* PBXTextBookmark */ = 615F198E1166A71E002444F2 /* PBXTextBookmark */;
- 61697B9E1163478A00CCDF37 /* PBXTextBookmark */ = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */;
- 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
- 61799342114B297000BA94A9 /* PBXBookmark */ = 61799342114B297000BA94A9 /* PBXBookmark */;
- 61799343114B297000BA94A9 /* PBXBookmark */ = 61799343114B297000BA94A9 /* PBXBookmark */;
- 6179937111501D7800BA94A9 /* PBXBookmark */ = 6179937111501D7800BA94A9 /* PBXBookmark */;
- 6179937411501D7800BA94A9 /* PBXBookmark */ = 6179937411501D7800BA94A9 /* PBXBookmark */;
- 6179937511501D7800BA94A9 /* PBXBookmark */ = 6179937511501D7800BA94A9 /* PBXBookmark */;
- 6179938511501FFA00BA94A9 /* PBXBookmark */ = 6179938511501FFA00BA94A9 /* PBXBookmark */;
- 6179943111502CEA00BA94A9 /* PBXBookmark */ = 6179943111502CEA00BA94A9 /* PBXBookmark */;
- 617B27B71171617A004A76A2 /* PBXTextBookmark */ = 617B27B71171617A004A76A2 /* PBXTextBookmark */;
- 617B27B81171617A004A76A2 /* PBXTextBookmark */ = 617B27B81171617A004A76A2 /* PBXTextBookmark */;
- 617B27B91171617A004A76A2 /* PBXTextBookmark */ = 617B27B91171617A004A76A2 /* PBXTextBookmark */;
- 617B27BA1171617A004A76A2 /* PBXTextBookmark */ = 617B27BA1171617A004A76A2 /* PBXTextBookmark */;
- 617B280E117164FC004A76A2 /* PBXTextBookmark */ = 617B280E117164FC004A76A2 /* PBXTextBookmark */;
- 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */ = 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */;
- 6188FE60116F77AF004F3690 /* PBXTextBookmark */ = 6188FE60116F77AF004F3690 /* PBXTextBookmark */;
- 618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */;
- 618BE56311750F6B00F22556 /* PBXTextBookmark */ = 618BE56311750F6B00F22556 /* PBXTextBookmark */;
- 618BE56511750F6B00F22556 /* PBXTextBookmark */ = 618BE56511750F6B00F22556 /* PBXTextBookmark */;
- 618BE56611750F6B00F22556 /* PBXTextBookmark */ = 618BE56611750F6B00F22556 /* PBXTextBookmark */;
- 618BE599117512E400F22556 /* PBXTextBookmark */ = 618BE599117512E400F22556 /* PBXTextBookmark */;
- 618BE59A117512E400F22556 /* PBXTextBookmark */ = 618BE59A117512E400F22556 /* PBXTextBookmark */;
- 618BE5FD11751F1C00F22556 /* PBXTextBookmark */ = 618BE5FD11751F1C00F22556 /* PBXTextBookmark */;
- 618BE5FE11751F1C00F22556 /* PBXTextBookmark */ = 618BE5FE11751F1C00F22556 /* PBXTextBookmark */;
- 618BE61E117520B700F22556 /* PBXTextBookmark */ = 618BE61E117520B700F22556 /* PBXTextBookmark */;
- 618BE6C2117528B200F22556 /* PBXTextBookmark */ = 618BE6C2117528B200F22556 /* PBXTextBookmark */;
- 618BE6C3117528B200F22556 /* PBXTextBookmark */ = 618BE6C3117528B200F22556 /* PBXTextBookmark */;
- 618BE6E81175298700F22556 /* PBXTextBookmark */ = 618BE6E81175298700F22556 /* PBXTextBookmark */;
- 618BE70011752C5200F22556 /* PBXTextBookmark */ = 618BE70011752C5200F22556 /* PBXTextBookmark */;
- 618BE70111752C5200F22556 /* PBXTextBookmark */ = 618BE70111752C5200F22556 /* PBXTextBookmark */;
- 618BE70311752C5200F22556 /* PBXTextBookmark */ = 618BE70311752C5200F22556 /* PBXTextBookmark */;
- 618BE70511752C5200F22556 /* PBXTextBookmark */ = 618BE70511752C5200F22556 /* PBXTextBookmark */;
- 618BE70711752C5200F22556 /* PBXTextBookmark */ = 618BE70711752C5200F22556 /* PBXTextBookmark */;
- 618BE71111752C5200F22556 /* PBXTextBookmark */ = 618BE71111752C5200F22556 /* PBXTextBookmark */;
- 618BE72C11752D7900F22556 /* PBXTextBookmark */ = 618BE72C11752D7900F22556 /* PBXTextBookmark */;
- 618BE72D11752D7900F22556 /* PBXTextBookmark */ = 618BE72D11752D7900F22556 /* PBXTextBookmark */;
- 618BE74511752E6200F22556 /* PBXTextBookmark */ = 618BE74511752E6200F22556 /* PBXTextBookmark */;
- 618BE74711752E6200F22556 /* PBXTextBookmark */ = 618BE74711752E6200F22556 /* PBXTextBookmark */;
- 6196317D116E89DF00C47CEE /* PBXTextBookmark */ = 6196317D116E89DF00C47CEE /* PBXTextBookmark */;
- 619C51C6116E42850049FD84 /* PBXTextBookmark */ = 619C51C6116E42850049FD84 /* PBXTextBookmark */;
- 619C51CB116E42850049FD84 /* PBXTextBookmark */ = 619C51CB116E42850049FD84 /* PBXTextBookmark */;
- 619C51E0116E45820049FD84 /* PBXTextBookmark */ = 619C51E0116E45820049FD84 /* PBXTextBookmark */;
- 619C523D116E56330049FD84 /* PBXBookmark */ = 619C523D116E56330049FD84 /* PBXBookmark */;
- 619C523F116E56330049FD84 /* PBXBookmark */ = 619C523F116E56330049FD84 /* PBXBookmark */;
- 619C5241116E56330049FD84 /* PBXBookmark */ = 619C5241116E56330049FD84 /* PBXBookmark */;
- 619C5243116E56330049FD84 /* PBXBookmark */ = 619C5243116E56330049FD84 /* PBXBookmark */;
- 619C5245116E56330049FD84 /* PBXBookmark */ = 619C5245116E56330049FD84 /* PBXBookmark */;
- 619C5247116E56330049FD84 /* PBXBookmark */ = 619C5247116E56330049FD84 /* PBXBookmark */;
- 619C5249116E56330049FD84 /* PBXBookmark */ = 619C5249116E56330049FD84 /* PBXBookmark */;
- 619C524B116E56330049FD84 /* PBXBookmark */ = 619C524B116E56330049FD84 /* PBXBookmark */;
- 619C524D116E56330049FD84 /* PBXBookmark */ = 619C524D116E56330049FD84 /* PBXBookmark */;
- 619C524F116E56330049FD84 /* PBXBookmark */ = 619C524F116E56330049FD84 /* PBXBookmark */;
- 619C5251116E56330049FD84 /* PBXBookmark */ = 619C5251116E56330049FD84 /* PBXBookmark */;
- 619C5253116E56330049FD84 /* PBXBookmark */ = 619C5253116E56330049FD84 /* PBXBookmark */;
- 619C5255116E56330049FD84 /* PBXBookmark */ = 619C5255116E56330049FD84 /* PBXBookmark */;
- 619C5257116E56330049FD84 /* PBXBookmark */ = 619C5257116E56330049FD84 /* PBXBookmark */;
- 619C5259116E56330049FD84 /* PBXBookmark */ = 619C5259116E56330049FD84 /* PBXBookmark */;
- 619C525B116E56330049FD84 /* PBXBookmark */ = 619C525B116E56330049FD84 /* PBXBookmark */;
- 619C525D116E56330049FD84 /* PBXBookmark */ = 619C525D116E56330049FD84 /* PBXBookmark */;
- 619C525F116E56330049FD84 /* PBXBookmark */ = 619C525F116E56330049FD84 /* PBXBookmark */;
- 619C5261116E56330049FD84 /* PBXBookmark */ = 619C5261116E56330049FD84 /* PBXBookmark */;
- 619C5263116E56330049FD84 /* PBXBookmark */ = 619C5263116E56330049FD84 /* PBXBookmark */;
- 619C5265116E56330049FD84 /* PBXBookmark */ = 619C5265116E56330049FD84 /* PBXBookmark */;
- 619C5267116E56330049FD84 /* PBXBookmark */ = 619C5267116E56330049FD84 /* PBXBookmark */;
- 619C5269116E56330049FD84 /* PBXBookmark */ = 619C5269116E56330049FD84 /* PBXBookmark */;
- 619C526B116E56330049FD84 /* PBXBookmark */ = 619C526B116E56330049FD84 /* PBXBookmark */;
- 619C526D116E56330049FD84 /* PBXBookmark */ = 619C526D116E56330049FD84 /* PBXBookmark */;
- 619C526F116E56330049FD84 /* PBXBookmark */ = 619C526F116E56330049FD84 /* PBXBookmark */;
- 619C5271116E56330049FD84 /* PBXBookmark */ = 619C5271116E56330049FD84 /* PBXBookmark */;
- 619C5273116E56330049FD84 /* PBXBookmark */ = 619C5273116E56330049FD84 /* PBXBookmark */;
- 619C5275116E56330049FD84 /* PBXBookmark */ = 619C5275116E56330049FD84 /* PBXBookmark */;
- 619C5277116E56330049FD84 /* PBXBookmark */ = 619C5277116E56330049FD84 /* PBXBookmark */;
- 619C5279116E56330049FD84 /* PBXBookmark */ = 619C5279116E56330049FD84 /* PBXBookmark */;
- 619C527B116E56330049FD84 /* PBXBookmark */ = 619C527B116E56330049FD84 /* PBXBookmark */;
- 619C527D116E56330049FD84 /* PBXBookmark */ = 619C527D116E56330049FD84 /* PBXBookmark */;
- 619C527F116E56330049FD84 /* PBXBookmark */ = 619C527F116E56330049FD84 /* PBXBookmark */;
- 619C5281116E56330049FD84 /* PBXBookmark */ = 619C5281116E56330049FD84 /* PBXBookmark */;
- 619C5283116E56330049FD84 /* PBXBookmark */ = 619C5283116E56330049FD84 /* PBXBookmark */;
- 619C5285116E56330049FD84 /* PBXBookmark */ = 619C5285116E56330049FD84 /* PBXBookmark */;
- 619C5287116E56330049FD84 /* PBXBookmark */ = 619C5287116E56330049FD84 /* PBXBookmark */;
- 619C5289116E56330049FD84 /* PBXBookmark */ = 619C5289116E56330049FD84 /* PBXBookmark */;
- 619C528B116E56330049FD84 /* PBXBookmark */ = 619C528B116E56330049FD84 /* PBXBookmark */;
- 619C528D116E56330049FD84 /* PBXBookmark */ = 619C528D116E56330049FD84 /* PBXBookmark */;
- 619C528F116E56330049FD84 /* PBXBookmark */ = 619C528F116E56330049FD84 /* PBXBookmark */;
- 619C5291116E56330049FD84 /* PBXBookmark */ = 619C5291116E56330049FD84 /* PBXBookmark */;
- 619C5293116E56330049FD84 /* PBXBookmark */ = 619C5293116E56330049FD84 /* PBXBookmark */;
- 619C5295116E56330049FD84 /* PBXBookmark */ = 619C5295116E56330049FD84 /* PBXBookmark */;
- 619C5297116E56330049FD84 /* PBXBookmark */ = 619C5297116E56330049FD84 /* PBXBookmark */;
- 619C5299116E56330049FD84 /* PBXBookmark */ = 619C5299116E56330049FD84 /* PBXBookmark */;
- 619C529B116E56330049FD84 /* PBXBookmark */ = 619C529B116E56330049FD84 /* PBXBookmark */;
- 619C529D116E56330049FD84 /* PBXBookmark */ = 619C529D116E56330049FD84 /* PBXBookmark */;
- 619C529F116E56330049FD84 /* PBXBookmark */ = 619C529F116E56330049FD84 /* PBXBookmark */;
- 619C52A1116E56330049FD84 /* PBXBookmark */ = 619C52A1116E56330049FD84 /* PBXBookmark */;
- 619C52A3116E56330049FD84 /* PBXBookmark */ = 619C52A3116E56330049FD84 /* PBXBookmark */;
- 619C52A5116E56330049FD84 /* PBXBookmark */ = 619C52A5116E56330049FD84 /* PBXBookmark */;
- 619C52A7116E56330049FD84 /* PBXBookmark */ = 619C52A7116E56330049FD84 /* PBXBookmark */;
- 619C52A9116E56330049FD84 /* PBXBookmark */ = 619C52A9116E56330049FD84 /* PBXBookmark */;
- 619C52AB116E56330049FD84 /* PBXBookmark */ = 619C52AB116E56330049FD84 /* PBXBookmark */;
- 619C52AD116E56330049FD84 /* PBXBookmark */ = 619C52AD116E56330049FD84 /* PBXBookmark */;
- 619C52AF116E56330049FD84 /* PBXBookmark */ = 619C52AF116E56330049FD84 /* PBXBookmark */;
- 619C52B1116E56330049FD84 /* PBXBookmark */ = 619C52B1116E56330049FD84 /* PBXBookmark */;
- 619C52B7116E56330049FD84 /* PBXBookmark */ = 619C52B7116E56330049FD84 /* PBXBookmark */;
- 619C52B9116E56330049FD84 /* PBXBookmark */ = 619C52B9116E56330049FD84 /* PBXBookmark */;
- 619C52BB116E56330049FD84 /* PBXBookmark */ = 619C52BB116E56330049FD84 /* PBXBookmark */;
- 619C52BD116E56330049FD84 /* PBXBookmark */ = 619C52BD116E56330049FD84 /* PBXBookmark */;
- 619C52BF116E56330049FD84 /* PBXBookmark */ = 619C52BF116E56330049FD84 /* PBXBookmark */;
- 619C52C1116E56330049FD84 /* PBXBookmark */ = 619C52C1116E56330049FD84 /* PBXBookmark */;
- 619C5373116E731F0049FD84 /* PBXTextBookmark */ = 619C5373116E731F0049FD84 /* PBXTextBookmark */;
- 619C5859116E73B00049FD84 /* PBXBookmark */ = 619C5859116E73B00049FD84 /* PBXBookmark */;
- 619C585B116E73B00049FD84 /* PBXBookmark */ = 619C585B116E73B00049FD84 /* PBXBookmark */;
- 619C585D116E73B00049FD84 /* PBXBookmark */ = 619C585D116E73B00049FD84 /* PBXBookmark */;
- 619C585F116E73B00049FD84 /* PBXBookmark */ = 619C585F116E73B00049FD84 /* PBXBookmark */;
- 619C5861116E73B00049FD84 /* PBXBookmark */ = 619C5861116E73B00049FD84 /* PBXBookmark */;
- 619C5863116E73B00049FD84 /* PBXBookmark */ = 619C5863116E73B00049FD84 /* PBXBookmark */;
- 619C5865116E73B00049FD84 /* PBXBookmark */ = 619C5865116E73B00049FD84 /* PBXBookmark */;
- 619C5867116E73B00049FD84 /* PBXBookmark */ = 619C5867116E73B00049FD84 /* PBXBookmark */;
- 619C5869116E73B00049FD84 /* PBXBookmark */ = 619C5869116E73B00049FD84 /* PBXBookmark */;
- 619C586B116E73B00049FD84 /* PBXBookmark */ = 619C586B116E73B00049FD84 /* PBXBookmark */;
- 619C586D116E73B00049FD84 /* PBXBookmark */ = 619C586D116E73B00049FD84 /* PBXBookmark */;
- 619C586F116E73B00049FD84 /* PBXBookmark */ = 619C586F116E73B00049FD84 /* PBXBookmark */;
- 619C5871116E73B00049FD84 /* PBXBookmark */ = 619C5871116E73B00049FD84 /* PBXBookmark */;
- 619C5873116E73B00049FD84 /* PBXBookmark */ = 619C5873116E73B00049FD84 /* PBXBookmark */;
- 619C5875116E73B00049FD84 /* PBXBookmark */ = 619C5875116E73B00049FD84 /* PBXBookmark */;
- 619C5877116E73B00049FD84 /* PBXBookmark */ = 619C5877116E73B00049FD84 /* PBXBookmark */;
- 619C5879116E73B00049FD84 /* PBXBookmark */ = 619C5879116E73B00049FD84 /* PBXBookmark */;
- 619C587B116E73B00049FD84 /* PBXBookmark */ = 619C587B116E73B00049FD84 /* PBXBookmark */;
- 619C587D116E73B00049FD84 /* PBXBookmark */ = 619C587D116E73B00049FD84 /* PBXBookmark */;
- 619C587F116E73B00049FD84 /* PBXBookmark */ = 619C587F116E73B00049FD84 /* PBXBookmark */;
- 619C5880116E73B00049FD84 /* PBXBookmark */ = 619C5880116E73B00049FD84 /* PBXBookmark */;
- 619C5882116E73B00049FD84 /* PBXBookmark */ = 619C5882116E73B00049FD84 /* PBXBookmark */;
- 619C5883116E73B00049FD84 /* PBXBookmark */ = 619C5883116E73B00049FD84 /* PBXBookmark */;
- 619C5885116E73B00049FD84 /* PBXBookmark */ = 619C5885116E73B00049FD84 /* PBXBookmark */;
- 619C5887116E73B00049FD84 /* PBXBookmark */ = 619C5887116E73B00049FD84 /* PBXBookmark */;
- 619C5888116E73B00049FD84 /* PBXBookmark */ = 619C5888116E73B00049FD84 /* PBXBookmark */;
- 619C5889116E73B00049FD84 /* PBXBookmark */ = 619C5889116E73B00049FD84 /* PBXBookmark */;
- 619C588B116E73B00049FD84 /* PBXBookmark */ = 619C588B116E73B00049FD84 /* PBXBookmark */;
- 619C588C116E73B00049FD84 /* PBXBookmark */ = 619C588C116E73B00049FD84 /* PBXBookmark */;
- 619C588D116E73B00049FD84 /* PBXBookmark */ = 619C588D116E73B00049FD84 /* PBXBookmark */;
- 619C588F116E73B00049FD84 /* PBXBookmark */ = 619C588F116E73B00049FD84 /* PBXBookmark */;
- 619C5890116E73B00049FD84 /* PBXBookmark */ = 619C5890116E73B00049FD84 /* PBXBookmark */;
- 619C5892116E73B00049FD84 /* PBXBookmark */ = 619C5892116E73B00049FD84 /* PBXBookmark */;
- 619C58B2116E76080049FD84 /* PBXBookmark */ = 619C58B2116E76080049FD84 /* PBXBookmark */;
- 619C58B3116E76080049FD84 /* PBXTextBookmark */ = 619C58B3116E76080049FD84 /* PBXTextBookmark */;
- 61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
- 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
- 61CCBF451161637F00833FE8 /* PBXTextBookmark */ = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
- 61CCBF461161637F00833FE8 /* PBXTextBookmark */ = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
- 61CCBF471161637F00833FE8 /* PBXTextBookmark */ = 61CCBF471161637F00833FE8 /* PBXTextBookmark */;
- 61CCBF7B1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7C1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7E1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7F1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */;
- 61CCBFD11161833800833FE8 /* PBXTextBookmark */ = 61CCBFD11161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD21161833800833FE8 /* PBXTextBookmark */ = 61CCBFD21161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD31161833800833FE8 /* PBXTextBookmark */ = 61CCBFD31161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD41161833800833FE8 /* PBXTextBookmark */ = 61CCBFD41161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD51161833800833FE8 /* PBXTextBookmark */ = 61CCBFD51161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD71161833800833FE8 /* PBXTextBookmark */ = 61CCBFD71161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD91161833800833FE8 /* PBXTextBookmark */ = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDA1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDB1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDC1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
- 61CE23E7115E49560098C467 /* PBXTextBookmark */ = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
- 61CE23FF115E4B290098C467 /* PBXBookmark */ = 61CE23FF115E4B290098C467 /* PBXBookmark */;
- 61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */;
- 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */ = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */;
- 61D96559117180D9001EB3B4 /* PBXTextBookmark */ = 61D96559117180D9001EB3B4 /* PBXTextBookmark */;
- 61D96591117182B1001EB3B4 /* PBXTextBookmark */ = 61D96591117182B1001EB3B4 /* PBXTextBookmark */;
- 61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
- 61F8E0D6116E98A900108149 /* PBXTextBookmark */ = 61F8E0D6116E98A900108149 /* PBXTextBookmark */;
- 61FE2AE4116D658700F76CDC /* PBXTextBookmark */ = 61FE2AE4116D658700F76CDC /* PBXTextBookmark */;
+ 61056377116C0393003C420C = 61056377116C0393003C420C /* PBXBookmark */;
+ 610563DF116C15E5003C420C = 610563DF116C15E5003C420C /* PBXTextBookmark */;
+ 611B0AC6116B6E8B00112153 = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */;
+ 611B0C42116BAF3A00112153 = 611B0C42116BAF3A00112153 /* PBXTextBookmark */;
+ 611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */;
+ 611FD8201155111700C2203D = 611FD8201155111700C2203D /* PBXTextBookmark */;
+ 611FD95811551C3700C2203D = 611FD95811551C3700C2203D /* PBXBookmark */;
+ 611FD96611551E8000C2203D = 611FD96611551E8000C2203D /* PBXBookmark */;
+ 611FDB6C1155C0B300C2203D = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
+ 611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
+ 611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
+ 612D5C451165535400C6D842 = 612D5C451165535400C6D842 /* PBXTextBookmark */;
+ 612D616B1165536300C6D842 = 612D616B1165536300C6D842 /* PBXTextBookmark */;
+ 61430D3D1165551600E2C62D = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
+ 614A80C51178B6FD00552546 /* PBXTextBookmark */ = 614A80C51178B6FD00552546 /* PBXTextBookmark */;
+ 614A80C81178B6FD00552546 /* PBXTextBookmark */ = 614A80C81178B6FD00552546 /* PBXTextBookmark */;
+ 614A80C91178B6FD00552546 /* PBXTextBookmark */ = 614A80C91178B6FD00552546 /* PBXTextBookmark */;
+ 614A80CA1178B6FD00552546 /* PBXTextBookmark */ = 614A80CA1178B6FD00552546 /* PBXTextBookmark */;
+ 614A80CB1178B6FD00552546 /* PBXTextBookmark */ = 614A80CB1178B6FD00552546 /* PBXTextBookmark */;
+ 614A80D91178B70800552546 /* PBXTextBookmark */ = 614A80D91178B70800552546 /* PBXTextBookmark */;
+ 614A80DA1178B70800552546 /* PBXTextBookmark */ = 614A80DA1178B70800552546 /* PBXTextBookmark */;
+ 614A80DB1178B70800552546 /* PBXTextBookmark */ = 614A80DB1178B70800552546 /* PBXTextBookmark */;
+ 614A80DC1178B70800552546 /* PBXTextBookmark */ = 614A80DC1178B70800552546 /* PBXTextBookmark */;
+ 614A80DD1178B70800552546 /* PBXTextBookmark */ = 614A80DD1178B70800552546 /* PBXTextBookmark */;
+ 614A80E01178B80E00552546 /* PBXTextBookmark */ = 614A80E01178B80E00552546 /* PBXTextBookmark */;
+ 614A80E11178B80E00552546 /* PBXTextBookmark */ = 614A80E11178B80E00552546 /* PBXTextBookmark */;
+ 614A80E21178B80E00552546 /* PBXTextBookmark */ = 614A80E21178B80E00552546 /* PBXTextBookmark */;
+ 614A80E31178B80E00552546 /* PBXTextBookmark */ = 614A80E31178B80E00552546 /* PBXTextBookmark */;
+ 614A80E41178B80E00552546 /* PBXTextBookmark */ = 614A80E41178B80E00552546 /* PBXTextBookmark */;
+ 614A80E51178B99E00552546 /* PBXTextBookmark */ = 614A80E51178B99E00552546 /* PBXTextBookmark */;
+ 61513435116C1B07001F16D1 = 61513435116C1B07001F16D1 /* PBXTextBookmark */;
+ 61513436116C1B07001F16D1 = 61513436116C1B07001F16D1 /* PBXTextBookmark */;
+ 6151348C116C2954001F16D1 = 6151348C116C2954001F16D1 /* PBXBookmark */;
+ 6151348D116C2954001F16D1 = 6151348D116C2954001F16D1 /* PBXBookmark */;
+ 6151348E116C2954001F16D1 = 6151348E116C2954001F16D1 /* PBXBookmark */;
+ 6151348F116C2954001F16D1 = 6151348F116C2954001F16D1 /* PlistBookmark */;
+ 6157F7BA116F3B2D005E4A26 = 6157F7BA116F3B2D005E4A26 /* PBXTextBookmark */;
+ 615F1316116561BE002444F2 = 615F1316116561BE002444F2 /* PBXTextBookmark */;
+ 615F134D11656569002444F2 = 615F134D11656569002444F2 /* PBXTextBookmark */;
+ 615F147F11659AC5002444F2 = 615F147F11659AC5002444F2 /* PBXTextBookmark */;
+ 615F198C1166A71E002444F2 = 615F198C1166A71E002444F2 /* PBXBookmark */;
+ 615F198E1166A71E002444F2 = 615F198E1166A71E002444F2 /* PBXTextBookmark */;
+ 61697B9E1163478A00CCDF37 = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */;
+ 6179889D114AA5BD00BA94A9 = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
+ 61799342114B297000BA94A9 = 61799342114B297000BA94A9 /* PBXBookmark */;
+ 61799343114B297000BA94A9 = 61799343114B297000BA94A9 /* PBXBookmark */;
+ 6179937111501D7800BA94A9 = 6179937111501D7800BA94A9 /* PBXBookmark */;
+ 6179937411501D7800BA94A9 = 6179937411501D7800BA94A9 /* PBXBookmark */;
+ 6179937511501D7800BA94A9 = 6179937511501D7800BA94A9 /* PBXBookmark */;
+ 6179938511501FFA00BA94A9 = 6179938511501FFA00BA94A9 /* PBXBookmark */;
+ 6179943111502CEA00BA94A9 = 6179943111502CEA00BA94A9 /* PBXBookmark */;
+ 617B27B71171617A004A76A2 = 617B27B71171617A004A76A2 /* PBXTextBookmark */;
+ 617B27B81171617A004A76A2 = 617B27B81171617A004A76A2 /* PBXTextBookmark */;
+ 617B27B91171617A004A76A2 = 617B27B91171617A004A76A2 /* PBXTextBookmark */;
+ 617B27BA1171617A004A76A2 = 617B27BA1171617A004A76A2 /* PBXTextBookmark */;
+ 617B280E117164FC004A76A2 = 617B280E117164FC004A76A2 /* PBXTextBookmark */;
+ 617E1DB5116FEE5B002EF3D8 = 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */;
+ 6188FE60116F77AF004F3690 = 6188FE60116F77AF004F3690 /* PBXTextBookmark */;
+ 618AFC07115BE92A003D411B = 618AFC07115BE92A003D411B /* PBXBookmark */;
+ 618BE56511750F6B00F22556 = 618BE56511750F6B00F22556 /* PBXTextBookmark */;
+ 618BE56611750F6B00F22556 = 618BE56611750F6B00F22556 /* PBXTextBookmark */;
+ 618BE599117512E400F22556 = 618BE599117512E400F22556 /* PBXTextBookmark */;
+ 618BE59A117512E400F22556 = 618BE59A117512E400F22556 /* PBXTextBookmark */;
+ 618BE5FD11751F1C00F22556 = 618BE5FD11751F1C00F22556 /* PBXTextBookmark */;
+ 618BE5FE11751F1C00F22556 = 618BE5FE11751F1C00F22556 /* PBXTextBookmark */;
+ 618BE61E117520B700F22556 = 618BE61E117520B700F22556 /* PBXTextBookmark */;
+ 618BE6C2117528B200F22556 = 618BE6C2117528B200F22556 /* PBXTextBookmark */;
+ 618BE6C3117528B200F22556 = 618BE6C3117528B200F22556 /* PBXTextBookmark */;
+ 618BE6E81175298700F22556 = 618BE6E81175298700F22556 /* PBXTextBookmark */;
+ 618BE70011752C5200F22556 = 618BE70011752C5200F22556 /* PBXTextBookmark */;
+ 618BE70111752C5200F22556 = 618BE70111752C5200F22556 /* PBXTextBookmark */;
+ 618BE70311752C5200F22556 = 618BE70311752C5200F22556 /* PBXTextBookmark */;
+ 618BE70511752C5200F22556 = 618BE70511752C5200F22556 /* PBXTextBookmark */;
+ 618BE70711752C5200F22556 = 618BE70711752C5200F22556 /* PBXTextBookmark */;
+ 618BE72C11752D7900F22556 = 618BE72C11752D7900F22556 /* PBXTextBookmark */;
+ 6196317D116E89DF00C47CEE = 6196317D116E89DF00C47CEE /* PBXTextBookmark */;
+ 619C51C6116E42850049FD84 = 619C51C6116E42850049FD84 /* PBXTextBookmark */;
+ 619C51CB116E42850049FD84 = 619C51CB116E42850049FD84 /* PBXTextBookmark */;
+ 619C51E0116E45820049FD84 = 619C51E0116E45820049FD84 /* PBXTextBookmark */;
+ 619C523D116E56330049FD84 = 619C523D116E56330049FD84 /* PBXBookmark */;
+ 619C523F116E56330049FD84 = 619C523F116E56330049FD84 /* PBXBookmark */;
+ 619C5241116E56330049FD84 = 619C5241116E56330049FD84 /* PBXBookmark */;
+ 619C5243116E56330049FD84 = 619C5243116E56330049FD84 /* PBXBookmark */;
+ 619C5245116E56330049FD84 = 619C5245116E56330049FD84 /* PBXBookmark */;
+ 619C5247116E56330049FD84 = 619C5247116E56330049FD84 /* PBXBookmark */;
+ 619C5249116E56330049FD84 = 619C5249116E56330049FD84 /* PBXBookmark */;
+ 619C524B116E56330049FD84 = 619C524B116E56330049FD84 /* PBXBookmark */;
+ 619C524D116E56330049FD84 = 619C524D116E56330049FD84 /* PBXBookmark */;
+ 619C524F116E56330049FD84 = 619C524F116E56330049FD84 /* PBXBookmark */;
+ 619C5251116E56330049FD84 = 619C5251116E56330049FD84 /* PBXBookmark */;
+ 619C5253116E56330049FD84 = 619C5253116E56330049FD84 /* PBXBookmark */;
+ 619C5255116E56330049FD84 = 619C5255116E56330049FD84 /* PBXBookmark */;
+ 619C5257116E56330049FD84 = 619C5257116E56330049FD84 /* PBXBookmark */;
+ 619C5259116E56330049FD84 = 619C5259116E56330049FD84 /* PBXBookmark */;
+ 619C525B116E56330049FD84 = 619C525B116E56330049FD84 /* PBXBookmark */;
+ 619C525D116E56330049FD84 = 619C525D116E56330049FD84 /* PBXBookmark */;
+ 619C525F116E56330049FD84 = 619C525F116E56330049FD84 /* PBXBookmark */;
+ 619C5261116E56330049FD84 = 619C5261116E56330049FD84 /* PBXBookmark */;
+ 619C5263116E56330049FD84 = 619C5263116E56330049FD84 /* PBXBookmark */;
+ 619C5265116E56330049FD84 = 619C5265116E56330049FD84 /* PBXBookmark */;
+ 619C5267116E56330049FD84 = 619C5267116E56330049FD84 /* PBXBookmark */;
+ 619C5269116E56330049FD84 = 619C5269116E56330049FD84 /* PBXBookmark */;
+ 619C526B116E56330049FD84 = 619C526B116E56330049FD84 /* PBXBookmark */;
+ 619C526D116E56330049FD84 = 619C526D116E56330049FD84 /* PBXBookmark */;
+ 619C526F116E56330049FD84 = 619C526F116E56330049FD84 /* PBXBookmark */;
+ 619C5271116E56330049FD84 = 619C5271116E56330049FD84 /* PBXBookmark */;
+ 619C5273116E56330049FD84 = 619C5273116E56330049FD84 /* PBXBookmark */;
+ 619C5275116E56330049FD84 = 619C5275116E56330049FD84 /* PBXBookmark */;
+ 619C5277116E56330049FD84 = 619C5277116E56330049FD84 /* PBXBookmark */;
+ 619C5279116E56330049FD84 = 619C5279116E56330049FD84 /* PBXBookmark */;
+ 619C527B116E56330049FD84 = 619C527B116E56330049FD84 /* PBXBookmark */;
+ 619C527D116E56330049FD84 = 619C527D116E56330049FD84 /* PBXBookmark */;
+ 619C527F116E56330049FD84 = 619C527F116E56330049FD84 /* PBXBookmark */;
+ 619C5281116E56330049FD84 = 619C5281116E56330049FD84 /* PBXBookmark */;
+ 619C5283116E56330049FD84 = 619C5283116E56330049FD84 /* PBXBookmark */;
+ 619C5285116E56330049FD84 = 619C5285116E56330049FD84 /* PBXBookmark */;
+ 619C5287116E56330049FD84 = 619C5287116E56330049FD84 /* PBXBookmark */;
+ 619C5289116E56330049FD84 = 619C5289116E56330049FD84 /* PBXBookmark */;
+ 619C528B116E56330049FD84 = 619C528B116E56330049FD84 /* PBXBookmark */;
+ 619C528D116E56330049FD84 = 619C528D116E56330049FD84 /* PBXBookmark */;
+ 619C528F116E56330049FD84 = 619C528F116E56330049FD84 /* PBXBookmark */;
+ 619C5291116E56330049FD84 = 619C5291116E56330049FD84 /* PBXBookmark */;
+ 619C5293116E56330049FD84 = 619C5293116E56330049FD84 /* PBXBookmark */;
+ 619C5295116E56330049FD84 = 619C5295116E56330049FD84 /* PBXBookmark */;
+ 619C5297116E56330049FD84 = 619C5297116E56330049FD84 /* PBXBookmark */;
+ 619C5299116E56330049FD84 = 619C5299116E56330049FD84 /* PBXBookmark */;
+ 619C529B116E56330049FD84 = 619C529B116E56330049FD84 /* PBXBookmark */;
+ 619C529D116E56330049FD84 = 619C529D116E56330049FD84 /* PBXBookmark */;
+ 619C529F116E56330049FD84 = 619C529F116E56330049FD84 /* PBXBookmark */;
+ 619C52A1116E56330049FD84 = 619C52A1116E56330049FD84 /* PBXBookmark */;
+ 619C52A3116E56330049FD84 = 619C52A3116E56330049FD84 /* PBXBookmark */;
+ 619C52A5116E56330049FD84 = 619C52A5116E56330049FD84 /* PBXBookmark */;
+ 619C52A7116E56330049FD84 = 619C52A7116E56330049FD84 /* PBXBookmark */;
+ 619C52A9116E56330049FD84 = 619C52A9116E56330049FD84 /* PBXBookmark */;
+ 619C52AB116E56330049FD84 = 619C52AB116E56330049FD84 /* PBXBookmark */;
+ 619C52AD116E56330049FD84 = 619C52AD116E56330049FD84 /* PBXBookmark */;
+ 619C52AF116E56330049FD84 = 619C52AF116E56330049FD84 /* PBXBookmark */;
+ 619C52B1116E56330049FD84 = 619C52B1116E56330049FD84 /* PBXBookmark */;
+ 619C52B7116E56330049FD84 = 619C52B7116E56330049FD84 /* PBXBookmark */;
+ 619C52B9116E56330049FD84 = 619C52B9116E56330049FD84 /* PBXBookmark */;
+ 619C52BB116E56330049FD84 = 619C52BB116E56330049FD84 /* PBXBookmark */;
+ 619C52BD116E56330049FD84 = 619C52BD116E56330049FD84 /* PBXBookmark */;
+ 619C52BF116E56330049FD84 = 619C52BF116E56330049FD84 /* PBXBookmark */;
+ 619C52C1116E56330049FD84 = 619C52C1116E56330049FD84 /* PBXBookmark */;
+ 619C5373116E731F0049FD84 = 619C5373116E731F0049FD84 /* PBXTextBookmark */;
+ 619C5859116E73B00049FD84 = 619C5859116E73B00049FD84 /* PBXBookmark */;
+ 619C585B116E73B00049FD84 = 619C585B116E73B00049FD84 /* PBXBookmark */;
+ 619C585D116E73B00049FD84 = 619C585D116E73B00049FD84 /* PBXBookmark */;
+ 619C585F116E73B00049FD84 = 619C585F116E73B00049FD84 /* PBXBookmark */;
+ 619C5861116E73B00049FD84 = 619C5861116E73B00049FD84 /* PBXBookmark */;
+ 619C5863116E73B00049FD84 = 619C5863116E73B00049FD84 /* PBXBookmark */;
+ 619C5865116E73B00049FD84 = 619C5865116E73B00049FD84 /* PBXBookmark */;
+ 619C5867116E73B00049FD84 = 619C5867116E73B00049FD84 /* PBXBookmark */;
+ 619C5869116E73B00049FD84 = 619C5869116E73B00049FD84 /* PBXBookmark */;
+ 619C586B116E73B00049FD84 = 619C586B116E73B00049FD84 /* PBXBookmark */;
+ 619C586D116E73B00049FD84 = 619C586D116E73B00049FD84 /* PBXBookmark */;
+ 619C586F116E73B00049FD84 = 619C586F116E73B00049FD84 /* PBXBookmark */;
+ 619C5871116E73B00049FD84 = 619C5871116E73B00049FD84 /* PBXBookmark */;
+ 619C5873116E73B00049FD84 = 619C5873116E73B00049FD84 /* PBXBookmark */;
+ 619C5875116E73B00049FD84 = 619C5875116E73B00049FD84 /* PBXBookmark */;
+ 619C5877116E73B00049FD84 = 619C5877116E73B00049FD84 /* PBXBookmark */;
+ 619C5879116E73B00049FD84 = 619C5879116E73B00049FD84 /* PBXBookmark */;
+ 619C587B116E73B00049FD84 = 619C587B116E73B00049FD84 /* PBXBookmark */;
+ 619C587D116E73B00049FD84 = 619C587D116E73B00049FD84 /* PBXBookmark */;
+ 619C587F116E73B00049FD84 = 619C587F116E73B00049FD84 /* PBXBookmark */;
+ 619C5880116E73B00049FD84 = 619C5880116E73B00049FD84 /* PBXBookmark */;
+ 619C5882116E73B00049FD84 = 619C5882116E73B00049FD84 /* PBXBookmark */;
+ 619C5883116E73B00049FD84 = 619C5883116E73B00049FD84 /* PBXBookmark */;
+ 619C5885116E73B00049FD84 = 619C5885116E73B00049FD84 /* PBXBookmark */;
+ 619C5887116E73B00049FD84 = 619C5887116E73B00049FD84 /* PBXBookmark */;
+ 619C5888116E73B00049FD84 = 619C5888116E73B00049FD84 /* PBXBookmark */;
+ 619C5889116E73B00049FD84 = 619C5889116E73B00049FD84 /* PBXBookmark */;
+ 619C588B116E73B00049FD84 = 619C588B116E73B00049FD84 /* PBXBookmark */;
+ 619C588C116E73B00049FD84 = 619C588C116E73B00049FD84 /* PBXBookmark */;
+ 619C588D116E73B00049FD84 = 619C588D116E73B00049FD84 /* PBXBookmark */;
+ 619C588F116E73B00049FD84 = 619C588F116E73B00049FD84 /* PBXBookmark */;
+ 619C5890116E73B00049FD84 = 619C5890116E73B00049FD84 /* PBXBookmark */;
+ 619C5892116E73B00049FD84 = 619C5892116E73B00049FD84 /* PBXBookmark */;
+ 619C58B2116E76080049FD84 = 619C58B2116E76080049FD84 /* PBXBookmark */;
+ 619C58B3116E76080049FD84 = 619C58B3116E76080049FD84 /* PBXTextBookmark */;
+ 61BD54C411789A020038D495 = 61BD54C411789A020038D495 /* PBXTextBookmark */;
+ 61BD54D011789A020038D495 = 61BD54D011789A020038D495 /* PBXTextBookmark */;
+ 61BD553B1178A4E40038D495 = 61BD553B1178A4E40038D495 /* PBXBookmark */;
+ 61BD553C1178A5220038D495 = 61BD553C1178A5220038D495 /* PBXBookmark */;
+ 61BD55411178A5610038D495 = 61BD55411178A5610038D495 /* PBXTextBookmark */;
+ 61BD55A81178B1080038D495 = 61BD55A81178B1080038D495 /* PBXTextBookmark */;
+ 61BD55A91178B1080038D495 = 61BD55A91178B1080038D495 /* PBXTextBookmark */;
+ 61BD55FE1178B58F0038D495 = 61BD55FE1178B58F0038D495 /* PBXTextBookmark */;
+ 61BD55FF1178B58F0038D495 = 61BD55FF1178B58F0038D495 /* PBXTextBookmark */;
+ 61BD56001178B58F0038D495 = 61BD56001178B58F0038D495 /* PBXTextBookmark */;
+ 61BD56011178B58F0038D495 = 61BD56011178B58F0038D495 /* PBXTextBookmark */;
+ 61BD56021178B58F0038D495 = 61BD56021178B58F0038D495 /* PBXTextBookmark */;
+ 61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
+ 61CCBF1E116162CA00833FE8 = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
+ 61CCBF451161637F00833FE8 = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
+ 61CCBF461161637F00833FE8 = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
+ 61CCBF471161637F00833FE8 = 61CCBF471161637F00833FE8 /* PBXTextBookmark */;
+ 61CCBF7B1161657400833FE8 = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7C1161657400833FE8 = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7E1161657400833FE8 = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7F1161657400833FE8 = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBFD11161833800833FE8 = 61CCBFD11161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD21161833800833FE8 = 61CCBFD21161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD31161833800833FE8 = 61CCBFD31161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD41161833800833FE8 = 61CCBFD41161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD51161833800833FE8 = 61CCBFD51161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD71161833800833FE8 = 61CCBFD71161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD91161833800833FE8 = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDA1161833800833FE8 = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDB1161833800833FE8 = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDC1161833800833FE8 = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
+ 61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
+ 61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */;
+ 61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */;
+ 61CEDB60116ACBBB0067BAFC = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */;
+ 61D96559117180D9001EB3B4 = 61D96559117180D9001EB3B4 /* PBXTextBookmark */;
+ 61D96591117182B1001EB3B4 = 61D96591117182B1001EB3B4 /* PBXTextBookmark */;
+ 61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
+ 61F6AB931177BE470013254C = 61F6AB931177BE470013254C /* PBXTextBookmark */;
+ 61F8E0D6116E98A900108149 = 61F8E0D6116E98A900108149 /* PBXTextBookmark */;
+ 61FE2AE4116D658700F76CDC = 61FE2AE4116D658700F76CDC /* PBXTextBookmark */;
};
sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
userBuildSettings = {
@@ -428,7 +451,7 @@
fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
name = "uKeys.pas: 106";
rLen = 0;
- rLoc = 2995;
+ rLoc = 2597;
rType = 0;
vrLen = 94;
vrLoc = 2933;
@@ -443,16 +466,6 @@
vrLen = 33;
vrLoc = 791;
};
- 61430D3B1165551600E2C62D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
- name = "PascalExports.pas: 120";
- rLen = 0;
- rLoc = 1966;
- rType = 0;
- vrLen = 22;
- vrLoc = 3;
- };
61430D3D1165551600E2C62D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61798867114AA4AA00BA94A9 /* SDL_uikitwindow.h */;
@@ -463,6 +476,166 @@
vrLen = 3;
vrLoc = 0;
};
+ 614A80C51178B6FD00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 133";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 368;
+ vrLoc = 1805;
+ };
+ 614A80C81178B6FD00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
+ name = "OverlayViewController.m: 302";
+ rLen = 0;
+ rLoc = 9417;
+ rType = 0;
+ vrLen = 2500;
+ vrLoc = 8790;
+ };
+ 614A80C91178B6FD00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179885A114AA48A00BA94A9 /* PascalImports.h */;
+ name = "PascalImports.h: 49";
+ rLen = 0;
+ rLoc = 899;
+ rType = 0;
+ vrLen = 766;
+ vrLoc = 191;
+ };
+ 614A80CA1178B6FD00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 133";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 793;
+ vrLoc = 1605;
+ };
+ 614A80CB1178B6FD00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
+ name = "uKeys.pas: 511";
+ rLen = 0;
+ rLoc = 14805;
+ rType = 0;
+ vrLen = 585;
+ vrLoc = 14913;
+ };
+ 614A80D91178B70800552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 133";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 368;
+ vrLoc = 1805;
+ };
+ 614A80DA1178B70800552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
+ name = "OverlayViewController.m: 302";
+ rLen = 0;
+ rLoc = 9417;
+ rType = 0;
+ vrLen = 2500;
+ vrLoc = 8790;
+ };
+ 614A80DB1178B70800552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179885A114AA48A00BA94A9 /* PascalImports.h */;
+ name = "PascalImports.h: 49";
+ rLen = 0;
+ rLoc = 899;
+ rType = 0;
+ vrLen = 766;
+ vrLoc = 191;
+ };
+ 614A80DC1178B70800552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 133";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 793;
+ vrLoc = 1605;
+ };
+ 614A80DD1178B70800552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
+ name = "uKeys.pas: 511";
+ rLen = 0;
+ rLoc = 14805;
+ rType = 0;
+ vrLen = 585;
+ vrLoc = 14913;
+ };
+ 614A80E01178B80E00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 133";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 368;
+ vrLoc = 1805;
+ };
+ 614A80E11178B80E00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
+ name = "OverlayViewController.m: 284";
+ rLen = 0;
+ rLoc = 8860;
+ rType = 0;
+ vrLen = 2473;
+ vrLoc = 8790;
+ };
+ 614A80E21178B80E00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179885A114AA48A00BA94A9 /* PascalImports.h */;
+ name = "PascalImports.h: 49";
+ rLen = 0;
+ rLoc = 899;
+ rType = 0;
+ vrLen = 766;
+ vrLoc = 191;
+ };
+ 614A80E31178B80E00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 133";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 793;
+ vrLoc = 1605;
+ };
+ 614A80E41178B80E00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
+ name = "uKeys.pas: 511";
+ rLen = 0;
+ rLoc = 14805;
+ rType = 0;
+ vrLen = 585;
+ vrLoc = 14913;
+ };
+ 614A80E51178B99E00552546 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 133";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 368;
+ vrLoc = 1805;
+ };
61513435116C1B07001F16D1 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987EB114AA34C00BA94A9 /* options.inc */;
@@ -679,9 +852,9 @@
};
617987EC114AA34C00BA94A9 /* PascalExports.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {744, 1651}}";
- sepNavSelRange = "{724, 0}";
- sepNavVisRange = "{140, 732}";
+ sepNavIntBoundsRect = "{{0, 0}, {474, 1872}}";
+ sepNavSelRange = "{2198, 0}";
+ sepNavVisRange = "{1805, 368}";
sepNavWindowFrame = "{{238, 238}, {803, 674}}";
};
};
@@ -806,10 +979,10 @@
};
617987FE114AA34C00BA94A9 /* uKeys.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {862, 7007}}";
- sepNavSelRange = "{2977, 18}";
- sepNavVisRange = "{2541, 832}";
- sepNavWindowFrame = "{{674, 505}, {921, 605}}";
+ sepNavIntBoundsRect = "{{0, 0}, {862, 7111}}";
+ sepNavSelRange = "{14805, 0}";
+ sepNavVisRange = "{14913, 585}";
+ sepNavWindowFrame = "{{270, 164}, {921, 605}}";
};
};
617987FF114AA34C00BA94A9 /* uLand.pas */ = {
@@ -980,9 +1153,9 @@
};
6179885A114AA48A00BA94A9 /* PascalImports.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {537, 702}}";
- sepNavSelRange = "{246, 0}";
- sepNavVisRange = "{139, 52}";
+ sepNavIntBoundsRect = "{{0, 0}, {744, 754}}";
+ sepNavSelRange = "{899, 0}";
+ sepNavVisRange = "{191, 766}";
sepNavWindowFrame = "{{685, 352}, {803, 674}}";
};
};
@@ -995,17 +1168,17 @@
};
61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {642, 702}}";
+ sepNavIntBoundsRect = "{{0, 0}, {744, 715}}";
sepNavSelRange = "{1425, 0}";
- sepNavVisRange = "{1130, 585}";
+ sepNavVisRange = "{551, 1256}";
sepNavWindowFrame = "{{471, 203}, {803, 674}}";
};
};
61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {873, 2041}}";
- sepNavSelRange = "{3864, 314}";
- sepNavVisRange = "{3625, 1524}";
+ sepNavIntBoundsRect = "{{0, 0}, {873, 2002}}";
+ sepNavSelRange = "{3865, 188}";
+ sepNavVisRange = "{3583, 1566}";
sepNavWindowFrame = "{{29, 241}, {803, 674}}";
};
};
@@ -1035,8 +1208,8 @@
6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {999, 2210}}";
- sepNavSelRange = "{3579, 0}";
- sepNavVisRange = "{2155, 1824}";
+ sepNavSelRange = "{192, 20}";
+ sepNavVisRange = "{0, 1468}";
sepNavWindowFrame = "{{682, 125}, {1058, 792}}";
};
};
@@ -1050,9 +1223,9 @@
};
61798888114AA4E600BA94A9 /* GameSetup.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1412, 4316}}";
- sepNavSelRange = "{12127, 0}";
- sepNavVisRange = "{11887, 1340}";
+ sepNavIntBoundsRect = "{{0, 0}, {1412, 4524}}";
+ sepNavSelRange = "{2744, 0}";
+ sepNavVisRange = "{989, 2918}";
sepNavWindowFrame = "{{256, 240}, {1079, 870}}";
};
};
@@ -1186,16 +1359,6 @@
isa = PBXBookmark;
fRef = 61798A20114ADD2600BA94A9 /* backgroundLeft.png */;
};
- 618BE56311750F6B00F22556 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
- name = "OverlayViewController.m: 18";
- rLen = 0;
- rLoc = 422;
- rType = 0;
- vrLen = 585;
- vrLoc = 51;
- };
618BE56511750F6B00F22556 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 619C51BD116E40FC0049FD84 /* CommodityFunctions.h */;
@@ -1364,6 +1527,7 @@
};
618BE70211752C5200F22556 /* SDL_audiocvt.c */ = {
isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.c;
name = SDL_audiocvt.c;
path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/audio/SDL_audiocvt.c";
sourceTree = "";
@@ -1380,6 +1544,7 @@
};
618BE70411752C5200F22556 /* music_ogg.c */ = {
isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.c;
name = music_ogg.c;
path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/music_ogg.c";
sourceTree = "";
@@ -1396,6 +1561,7 @@
};
618BE70611752C5200F22556 /* music.c */ = {
isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.c;
name = music.c;
path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/music.c";
sourceTree = "";
@@ -1412,42 +1578,11 @@
};
618BE70811752C5200F22556 /* mixer.c */ = {
isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.c;
name = mixer.c;
path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/mixer.c";
sourceTree = "";
};
- 618BE70B11752C5200F22556 /* SDL_audiotypecvt.c */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.c;
- name = SDL_audiotypecvt.c;
- path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/audio/SDL_audiotypecvt.c";
- sourceTree = "";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {775, 208949}}";
- sepNavSelRange = "{123570, 0}";
- sepNavVisRange = "{123042, 992}";
- };
- };
- 618BE71111752C5200F22556 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 618BE71211752C5200F22556 /* SDL_mixer.h */;
- rLen = 1;
- rLoc = 148;
- rType = 1;
- };
- 618BE71211752C5200F22556 /* SDL_mixer.h */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- name = SDL_mixer.h;
- path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/SDL_mixer.h";
- sourceTree = "";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {943, 8775}}";
- sepNavSelRange = "{4362, 9}";
- sepNavVisRange = "{3265, 1642}";
- sepNavWindowFrame = "{{107, 311}, {1002, 778}}";
- };
- };
618BE72C11752D7900F22556 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 618BE6A2117527CD00F22556 /* VoicesViewController.m */;
@@ -1458,45 +1593,6 @@
vrLen = 512;
vrLoc = 943;
};
- 618BE72D11752D7900F22556 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 618BE70B11752C5200F22556 /* SDL_audiotypecvt.c */;
- rLen = 0;
- rLoc = 3860;
- rType = 1;
- };
- 618BE74511752E6200F22556 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 618BE74611752E6200F22556 /* SDL_audiotypecvt.c */;
- name = "SDL_audiotypecvt.c: 3861";
- rLen = 0;
- rLoc = 123570;
- rType = 0;
- vrLen = 992;
- vrLoc = 123042;
- };
- 618BE74611752E6200F22556 /* SDL_audiotypecvt.c */ = {
- isa = PBXFileReference;
- name = SDL_audiotypecvt.c;
- path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/audio/SDL_audiotypecvt.c";
- sourceTree = "";
- };
- 618BE74711752E6200F22556 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 618BE74811752E6200F22556 /* SDL_mixer.h */;
- name = "SDL_mixer.h: 149";
- rLen = 9;
- rLoc = 4362;
- rType = 0;
- vrLen = 1642;
- vrLoc = 3265;
- };
- 618BE74811752E6200F22556 /* SDL_mixer.h */ = {
- isa = PBXFileReference;
- name = SDL_mixer.h;
- path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL_mixer/SDL_mixer.h";
- sourceTree = "";
- };
6196317D116E89DF00C47CEE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 32CA4F630368D1EE00C91783 /* HedgewarsMobile_Prefix.pch */;
@@ -2820,6 +2916,114 @@
sepNavWindowFrame = "{{807, 320}, {1058, 792}}";
};
};
+ 61BD54C411789A020038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61F6AB961177BE470013254C /* SDL_audiotypecvt.c */;
+ name = "SDL_audiotypecvt.c: 3861";
+ rLen = 0;
+ rLoc = 123570;
+ rType = 0;
+ vrLen = 779;
+ vrLoc = 123261;
+ };
+ 61BD54D011789A020038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
+ name = "uKeys.pas: 397";
+ rLen = 0;
+ rLoc = 2597;
+ rType = 0;
+ vrLen = 828;
+ vrLoc = 10674;
+ };
+ 61BD553B1178A4E40038D495 /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ };
+ 61BD553C1178A5220038D495 /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 6179885A114AA48A00BA94A9 /* PascalImports.h */;
+ };
+ 61BD55411178A5610038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 129";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 350;
+ vrLoc = 1857;
+ };
+ 61BD55A81178B1080038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */;
+ name = "OverlayViewController.h: 23";
+ rLen = 0;
+ rLoc = 468;
+ rType = 0;
+ vrLen = 1120;
+ vrLoc = 0;
+ };
+ 61BD55A91178B1080038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
+ name = "OverlayViewController.m: 331";
+ rLen = 0;
+ rLoc = 10696;
+ rType = 0;
+ vrLen = 2832;
+ vrLoc = 9030;
+ };
+ 61BD55FE1178B58F0038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 133";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 427;
+ vrLoc = 1746;
+ };
+ 61BD55FF1178B58F0038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
+ name = "OverlayViewController.m: 297";
+ rLen = 0;
+ rLoc = 9314;
+ rType = 0;
+ vrLen = 2649;
+ vrLoc = 8793;
+ };
+ 61BD56001178B58F0038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179885A114AA48A00BA94A9 /* PascalImports.h */;
+ name = "PascalImports.h: 49";
+ rLen = 0;
+ rLoc = 899;
+ rType = 0;
+ vrLen = 788;
+ vrLoc = 169;
+ };
+ 61BD56011178B58F0038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 133";
+ rLen = 0;
+ rLoc = 2198;
+ rType = 0;
+ vrLen = 760;
+ vrLoc = 1638;
+ };
+ 61BD56021178B58F0038D495 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
+ name = "uKeys.pas: 511";
+ rLen = 0;
+ rLoc = 14805;
+ rType = 0;
+ vrLen = 537;
+ vrLoc = 14961;
+ };
61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61798800114AA34C00BA94A9 /* uLandGraphics.pas */;
@@ -3026,18 +3230,18 @@
};
61CE250B115E749A0098C467 /* OverlayViewController.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {879, 768}}";
- sepNavSelRange = "{354, 0}";
- sepNavVisRange = "{0, 1083}";
+ sepNavIntBoundsRect = "{{0, 0}, {879, 839}}";
+ sepNavSelRange = "{468, 0}";
+ sepNavVisRange = "{0, 1087}";
sepNavWindowFrame = "{{982, 125}, {938, 967}}";
};
};
61CE250C115E749A0098C467 /* OverlayViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {915, 4550}}";
- sepNavSelRange = "{422, 0}";
- sepNavVisRange = "{1924, 2141}";
- sepNavWindowFrame = "{{892, 189}, {938, 967}}";
+ sepNavIntBoundsRect = "{{0, 0}, {936, 4745}}";
+ sepNavSelRange = "{10697, 0}";
+ sepNavVisRange = "{7551, 1834}";
+ sepNavWindowFrame = "{{572, 185}, {938, 967}}";
};
};
61CE251F115E75A70098C467 /* PBXBookmark */ = {
@@ -3084,6 +3288,23 @@
vrLen = 181;
vrLoc = 0;
};
+ 61F6AB931177BE470013254C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
+ name = "OverlayViewController.m: 7";
+ rLen = 0;
+ rLoc = 152;
+ rType = 0;
+ vrLen = 547;
+ vrLoc = 51;
+ };
+ 61F6AB961177BE470013254C /* SDL_audiotypecvt.c */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.c;
+ name = SDL_audiotypecvt.c;
+ path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/audio/SDL_audiotypecvt.c";
+ sourceTree = "";
+ };
61F8E0D6116E98A900108149 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 619C533D116E70050049FD84 /* FortsViewController.m */;