--- a/CMakeLists.txt Tue Mar 30 23:20:07 2010 +0000
+++ b/CMakeLists.txt Tue Mar 30 23:29:30 2010 +0000
@@ -67,9 +67,7 @@
endif()
set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
- if(current_macosx_version MATCHES "10.6")
- set(CMAKE_OSX_ARCHITECTURES "x86_64")
- endif()
+
#create universal binaries only when it's time to bundle the application, also build server
IF(BUNDLE)
@@ -78,6 +76,10 @@
set(CMAKE_C_COMPILER "gcc-4.0")
set(CMAKE_CXX_COMPILER "g++-4.0")
endif()
+ ELSE()
+ if(current_macosx_version MATCHES "10.6")
+ set(CMAKE_OSX_ARCHITECTURES "x86_64")
+ endif()
ENDIF()
message(STATUS "Target system: Mac OS X ${minimum_macosx} ${CMAKE_OSX_ARCHITECTURES}")
--- a/cocoaTouch/GameSetup.h Tue Mar 30 23:20:07 2010 +0000
+++ b/cocoaTouch/GameSetup.h Tue Mar 30 23:29:30 2010 +0000
@@ -11,7 +11,7 @@
@interface GameSetup : NSObject {
NSDictionary *systemSettings;
- NSArray *teams;
+ NSMutableArray *teams;
NSInteger ipcPort;
TCPsocket sd, csd; // Socket descriptor, Client socket descriptor
@@ -23,7 +23,9 @@
-(void) engineProtocol;
-(void) startThread: (NSString *)selector;
-(int) sendToEngine: (NSString *)string;
--(void) sendTeamData:(NSDictionary *)teamData;
+-(void) sendTeamData:(NSDictionary *)teamData withPlayingHogs:(int) playingHogs;
+-(void) initTeam:(NSArray *)teamLists;
+
-(const char **)getSettings;
+
@end
-
--- a/cocoaTouch/GameSetup.m Tue Mar 30 23:20:07 2010 +0000
+++ b/cocoaTouch/GameSetup.m Tue Mar 30 23:29:30 2010 +0000
@@ -23,32 +23,6 @@
if (self = [super init]) {
srandom(time(NULL));
ipcPort = (random() % 64541) + 1025;
-
- NSDictionary *hogA1 = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level",@"Snow Leopard",@"hogname",@"NoHat",@"hat",nil];
- NSDictionary *hogA2 = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level",@"Leopard",@"hogname",@"NoHat",@"hat",nil];
- 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];
- [hedgehogs1 release];
-
- NSDictionary *hogB1 = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level",@"Raichu",@"hogname",@"Bunny",@"hat",nil];
- NSDictionary *hogB2 = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level",@"Pikachu",@"hogname",@"Bunny",@"hat",nil];
- NSArray *hedgehogs2 = [[NSArray alloc] initWithObjects:hogB1,hogB2,nil];
- [hogB1 release];
- [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];
- [hedgehogs2 release];
-
- teams = [[NSArray alloc] initWithObjects: firstTeam, secondTeam, nil];
- [firstTeam release];
- [secondTeam release];
NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"];
systemSettings = [[NSDictionary alloc] initWithContentsOfFile:filePath]; //should check it exists
@@ -71,13 +45,53 @@
}
-(int) sendToEngine: (NSString *)string {
- Uint8 length = [string length];
+ unsigned char length = [string length];
SDLNet_TCP_Send(csd, &length , 1);
return SDLNet_TCP_Send(csd, [string UTF8String], length);
}
--(void) sendTeamData:(NSDictionary *)teamData {
+-(void) initTeam:(NSArray *)teamLists {
+ teams = [[NSMutableArray alloc] initWithObjects:nil];
+
+ for (NSString *teamString in teamLists) {
+ //NSString *teamFile = [[NSString alloc] initWithFormat:@"%@.plist", teamString];
+
+ //NSDictionary *theTeam = [[NSDictionary alloc] initWithContentsOfFile:filePath];
+ //[teams addObject:theTeam];
+ //[theTeam release];
+ }
+
+ NSDictionary *hogA1 = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level",@"Snow Leopard",@"hogname",@"NoHat",@"hat",nil];
+ NSDictionary *hogA2 = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level",@"Leopard",@"hogname",@"NoHat",@"hat",nil];
+ 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];
+ [hedgehogs1 release];
+ [teams addObject:firstTeam];
+ [firstTeam release];
+
+ NSDictionary *hogB1 = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level",@"Raichu",@"hogname",@"Bunny",@"hat",nil];
+ NSDictionary *hogB2 = [[NSDictionary alloc] initWithObjectsAndKeys:@"100",@"health",@"0",@"level",@"Pikachu",@"hogname",@"Bunny",@"hat",nil];
+ NSArray *hedgehogs2 = [[NSArray alloc] initWithObjects:hogB1,hogB2,nil];
+ [hogB1 release];
+ [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];
+ [hedgehogs2 release];
+ [teams addObject:secondTeam];
+ [secondTeam release];
+}
+
+-(void) sendTeamData:(NSDictionary *)teamData withPlayingHogs:(int) playingHogs{
+ int i;
+
NSString *teamHashColorAndName = [[NSString alloc] initWithFormat:@"eaddteam %@ %@ %@", [teamData objectForKey:@"hash"], [teamData objectForKey:@"color"], [teamData objectForKey:@"teamname"]];
[self sendToEngine: teamHashColorAndName];
[teamHashColorAndName release];
@@ -99,7 +113,9 @@
[flag release];
NSArray *hogs = [teamData objectForKey:@"hedgehogs"];
- for (NSDictionary *hog in hogs) {
+ for (i = 0; i < playingHogs; i++) {
+ NSDictionary *hog = [hogs objectAtIndex:i];
+
NSString *hogLevelHealthAndName = [[NSString alloc] initWithFormat:@"eaddhh %@ %@ %@", [hog objectForKey:@"level"], [hog objectForKey:@"health"], [hog objectForKey:@"hogname"]];
[self sendToEngine: hogLevelHealthAndName];
[hogLevelHealthAndName release];
@@ -160,7 +176,11 @@
if ('C' == buffer[0]) {
NSLog(@"engineProtocol - sending game config");
-
+
+ NSArray *teamlist = [[NSArray alloc] initWithObjects:@"this",@"is",@"test",nil];
+ [self initTeam:teamlist];
+ [teamlist release];
+
// send config data data
/*
seed is arbitrary string
@@ -191,7 +211,7 @@
[self sendToEngine:@"etheme Compost"];
for (NSDictionary *teamData in teams) {
- [self sendTeamData:teamData];
+ [self sendTeamData:teamData withPlayingHogs:2];
NSLog(@"teamData sent");
}
@@ -228,7 +248,7 @@
sscanf(buffer, "%*s %d", &eProto);
short int netProto;
char *versionStr;
- /*
+
HW_versionInfo(&netProto, &versionStr);
if (netProto == eProto) {
NSLog(@"Setting protocol version %d (%s)", eProto, versionStr);
@@ -236,7 +256,7 @@
NSLog(@"ERROR - wrong protocol number: [%s] - expecting %d", buffer, eProto);
clientQuit = YES;
}
- */
+
break;
case 'i':
switch (buffer[1]) {
--- a/cocoaTouch/MainMenuViewController.m Tue Mar 30 23:20:07 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m Tue Mar 30 23:29:30 2010 +0000
@@ -37,10 +37,13 @@
-(void) viewDidLoad {
[NSThread detachNewThreadSelector:@selector(checkFirstRun) toTarget:self withObject:nil];
-
- char *ver="test";
- //HW_versionInfo(NULL, &ver);
- self.versionLabel.text = [[NSString stringWithUTF8String:ver] autorelease];
+ /*
+ char *ver;
+ HW_versionInfo(NULL, &ver);
+ NSString *versionNumber = [[NSString alloc] initWithCString:ver];
+ self.versionLabel.text = versionNumber;
+ [versionNumber release];
+ */
[super viewDidLoad];
}
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Tue Mar 30 23:20:07 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Tue Mar 30 23:29:30 2010 +0000
@@ -103,7 +103,7 @@
// override the direct execution of SDL_main to allow us to implement the frontend (even using a nib)
-(void) applicationDidFinishLaunching:(UIApplication *)application {
//[application setStatusBarHidden:YES animated:NO];
- [application setStatusBarHidden:YES withAnimation:NO];
+ //[application setStatusBarHidden:YES withAnimation:NO];
[application setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO];
self.uiwindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Tue Mar 30 23:20:07 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Tue Mar 30 23:29:30 2010 +0000
@@ -229,8 +229,6 @@
<key>Layout</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -274,8 +272,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>3</integer>
- <integer>2</integer>
+ <integer>1</integer>
<integer>0</integer>
</array>
</array>
@@ -299,7 +296,7 @@
<real>186</real>
</array>
<key>RubberWindowFrame</key>
- <string>1063 490 801 617 0 0 1920 1178 </string>
+ <string>844 455 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -315,7 +312,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>GameSetup.m</string>
+ <string>uLandTexture.pas</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -323,11 +320,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>GameSetup.m</string>
+ <string>uLandTexture.pas</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>61715D74116199330029EE6B</string>
+ <string>6156E8321162CD7F00FF6486</string>
<key>history</key>
<array>
<string>6179889D114AA5BD00BA94A9</string>
@@ -351,7 +348,6 @@
<string>611FD82B1155111700C2203D</string>
<string>611FD82C1155111700C2203D</string>
<string>611FD82D1155111700C2203D</string>
- <string>611FD94E11551BD300C2203D</string>
<string>611FD95711551C3700C2203D</string>
<string>611FD95811551C3700C2203D</string>
<string>611FD95911551C3700C2203D</string>
@@ -378,8 +374,6 @@
<string>61CE25B4115E7C940098C467</string>
<string>61CE25B5115E7C940098C467</string>
<string>615E2350115ED80500B0ACA1</string>
- <string>615E2395115F023B00B0ACA1</string>
- <string>615E2396115F023B00B0ACA1</string>
<string>615E2397115F023B00B0ACA1</string>
<string>615E2398115F023B00B0ACA1</string>
<string>615E2399115F023B00B0ACA1</string>
@@ -389,7 +383,6 @@
<string>61CCBE60116135FF00833FE8</string>
<string>61CCBECC1161477A00833FE8</string>
<string>61CCBECD1161477A00833FE8</string>
- <string>61CCBECE1161477A00833FE8</string>
<string>61CCBF1E116162CA00833FE8</string>
<string>61CCBF1F116162CA00833FE8</string>
<string>61CCBF451161637F00833FE8</string>
@@ -400,13 +393,11 @@
<string>61CCBF7C1161657400833FE8</string>
<string>61CCBF7E1161657400833FE8</string>
<string>61CCBF7F1161657400833FE8</string>
- <string>61CCBF811161657400833FE8</string>
<string>61CCBFD11161833800833FE8</string>
<string>61CCBFD21161833800833FE8</string>
<string>61CCBFD31161833800833FE8</string>
<string>61CCBFD41161833800833FE8</string>
<string>61CCBFD51161833800833FE8</string>
- <string>61CCBFD61161833800833FE8</string>
<string>61CCBFD71161833800833FE8</string>
<string>61CCBFD81161833800833FE8</string>
<string>61CCBFD91161833800833FE8</string>
@@ -414,7 +405,12 @@
<string>61CCBFDB1161833800833FE8</string>
<string>61CCBFDC1161833800833FE8</string>
<string>61CCBFDD1161833800833FE8</string>
- <string>61715D4311618D1B0029EE6B</string>
+ <string>6166BD931162C46400172C3A</string>
+ <string>61AB99EA1162CC3100B1CF7E</string>
+ <string>61AB99EB1162CC3100B1CF7E</string>
+ <string>61AB99EC1162CC3100B1CF7E</string>
+ <string>6156E8311162CD7F00FF6486</string>
+ <string>61CCBF811161657400833FE8</string>
</array>
</dict>
<key>SplitCount</key>
@@ -426,16 +422,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {593, 101}}</string>
+ <string>{{0, 0}, {593, 28}}</string>
<key>RubberWindowFrame</key>
- <string>1063 490 801 617 0 0 1920 1178 </string>
+ <string>844 455 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>101pt</string>
+ <string>28pt</string>
</dict>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -446,14 +444,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 106}, {593, 470}}</string>
+ <string>{{0, 33}, {593, 543}}</string>
<key>RubberWindowFrame</key>
- <string>1063 490 801 617 0 0 1920 1178 </string>
+ <string>844 455 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>470pt</string>
+ <string>543pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -472,9 +470,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>61715D4511618D1B0029EE6B</string>
+ <string>6156E8331162CD7F00FF6486</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>61715D4611618D1B0029EE6B</string>
+ <string>6156E8341162CD7F00FF6486</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -612,16 +610,12 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>61715D73116199330029EE6B</string>
- <string>61715D5011618D1B0029EE6B</string>
- <string>61715D5111618D1B0029EE6B</string>
- <string>1C78EAAD065D492600B07095</string>
- <string>1CD10A99069EF8BA00B06720</string>
<string>61798848114AA42600BA94A9</string>
+ <string>61AB99F31162CC3100B1CF7E</string>
<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>1063 490 801 617 0 0 1920 1178 </string>
+ <string>844 455 801 617 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -637,14 +631,12 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string>GameSetup.m</string>
+ <string></string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -653,7 +645,7 @@
<key>Frame</key>
<string>{{0, 0}, {1065, 243}}</string>
<key>RubberWindowFrame</key>
- <string>161 263 1065 574 0 0 1920 1178 </string>
+ <string>253 402 1065 574 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -677,7 +669,7 @@
<key>Frame</key>
<string>{{0, 248}, {1065, 285}}</string>
<key>RubberWindowFrame</key>
- <string>161 263 1065 574 0 0 1920 1178 </string>
+ <string>253 402 1065 574 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -700,7 +692,7 @@
<key>TableOfContents</key>
<array>
<string>61798848114AA42600BA94A9</string>
- <string>61715D28116186890029EE6B</string>
+ <string>6156E8351162CD7F00FF6486</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -709,7 +701,7 @@
<key>WindowContentMinSize</key>
<string>486 300</string>
<key>WindowString</key>
- <string>161 263 1065 574 0 0 1920 1178 </string>
+ <string>253 402 1065 574 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>61798848114AA42600BA94A9</string>
<key>WindowToolIsVisible</key>
@@ -787,11 +779,13 @@
<key>DebugVariablesTableConfiguration</key>
<array>
<string>Name</string>
- <real>133</real>
+ <real>120</real>
<string>Value</string>
- <real>97</real>
+ <real>85</real>
<string>Summary</string>
- <real>157</real>
+ <real>95</real>
+ <string>Type</string>
+ <real>84</real>
</array>
<key>Frame</key>
<string>{{0, 239}, {412, 239}}</string>
@@ -822,13 +816,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>61715D3A11618D150029EE6B</string>
+ <string>61AB99E31162CC3000B1CF7E</string>
<string>1C162984064C10D400B95A72</string>
- <string>61715D3B11618D150029EE6B</string>
- <string>61715D3C11618D150029EE6B</string>
- <string>61715D3D11618D150029EE6B</string>
- <string>61715D3E11618D150029EE6B</string>
- <string>61715D3F11618D150029EE6B</string>
+ <string>61AB99E41162CC3000B1CF7E</string>
+ <string>61AB99E51162CC3000B1CF7E</string>
+ <string>61AB99E61162CC3000B1CF7E</string>
+ <string>61AB99E71162CC3000B1CF7E</string>
+ <string>61AB99E81162CC3000B1CF7E</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -969,7 +963,7 @@
<key>Frame</key>
<string>{{0, 0}, {656, 344}}</string>
<key>RubberWindowFrame</key>
- <string>1229 297 656 385 0 0 1920 1178 </string>
+ <string>1204 210 656 385 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
@@ -992,13 +986,13 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>61715D4011618D150029EE6B</string>
+ <string>61AB99E91162CC3000B1CF7E</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
- <string>1229 297 656 385 0 0 1920 1178 </string>
+ <string>1204 210 656 385 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Tue Mar 30 23:20:07 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Tue Mar 30 23:29:30 2010 +0000
@@ -7,10 +7,10 @@
);
};
29B97313FDCFA39411CA2CEA /* Project object */ = {
- activeBuildConfigurationName = Debug;
- activeExecutable = 6100DAD3115446B000F455E0 /* iHedgewars */;
- activeSDKPreference = iphonesimulator3.2;
- activeTarget = 6100DA6E115446B000F455E0 /* iHedgewars */;
+ activeBuildConfigurationName = Release;
+ activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */;
+ activeSDKPreference = iphoneos3.0;
+ activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */;
addToTargets = (
1D6058900D05DD3D006BFB54 /* HedgewarsMobile */,
);
@@ -94,96 +94,101 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 291603329;
- PBXWorkspaceStateSaveDate = 291603329;
+ PBXPerProjectTemplateStateSaveDate = 291687784;
+ PBXWorkspaceStateSaveDate = 291687784;
};
perUserProjectItems = {
- 611FD81D1155111700C2203D /* PBXTextBookmark */ = 611FD81D1155111700C2203D /* PBXTextBookmark */;
- 611FD81E1155111700C2203D /* PBXTextBookmark */ = 611FD81E1155111700C2203D /* PBXTextBookmark */;
- 611FD81F1155111700C2203D /* PBXTextBookmark */ = 611FD81F1155111700C2203D /* PBXTextBookmark */;
- 611FD8201155111700C2203D /* PBXTextBookmark */ = 611FD8201155111700C2203D /* PBXTextBookmark */;
- 611FD8211155111700C2203D /* PBXTextBookmark */ = 611FD8211155111700C2203D /* PBXTextBookmark */;
- 611FD8281155111700C2203D /* PBXTextBookmark */ = 611FD8281155111700C2203D /* PBXTextBookmark */;
- 611FD8291155111700C2203D /* PBXTextBookmark */ = 611FD8291155111700C2203D /* PBXTextBookmark */;
- 611FD82A1155111700C2203D /* PBXTextBookmark */ = 611FD82A1155111700C2203D /* PBXTextBookmark */;
- 611FD82B1155111700C2203D /* PBXTextBookmark */ = 611FD82B1155111700C2203D /* PBXTextBookmark */;
- 611FD82C1155111700C2203D /* PBXTextBookmark */ = 611FD82C1155111700C2203D /* PBXTextBookmark */;
- 611FD82D1155111700C2203D /* PBXTextBookmark */ = 611FD82D1155111700C2203D /* PBXTextBookmark */;
- 611FD94E11551BD300C2203D /* PBXTextBookmark */ = 611FD94E11551BD300C2203D /* PBXTextBookmark */;
- 611FD95711551C3700C2203D /* PBXTextBookmark */ = 611FD95711551C3700C2203D /* PBXTextBookmark */;
- 611FD95811551C3700C2203D /* PBXBookmark */ = 611FD95811551C3700C2203D /* PBXBookmark */;
- 611FD95911551C3700C2203D /* PBXBookmark */ = 611FD95911551C3700C2203D /* PBXBookmark */;
- 611FD96611551E8000C2203D /* PBXBookmark */ = 611FD96611551E8000C2203D /* PBXBookmark */;
- 611FDAC41155B77500C2203D /* PBXTextBookmark */ = 611FDAC41155B77500C2203D /* PBXTextBookmark */;
- 611FDB481155BCE500C2203D /* PBXTextBookmark */ = 611FDB481155BCE500C2203D /* PBXTextBookmark */;
- 611FDB6B1155C0B300C2203D /* PBXBookmark */ = 611FDB6B1155C0B300C2203D /* PBXBookmark */;
- 611FDB6C1155C0B300C2203D /* PBXBookmark */ = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
- 611FDB6D1155C0B300C2203D /* PBXBookmark */ = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
- 611FDBF71155D39400C2203D /* PBXTextBookmark */ = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
- 615E2350115ED80500B0ACA1 /* PBXTextBookmark */ = 615E2350115ED80500B0ACA1 /* PBXTextBookmark */;
- 615E2395115F023B00B0ACA1 /* PBXTextBookmark */ = 615E2395115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E2396115F023B00B0ACA1 /* PBXTextBookmark */ = 615E2396115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E2397115F023B00B0ACA1 /* PBXTextBookmark */ = 615E2397115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E2398115F023B00B0ACA1 /* PBXTextBookmark */ = 615E2398115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E2399115F023B00B0ACA1 /* PBXTextBookmark */ = 615E2399115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E239A115F023B00B0ACA1 /* PBXTextBookmark */ = 615E239A115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E239B115F023B00B0ACA1 /* PBXTextBookmark */ = 615E239B115F023B00B0ACA1 /* PBXTextBookmark */;
- 61715D4311618D1B0029EE6B /* XCBuildMessageTextBookmark */ = 61715D4311618D1B0029EE6B /* XCBuildMessageTextBookmark */;
- 61715D74116199330029EE6B /* PBXTextBookmark */ = 61715D74116199330029EE6B /* PBXTextBookmark */;
- 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
- 61799342114B297000BA94A9 /* PBXBookmark */ = 61799342114B297000BA94A9 /* PBXBookmark */;
- 61799343114B297000BA94A9 /* PBXBookmark */ = 61799343114B297000BA94A9 /* PBXBookmark */;
- 61799354114BD5C300BA94A9 /* PBXTextBookmark */ = 61799354114BD5C300BA94A9 /* PBXTextBookmark */;
- 6179937111501D7800BA94A9 /* PBXBookmark */ = 6179937111501D7800BA94A9 /* PBXBookmark */;
- 6179937411501D7800BA94A9 /* PBXBookmark */ = 6179937411501D7800BA94A9 /* PBXBookmark */;
- 6179937511501D7800BA94A9 /* PBXBookmark */ = 6179937511501D7800BA94A9 /* PBXBookmark */;
- 6179938511501FFA00BA94A9 /* PBXBookmark */ = 6179938511501FFA00BA94A9 /* PBXBookmark */;
- 6179943111502CEA00BA94A9 /* PBXBookmark */ = 6179943111502CEA00BA94A9 /* PBXBookmark */;
- 618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */;
- 6194CC0711505FCF00A4BA5C /* PlistBookmark */ = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
- 61CCBDA11160666200833FE8 /* PBXTextBookmark */ = 61CCBDA11160666200833FE8 /* PBXTextBookmark */;
- 61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
- 61CCBECC1161477A00833FE8 /* PBXTextBookmark */ = 61CCBECC1161477A00833FE8 /* PBXTextBookmark */;
- 61CCBECD1161477A00833FE8 /* PBXTextBookmark */ = 61CCBECD1161477A00833FE8 /* PBXTextBookmark */;
- 61CCBECE1161477A00833FE8 /* PBXTextBookmark */ = 61CCBECE1161477A00833FE8 /* PBXTextBookmark */;
- 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
- 61CCBF1F116162CA00833FE8 /* PBXTextBookmark */ = 61CCBF1F116162CA00833FE8 /* PBXTextBookmark */;
- 61CCBF451161637F00833FE8 /* PBXTextBookmark */ = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
- 61CCBF461161637F00833FE8 /* PBXTextBookmark */ = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
- 61CCBF471161637F00833FE8 /* PBXTextBookmark */ = 61CCBF471161637F00833FE8 /* PBXTextBookmark */;
- 61CCBF791161657400833FE8 /* PBXTextBookmark */ = 61CCBF791161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7B1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7C1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7E1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7F1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF811161657400833FE8 /* PBXTextBookmark */ = 61CCBF811161657400833FE8 /* PBXTextBookmark */;
- 61CCBFD11161833800833FE8 /* PBXTextBookmark */ = 61CCBFD11161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD21161833800833FE8 /* PBXTextBookmark */ = 61CCBFD21161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD31161833800833FE8 /* PBXTextBookmark */ = 61CCBFD31161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD41161833800833FE8 /* PBXTextBookmark */ = 61CCBFD41161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD51161833800833FE8 /* PBXTextBookmark */ = 61CCBFD51161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD61161833800833FE8 /* PBXTextBookmark */ = 61CCBFD61161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD71161833800833FE8 /* PBXTextBookmark */ = 61CCBFD71161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD81161833800833FE8 /* PBXTextBookmark */ = 61CCBFD81161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD91161833800833FE8 /* PBXTextBookmark */ = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDA1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDB1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDC1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDD1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDD1161833800833FE8 /* PBXTextBookmark */;
- 61CE23E7115E49560098C467 /* PBXTextBookmark */ = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
- 61CE23FF115E4B290098C467 /* PBXBookmark */ = 61CE23FF115E4B290098C467 /* PBXBookmark */;
- 61CE2410115E4F620098C467 /* PBXBookmark */ = 61CE2410115E4F620098C467 /* PBXBookmark */;
- 61CE24D4115E5E630098C467 /* PBXTextBookmark */ = 61CE24D4115E5E630098C467 /* PBXTextBookmark */;
- 61CE24DC115E641F0098C467 /* PBXTextBookmark */ = 61CE24DC115E641F0098C467 /* PBXTextBookmark */;
- 61CE24FE115E72A80098C467 /* PBXTextBookmark */ = 61CE24FE115E72A80098C467 /* PBXTextBookmark */;
- 61CE2514115E74CC0098C467 /* PBXBookmark */ = 61CE2514115E74CC0098C467 /* PBXBookmark */;
- 61CE2515115E74CC0098C467 /* PBXTextBookmark */ = 61CE2515115E74CC0098C467 /* PBXTextBookmark */;
- 61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */;
- 61CE2577115E78900098C467 /* PBXTextBookmark */ = 61CE2577115E78900098C467 /* PBXTextBookmark */;
- 61CE2578115E78900098C467 /* PBXTextBookmark */ = 61CE2578115E78900098C467 /* PBXTextBookmark */;
- 61CE25B4115E7C940098C467 /* PBXTextBookmark */ = 61CE25B4115E7C940098C467 /* PBXTextBookmark */;
- 61CE25B5115E7C940098C467 /* PBXTextBookmark */ = 61CE25B5115E7C940098C467 /* PBXTextBookmark */;
- 61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
+ 611FD81D1155111700C2203D = 611FD81D1155111700C2203D /* PBXTextBookmark */;
+ 611FD81E1155111700C2203D = 611FD81E1155111700C2203D /* PBXTextBookmark */;
+ 611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */;
+ 611FD8201155111700C2203D = 611FD8201155111700C2203D /* PBXTextBookmark */;
+ 611FD8211155111700C2203D = 611FD8211155111700C2203D /* PBXTextBookmark */;
+ 611FD8281155111700C2203D = 611FD8281155111700C2203D /* PBXTextBookmark */;
+ 611FD8291155111700C2203D = 611FD8291155111700C2203D /* PBXTextBookmark */;
+ 611FD82A1155111700C2203D = 611FD82A1155111700C2203D /* PBXTextBookmark */;
+ 611FD82B1155111700C2203D = 611FD82B1155111700C2203D /* PBXTextBookmark */;
+ 611FD82C1155111700C2203D = 611FD82C1155111700C2203D /* PBXTextBookmark */;
+ 611FD82D1155111700C2203D = 611FD82D1155111700C2203D /* PBXTextBookmark */;
+ 611FD95711551C3700C2203D = 611FD95711551C3700C2203D /* PBXTextBookmark */;
+ 611FD95811551C3700C2203D = 611FD95811551C3700C2203D /* PBXBookmark */;
+ 611FD95911551C3700C2203D = 611FD95911551C3700C2203D /* PBXBookmark */;
+ 611FD96611551E8000C2203D = 611FD96611551E8000C2203D /* PBXBookmark */;
+ 611FDAC41155B77500C2203D = 611FDAC41155B77500C2203D /* PBXTextBookmark */;
+ 611FDB481155BCE500C2203D = 611FDB481155BCE500C2203D /* PBXTextBookmark */;
+ 611FDB6B1155C0B300C2203D = 611FDB6B1155C0B300C2203D /* PBXBookmark */;
+ 611FDB6C1155C0B300C2203D = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
+ 611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
+ 611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
+ 6156E8311162CD7F00FF6486 /* PBXTextBookmark */ = 6156E8311162CD7F00FF6486 /* PBXTextBookmark */;
+ 6156E8321162CD7F00FF6486 /* PBXTextBookmark */ = 6156E8321162CD7F00FF6486 /* PBXTextBookmark */;
+ 615E2350115ED80500B0ACA1 = 615E2350115ED80500B0ACA1 /* PBXTextBookmark */;
+ 615E2397115F023B00B0ACA1 = 615E2397115F023B00B0ACA1 /* PBXTextBookmark */;
+ 615E2398115F023B00B0ACA1 = 615E2398115F023B00B0ACA1 /* PBXTextBookmark */;
+ 615E2399115F023B00B0ACA1 = 615E2399115F023B00B0ACA1 /* PBXTextBookmark */;
+ 615E239A115F023B00B0ACA1 = 615E239A115F023B00B0ACA1 /* PBXTextBookmark */;
+ 615E239B115F023B00B0ACA1 = 615E239B115F023B00B0ACA1 /* PBXTextBookmark */;
+ 6166BD931162C46400172C3A = 6166BD931162C46400172C3A /* PBXTextBookmark */;
+ 6179889D114AA5BD00BA94A9 = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
+ 61799342114B297000BA94A9 = 61799342114B297000BA94A9 /* PBXBookmark */;
+ 61799343114B297000BA94A9 = 61799343114B297000BA94A9 /* PBXBookmark */;
+ 61799354114BD5C300BA94A9 = 61799354114BD5C300BA94A9 /* PBXTextBookmark */;
+ 6179937111501D7800BA94A9 = 6179937111501D7800BA94A9 /* PBXBookmark */;
+ 6179937411501D7800BA94A9 = 6179937411501D7800BA94A9 /* PBXBookmark */;
+ 6179937511501D7800BA94A9 = 6179937511501D7800BA94A9 /* PBXBookmark */;
+ 6179938511501FFA00BA94A9 = 6179938511501FFA00BA94A9 /* PBXBookmark */;
+ 6179943111502CEA00BA94A9 = 6179943111502CEA00BA94A9 /* PBXBookmark */;
+ 618AFC07115BE92A003D411B = 618AFC07115BE92A003D411B /* PBXBookmark */;
+ 6194CC0711505FCF00A4BA5C = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
+ 61AB99B91162C4A800B1CF7E = 61AB99B91162C4A800B1CF7E /* PBXBookmark */;
+ 61AB99C11162C59E00B1CF7E = 61AB99C11162C59E00B1CF7E /* PBXBookmark */;
+ 61AB99EA1162CC3100B1CF7E = 61AB99EA1162CC3100B1CF7E /* PBXTextBookmark */;
+ 61AB99EB1162CC3100B1CF7E = 61AB99EB1162CC3100B1CF7E /* PBXTextBookmark */;
+ 61AB99EC1162CC3100B1CF7E = 61AB99EC1162CC3100B1CF7E /* PBXTextBookmark */;
+ 61AB99F91162CD2E00B1CF7E = 61AB99F91162CD2E00B1CF7E /* PBXTextBookmark */;
+ 61AB99FA1162CD2E00B1CF7E = 61AB99FA1162CD2E00B1CF7E /* PBXTextBookmark */;
+ 61AB99FB1162CD2E00B1CF7E = 61AB99FB1162CD2E00B1CF7E /* PBXTextBookmark */;
+ 61CCBDA11160666200833FE8 = 61CCBDA11160666200833FE8 /* PBXTextBookmark */;
+ 61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
+ 61CCBECC1161477A00833FE8 = 61CCBECC1161477A00833FE8 /* PBXTextBookmark */;
+ 61CCBECD1161477A00833FE8 = 61CCBECD1161477A00833FE8 /* PBXTextBookmark */;
+ 61CCBECE1161477A00833FE8 = 61CCBECE1161477A00833FE8 /* PBXTextBookmark */;
+ 61CCBF1E116162CA00833FE8 = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
+ 61CCBF1F116162CA00833FE8 = 61CCBF1F116162CA00833FE8 /* PBXTextBookmark */;
+ 61CCBF451161637F00833FE8 = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
+ 61CCBF461161637F00833FE8 = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
+ 61CCBF471161637F00833FE8 = 61CCBF471161637F00833FE8 /* PBXTextBookmark */;
+ 61CCBF791161657400833FE8 = 61CCBF791161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7B1161657400833FE8 = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7C1161657400833FE8 = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7E1161657400833FE8 = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7F1161657400833FE8 = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF811161657400833FE8 = 61CCBF811161657400833FE8 /* PBXTextBookmark */;
+ 61CCBFD11161833800833FE8 = 61CCBFD11161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD21161833800833FE8 = 61CCBFD21161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD31161833800833FE8 = 61CCBFD31161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD41161833800833FE8 = 61CCBFD41161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD51161833800833FE8 = 61CCBFD51161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD71161833800833FE8 = 61CCBFD71161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD81161833800833FE8 = 61CCBFD81161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD91161833800833FE8 = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDA1161833800833FE8 = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDB1161833800833FE8 = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDC1161833800833FE8 = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDD1161833800833FE8 = 61CCBFDD1161833800833FE8 /* PBXTextBookmark */;
+ 61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
+ 61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */;
+ 61CE2410115E4F620098C467 = 61CE2410115E4F620098C467 /* PBXBookmark */;
+ 61CE24D4115E5E630098C467 = 61CE24D4115E5E630098C467 /* PBXTextBookmark */;
+ 61CE24DC115E641F0098C467 = 61CE24DC115E641F0098C467 /* PBXTextBookmark */;
+ 61CE24FE115E72A80098C467 = 61CE24FE115E72A80098C467 /* PBXTextBookmark */;
+ 61CE2514115E74CC0098C467 = 61CE2514115E74CC0098C467 /* PBXBookmark */;
+ 61CE2515115E74CC0098C467 = 61CE2515115E74CC0098C467 /* PBXTextBookmark */;
+ 61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */;
+ 61CE2577115E78900098C467 = 61CE2577115E78900098C467 /* PBXTextBookmark */;
+ 61CE2578115E78900098C467 = 61CE2578115E78900098C467 /* PBXTextBookmark */;
+ 61CE25B4115E7C940098C467 = 61CE25B4115E7C940098C467 /* PBXTextBookmark */;
+ 61CE25B5115E7C940098C467 = 61CE25B5115E7C940098C467 /* PBXTextBookmark */;
+ 61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
};
sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
userBuildSettings = {
@@ -344,16 +349,6 @@
vrLen = 225;
vrLoc = 0;
};
- 611FD94E11551BD300C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 61798887114AA4E600BA94A9 /* GameSetup.h */;
- name = "GameSetup.h: 9";
- rLen = 33;
- rLoc = 135;
- rType = 0;
- vrLen = 236;
- vrLoc = 19;
- };
611FD95711551C3700C2203D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61798856114AA48A00BA94A9 /* CGPointUtils.c */;
@@ -418,6 +413,26 @@
vrLen = 201;
vrLoc = 686;
};
+ 6156E8311162CD7F00FF6486 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 120";
+ rLen = 0;
+ rLoc = 1932;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 6156E8321162CD7F00FF6486 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798803114AA34C00BA94A9 /* uLandTexture.pas */;
+ name = "uLandTexture.pas: 107";
+ rLen = 0;
+ rLoc = 3388;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
615E2350115ED80500B0ACA1 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */;
@@ -428,26 +443,6 @@
vrLen = 149;
vrLoc = 7;
};
- 615E2395115F023B00B0ACA1 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
- name = "MainMenuViewController.m: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 69;
- vrLoc = 147;
- };
- 615E2396115F023B00B0ACA1 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */;
- name = "OverlayViewController.h: 14";
- rLen = 0;
- rLoc = 281;
- rType = 0;
- vrLen = 184;
- vrLoc = 180;
- };
615E2397115F023B00B0ACA1 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */;
@@ -498,24 +493,15 @@
vrLen = 269;
vrLoc = 1592;
};
- 61715D4311618D1B0029EE6B /* XCBuildMessageTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "Expected ',' or ';' before 'NSDictionary'";
- fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
- fallbackIsa = XCBuildMessageTextBookmark;
- rLen = 1;
- rLoc = 27;
- rType = 1;
- };
- 61715D74116199330029EE6B /* PBXTextBookmark */ = {
+ 6166BD931162C46400172C3A /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
- name = "GameSetup.m: 58";
+ name = "GameSetup.m: 79";
rLen = 0;
- rLoc = 2913;
+ rLoc = 2907;
rType = 0;
- vrLen = 715;
- vrLoc = 489;
+ vrLen = 38;
+ vrLoc = 1149;
};
617987D7114AA2CD00BA94A9 /* HedgewarsMobile */ = {
isa = PBXExecutable;
@@ -620,9 +606,9 @@
};
617987EC114AA34C00BA94A9 /* PascalExports.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {744, 1677}}";
+ sepNavIntBoundsRect = "{{0, 0}, {532, 1664}}";
sepNavSelRange = "{1932, 0}";
- sepNavVisRange = "{0, 757}";
+ sepNavVisRange = "{0, 0}";
sepNavWindowFrame = "{{238, 238}, {803, 674}}";
};
};
@@ -707,9 +693,9 @@
};
617987F9114AA34C00BA94A9 /* uConsts.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {532, 24284}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{114, 72}";
+ sepNavIntBoundsRect = "{{0, 0}, {879, 25077}}";
+ sepNavSelRange = "{10318, 0}";
+ sepNavVisRange = "{9634, 1948}";
sepNavWindowFrame = "{{162, 164}, {938, 967}}";
};
};
@@ -747,9 +733,9 @@
};
617987FE114AA34C00BA94A9 /* uKeys.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {544, 6812}}";
+ sepNavIntBoundsRect = "{{0, 0}, {532, 6955}}";
sepNavSelRange = "{2954, 0}";
- sepNavVisRange = "{2933, 21}";
+ sepNavVisRange = "{2954, 46}";
sepNavWindowFrame = "{{674, 505}, {921, 605}}";
};
};
@@ -787,9 +773,9 @@
};
61798803114AA34C00BA94A9 /* uLandTexture.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {845, 1664}}";
+ sepNavIntBoundsRect = "{{0, 0}, {532, 1664}}";
sepNavSelRange = "{3388, 0}";
- sepNavVisRange = "{3748, 5}";
+ sepNavVisRange = "{0, 0}";
sepNavWindowFrame = "{{400, 151}, {938, 967}}";
};
};
@@ -942,10 +928,10 @@
};
61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {768, 1885}}";
- sepNavSelRange = "{2818, 0}";
- sepNavVisRange = "{1968, 1414}";
- sepNavWindowFrame = "{{841, 168}, {803, 674}}";
+ sepNavIntBoundsRect = "{{0, 0}, {744, 1911}}";
+ sepNavSelRange = "{1141, 0}";
+ sepNavVisRange = "{0, 1400}";
+ sepNavWindowFrame = "{{156, 236}, {803, 674}}";
};
};
61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */ = {
@@ -966,9 +952,9 @@
};
6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {537, 2405}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{147, 69}";
+ sepNavIntBoundsRect = "{{0, 0}, {901, 2366}}";
+ sepNavSelRange = "{1275, 0}";
+ sepNavVisRange = "{1158, 1026}";
sepNavWindowFrame = "{{525, 308}, {775, 623}}";
};
};
@@ -1035,18 +1021,18 @@
};
61798887114AA4E600BA94A9 /* GameSetup.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {838, 564}}";
- sepNavSelRange = "{548, 0}";
- sepNavVisRange = "{0, 665}";
+ sepNavIntBoundsRect = "{{0, 0}, {1020, 742}}";
+ sepNavSelRange = "{700, 0}";
+ sepNavVisRange = "{0, 746}";
sepNavWindowFrame = "{{61, 439}, {897, 692}}";
};
};
61798888114AA4E600BA94A9 /* GameSetup.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1433, 4797}}";
- sepNavSelRange = "{2913, 0}";
- sepNavVisRange = "{489, 715}";
- sepNavWindowFrame = "{{735, 308}, {1079, 870}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1020, 4706}}";
+ sepNavSelRange = "{9695, 0}";
+ sepNavVisRange = "{9136, 1732}";
+ sepNavWindowFrame = "{{659, 189}, {1079, 870}}";
};
};
6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = {
@@ -1116,6 +1102,74 @@
rLen = 0;
rLoc = 9223372036854775808;
};
+ 61AB99B91162C4A800B1CF7E /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */;
+ };
+ 61AB99C11162C59E00B1CF7E /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 617987F9114AA34C00BA94A9 /* uConsts.pas */;
+ };
+ 61AB99EA1162CC3100B1CF7E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
+ name = "uKeys.pas: 105";
+ rLen = 0;
+ rLoc = 2954;
+ rType = 0;
+ vrLen = 46;
+ vrLoc = 2954;
+ };
+ 61AB99EB1162CC3100B1CF7E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */;
+ name = "OverlayViewController.h: 14";
+ rLen = 0;
+ rLoc = 281;
+ rType = 0;
+ vrLen = 31;
+ vrLoc = 0;
+ };
+ 61AB99EC1162CC3100B1CF7E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
+ name = "MainMenuViewController.m: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 61AB99F91162CD2E00B1CF7E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 120";
+ rLen = 0;
+ rLoc = 1932;
+ rType = 0;
+ vrLen = 25;
+ vrLoc = 0;
+ };
+ 61AB99FA1162CD2E00B1CF7E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987F9114AA34C00BA94A9 /* uConsts.pas */;
+ name = "uConsts.pas: 222";
+ rLen = 0;
+ rLoc = 10317;
+ rType = 0;
+ vrLen = 1964;
+ vrLoc = 9634;
+ };
+ 61AB99FB1162CD2E00B1CF7E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */;
+ name = "SDL_uikitappdelegate.m: 106";
+ rLen = 0;
+ rLoc = 3388;
+ rType = 0;
+ vrLen = 1757;
+ vrLoc = 2381;
+ };
61CCBDA11160666200833FE8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
@@ -1326,16 +1380,6 @@
vrLen = 58;
vrLoc = 258;
};
- 61CCBFD61161833800833FE8 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
- name = "uKeys.pas: 105";
- rLen = 0;
- rLoc = 2954;
- rType = 0;
- vrLen = 21;
- vrLoc = 2933;
- };
61CCBFD71161833800833FE8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 6179880C114AA34C00BA94A9 /* uTeams.pas */;
@@ -1446,9 +1490,9 @@
};
61CE24EA115E71C20098C467 /* OverlayViewController.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {551, 494}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1004, 494}}";
sepNavSelRange = "{281, 0}";
- sepNavVisRange = "{180, 184}";
+ sepNavVisRange = "{0, 395}";
sepNavWindowFrame = "{{15, 206}, {938, 967}}";
};
};