# HG changeset patch
# User koda
# Date 1271433861 0
# Node ID 5571592f10a8df18df4ebc299d264f70b807eb9f
# Parent 5f3b423babcbaec5665c10d0539f574bc73df360
update ifrontend to latest ammostore protocol
update sdl 1.3 bindings
diff -r 5f3b423babcb -r 5571592f10a8 cocoaTouch/GameSetup.m
--- a/cocoaTouch/GameSetup.m Fri Apr 16 15:37:04 2010 +0000
+++ b/cocoaTouch/GameSetup.m Fri Apr 16 16:04:21 2010 +0000
@@ -73,10 +73,10 @@
NSArray *hedgehogs1 = [[NSArray alloc] initWithObjects:hogA1,hogA2,nil];
[hogA1 release];
[hogA2 release];
+
NSDictionary *firstTeam = [[NSDictionary alloc] initWithObjectsAndKeys:@"4421353",@"color",@"0",@"hash",@"System Cats",@"teamname",
@"star",@"grave",@"Earth",@"fort",@"Classic",@"voicepack",@"hedgewars",@"flag",hedgehogs1,@"hedgehogs",
- @"93919294221991210322351110012010000002111040400044140044464564444477477611221114440000000000000205500000040007004000000000213111103121111111231141111111111111112111",
- @"ammostore",nil];
+ nil];
[hedgehogs1 release];
[teams addObject:firstTeam];
[firstTeam release];
@@ -88,8 +88,7 @@
[hogB2 release];
NSDictionary *secondTeam = [[NSDictionary alloc] initWithObjectsAndKeys:@"4100897",@"color",@"0",@"hash",@"Poke-MAN",@"teamname",
@"Badger",@"grave",@"UFO",@"fort",@"Default",@"voicepack",@"hedgewars",@"flag",hedgehogs2,@"hedgehogs",
- @"93919294221991210322351110012010000002111040400044140044464564444477477611221114440000000000000205500000040007004000000000213111103121111111231141111111111111112111",
- @"ammostore",nil];
+ nil];
[hedgehogs2 release];
[teams addObject:secondTeam];
[secondTeam release];
@@ -129,11 +128,31 @@
NSString *hogHat = [[NSString alloc] initWithFormat:@"ehat %@", [hog objectForKey:@"hat"]];
[self sendToEngine: hogHat];
[hogHat release];
- }
+ }
+}
+
+-(void) sendAmmoData:(NSDictionary *)ammoData {
+ NSString *ammloadt = [[NSString alloc] initWithFormat:@"eammloadt %@", [ammoData objectForKey:@"ammostore_initialqt"]];
+ [self sendToEngine: ammloadt];
+ [ammloadt release];
+
+ NSString *ammdelay = [[NSString alloc] initWithFormat:@"eammprob %@", [ammoData objectForKey:@"ammostore_probability"]];
+ [self sendToEngine: ammdelay];
+ [ammdelay release];
- NSString *ammostore = [[NSString alloc] initWithFormat:@"eammstore %@", [teamData objectForKey:@"ammostore"]];
- [self sendToEngine: ammostore];
- [ammostore release];
+ NSString *ammprob = [[NSString alloc] initWithFormat:@"eammdelay %@", [ammoData objectForKey:@"ammostore_delay"]];
+ [self sendToEngine: ammprob];
+ [ammprob release];
+
+ NSString *ammreinf = [[NSString alloc] initWithFormat:@"eammreinf %@", [ammoData objectForKey:@"ammostore_crate"]];
+ [self sendToEngine: ammreinf];
+ [ammreinf release];
+
+ // sent twice so it applies to both teams
+ NSString *ammstore = [[NSString alloc] initWithString:@"eammstore"];
+ [self sendToEngine: ammstore];
+ [self sendToEngine: ammstore];
+ [ammstore release];
}
-(void) engineProtocol {
@@ -220,7 +239,15 @@
[self sendTeamData:teamData withPlayingHogs:2];
NSLog(@"teamData sent");
}
-
+
+ NSDictionary *ammoData = [[NSDictionary alloc] initWithObjectsAndKeys:
+ @"939192942219912103223511100120100000021110",@"ammostore_initialqt",
+ @"040504054160065554655446477657666666615550",@"ammostore_probability",
+ @"000000000000020550000004000700400000000020",@"ammostore_delay",
+ @"131111031211111112311411111111111111121110",@"ammostore_crate", nil];
+ [self sendAmmoData: ammoData];
+ [ammoData release];
+
clientQuit = NO;
} else {
NSLog(@"engineProtocolThread - wrong message or client closed connection");
diff -r 5f3b423babcb -r 5571592f10a8 hedgewars/SDLh.pas
--- a/hedgewars/SDLh.pas Fri Apr 16 15:37:04 2010 +0000
+++ b/hedgewars/SDLh.pas Fri Apr 16 16:04:21 2010 +0000
@@ -27,6 +27,7 @@
{$IFDEF FREEBSD}
{$DEFINE UNIX}
{$ENDIF}
+// UNIX is already defined in Darwin
{$IFDEF UNIX}
{$IFNDEF DARWIN}
@@ -104,27 +105,36 @@
SDL_BUTTON_WHEELDOWN = 5;
{*begin SDL_Event binding*}
+
+{$IFDEF SDL13}
+ SDL_FIRSTEVENT = 0;
+ SDL_QUITEV = $100;
+ SDL_WINDOWEVENT = $200;
+ SDL_SYSWMEVENT = $201;
+ SDL_KEYDOWN = $300;
+ SDL_KEYUP = $301;
+ SDL_TEXTEDITING = $302;
+ SDL_TEXTINPUT = $303;
+ SDL_MOUSEMOTION = $400;
+ SDL_MOUSEBUTTONDOWN = $401;
+ SDL_MOUSEBUTTONUP = $402;
+ SDL_MOUSEWHEEL = $403;
+ SDL_PROXIMITYIN = $500;
+ SDL_PROXIMITYOUT = $501;
+ SDL_JOYAXISMOTION = $600;
+ SDL_JOYBALLMOTION = $601;
+ SDL_JOYHATMOTION = $602;
+ SDL_JOYBUTTONDOWN = $603;
+ SDL_JOYBUTTONUP = $604;
+ SDL_USEREVENT = $8000;
+ SDL_LASTEVENT = $FFFF;
+{$ELSE}
SDL_NOEVENT = 0;
+ SDL_ACTIVEEVENT = 1;
SDL_KEYDOWN = 2;
SDL_KEYUP = 3;
-{$IFDEF SDL13}
- SDL_WINDOWEVENT = 1;
- SDL_TEXTINPUT = 4;
- SDL_TEXTEDITING = 5;
- SDL_MOUSEMOTION = 6;
- SDL_MOUSEBUTTONDOWN = 7;
- SDL_MOUSEBUTTONUP = 8;
- SDL_MOUSEWHEEL = 9;
- SDL_JOYAXISMOTION = 10;
- SDL_JOYBALLMOTION = 11;
- SDL_JOYHATMOTION = 12;
- SDL_JOYBUTTONDOWN = 13;
- SDL_JOYBUTTONUP = 14;
- SDL_QUITEV = 15;
-{$ELSE}
- SDL_ACTIVEEVENT = 1;
SDL_MOUSEMOTION = 4;
- SDL_MOUSEBUTTONDOWN = 5;
+ SDL_MOUSEBUTTONDOWN = 5;
SDL_MOUSEBUTTONUP = 6;
SDL_JOYAXISMOTION = 7;
SDL_JOYBALLMOTION = 8;
@@ -331,16 +341,17 @@
PSDL_Texture = pointer;
TSDL_WindowEvent = record
- type_: byte;
- gain: byte;
- state: byte;
+ type_: LongInt;
windowID: LongInt;
+ event: byte;
+ padding1, padding2, padding3: byte;
data1, data2: LongInt;
end;
// implement SDL_TextEditingEvent + SDL_TextInputEvent for sdl13
{$ELSE}
- //these two are present in sdl1.3 but only for backward compatibility
+ // these two are present in sdl1.3 but only for backward compatibility
+ // and in 1.3 type_ is LongInt, not byte
TSDL_ActiveEvent = record
type_: byte;
gain: byte;
@@ -354,49 +365,59 @@
{$ENDIF}
TSDL_MouseMotionEvent = record
- type_: byte;
which: byte;
state: byte;
{$IFDEF SDL13}
+ type_: LongInt;
windowID: LongInt;
- x, y, xrel, yrel : LongInt;
+ padding1, padding2: byte;
+ x, y, z, xrel, yrel : LongInt;
pressure, pressure_max, pressure_min,
rotation, tilt, cursor: LongInt;
{$ELSE}
+ type_: byte;
x, y, xrel, yrel : word;
{$ENDIF}
end;
TSDL_KeyboardEvent = record
- type_: Byte;
{$IFDEF SDL13}
+ type_: LongInt;
windowID: LongInt;
+ padding1, padding2: byte;
+{$ELSE}
+ type_: byte;
{$ENDIF}
- which: Byte;
- state: Byte;
+ which: byte;
+ state: byte;
keysym: TSDL_KeySym;
end;
TSDL_MouseButtonEvent = record
- _type,
which,
button,
state: byte;
{$IFDEF SDL13}
+ _type: LongInt;
windowID: LongInt;
x, y: LongInt;
+ padding1: byte;
{$ELSE}
+ _type: byteM
x, y: word;
{$ENDIF}
end;
{$IFDEF SDL13}
TSDL_MouseWheelEvent = record
- type_: Byte;
+ type_: LongInt;
windowID: LongInt;
which: Byte;
x, y: LongInt;
+ padding1, padding2, padding3: byte;
end;
+
+ // implement SDL_ProximityEvent
{$ENDIF}
TSDL_JoyAxisEvent = record
@@ -411,39 +432,53 @@
end;
TSDL_JoyBallEvent = record
- type_: Byte;
which: Byte;
ball: Byte;
{$IFDEF SDL13}
+ type_: LongInt;
xrel, yrel: LongInt;
{$ELSE}
+ type_: Byte;
xrel, yrel: word;
{$ENDIF}
end;
TSDL_JoyHatEvent = record
+{$IFDEF SDL13}
+ type_: LongInt;
+{$ELSE}
type_: Byte;
+{$ENDIF}
which: Byte;
hat: Byte;
value: Byte;
end;
TSDL_JoyButtonEvent = record
+{$IFDEF SDL13}
+ type_: LongInt;
+{$ELSE}
type_: Byte;
+{$ENDIF}
which: Byte;
button: Byte;
state: Byte;
end;
TSDL_QuitEvent = record
- type_: Byte;
- end;
+{$IFDEF SDL13}
+ type_: LongInt;
+{$ELSE}
+ type_: Byte;
+{$ENDIF}
+ end;
PSDL_Event = ^TSDL_Event;
TSDL_Event = record
case Byte of
- SDL_NOEVENT: (type_: byte);
{$IFDEF SDL13}
+ SDL_FIRSTEVENT: (type_: byte);
+ SDL_QUITEV: (quit: TSDL_QuitEvent);
SDL_WINDOWEVENT: (active: TSDL_WindowEvent);
SDL_KEYDOWN,
SDL_KEYUP: (key: TSDL_KeyboardEvent);
@@ -458,8 +493,8 @@
SDL_JOYBALLMOTION: (jball: TSDL_JoyBallEvent);
SDL_JOYBUTTONDOWN,
SDL_JOYBUTTONUP: (jbutton: TSDL_JoyButtonEvent);
- SDL_QUITEV: (quit: TSDL_QuitEvent);
{$ELSE}
+ SDL_NOEVENT: (type_: byte);
SDL_ACTIVEEVENT: (active: TSDL_ActiveEvent);
SDL_KEYDOWN,
SDL_KEYUP: (key: TSDL_KeyboardEvent);
diff -r 5f3b423babcb -r 5571592f10a8 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Fri Apr 16 15:37:04 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Fri Apr 16 16:04:21 2010 +0000
@@ -229,8 +229,6 @@
Layout
- BecomeActive
-
ContentConfiguration
PBXBottomSmartGroupGIDs
@@ -280,8 +278,7 @@
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 3
- 2
+ 1
0
@@ -321,7 +318,7 @@
PBXProjectModuleGUID
1CE0B20306471E060097A5F4
PBXProjectModuleLabel
- PascalExports.pas
+ uMisc.s
PBXSplitModuleInNavigatorKey
Split0
@@ -329,11 +326,11 @@
PBXProjectModuleGUID
1CE0B20406471E060097A5F4
PBXProjectModuleLabel
- PascalExports.pas
+ uMisc.s
_historyCapacity
0
bookmark
- 614A80E51178B99E00552546
+ 614A818A1178C72A00552546
history
6179889D114AA5BD00BA94A9
@@ -508,7 +505,6 @@
617B27B71171617A004A76A2
617B27B81171617A004A76A2
617B27B91171617A004A76A2
- 617B27BA1171617A004A76A2
617B280E117164FC004A76A2
61D96559117180D9001EB3B4
61D96591117182B1001EB3B4
@@ -530,7 +526,9 @@
618BE72C11752D7900F22556
61F6AB931177BE470013254C
61BD54C411789A020038D495
- 61BD55FE1178B58F0038D495
+ 614A80ED1178BB9B00552546
+ 614A81041178BCC500552546
+ 614A81441178C16800552546
SplitCount
@@ -542,16 +540,18 @@
GeometryConfiguration
Frame
- {{0, 0}, {535, 269}}
+ {{0, 0}, {535, 258}}
RubberWindowFrame
469 489 801 617 0 0 1920 1178
Module
PBXNavigatorGroup
Proportion
- 269pt
+ 258pt
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
@@ -562,14 +562,14 @@
GeometryConfiguration
Frame
- {{0, 274}, {535, 302}}
+ {{0, 263}, {535, 313}}
RubberWindowFrame
469 489 801 617 0 0 1920 1178
Module
XCDetailModule
Proportion
- 302pt
+ 313pt
Proportion
@@ -588,9 +588,9 @@
TableOfContents
- 614A80C61178B6FD00552546
+ 614A815E1178C23E00552546
1CE0B1FE06471DED0097A5F4
- 614A80C71178B6FD00552546
+ 614A815F1178C23E00552546
1CE0B20306471E060097A5F4
1CE0B20506471E060097A5F4
@@ -728,12 +728,12 @@
5
WindowOrderList
- 614A80D41178B6FD00552546
- 614A80D51178B6FD00552546
+ 614A81891178C72A00552546
+ 614A81861178C70600552546
1C78EAAD065D492600B07095
1CD10A99069EF8BA00B06720
+ 614A81601178C23E00552546
61798848114AA42600BA94A9
- 61BD55441178A5610038D495
/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj
WindowString
@@ -775,8 +775,6 @@
307pt
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
@@ -816,7 +814,7 @@
TableOfContents
61798848114AA42600BA94A9
- 614A80CC1178B6FD00552546
+ 614A81631178C23E00552546
1CD0528F0623707200166675
XCMainBuildResultsModuleGUID
@@ -940,13 +938,13 @@
TableOfContents
1CD10A99069EF8BA00B06720
- 614A80CD1178B6FD00552546
+ 614A817E1178C70600552546
1C162984064C10D400B95A72
- 614A80CE1178B6FD00552546
- 614A80CF1178B6FD00552546
- 614A80D01178B6FD00552546
- 614A80D11178B6FD00552546
- 614A80D21178B6FD00552546
+ 614A817F1178C70600552546
+ 614A81801178C70600552546
+ 614A81811178C70600552546
+ 614A81821178C70600552546
+ 614A81831178C70600552546
ToolbarConfiguration
xcode.toolbar.config.debugV3
@@ -1110,7 +1108,7 @@
TableOfContents
1C78EAAD065D492600B07095
- 614A80D31178B6FD00552546
+ 614A81841178C70600552546
1C78EAAC065D492600B07095
ToolbarConfiguration
diff -r 5f3b423babcb -r 5571592f10a8 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Fri Apr 16 15:37:04 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Fri Apr 16 16:04:21 2010 +0000
@@ -7,9 +7,9 @@
);
};
29B97313FDCFA39411CA2CEA /* Project object */ = {
- activeBuildConfigurationName = Release;
+ activeBuildConfigurationName = Debug;
activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */;
- activeSDKPreference = iphoneos3.0;
+ activeSDKPreference = iphonesimulator3.2;
activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */;
addToTargets = (
1D6058900D05DD3D006BFB54 /* HedgewarsMobile */,
@@ -107,231 +107,207 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 293123475;
- PBXWorkspaceStateSaveDate = 293123475;
+ PBXPerProjectTemplateStateSaveDate = 293126708;
+ PBXWorkspaceStateSaveDate = 293126708;
};
perUserProjectItems = {
- 61056377116C0393003C420C = 61056377116C0393003C420C /* PBXBookmark */;
- 610563DF116C15E5003C420C = 610563DF116C15E5003C420C /* PBXTextBookmark */;
- 611B0AC6116B6E8B00112153 = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */;
- 611B0C42116BAF3A00112153 = 611B0C42116BAF3A00112153 /* PBXTextBookmark */;
- 611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */;
- 611FD8201155111700C2203D = 611FD8201155111700C2203D /* PBXTextBookmark */;
- 611FD95811551C3700C2203D = 611FD95811551C3700C2203D /* PBXBookmark */;
- 611FD96611551E8000C2203D = 611FD96611551E8000C2203D /* PBXBookmark */;
- 611FDB6C1155C0B300C2203D = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
- 611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
- 611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
- 612D5C451165535400C6D842 = 612D5C451165535400C6D842 /* PBXTextBookmark */;
- 612D616B1165536300C6D842 = 612D616B1165536300C6D842 /* PBXTextBookmark */;
- 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 */;
+ 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 */;
+ 61430D3D1165551600E2C62D /* PBXTextBookmark */ = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
+ 614A80ED1178BB9B00552546 /* PBXTextBookmark */ = 614A80ED1178BB9B00552546 /* PBXTextBookmark */;
+ 614A81041178BCC500552546 /* PBXTextBookmark */ = 614A81041178BCC500552546 /* PBXTextBookmark */;
+ 614A81441178C16800552546 /* PBXTextBookmark */ = 614A81441178C16800552546 /* PBXTextBookmark */;
+ 614A818A1178C72A00552546 /* PBXTextBookmark */ = 614A818A1178C72A00552546 /* 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 */;
+ 617B280E117164FC004A76A2 /* PBXTextBookmark */ = 617B280E117164FC004A76A2 /* PBXTextBookmark */;
+ 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */ = 617E1DB5116FEE5B002EF3D8 /* PBXTextBookmark */;
+ 6188FE60116F77AF004F3690 /* PBXTextBookmark */ = 6188FE60116F77AF004F3690 /* PBXTextBookmark */;
+ 618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */;
+ 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 */;
+ 618BE72C11752D7900F22556 /* PBXTextBookmark */ = 618BE72C11752D7900F22556 /* 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 */;
+ 61BD54C411789A020038D495 /* PBXTextBookmark */ = 61BD54C411789A020038D495 /* 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 */;
+ 61F6AB931177BE470013254C /* PBXTextBookmark */ = 61F6AB931177BE470013254C /* PBXTextBookmark */;
+ 61F8E0D6116E98A900108149 /* PBXTextBookmark */ = 61F8E0D6116E98A900108149 /* PBXTextBookmark */;
+ 61FE2AE4116D658700F76CDC /* PBXTextBookmark */ = 61FE2AE4116D658700F76CDC /* PBXTextBookmark */;
};
sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
userBuildSettings = {
@@ -476,57 +452,7 @@
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 */ = {
+ 614A80ED1178BB9B00552546 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
name = "PascalExports.pas: 133";
@@ -536,105 +462,58 @@
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 */ = {
+ 614A81041178BCC500552546 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
- name = "PascalExports.pas: 133";
+ fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
+ name = "GameSetup.m: 356";
rLen = 0;
- rLoc = 2198;
+ rLoc = 13178;
rType = 0;
- vrLen = 793;
- vrLoc = 1605;
- };
- 614A80DD1178B70800552546 /* PBXTextBookmark */ = {
+ vrLen = 674;
+ vrLoc = 11543;
+ };
+ 614A81441178C16800552546 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
- name = "uKeys.pas: 511";
+ fRef = 614A81451178C16800552546 /* uMisc.s */;
+ name = "uMisc.s: 5536";
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;
+ rLoc = 126279;
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 */ = {
+ vrLen = 399;
+ vrLoc = 75947;
+ };
+ 614A81451178C16800552546 /* uMisc.s */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.asm;
+ name = uMisc.s;
+ path = "/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/build/HedgewarsMobile.build/Debug-iphonesimulator/HedgewarsMobile.build/DerivedSources-normal/i386/uMisc.s";
+ sourceTree = "";
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {880, 71318}}";
+ sepNavSelRange = "{126279, 0}";
+ sepNavVisRange = "{75947, 380}";
+ };
+ };
+ 614A818A1178C72A00552546 /* 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";
+ fRef = 614A818B1178C72A00552546 /* uMisc.s */;
+ name = "uMisc.s: 5536";
rLen = 0;
- rLoc = 14805;
+ rLoc = 126279;
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;
+ vrLen = 380;
+ vrLoc = 75947;
+ };
+ 614A818B1178C72A00552546 /* uMisc.s */ = {
+ isa = PBXFileReference;
+ name = uMisc.s;
+ path = "/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/build/HedgewarsMobile.build/Debug-iphonesimulator/HedgewarsMobile.build/DerivedSources-normal/i386/uMisc.s";
+ sourceTree = "";
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {880, 71318}}";
+ sepNavSelRange = "{126279, 0}";
+ sepNavVisRange = "{75947, 380}";
+ };
};
61513435116C1B07001F16D1 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -714,7 +593,7 @@
fRef = 617987ED114AA34C00BA94A9 /* SDLh.pas */;
name = "SDLh.pas: 488";
rLen = 0;
- rLoc = 12867;
+ rLoc = 13681;
rType = 0;
vrLen = 150;
vrLoc = 12762;
@@ -860,9 +739,9 @@
};
617987ED114AA34C00BA94A9 /* SDLh.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {532, 10569}}";
- sepNavSelRange = "{12867, 0}";
- sepNavVisRange = "{12762, 150}";
+ sepNavIntBoundsRect = "{{0, 0}, {1202, 11570}}";
+ sepNavSelRange = "{12106, 0}";
+ sepNavVisRange = "{11567, 1549}";
sepNavWindowFrame = "{{15, 455}, {927, 718}}";
};
};
@@ -1215,18 +1094,18 @@
};
61798887114AA4E600BA94A9 /* GameSetup.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {572, 416}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1020, 742}}";
sepNavSelRange = "{254, 0}";
- sepNavVisRange = "{169, 135}";
+ sepNavVisRange = "{0, 746}";
sepNavWindowFrame = "{{761, 205}, {897, 692}}";
};
};
61798888114AA4E600BA94A9 /* GameSetup.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1412, 4524}}";
- sepNavSelRange = "{2744, 0}";
- sepNavVisRange = "{989, 2918}";
- sepNavWindowFrame = "{{256, 240}, {1079, 870}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1384, 5070}}";
+ sepNavSelRange = "{2276, 0}";
+ sepNavVisRange = "{10455, 1732}";
+ sepNavWindowFrame = "{{93, 224}, {1079, 870}}";
};
};
6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = {
@@ -1315,16 +1194,6 @@
vrLen = 691;
vrLoc = 0;
};
- 617B27BA1171617A004A76A2 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
- name = "GameSetup.m: 332";
- rLen = 0;
- rLoc = 12127;
- rType = 0;
- vrLen = 1340;
- vrLoc = 11887;
- };
617B280E117164FC004A76A2 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */;
@@ -2926,104 +2795,6 @@
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 */;