koda's changelog turn
fix to build mac system
remove some warnings
forgot one hat
debug stuff
--- a/CMakeLists.txt Wed Mar 31 22:02:12 2010 +0000
+++ b/CMakeLists.txt Wed Mar 31 22:54:28 2010 +0000
@@ -71,10 +71,14 @@
#create universal binaries only when it's time to bundle the application, also build server
IF(BUNDLE)
- set(WITH_SERVER false)
+ set(WITH_SERVER true)
if(NOT minimum_macosx MATCHES "10.6")
set(CMAKE_C_COMPILER "gcc-4.0")
set(CMAKE_CXX_COMPILER "g++-4.0")
+ else()
+ if(current_macosx_version MATCHES "10.6")
+ set(CMAKE_OSX_ARCHITECTURES "x86_64")
+ endif()
endif()
ELSE()
if(current_macosx_version MATCHES "10.6")
--- a/ChangeLog.txt Wed Mar 31 22:02:12 2010 +0000
+++ b/ChangeLog.txt Wed Mar 31 22:54:28 2010 +0000
@@ -59,6 +59,8 @@
* Fixed several memory leaks
+ Lots of other bug fixes and additions we already forgot during this huge release
+ Updated translation
+ + PowerPC architecture supported
+ * Reduced memory footprint and leakage
0.9.11 -> 0.9.12:
+ Zoom
--- a/cocoaTouch/GameSetup.m Wed Mar 31 22:02:12 2010 +0000
+++ b/cocoaTouch/GameSetup.m Wed Mar 31 22:54:28 2010 +0000
@@ -14,6 +14,7 @@
#include <sys/sysctl.h>
#define BUFFER_SIZE 256
+#define debug(format, ...) CFShow([NSString stringWithFormat:format, ## __VA_ARGS__]);
@implementation GameSetup
@@ -31,6 +32,10 @@
return nil;
}
+-(NSString *)description {
+ return [NSString stringWithFormat:@"ipcport: %d\nsockets: %d,%d\n teams: %@\n systemSettings: %@",ipcPort,sd,csd,teams,systemSettings];
+}
+
-(void) dealloc {
[teams release];
[systemSettings release];
--- a/hedgewars/uKeys.pas Wed Mar 31 22:02:12 2010 +0000
+++ b/hedgewars/uKeys.pas Wed Mar 31 22:54:28 2010 +0000
@@ -102,8 +102,8 @@
procedure ProcessKbd;
var i, j, k: LongInt;
s: shortstring;
- pkbd: PByteArray;
Trusted: boolean;
+{$IFNDEF IPHONEOS}pkbd: PByteArray;{$ENDIF}
begin
hideAmmoMenu:= false;
Trusted:= (CurrentTeam <> nil)
@@ -115,9 +115,11 @@
movecursor(5 * CursorMovementX, 5 * CursorMovementY);
k:= SDL_GetMouseState(nil, nil);
+
+{$IFDEF IPHONEOS}
+SDL_GetKeyState(@j);
+{$ELSE}
pkbd:= SDL_GetKeyState(@j);
-
-{$IFNDEF IPHONEOS}
for i:= 6 to pred(j) do // first 6 will be overwritten
tkbdn[i]:= pkbd^[i];
{$ENDIF}
@@ -187,11 +189,11 @@
procedure ResetKbd;
var i, j, k, t: LongInt;
- pkbd: PByteArray;
+{$IFNDEF IPHONEOS}pkbd: PByteArray;{$ENDIF}
begin
k:= SDL_GetMouseState(nil, nil);
-pkbd:= SDL_GetKeyState(@j);
+{$IFNDEF IPHONEOS}pkbd:={$ENDIF}SDL_GetKeyState(@j);
TryDo(j < cKeyMaxIndex, 'SDL keys number is more than expected (' + inttostr(j) + ')', true);
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Wed Mar 31 22:02:12 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Wed Mar 31 22:54:28 2010 +0000
@@ -229,6 +229,8 @@
<key>Layout</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -272,7 +274,8 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>1</integer>
+ <integer>4</integer>
+ <integer>2</integer>
<integer>0</integer>
</array>
</array>
@@ -312,7 +315,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>uLandTexture.pas</string>
+ <string>uKeys.pas</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -320,11 +323,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>uLandTexture.pas</string>
+ <string>uKeys.pas</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>6156E8321162CD7F00FF6486</string>
+ <string>61697BBB11634AA000CCDF37</string>
<key>history</key>
<array>
<string>6179889D114AA5BD00BA94A9</string>
@@ -405,12 +408,12 @@
<string>61CCBFDB1161833800833FE8</string>
<string>61CCBFDC1161833800833FE8</string>
<string>61CCBFDD1161833800833FE8</string>
- <string>6166BD931162C46400172C3A</string>
- <string>61AB99EA1162CC3100B1CF7E</string>
<string>61AB99EB1162CC3100B1CF7E</string>
<string>61AB99EC1162CC3100B1CF7E</string>
<string>6156E8311162CD7F00FF6486</string>
- <string>61CCBF811161657400833FE8</string>
+ <string>61697B9E1163478A00CCDF37</string>
+ <string>61697BB611634A2400CCDF37</string>
+ <string>61697BB711634A2400CCDF37</string>
</array>
</dict>
<key>SplitCount</key>
@@ -422,18 +425,16 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {593, 28}}</string>
+ <string>{{0, 0}, {593, 93}}</string>
<key>RubberWindowFrame</key>
<string>844 455 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>28pt</string>
+ <string>93pt</string>
</dict>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -444,14 +445,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 33}, {593, 543}}</string>
+ <string>{{0, 98}, {593, 478}}</string>
<key>RubberWindowFrame</key>
<string>844 455 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>543pt</string>
+ <string>478pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -470,9 +471,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>6156E8331162CD7F00FF6486</string>
+ <string>61697BA11163478A00CCDF37</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>6156E8341162CD7F00FF6486</string>
+ <string>61697BA21163478A00CCDF37</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -610,8 +611,8 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
+ <string>61697BA31163478A00CCDF37</string>
<string>61798848114AA42600BA94A9</string>
- <string>61AB99F31162CC3100B1CF7E</string>
<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
</array>
<key>WindowString</key>
@@ -631,12 +632,14 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string></string>
+ <string>uKeys.pas</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -692,7 +695,7 @@
<key>TableOfContents</key>
<array>
<string>61798848114AA42600BA94A9</string>
- <string>6156E8351162CD7F00FF6486</string>
+ <string>61697B9B1163477E00CCDF37</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Wed Mar 31 22:02:12 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Wed Mar 31 22:54:28 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 */,
@@ -94,101 +94,95 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 291687784;
- PBXWorkspaceStateSaveDate = 291687784;
+ PBXPerProjectTemplateStateSaveDate = 291718669;
+ PBXWorkspaceStateSaveDate = 291718669;
};
perUserProjectItems = {
- 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 */;
+ 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 */;
- 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 */;
+ 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 */;
};
sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
userBuildSettings = {
@@ -423,16 +417,6 @@
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 */;
@@ -493,15 +477,44 @@
vrLen = 269;
vrLoc = 1592;
};
- 6166BD931162C46400172C3A /* PBXTextBookmark */ = {
+ 61697B9E1163478A00CCDF37 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798803114AA34C00BA94A9 /* uLandTexture.pas */;
+ name = "uLandTexture.pas: 107";
+ rLen = 0;
+ rLoc = 3388;
+ rType = 0;
+ vrLen = 250;
+ vrLoc = 3;
+ };
+ 61697BB611634A2400CCDF37 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
- name = "GameSetup.m: 79";
+ name = "GameSetup.m: 83";
rLen = 0;
- rLoc = 2907;
+ rLoc = 3164;
rType = 0;
- vrLen = 38;
- vrLoc = 1149;
+ 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;
@@ -733,9 +746,9 @@
};
617987FE114AA34C00BA94A9 /* uKeys.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {532, 6955}}";
- sepNavSelRange = "{2954, 0}";
- sepNavVisRange = "{2954, 46}";
+ sepNavIntBoundsRect = "{{0, 0}, {1818, 6877}}";
+ sepNavSelRange = "{3401, 0}";
+ sepNavVisRange = "{5606, 471}";
sepNavWindowFrame = "{{674, 505}, {921, 605}}";
};
};
@@ -773,9 +786,9 @@
};
61798803114AA34C00BA94A9 /* uLandTexture.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {532, 1664}}";
+ sepNavIntBoundsRect = "{{0, 0}, {845, 1638}}";
sepNavSelRange = "{3388, 0}";
- sepNavVisRange = "{0, 0}";
+ sepNavVisRange = "{3, 250}";
sepNavWindowFrame = "{{400, 151}, {938, 967}}";
};
};
@@ -1029,10 +1042,10 @@
};
61798888114AA4E600BA94A9 /* GameSetup.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1020, 4706}}";
- sepNavSelRange = "{9695, 0}";
- sepNavVisRange = "{9136, 1732}";
- sepNavWindowFrame = "{{659, 189}, {1079, 870}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1062, 4667}}";
+ sepNavSelRange = "{840, 0}";
+ sepNavVisRange = "{131, 1623}";
+ sepNavWindowFrame = "{{760, 256}, {1079, 870}}";
};
};
6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = {
@@ -1102,24 +1115,6 @@
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 */;
@@ -1140,36 +1135,6 @@
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 */;
@@ -1210,16 +1175,6 @@
vrLen = 14;
vrLoc = 0;
};
- 61CCBECE1161477A00833FE8 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
- name = "PascalExports.pas: 120";
- rLen = 0;
- rLoc = 1932;
- rType = 0;
- vrLen = 70;
- vrLoc = 1891;
- };
61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987F3114AA34C00BA94A9 /* uAIAmmoTests.pas */;
@@ -1320,16 +1275,6 @@
vrLen = 219;
vrLoc = 1004;
};
- 61CCBF811161657400833FE8 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 61798803114AA34C00BA94A9 /* uLandTexture.pas */;
- name = "uLandTexture.pas: 107";
- rLen = 0;
- rLoc = 3388;
- rType = 0;
- vrLen = 5;
- vrLoc = 3748;
- };
61CCBFD11161833800833FE8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987FD114AA34C00BA94A9 /* uIO.pas */;
Binary file share/hedgewars/Data/Graphics/Hats/diglett.png has changed
