--- a/cocoaTouch/MainMenuViewController.m Sun Mar 21 16:04:57 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m Sun Mar 21 16:42:41 2010 +0000
@@ -143,14 +143,12 @@
[alert release];
}
-/*
-(IBAction) switchViews:(id)sender {
// view not displayed or not created
if (nil == self.settingsViewController.view.superview) {
// view not created
if (nil == self.settingsViewController) {
- SettingsViewController *controller = [[SettingsViewController alloc] initWithNibName:@"SettingsViewController"
- bundle:nil];
+ SettingsViewController *controller = [[SettingsViewController alloc] initWithNibName:@"SettingsViewController" bundle:nil];
self.settingsViewController = controller;
[controller release];
}
@@ -167,6 +165,5 @@
[self.view insertSubview:settingsViewController.view atIndex:0];
}
}
-*/
@end
--- a/cocoaTouch/cleanData.sh Sun Mar 21 16:04:57 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-svn export --force share/hedgewars/Data ../iphone-hwengine/Data
-rm -rf ../iphone-hwengine/Data/Sounds/*
-rm -rf ../iphone-hwengine/Data/Music/*
-rm -rf ../iphone-hwengine/Data/Locale/hedgewars_*
--- a/cocoaTouch/iPad/overlayViewController.xib Sun Mar 21 16:04:57 2010 +0000
+++ b/cocoaTouch/iPad/overlayViewController.xib Sun Mar 21 16:42:41 2010 +0000
@@ -45,7 +45,7 @@
<object class="IBUIButton" id="584263820">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 655}, {39, 53}}</string>
+ <string key="NSFrame">{{0, 675}, {39, 53}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -77,7 +77,7 @@
<object class="IBUIButton" id="123494776">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{110, 655}, {39, 54}}</string>
+ <string key="NSFrame">{{90, 675}, {39, 54}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -100,7 +100,7 @@
<object class="IBUIButton" id="590902961">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{869, 618}, {64, 64}}</string>
+ <string key="NSFrame">{{960, 690}, {64, 48}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -123,7 +123,7 @@
<object class="IBUIButton" id="132251648">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{913, 649}, {64, 64}}</string>
+ <string key="NSFrame">{{915, 665}, {64, 50}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -143,7 +143,7 @@
<object class="IBUIButton" id="752933969">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{849, 663}, {64, 64}}</string>
+ <string key="NSFrame">{{904, 719}, {61, 49}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -163,7 +163,7 @@
<object class="IBUIButton" id="261686746">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{57, 618}, {53, 39}}</string>
+ <string key="NSFrame">{{37, 638}, {53, 39}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -186,7 +186,7 @@
<object class="IBUIButton" id="81315603">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{57, 709}, {53, 39}}</string>
+ <string key="NSFrame">{{37, 729}, {53, 39}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -584,7 +584,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>overlayViewController</string>
<string>UIResponder</string>
- <string>{{102, 260}, {1024, 768}}</string>
+ <string>{{226, 336}, {1024, 768}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
--- a/cocoaTouch/overlayViewController.m Sun Mar 21 16:04:57 2010 +0000
+++ b/cocoaTouch/overlayViewController.m Sun Mar 21 16:42:41 2010 +0000
@@ -25,6 +25,10 @@
-(void) viewDidLoad {
self.view.alpha = 0;
+
+ // needed for rotation to work on os < 3.2
+ self.view.center = CGPointMake(self.view.frame.size.height/2.0, self.view.frame.size.width/2.0);
+ self.view.transform = CGAffineTransformRotate(self.view.transform, (M_PI/2.0));
dimTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:6]
interval:1000
@@ -38,7 +42,7 @@
[NSTimer scheduledTimerWithTimeInterval:2 target:self selector:@selector(showMenuAfterwards) userInfo:nil repeats:NO];
}
--(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
return (interfaceOrientation == UIInterfaceOrientationLandscapeRight);
}
--- a/cocoaTouch/overlayViewController.xib Sun Mar 21 16:04:57 2010 +0000
+++ b/cocoaTouch/overlayViewController.xib Sun Mar 21 16:42:41 2010 +0000
@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">768</int>
<string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
+ <string key="IBDocument.InterfaceBuilderVersion">762</string>
<string key="IBDocument.AppKitVersion">1038.25</string>
<string key="IBDocument.HIToolboxVersion">458.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">62</string>
+ <string key="NS.object.0">87</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -31,9 +31,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="975951072">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="191373211">
<reference key="NSNextResponder"/>
@@ -43,11 +45,11 @@
<object class="IBUIButton" id="584263820">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{0, 30}, {39, 53}}</string>
+ <string key="NSFrame">{{0, 237}, {39, 53}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUITag">3</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<object class="NSFont" key="IBUIFont" id="969592940">
@@ -75,11 +77,12 @@
<object class="IBUIButton" id="123494776">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{73, 30}, {39, 54}}</string>
+ <string key="NSFrame">{{75, 237}, {39, 54}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUITag">2</int>
+ <int key="IBUITag">1</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIFont" ref="969592940"/>
@@ -97,11 +100,12 @@
<object class="IBUIButton" id="590902961">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{38, 416}, {64, 64}}</string>
+ <string key="NSFrame">{{416, 233}, {64, 64}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="IBUITag">6</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIFont" ref="969592940"/>
@@ -119,11 +123,12 @@
<object class="IBUIButton" id="132251648">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{60, 379}, {64, 64}}</string>
+ <string key="NSFrame">{{368, 213}, {64, 64}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="IBUITag">5</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIFont" ref="969592940"/>
@@ -138,11 +143,12 @@
<object class="IBUIButton" id="752933969">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{6, 365}, {64, 64}}</string>
+ <string key="NSFrame">{{344, 262}, {64, 64}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="IBUITag">4</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIFont" ref="969592940"/>
@@ -157,10 +163,12 @@
<object class="IBUIButton" id="261686746">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{29, 0}, {53, 39}}</string>
+ <string key="NSFrame">{{29, 207}, {53, 39}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUITag">2</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIFont" ref="969592940"/>
@@ -178,11 +186,12 @@
<object class="IBUIButton" id="81315603">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{29, 74}, {53, 39}}</string>
+ <string key="NSFrame">{{29, 281}, {53, 39}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUITag">1</int>
+ <int key="IBUITag">3</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIFont" ref="969592940"/>
@@ -198,7 +207,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{135, 480}</string>
+ <string key="NSFrameSize">{480, 320}</string>
<reference key="NSSuperview"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
@@ -206,6 +215,10 @@
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -487,9 +500,9 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="584263820"/>
+ <reference ref="123494776"/>
<reference ref="261686746"/>
<reference ref="81315603"/>
- <reference ref="123494776"/>
<reference ref="590902961"/>
<reference ref="132251648"/>
<reference ref="752933969"/>
@@ -571,7 +584,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>overlayViewController</string>
<string>UIResponder</string>
- <string>{{271, 498}, {135, 480}}</string>
+ <string>{{222, 776}, {480, 320}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -625,218 +638,9 @@
</object>
</object>
</object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSPort.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSStream.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="835566956">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIButton</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="835566956"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="768" key="NS.object.0"/>
@@ -848,6 +652,25 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">3.1</string>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>arrowDown.png</string>
+ <string>arrowLeft.png</string>
+ <string>arrowRight.png</string>
+ <string>arrowUp.png</string>
+ <string>joyPush.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{64, 64}</string>
+ <string>{64, 64}</string>
+ <string>{64, 64}</string>
+ <string>{64, 64}</string>
+ <string>{64, 64}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">87</string>
</data>
</archive>
--- a/hedgewars/uScript.pas Sun Mar 21 16:04:57 2010 +0000
+++ b/hedgewars/uScript.pas Sun Mar 21 16:42:41 2010 +0000
@@ -529,7 +529,7 @@
procedure ScriptOnGameInit;
var s, t : ansistring;
begin
-// not required if there's no script to run
+// not required if there is no script to run
if not ScriptLoaded then
exit;
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Sun Mar 21 16:04:57 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Sun Mar 21 16:42:41 2010 +0000
@@ -197,6 +197,8 @@
6179936E11501D3D00BA94A9 /* arrowUp.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936A11501D3D00BA94A9 /* arrowUp.png */; };
617993A01150226700BA94A9 /* overlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; };
617995321150403800BA94A9 /* joyPush.png in Resources */ = {isa = PBXBuildFile; fileRef = 617995311150403800BA94A9 /* joyPush.png */; };
+ 61C0838A11567C83005D474F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61C0838911567C83005D474F /* CoreGraphics.framework */; };
+ 61E2F06911567CC7002D33C1 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61E2F06811567CC7002D33C1 /* CoreGraphics.framework */; };
922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; };
/* End PBXBuildFile section */
@@ -385,6 +387,8 @@
6179939D1150226700BA94A9 /* overlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlayViewController.h; path = ../../cocoaTouch/overlayViewController.h; sourceTree = SOURCE_ROOT; };
6179939E1150226700BA94A9 /* overlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = overlayViewController.m; path = ../../cocoaTouch/overlayViewController.m; sourceTree = SOURCE_ROOT; };
617995311150403800BA94A9 /* joyPush.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyPush.png; path = ../../cocoaTouch/resources/joyPush.png; sourceTree = SOURCE_ROOT; };
+ 61C0838911567C83005D474F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+ 61E2F06811567CC7002D33C1 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
928301170F10CAFC00CC5A3C /* libfpc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfpc.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -409,6 +413,7 @@
6179891E114AAF2100BA94A9 /* libpng_x86.a in Frameworks */,
6179891F114AAF2100BA94A9 /* libvorbis_arm.a in Frameworks */,
61798935114AB25F00BA94A9 /* AudioToolbox.framework in Frameworks */,
+ 61C0838A11567C83005D474F /* CoreGraphics.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -431,6 +436,7 @@
6100DACA115446B000F455E0 /* libpng_x86.a in Frameworks */,
6100DACB115446B000F455E0 /* libvorbis_arm.a in Frameworks */,
6100DACC115446B000F455E0 /* AudioToolbox.framework in Frameworks */,
+ 61E2F06911567CC7002D33C1 /* CoreGraphics.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -522,6 +528,8 @@
61798918114AAF2100BA94A9 /* libpng_arm.a */,
61798919114AAF2100BA94A9 /* libpng_x86.a */,
6179891A114AAF2100BA94A9 /* libvorbis_arm.a */,
+ 61C0838911567C83005D474F /* CoreGraphics.framework */,
+ 61E2F06811567CC7002D33C1 /* CoreGraphics.framework */,
);
name = Frameworks;
sourceTree = "<group>";
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sun Mar 21 16:04:57 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sun Mar 21 16:42:41 2010 +0000
@@ -202,7 +202,7 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>611FDC101155D61400C2203D</string>
+ <string>61C0839211567CA9005D474F</string>
<key>PBXProjectModuleLabel</key>
<string>overlayViewController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
@@ -210,16 +210,16 @@
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>611FDC111155D61400C2203D</string>
+ <string>61C0839311567CA9005D474F</string>
<key>PBXProjectModuleLabel</key>
<string>overlayViewController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>611FDC1E1155D8E400C2203D</string>
+ <string>61C0839411567CA9005D474F</string>
<key>history</key>
<array>
- <string>611FDC0A1155D5F500C2203D</string>
+ <string>61C0837811567B4B005D474F</string>
</array>
</dict>
<key>SplitCount</key>
@@ -235,48 +235,7 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
- <string>870 449 927 662 0 0 1920 1178 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>611FDBAD1155CEAB00C2203D</string>
- <key>PBXProjectModuleLabel</key>
- <string>MainMenuViewController.m</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>611FDBAE1155CEAB00C2203D</string>
- <key>PBXProjectModuleLabel</key>
- <string>MainMenuViewController.m</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>611FDC1F1155D8E400C2203D</string>
- <key>history</key>
- <array>
- <string>611FDC131155D61400C2203D</string>
- <string>611FDC141155D61400C2203D</string>
- </array>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>Geometry</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 20}, {775, 526}}</string>
- <key>PBXModuleWindowStatusBarHidden2</key>
- <false/>
- <key>RubberWindowFrame</key>
- <string>226 444 775 567 0 0 1920 1178 </string>
+ <string>722 248 927 662 0 0 1920 1178 </string>
</dict>
</dict>
</array>
@@ -311,6 +270,8 @@
<key>Layout</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -348,14 +309,12 @@
<string>29B97314FDCFA39411CA2CEA</string>
<string>080E96DDFE201D6D7F000001</string>
<string>1C37FBAC04509CD000000102</string>
- <string>611FD9DD1155A74D00C2203D</string>
<string>1C37FABC05509CD000000102</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>4</integer>
- <integer>2</integer>
+ <integer>10</integer>
<integer>0</integer>
</array>
</array>
@@ -379,7 +338,7 @@
<real>186</real>
</array>
<key>RubberWindowFrame</key>
- <string>1083 419 801 617 0 0 1920 1178 </string>
+ <string>1005 485 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -390,14 +349,12 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>GameSetup.m</string>
+ <string>overlayViewController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -405,11 +362,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>GameSetup.m</string>
+ <string>overlayViewController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>611FDC1D1155D8E400C2203D</string>
+ <string>61C0839111567CA9005D474F</string>
<key>history</key>
<array>
<string>6179889C114AA5BD00BA94A9</string>
@@ -464,8 +421,8 @@
<string>611FDC0D1155D61400C2203D</string>
<string>611FDC1A1155D8E400C2203D</string>
<string>611FDC1B1155D8E400C2203D</string>
- <string>611FDC1C1155D8E400C2203D</string>
- <string>611FD9B0115594B400C2203D</string>
+ <string>61C0838F11567CA9005D474F</string>
+ <string>61C0839011567CA9005D474F</string>
</array>
</dict>
<key>SplitCount</key>
@@ -477,14 +434,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {593, 140}}</string>
+ <string>{{0, 0}, {593, 108}}</string>
<key>RubberWindowFrame</key>
- <string>1083 419 801 617 0 0 1920 1178 </string>
+ <string>1005 485 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>140pt</string>
+ <string>108pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -497,14 +454,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 145}, {593, 431}}</string>
+ <string>{{0, 113}, {593, 463}}</string>
<key>RubberWindowFrame</key>
- <string>1083 419 801 617 0 0 1920 1178 </string>
+ <string>1005 485 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>431pt</string>
+ <string>463pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -523,9 +480,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>611FD98611558FC600C2203D</string>
+ <string>61C0836E11567B32005D474F</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>611FD98711558FC600C2203D</string>
+ <string>61C0836F11567B32005D474F</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -663,19 +620,14 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>611FDC201155D8E400C2203D</string>
- <string>611FDC211155D8E400C2203D</string>
- <string>611FDACA1155B77500C2203D</string>
- <string>611FDACB1155B77500C2203D</string>
+ <string>1C78EAAD065D492600B07095</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>61798848114AA42600BA94A9</string>
- <string>611FDBAD1155CEAB00C2203D</string>
- <string>1C78EAAD065D492600B07095</string>
- <string>611FDC101155D61400C2203D</string>
<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
+ <string>61C0839211567CA9005D474F</string>
</array>
<key>WindowString</key>
- <string>1083 419 801 617 0 0 1920 1178 </string>
+ <string>1005 485 801 617 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -696,7 +648,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string>hwengine.pas</string>
+ <string></string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -705,7 +657,7 @@
<key>Frame</key>
<string>{{0, 0}, {757, 232}}</string>
<key>RubberWindowFrame</key>
- <string>719 615 757 563 0 0 1920 1178 </string>
+ <string>330 339 757 563 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -731,7 +683,7 @@
<key>Frame</key>
<string>{{0, 237}, {757, 285}}</string>
<key>RubberWindowFrame</key>
- <string>719 615 757 563 0 0 1920 1178 </string>
+ <string>330 339 757 563 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -754,7 +706,7 @@
<key>TableOfContents</key>
<array>
<string>61798848114AA42600BA94A9</string>
- <string>611FD98911558FC600C2203D</string>
+ <string>61C0837011567B32005D474F</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -763,7 +715,7 @@
<key>WindowContentMinSize</key>
<string>486 300</string>
<key>WindowString</key>
- <string>719 615 757 563 0 0 1920 1178 </string>
+ <string>330 339 757 563 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>61798848114AA42600BA94A9</string>
<key>WindowToolIsVisible</key>
@@ -841,11 +793,13 @@
<key>DebugVariablesTableConfiguration</key>
<array>
<string>Name</string>
- <real>143</real>
+ <real>120</real>
<string>Value</string>
- <real>108</real>
+ <real>85</real>
<string>Summary</string>
- <real>102</real>
+ <real>80</real>
+ <string>Type</string>
+ <real>84</real>
</array>
<key>Frame</key>
<string>{{316, 0}, {378, 203}}</string>
@@ -876,13 +830,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>611FD9C0115594B400C2203D</string>
+ <string>61C0837111567B32005D474F</string>
<string>1C162984064C10D400B95A72</string>
- <string>611FD9C1115594B400C2203D</string>
- <string>611FD9C2115594B400C2203D</string>
- <string>611FD9C3115594B400C2203D</string>
- <string>611FD9C4115594B400C2203D</string>
- <string>611FD9C5115594B400C2203D</string>
+ <string>61C0837211567B32005D474F</string>
+ <string>61C0837311567B32005D474F</string>
+ <string>61C0837411567B32005D474F</string>
+ <string>61C0837511567B32005D474F</string>
+ <string>61C0837611567B32005D474F</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -1009,8 +963,6 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -1046,7 +998,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>611FD9C6115594B400C2203D</string>
+ <string>61C0837711567B32005D474F</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
@@ -1056,7 +1008,7 @@
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
- <true/>
+ <false/>
</dict>
<dict>
<key>Identifier</key>
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sun Mar 21 16:04:57 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sun Mar 21 16:42:41 2010 +0000
@@ -68,70 +68,67 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 290820026;
- PBXWorkspaceStateSaveDate = 290820026;
+ PBXPerProjectTemplateStateSaveDate = 290880688;
+ PBXWorkspaceStateSaveDate = 290880688;
};
perUserProjectItems = {
- 611FD81C1155111700C2203D /* PBXTextBookmark */ = 611FD81C1155111700C2203D /* PBXTextBookmark */;
- 611FD81D1155111700C2203D /* PBXTextBookmark */ = 611FD81D1155111700C2203D /* PBXTextBookmark */;
- 611FD81E1155111700C2203D /* PBXTextBookmark */ = 611FD81E1155111700C2203D /* PBXTextBookmark */;
- 611FD81F1155111700C2203D /* PBXTextBookmark */ = 611FD81F1155111700C2203D /* PBXTextBookmark */;
- 611FD8201155111700C2203D /* PBXTextBookmark */ = 611FD8201155111700C2203D /* PBXTextBookmark */;
- 611FD8211155111700C2203D /* PBXTextBookmark */ = 611FD8211155111700C2203D /* PBXTextBookmark */;
- 611FD8271155111700C2203D /* PBXTextBookmark */ = 611FD8271155111700C2203D /* 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 */;
- 611FD9AE115594B400C2203D /* PBXTextBookmark */ = 611FD9AE115594B400C2203D /* PBXTextBookmark */;
- 611FD9B0115594B400C2203D /* PBXTextBookmark */ = 611FD9B0115594B400C2203D /* PBXTextBookmark */;
- 611FD9D51155A4B900C2203D /* PBXTextBookmark */ = 611FD9D51155A4B900C2203D /* PBXTextBookmark */;
- 611FD9F41155A8F500C2203D /* PBXTextBookmark */ = 611FD9F41155A8F500C2203D /* PBXTextBookmark */;
- 611FDA441155AEBF00C2203D /* PBXTextBookmark */ = 611FDA441155AEBF00C2203D /* PBXTextBookmark */;
- 611FDAC41155B77500C2203D /* PBXTextBookmark */ = 611FDAC41155B77500C2203D /* PBXTextBookmark */;
- 611FDADF1155B83200C2203D /* PBXTextBookmark */ = 611FDADF1155B83200C2203D /* PBXTextBookmark */;
- 611FDB471155BCE500C2203D /* PBXTextBookmark */ = 611FDB471155BCE500C2203D /* PBXTextBookmark */;
- 611FDB481155BCE500C2203D /* PBXTextBookmark */ = 611FDB481155BCE500C2203D /* PBXTextBookmark */;
- 611FDB6B1155C0B300C2203D /* PBXBookmark */ = 611FDB6B1155C0B300C2203D /* PBXBookmark */;
- 611FDB6C1155C0B300C2203D /* PBXBookmark */ = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
- 611FDB6D1155C0B300C2203D /* PBXBookmark */ = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
- 611FDB6E1155C0B300C2203D /* PBXBookmark */ = 611FDB6E1155C0B300C2203D /* PBXBookmark */;
- 611FDBF51155D39400C2203D /* PBXBookmark */ = 611FDBF51155D39400C2203D /* PBXBookmark */;
- 611FDBF61155D39400C2203D /* PBXTextBookmark */ = 611FDBF61155D39400C2203D /* PBXTextBookmark */;
- 611FDBF71155D39400C2203D /* PBXTextBookmark */ = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
- 611FDC0A1155D5F500C2203D /* PBXBookmark */ = 611FDC0A1155D5F500C2203D /* PBXBookmark */;
- 611FDC0D1155D61400C2203D /* PBXTextBookmark */ = 611FDC0D1155D61400C2203D /* PBXTextBookmark */;
- 611FDC131155D61400C2203D /* PBXTextBookmark */ = 611FDC131155D61400C2203D /* PBXTextBookmark */;
- 611FDC141155D61400C2203D /* PBXTextBookmark */ = 611FDC141155D61400C2203D /* PBXTextBookmark */;
- 611FDC1A1155D8E400C2203D /* PBXTextBookmark */ = 611FDC1A1155D8E400C2203D /* PBXTextBookmark */;
- 611FDC1B1155D8E400C2203D /* PBXTextBookmark */ = 611FDC1B1155D8E400C2203D /* PBXTextBookmark */;
- 611FDC1C1155D8E400C2203D /* PBXTextBookmark */ = 611FDC1C1155D8E400C2203D /* PBXTextBookmark */;
- 611FDC1D1155D8E400C2203D /* PBXTextBookmark */ = 611FDC1D1155D8E400C2203D /* PBXTextBookmark */;
- 611FDC1E1155D8E400C2203D /* PBXTextBookmark */ = 611FDC1E1155D8E400C2203D /* PBXTextBookmark */;
- 611FDC1F1155D8E400C2203D /* PBXTextBookmark */ = 611FDC1F1155D8E400C2203D /* PBXTextBookmark */;
- 6179889C114AA5BD00BA94A9 /* PBXTextBookmark */ = 6179889C114AA5BD00BA94A9 /* PBXTextBookmark */;
- 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
- 617988DF114AAABF00BA94A9 /* PBXTextBookmark */ = 617988DF114AAABF00BA94A9 /* PBXTextBookmark */;
- 617988EA114AAB9E00BA94A9 /* PBXTextBookmark */ = 617988EA114AAB9E00BA94A9 /* PBXTextBookmark */;
- 61799342114B297000BA94A9 /* PBXBookmark */ = 61799342114B297000BA94A9 /* PBXBookmark */;
- 61799343114B297000BA94A9 /* PBXBookmark */ = 61799343114B297000BA94A9 /* PBXBookmark */;
- 61799354114BD5C300BA94A9 /* PBXTextBookmark */ = 61799354114BD5C300BA94A9 /* PBXTextBookmark */;
- 6179937111501D7800BA94A9 /* PBXBookmark */ = 6179937111501D7800BA94A9 /* PBXBookmark */;
- 6179937311501D7800BA94A9 /* PBXBookmark */ = 6179937311501D7800BA94A9 /* PBXBookmark */;
- 6179937411501D7800BA94A9 /* PBXBookmark */ = 6179937411501D7800BA94A9 /* PBXBookmark */;
- 6179937511501D7800BA94A9 /* PBXBookmark */ = 6179937511501D7800BA94A9 /* PBXBookmark */;
- 6179937711501D7800BA94A9 /* PBXBookmark */ = 6179937711501D7800BA94A9 /* PBXBookmark */;
- 6179938511501FFA00BA94A9 /* PBXBookmark */ = 6179938511501FFA00BA94A9 /* PBXBookmark */;
- 6179943111502CEA00BA94A9 /* PBXBookmark */ = 6179943111502CEA00BA94A9 /* PBXBookmark */;
- 6194CC0711505FCF00A4BA5C /* PlistBookmark */ = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
- 6194CCFC1151E00900A4BA5C /* PBXTextBookmark */ = 6194CCFC1151E00900A4BA5C /* PBXTextBookmark */;
+ 611FD81C1155111700C2203D = 611FD81C1155111700C2203D /* PBXTextBookmark */;
+ 611FD81D1155111700C2203D = 611FD81D1155111700C2203D /* PBXTextBookmark */;
+ 611FD81E1155111700C2203D = 611FD81E1155111700C2203D /* PBXTextBookmark */;
+ 611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */;
+ 611FD8201155111700C2203D = 611FD8201155111700C2203D /* PBXTextBookmark */;
+ 611FD8211155111700C2203D = 611FD8211155111700C2203D /* PBXTextBookmark */;
+ 611FD8271155111700C2203D = 611FD8271155111700C2203D /* PBXTextBookmark */;
+ 611FD8281155111700C2203D = 611FD8281155111700C2203D /* PBXTextBookmark */;
+ 611FD8291155111700C2203D = 611FD8291155111700C2203D /* PBXTextBookmark */;
+ 611FD82A1155111700C2203D = 611FD82A1155111700C2203D /* PBXTextBookmark */;
+ 611FD82B1155111700C2203D = 611FD82B1155111700C2203D /* PBXTextBookmark */;
+ 611FD82C1155111700C2203D = 611FD82C1155111700C2203D /* PBXTextBookmark */;
+ 611FD82D1155111700C2203D = 611FD82D1155111700C2203D /* PBXTextBookmark */;
+ 611FD94E11551BD300C2203D = 611FD94E11551BD300C2203D /* PBXTextBookmark */;
+ 611FD95711551C3700C2203D = 611FD95711551C3700C2203D /* PBXTextBookmark */;
+ 611FD95811551C3700C2203D = 611FD95811551C3700C2203D /* PBXBookmark */;
+ 611FD95911551C3700C2203D = 611FD95911551C3700C2203D /* PBXBookmark */;
+ 611FD96611551E8000C2203D = 611FD96611551E8000C2203D /* PBXBookmark */;
+ 611FD9AE115594B400C2203D = 611FD9AE115594B400C2203D /* PBXTextBookmark */;
+ 611FD9D51155A4B900C2203D = 611FD9D51155A4B900C2203D /* PBXTextBookmark */;
+ 611FD9F41155A8F500C2203D = 611FD9F41155A8F500C2203D /* PBXTextBookmark */;
+ 611FDA441155AEBF00C2203D = 611FDA441155AEBF00C2203D /* PBXTextBookmark */;
+ 611FDAC41155B77500C2203D = 611FDAC41155B77500C2203D /* PBXTextBookmark */;
+ 611FDADF1155B83200C2203D = 611FDADF1155B83200C2203D /* PBXTextBookmark */;
+ 611FDB471155BCE500C2203D = 611FDB471155BCE500C2203D /* PBXTextBookmark */;
+ 611FDB481155BCE500C2203D = 611FDB481155BCE500C2203D /* PBXTextBookmark */;
+ 611FDB6B1155C0B300C2203D = 611FDB6B1155C0B300C2203D /* PBXBookmark */;
+ 611FDB6C1155C0B300C2203D = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
+ 611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
+ 611FDB6E1155C0B300C2203D = 611FDB6E1155C0B300C2203D /* PBXBookmark */;
+ 611FDBF51155D39400C2203D = 611FDBF51155D39400C2203D /* PBXBookmark */;
+ 611FDBF61155D39400C2203D = 611FDBF61155D39400C2203D /* PBXTextBookmark */;
+ 611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
+ 611FDC0D1155D61400C2203D = 611FDC0D1155D61400C2203D /* PBXTextBookmark */;
+ 611FDC1A1155D8E400C2203D = 611FDC1A1155D8E400C2203D /* PBXTextBookmark */;
+ 611FDC1B1155D8E400C2203D = 611FDC1B1155D8E400C2203D /* PBXTextBookmark */;
+ 6179889C114AA5BD00BA94A9 = 6179889C114AA5BD00BA94A9 /* PBXTextBookmark */;
+ 6179889D114AA5BD00BA94A9 = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
+ 617988DF114AAABF00BA94A9 = 617988DF114AAABF00BA94A9 /* PBXTextBookmark */;
+ 617988EA114AAB9E00BA94A9 = 617988EA114AAB9E00BA94A9 /* PBXTextBookmark */;
+ 61799342114B297000BA94A9 = 61799342114B297000BA94A9 /* PBXBookmark */;
+ 61799343114B297000BA94A9 = 61799343114B297000BA94A9 /* PBXBookmark */;
+ 61799354114BD5C300BA94A9 = 61799354114BD5C300BA94A9 /* PBXTextBookmark */;
+ 6179937111501D7800BA94A9 = 6179937111501D7800BA94A9 /* PBXBookmark */;
+ 6179937311501D7800BA94A9 = 6179937311501D7800BA94A9 /* PBXBookmark */;
+ 6179937411501D7800BA94A9 = 6179937411501D7800BA94A9 /* PBXBookmark */;
+ 6179937511501D7800BA94A9 = 6179937511501D7800BA94A9 /* PBXBookmark */;
+ 6179937711501D7800BA94A9 = 6179937711501D7800BA94A9 /* PBXBookmark */;
+ 6179938511501FFA00BA94A9 = 6179938511501FFA00BA94A9 /* PBXBookmark */;
+ 6179943111502CEA00BA94A9 = 6179943111502CEA00BA94A9 /* PBXBookmark */;
+ 6194CC0711505FCF00A4BA5C = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
+ 6194CCFC1151E00900A4BA5C = 6194CCFC1151E00900A4BA5C /* PBXTextBookmark */;
+ 61C0837811567B4B005D474F = 61C0837811567B4B005D474F /* PBXBookmark */;
+ 61C0838F11567CA9005D474F = 61C0838F11567CA9005D474F /* PBXTextBookmark */;
+ 61C0839011567CA9005D474F = 61C0839011567CA9005D474F /* PBXTextBookmark */;
+ 61C0839111567CA9005D474F = 61C0839111567CA9005D474F /* PBXTextBookmark */;
+ 61C0839411567CA9005D474F = 61C0839411567CA9005D474F /* PBXTextBookmark */;
};
sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
userBuildSettings = {
@@ -354,16 +351,6 @@
vrLen = 470;
vrLoc = 8233;
};
- 611FD9B0115594B400C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
- name = "GameSetup.m: 262";
- rLen = 0;
- rLoc = 8190;
- rType = 0;
- vrLen = 228;
- vrLoc = 8019;
- };
611FD9D51155A4B900C2203D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */;
@@ -405,7 +392,7 @@
hitCount = 0;
ignoreCount = 0;
location = libSystem.B.dylib;
- modificationTime = 290833782.260859;
+ modificationTime = 290879724.515999;
originalNumberOfMultipleMatches = 1;
state = 2;
symbolName = malloc_error_break;
@@ -431,7 +418,7 @@
hitCount = 0;
ignoreCount = 0;
location = libSystem.B.dylib;
- modificationTime = 290833782.260976;
+ modificationTime = 290879724.516013;
originalNumberOfMultipleMatches = 1;
state = 2;
symbolName = malloc_error_break;
@@ -448,14 +435,10 @@
};
611FDAE21155B83200C2203D /* SDL_uikitopengles.m */ = {
isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.objc;
name = SDL_uikitopengles.m;
path = "/Users/vittorio/hedgewars/Library/SDL-1.3/SDL/src/video/uikit/SDL_uikitopengles.m";
sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {691, 1768}}";
- sepNavSelRange = "{2857, 0}";
- sepNavVisRange = "{2722, 334}";
- };
};
611FDB471155BCE500C2203D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -517,10 +500,6 @@
vrLen = 201;
vrLoc = 686;
};
- 611FDC0A1155D5F500C2203D /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
- };
611FDC0D1155D61400C2203D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
@@ -531,26 +510,6 @@
vrLen = 106;
vrLoc = 1567;
};
- 611FDC131155D61400C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
- name = "MainMenuViewController.h: 27";
- rLen = 0;
- rLoc = 651;
- rType = 0;
- vrLen = 692;
- vrLoc = 0;
- };
- 611FDC141155D61400C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
- name = "MainMenuViewController.m: 171";
- rLen = 0;
- rLoc = 5635;
- rType = 0;
- vrLen = 1361;
- vrLoc = 4123;
- };
611FDC1A1155D8E400C2203D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987F5114AA34C00BA94A9 /* uAmmos.pas */;
@@ -571,46 +530,6 @@
vrLen = 316;
vrLoc = 0;
};
- 611FDC1C1155D8E400C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
- name = "overlayViewController.m: 13";
- rLen = 0;
- rLoc = 272;
- rType = 0;
- vrLen = 201;
- vrLoc = 484;
- };
- 611FDC1D1155D8E400C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
- name = "GameSetup.m: 265";
- rLen = 0;
- rLoc = 8306;
- rType = 0;
- vrLen = 400;
- vrLoc = 7928;
- };
- 611FDC1E1155D8E400C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
- name = "overlayViewController.m: 50";
- rLen = 0;
- rLoc = 1461;
- rType = 0;
- vrLen = 1543;
- vrLoc = 685;
- };
- 611FDC1F1155D8E400C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
- name = "MainMenuViewController.m: 9";
- rLen = 0;
- rLoc = 182;
- rType = 0;
- vrLen = 1353;
- vrLoc = 48;
- };
617987D7114AA2CD00BA94A9 /* HedgewarsMobile */ = {
isa = PBXExecutable;
activeArgIndices = (
@@ -891,10 +810,10 @@
};
6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {901, 2314}}";
- sepNavSelRange = "{182, 0}";
- sepNavVisRange = "{48, 1353}";
- sepNavWindowFrame = "{{793, 305}, {775, 623}}";
+ sepNavIntBoundsRect = "{{0, 0}, {901, 2262}}";
+ sepNavSelRange = "{770, 0}";
+ sepNavVisRange = "{148, 1277}";
+ sepNavWindowFrame = "{{226, 388}, {775, 623}}";
};
};
61798871114AA4D000BA94A9 /* SchemeEditViewController.h */ = {
@@ -956,9 +875,9 @@
};
61798888114AA4E600BA94A9 /* GameSetup.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {957, 3445}}";
+ sepNavIntBoundsRect = "{{0, 0}, {670, 3406}}";
sepNavSelRange = "{8306, 0}";
- sepNavVisRange = "{7928, 400}";
+ sepNavVisRange = "{8101, 252}";
sepNavWindowFrame = "{{563, 256}, {1079, 870}}";
};
};
@@ -1057,10 +976,10 @@
};
6179939E1150226700BA94A9 /* overlayViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {868, 3003}}";
- sepNavSelRange = "{1461, 0}";
- sepNavVisRange = "{685, 1543}";
- sepNavWindowFrame = "{{870, 393}, {927, 718}}";
+ sepNavIntBoundsRect = "{{0, 0}, {684, 3094}}";
+ sepNavSelRange = "{272, 0}";
+ sepNavVisRange = "{545, 227}";
+ sepNavWindowFrame = "{{722, 192}, {927, 718}}";
};
};
6179943111502CEA00BA94A9 /* PBXBookmark */ = {
@@ -1089,6 +1008,50 @@
vrLen = 860;
vrLoc = 0;
};
+ 61C0837811567B4B005D474F /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ };
+ 61C0838F11567CA9005D474F /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
+ name = "GameSetup.m: 265";
+ rLen = 0;
+ rLoc = 8306;
+ rType = 0;
+ vrLen = 252;
+ vrLoc = 8101;
+ };
+ 61C0839011567CA9005D474F /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 13";
+ rLen = 0;
+ rLoc = 272;
+ rType = 0;
+ vrLen = 227;
+ vrLoc = 545;
+ };
+ 61C0839111567CA9005D474F /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 13";
+ rLen = 0;
+ rLoc = 272;
+ rType = 0;
+ vrLen = 227;
+ vrLoc = 545;
+ };
+ 61C0839411567CA9005D474F /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 29";
+ rLen = 0;
+ rLoc = 743;
+ rType = 0;
+ vrLen = 1556;
+ vrLoc = 31;
+ };
928301160F10CAFC00CC5A3C /* fpc */ = {
activeExec = 0;
};