# HG changeset patch
# User koda
# Date 1270159023 0
# Node ID 252be02536ab4b1da69c3f5264e99ff598f1f183
# Parent 654795439cf8f06225b572452fc7d2efea625c84
fix an error in passing strings between ObjC and Pascal
diff -r 654795439cf8 -r 252be02536ab cocoaTouch/MainMenuViewController.m
--- a/cocoaTouch/MainMenuViewController.m Thu Apr 01 17:01:04 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m Thu Apr 01 21:57:03 2010 +0000
@@ -36,15 +36,15 @@
}
-(void) viewDidLoad {
- [NSThread detachNewThreadSelector:@selector(checkFirstRun) toTarget:self withObject:nil];
- /*
- char *ver;
- HW_versionInfo(NULL, &ver);
+ [NSThread detachNewThreadSelector:@selector(checkFirstRun) toTarget:self withObject:nil];
+
+ char *ver;
+ HW_versionInfo(NULL, &ver);
NSString *versionNumber = [[NSString alloc] initWithCString:ver];
- self.versionLabel.text = versionNumber;
+ self.versionLabel.text = versionNumber;
[versionNumber release];
- */
- [super viewDidLoad];
+
+ [super viewDidLoad];
}
- (void)viewDidUnload {
diff -r 654795439cf8 -r 252be02536ab hedgewars/PascalExports.pas
--- a/hedgewars/PascalExports.pas Thu Apr 01 17:01:04 2010 +0000
+++ b/hedgewars/PascalExports.pas Thu Apr 01 21:57:03 2010 +0000
@@ -21,10 +21,11 @@
{$IFDEF HWLIBRARY}
// retrieve protocol information
-procedure HW_versionInfo(netProto: PShortInt; versionStr: PString); cdecl; export;
+procedure HW_versionInfo(netProto: PShortInt; versionStr: Ppchar); cdecl; export;
begin
+// http://bugs.freepascal.org/view.php?id=16156
if netProto <> nil then netProto^:= cNetProtoVersion;
- if versionStr <> nil then versionStr^:= shortstring(cVersionString);
+ if versionStr <> nil then versionStr^:= cVersionString;
end;
procedure HW_click; cdecl; export;
diff -r 654795439cf8 -r 252be02536ab hedgewars/hwLibrary.pas
--- a/hedgewars/hwLibrary.pas Thu Apr 01 17:01:04 2010 +0000
+++ b/hedgewars/hwLibrary.pas Thu Apr 01 21:57:03 2010 +0000
@@ -12,7 +12,7 @@
// these procedures/functions to the PascalImports.h file (also in the "Pascal Sources" group)
// to make these functions available in the C/C++/Objective-C source files
// (add "#include PascalImports.h" near the top of these files if it's not there yet)
-uses hwengine;
+uses cmem, hwengine;
end.
diff -r 654795439cf8 -r 252be02536ab project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Thu Apr 01 17:01:04 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Thu Apr 01 21:57:03 2010 +0000
@@ -229,8 +229,6 @@
Layout
- BecomeActive
-
ContentConfiguration
PBXBottomSmartGroupGIDs
@@ -274,7 +272,7 @@
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 4
+ 7
2
0
@@ -299,7 +297,7 @@
186
RubberWindowFrame
- 844 455 801 617 0 0 1920 1178
+ 313 455 801 617 0 0 1920 1178
Module
PBXSmartGroupTreeModule
@@ -310,12 +308,14 @@
Dock
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
1CE0B20306471E060097A5F4
PBXProjectModuleLabel
- uKeys.pas
+ SDL_uikitappdelegate.m
PBXSplitModuleInNavigatorKey
Split0
@@ -323,17 +323,16 @@
PBXProjectModuleGUID
1CE0B20406471E060097A5F4
PBXProjectModuleLabel
- uKeys.pas
+ SDL_uikitappdelegate.m
_historyCapacity
0
bookmark
- 61697BBB11634AA000CCDF37
+ 615F12C311655708002444F2
history
6179889D114AA5BD00BA94A9
61799342114B297000BA94A9
61799343114B297000BA94A9
- 61799354114BD5C300BA94A9
6179937111501D7800BA94A9
6179937411501D7800BA94A9
6179937511501D7800BA94A9
@@ -368,7 +367,6 @@
61CE2410115E4F620098C467
61CE24D4115E5E630098C467
61CE24DC115E641F0098C467
- 61CE24FE115E72A80098C467
61CE2514115E74CC0098C467
61CE2515115E74CC0098C467
61CE251F115E75A70098C467
@@ -384,8 +382,6 @@
615E239B115F023B00B0ACA1
61CCBDA11160666200833FE8
61CCBE60116135FF00833FE8
- 61CCBECC1161477A00833FE8
- 61CCBECD1161477A00833FE8
61CCBF1E116162CA00833FE8
61CCBF1F116162CA00833FE8
61CCBF451161637F00833FE8
@@ -409,11 +405,16 @@
61CCBFDC1161833800833FE8
61CCBFDD1161833800833FE8
61AB99EB1162CC3100B1CF7E
- 61AB99EC1162CC3100B1CF7E
- 6156E8311162CD7F00FF6486
61697B9E1163478A00CCDF37
61697BB611634A2400CCDF37
- 61697BB711634A2400CCDF37
+ 612D5C451165535400C6D842
+ 612D616B1165536300C6D842
+ 612D618F1165545F00C6D842
+ 61430D3B1165551600E2C62D
+ 61430D3C1165551600E2C62D
+ 61430D3D1165551600E2C62D
+ 61430D3E1165551600E2C62D
+ 61430D501165557800E2C62D
SplitCount
@@ -425,14 +426,14 @@
GeometryConfiguration
Frame
- {{0, 0}, {593, 93}}
+ {{0, 0}, {593, 213}}
RubberWindowFrame
- 844 455 801 617 0 0 1920 1178
+ 313 455 801 617 0 0 1920 1178
Module
PBXNavigatorGroup
Proportion
- 93pt
+ 213pt
ContentConfiguration
@@ -445,14 +446,14 @@
GeometryConfiguration
Frame
- {{0, 98}, {593, 478}}
+ {{0, 218}, {593, 358}}
RubberWindowFrame
- 844 455 801 617 0 0 1920 1178
+ 313 455 801 617 0 0 1920 1178
Module
XCDetailModule
Proportion
- 478pt
+ 358pt
Proportion
@@ -471,9 +472,9 @@
TableOfContents
- 61697BA11163478A00CCDF37
+ 615F12B911655601002444F2
1CE0B1FE06471DED0097A5F4
- 61697BA21163478A00CCDF37
+ 615F12BA11655601002444F2
1CE0B20306471E060097A5F4
1CE0B20506471E060097A5F4
@@ -611,12 +612,12 @@
5
WindowOrderList
- 61697BA31163478A00CCDF37
61798848114AA42600BA94A9
+ 612D61911165545F00C6D842
/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj
WindowString
- 844 455 801 617 0 0 1920 1178
+ 313 455 801 617 0 0 1920 1178
WindowToolsV3
@@ -632,14 +633,12 @@
Dock
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
1CD0528F0623707200166675
PBXProjectModuleLabel
- uKeys.pas
+
StatusBarVisibility
@@ -695,7 +694,7 @@
TableOfContents
61798848114AA42600BA94A9
- 61697B9B1163477E00CCDF37
+ 615F12BC11655601002444F2
1CD0528F0623707200166675
XCMainBuildResultsModuleGUID
@@ -819,13 +818,13 @@
TableOfContents
1CD10A99069EF8BA00B06720
- 61AB99E31162CC3000B1CF7E
+ 61430D451165551600E2C62D
1C162984064C10D400B95A72
- 61AB99E41162CC3000B1CF7E
- 61AB99E51162CC3000B1CF7E
- 61AB99E61162CC3000B1CF7E
- 61AB99E71162CC3000B1CF7E
- 61AB99E81162CC3000B1CF7E
+ 61430D461165551600E2C62D
+ 61430D471165551600E2C62D
+ 61430D481165551600E2C62D
+ 61430D491165551600E2C62D
+ 61430D4A1165551600E2C62D
ToolbarConfiguration
xcode.toolbar.config.debugV3
@@ -989,7 +988,7 @@
TableOfContents
1C78EAAD065D492600B07095
- 61AB99E91162CC3000B1CF7E
+ 61430D4B1165551600E2C62D
1C78EAAC065D492600B07095
ToolbarConfiguration
diff -r 654795439cf8 -r 252be02536ab project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Thu Apr 01 17:01:04 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Thu Apr 01 21:57:03 2010 +0000
@@ -94,95 +94,103 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 291718669;
- PBXWorkspaceStateSaveDate = 291718669;
+ PBXPerProjectTemplateStateSaveDate = 291853811;
+ PBXWorkspaceStateSaveDate = 291853811;
};
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 */;
- 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 */;
- 6156E8311162CD7F00FF6486 /* PBXTextBookmark */ = 6156E8311162CD7F00FF6486 /* PBXTextBookmark */;
- 615E2350115ED80500B0ACA1 /* PBXTextBookmark */ = 615E2350115ED80500B0ACA1 /* PBXTextBookmark */;
- 615E2397115F023B00B0ACA1 /* PBXTextBookmark */ = 615E2397115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E2398115F023B00B0ACA1 /* PBXTextBookmark */ = 615E2398115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E2399115F023B00B0ACA1 /* PBXTextBookmark */ = 615E2399115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E239A115F023B00B0ACA1 /* PBXTextBookmark */ = 615E239A115F023B00B0ACA1 /* PBXTextBookmark */;
- 615E239B115F023B00B0ACA1 /* PBXTextBookmark */ = 615E239B115F023B00B0ACA1 /* PBXTextBookmark */;
- 61697B9E1163478A00CCDF37 /* PBXTextBookmark */ = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */;
- 61697BB611634A2400CCDF37 /* PBXTextBookmark */ = 61697BB611634A2400CCDF37 /* PBXTextBookmark */;
- 61697BB711634A2400CCDF37 /* XCBuildMessageTextBookmark */ = 61697BB711634A2400CCDF37 /* XCBuildMessageTextBookmark */;
- 61697BBB11634AA000CCDF37 /* PBXTextBookmark */ = 61697BBB11634AA000CCDF37 /* 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 */;
- 61AB99EB1162CC3100B1CF7E /* PBXTextBookmark */ = 61AB99EB1162CC3100B1CF7E /* PBXTextBookmark */;
- 61AB99EC1162CC3100B1CF7E /* PBXTextBookmark */ = 61AB99EC1162CC3100B1CF7E /* PBXTextBookmark */;
- 61CCBDA11160666200833FE8 /* PBXTextBookmark */ = 61CCBDA11160666200833FE8 /* PBXTextBookmark */;
- 61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
- 61CCBECC1161477A00833FE8 /* PBXTextBookmark */ = 61CCBECC1161477A00833FE8 /* PBXTextBookmark */;
- 61CCBECD1161477A00833FE8 /* PBXTextBookmark */ = 61CCBECD1161477A00833FE8 /* 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 */;
- 61CCBFD11161833800833FE8 /* PBXTextBookmark */ = 61CCBFD11161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD21161833800833FE8 /* PBXTextBookmark */ = 61CCBFD21161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD31161833800833FE8 /* PBXTextBookmark */ = 61CCBFD31161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD41161833800833FE8 /* PBXTextBookmark */ = 61CCBFD41161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD51161833800833FE8 /* PBXTextBookmark */ = 61CCBFD51161833800833FE8 /* 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 */;
+ 612D5C451165535400C6D842 = 612D5C451165535400C6D842 /* PBXTextBookmark */;
+ 612D616B1165536300C6D842 = 612D616B1165536300C6D842 /* PBXTextBookmark */;
+ 612D618F1165545F00C6D842 = 612D618F1165545F00C6D842 /* PBXTextBookmark */;
+ 612D61931165545F00C6D842 = 612D61931165545F00C6D842 /* PBXTextBookmark */;
+ 61430D341165548700E2C62D = 61430D341165548700E2C62D /* PBXBookmark */;
+ 61430D3B1165551600E2C62D = 61430D3B1165551600E2C62D /* PBXTextBookmark */;
+ 61430D3C1165551600E2C62D = 61430D3C1165551600E2C62D /* PBXTextBookmark */;
+ 61430D3D1165551600E2C62D = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
+ 61430D3E1165551600E2C62D = 61430D3E1165551600E2C62D /* PBXTextBookmark */;
+ 61430D3F1165551600E2C62D = 61430D3F1165551600E2C62D /* PBXTextBookmark */;
+ 61430D501165557800E2C62D = 61430D501165557800E2C62D /* PBXTextBookmark */;
+ 61430D511165557800E2C62D = 61430D511165557800E2C62D /* PBXTextBookmark */;
+ 61430D521165557800E2C62D = 61430D521165557800E2C62D /* PBXTextBookmark */;
+ 615E2350115ED80500B0ACA1 = 615E2350115ED80500B0ACA1 /* PBXTextBookmark */;
+ 615E2397115F023B00B0ACA1 = 615E2397115F023B00B0ACA1 /* PBXTextBookmark */;
+ 615E2398115F023B00B0ACA1 = 615E2398115F023B00B0ACA1 /* PBXTextBookmark */;
+ 615E2399115F023B00B0ACA1 = 615E2399115F023B00B0ACA1 /* PBXTextBookmark */;
+ 615E239A115F023B00B0ACA1 = 615E239A115F023B00B0ACA1 /* PBXTextBookmark */;
+ 615E239B115F023B00B0ACA1 = 615E239B115F023B00B0ACA1 /* PBXTextBookmark */;
+ 615F12B811655601002444F2 /* PBXTextBookmark */ = 615F12B811655601002444F2 /* PBXTextBookmark */;
+ 615F12BB11655601002444F2 /* PBXTextBookmark */ = 615F12BB11655601002444F2 /* PBXTextBookmark */;
+ 615F12C311655708002444F2 /* PBXTextBookmark */ = 615F12C311655708002444F2 /* PBXTextBookmark */;
+ 61697B9E1163478A00CCDF37 = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */;
+ 61697BB611634A2400CCDF37 = 61697BB611634A2400CCDF37 /* 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 */;
+ 618AFC07115BE92A003D411B = 618AFC07115BE92A003D411B /* PBXBookmark */;
+ 6194CC0711505FCF00A4BA5C = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
+ 61AB99EB1162CC3100B1CF7E = 61AB99EB1162CC3100B1CF7E /* PBXTextBookmark */;
+ 61CCBDA11160666200833FE8 = 61CCBDA11160666200833FE8 /* PBXTextBookmark */;
+ 61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* 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 */;
+ 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 */;
+ 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 = {
@@ -407,14 +415,128 @@
vrLen = 201;
vrLoc = 686;
};
- 6156E8311162CD7F00FF6486 /* PBXTextBookmark */ = {
+ 612D5C451165535400C6D842 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
+ name = "uKeys.pas: 106";
+ rLen = 0;
+ rLoc = 2995;
+ rType = 0;
+ vrLen = 94;
+ vrLoc = 2933;
+ };
+ 612D616B1165536300C6D842 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
+ name = "hwengine.pas: 21";
+ rLen = 0;
+ rLoc = 806;
+ rType = 0;
+ vrLen = 33;
+ vrLoc = 791;
+ };
+ 612D618F1165545F00C6D842 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */;
+ name = "hwLibrary.pas: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 14;
+ vrLoc = 0;
+ };
+ 612D61931165545F00C6D842 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 10";
+ rLen = 0;
+ rLoc = 145;
+ rType = 0;
+ vrLen = 743;
+ vrLoc = 0;
+ };
+ 61430D341165548700E2C62D /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
+ };
+ 61430D3B1165551600E2C62D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
name = "PascalExports.pas: 120";
rLen = 0;
- rLoc = 1932;
+ rLoc = 1966;
+ rType = 0;
+ vrLen = 22;
+ vrLoc = 3;
+ };
+ 61430D3C1165551600E2C62D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
+ name = "MainMenuViewController.m: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 3;
+ vrLoc = 0;
+ };
+ 61430D3D1165551600E2C62D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798867114AA4AA00BA94A9 /* SDL_uikitwindow.h */;
+ name = "SDL_uikitwindow.h: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 3;
+ vrLoc = 0;
+ };
+ 61430D3E1165551600E2C62D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */;
+ name = "SDL_uikitappdelegate.h: 22";
+ rLen = 0;
+ rLoc = 936;
rType = 0;
- vrLen = 0;
+ vrLen = 324;
+ vrLoc = 936;
+ };
+ 61430D3F1165551600E2C62D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */;
+ name = "SDL_uikitappdelegate.m: 82";
+ rLen = 0;
+ rLoc = 2541;
+ rType = 0;
+ vrLen = 860;
+ vrLoc = 2929;
+ };
+ 61430D501165557800E2C62D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */;
+ name = "SDL_uikitappdelegate.m: 32";
+ rLen = 0;
+ rLoc = 1141;
+ rType = 0;
+ vrLen = 394;
+ vrLoc = 1006;
+ };
+ 61430D511165557800E2C62D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
+ name = "MainMenuViewController.m: 47";
+ rLen = 0;
+ rLoc = 1464;
+ rType = 0;
+ vrLen = 1025;
+ vrLoc = 1158;
+ };
+ 61430D521165557800E2C62D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 10";
+ rLen = 0;
+ rLoc = 145;
+ rType = 0;
+ vrLen = 743;
vrLoc = 0;
};
615E2350115ED80500B0ACA1 /* PBXTextBookmark */ = {
@@ -477,6 +599,36 @@
vrLen = 269;
vrLoc = 1592;
};
+ 615F12B811655601002444F2 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */;
+ name = "SDL_uikitappdelegate.m: 32";
+ rLen = 0;
+ rLoc = 1141;
+ rType = 0;
+ vrLen = 361;
+ vrLoc = 1006;
+ };
+ 615F12BB11655601002444F2 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+ name = "PascalExports.pas: 10";
+ rLen = 0;
+ rLoc = 145;
+ rType = 0;
+ vrLen = 743;
+ vrLoc = 0;
+ };
+ 615F12C311655708002444F2 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */;
+ name = "SDL_uikitappdelegate.m: 32";
+ rLen = 0;
+ rLoc = 1141;
+ rType = 0;
+ vrLen = 361;
+ vrLoc = 1006;
+ };
61697B9E1163478A00CCDF37 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61798803114AA34C00BA94A9 /* uLandTexture.pas */;
@@ -497,25 +649,6 @@
vrLen = 160;
vrLoc = 1161;
};
- 61697BB711634A2400CCDF37 /* XCBuildMessageTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "6: Local variable \"pkbd\" is assigned but never used";
- fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
- fallbackIsa = XCBuildMessageTextBookmark;
- rLen = 1;
- rLoc = 105;
- rType = 1;
- };
- 61697BBB11634AA000CCDF37 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
- name = "uKeys.pas: 106";
- rLen = 0;
- rLoc = 2995;
- rType = 0;
- vrLen = 117;
- vrLoc = 2910;
- };
617987D7114AA2CD00BA94A9 /* HedgewarsMobile */ = {
isa = PBXExecutable;
activeArgIndices = (
@@ -596,17 +729,18 @@
};
617987E7114AA34C00BA94A9 /* hwengine.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {873, 7618}}";
- sepNavSelRange = "{6500, 0}";
- sepNavVisRange = "{4463, 1914}";
+ sepNavIntBoundsRect = "{{0, 0}, {537, 7839}}";
+ sepNavSelRange = "{806, 0}";
+ sepNavVisRange = "{791, 33}";
sepNavWindowFrame = "{{421, 176}, {897, 692}}";
};
};
617987E9114AA34C00BA94A9 /* hwLibrary.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {677, 221}}";
+ sepNavIntBoundsRect = "{{0, 0}, {532, 299}}";
sepNavSelRange = "{0, 0}";
sepNavVisRange = "{0, 14}";
+ sepNavWindowFrame = "{{15, 481}, {897, 692}}";
};
};
617987EB114AA34C00BA94A9 /* options.inc */ = {
@@ -619,9 +753,9 @@
};
617987EC114AA34C00BA94A9 /* PascalExports.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {532, 1664}}";
- sepNavSelRange = "{1932, 0}";
- sepNavVisRange = "{0, 0}";
+ sepNavIntBoundsRect = "{{0, 0}, {744, 1651}}";
+ sepNavSelRange = "{724, 0}";
+ sepNavVisRange = "{140, 732}";
sepNavWindowFrame = "{{238, 238}, {803, 674}}";
};
};
@@ -746,9 +880,9 @@
};
617987FE114AA34C00BA94A9 /* uKeys.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1818, 6877}}";
- sepNavSelRange = "{3401, 0}";
- sepNavVisRange = "{5606, 471}";
+ sepNavIntBoundsRect = "{{0, 0}, {663, 7020}}";
+ sepNavSelRange = "{2995, 0}";
+ sepNavVisRange = "{2933, 94}";
sepNavWindowFrame = "{{674, 505}, {921, 605}}";
};
};
@@ -933,20 +1067,27 @@
};
61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {786, 585}}";
- sepNavSelRange = "{603, 0}";
- sepNavVisRange = "{937, 373}";
+ sepNavIntBoundsRect = "{{0, 0}, {558, 585}}";
+ sepNavSelRange = "{936, 0}";
+ sepNavVisRange = "{936, 324}";
sepNavWindowFrame = "{{841, 168}, {803, 674}}";
};
};
61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {744, 1911}}";
+ sepNavIntBoundsRect = "{{0, 0}, {537, 1898}}";
sepNavSelRange = "{1141, 0}";
- sepNavVisRange = "{0, 1400}";
+ sepNavVisRange = "{1006, 361}";
sepNavWindowFrame = "{{156, 236}, {803, 674}}";
};
};
+ 61798867114AA4AA00BA94A9 /* SDL_uikitwindow.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {532, 572}}";
+ sepNavSelRange = "{0, 0}";
+ sepNavVisRange = "{0, 3}";
+ };
+ };
61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {696, 1690}}";
@@ -965,9 +1106,9 @@
};
6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {901, 2366}}";
- sepNavSelRange = "{1275, 0}";
- sepNavVisRange = "{1158, 1026}";
+ sepNavIntBoundsRect = "{{0, 0}, {901, 2405}}";
+ sepNavSelRange = "{1464, 0}";
+ sepNavVisRange = "{1158, 1025}";
sepNavWindowFrame = "{{525, 308}, {775, 623}}";
};
};
@@ -1069,16 +1210,6 @@
isa = PBXBookmark;
fRef = 61798A21114ADD2600BA94A9 /* backgroundRight.png */;
};
- 61799354114BD5C300BA94A9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */;
- name = "SDL_uikitappdelegate.h: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 516;
- vrLoc = 936;
- };
6179937111501D7800BA94A9 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 61798A1E114ADD2600BA94A9 /* backgroundBottom.png */;
@@ -1125,16 +1256,6 @@
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;
- };
61CCBDA11160666200833FE8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
@@ -1155,26 +1276,6 @@
vrLen = 130;
vrLoc = 186;
};
- 61CCBECC1161477A00833FE8 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
- name = "hwengine.pas: 21";
- rLen = 0;
- rLoc = 806;
- rType = 0;
- vrLen = 33;
- vrLoc = 791;
- };
- 61CCBECD1161477A00833FE8 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */;
- name = "hwLibrary.pas: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 14;
- vrLoc = 0;
- };
61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987F3114AA34C00BA94A9 /* uAIAmmoTests.pas */;
@@ -1464,16 +1565,6 @@
sepNavWindowFrame = "{{15, 206}, {938, 967}}";
};
};
- 61CE24FE115E72A80098C467 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */;
- name = "SDL_uikitappdelegate.m: 80";
- rLen = 0;
- rLoc = 2541;
- rType = 0;
- vrLen = 401;
- vrLoc = 3082;
- };
61CE250B115E749A0098C467 /* OverlayViewController.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {879, 814}}";