--- a/cocoaTouch/GameSetup.m	Mon Mar 29 20:49:36 2010 +0000
+++ b/cocoaTouch/GameSetup.m	Mon Mar 29 23:20:34 2010 +0000
@@ -10,6 +10,8 @@
 #import "SDL_uikitappdelegate.h"
 #import "SDL_net.h"
 #import "PascalImports.h"
+#include <sys/types.h>
+#include <sys/sysctl.h>
 
 #define BUFFER_SIZE 256
 
@@ -246,12 +248,32 @@
 #pragma mark -
 #pragma mark Setting methods
 -(const char **)getSettings {
-	const char **gameArgs = (const char**) malloc(sizeof(char*) * 6);
 	NSString *ipcString = [[NSString alloc] initWithFormat:@"%d", ipcPort];
 	NSString *localeString = [[NSString alloc] initWithFormat:@"%@.txt", [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode]];
     CGRect screenBounds = [[UIScreen mainScreen] bounds];
     NSString *wSize = [[NSString alloc] initWithFormat:@"%d", (int) screenBounds.size.width];
     NSString *hSize = [[NSString alloc] initWithFormat:@"%d", (int) screenBounds.size.height];
+	const char **gameArgs = (const char**) malloc(sizeof(char*) * 8);
+
+    /*
+    size_t size;
+    // Set 'oldp' parameter to NULL to get the size of the data returned so we can allocate appropriate amount of space
+    sysctlbyname("hw.machine", NULL, &size, NULL, 0); 
+    char *name = malloc(size);
+    // Get the platform name
+    sysctlbyname("hw.machine", name, &size, NULL, 0);
+    NSString *machine = [[NSString alloc] initWithUTF8String:name];
+    free(name);
+    
+   	const char **gameArgs = (const char**) malloc(sizeof(char*) * 9);
+
+    // if the machine is less than iphone 3gs or less than ipod touch 3g use reduced graphics (land array)
+    if ([machine hasPrefix:@"iPhone1"] || ([machine hasPrefix:@"iPod"] && ([machine hasSuffix:@"1,1"] || [machine hasSuffix:@"2,1"])))
+        gameArgs[8] = "1";
+    else
+        gameArgs[8] = "0";
+    [machine release];
+    */
     
 	gameArgs[0] = [[systemSettings objectForKey:@"username"] UTF8String];	//UserNick
 	gameArgs[1] = [ipcString UTF8String];                                   //ipcPort

--- a/cocoaTouch/iPad/DetailViewController.h	Mon Mar 29 20:49:36 2010 +0000
+++ b/cocoaTouch/iPad/DetailViewController.h	Mon Mar 29 23:20:34 2010 +0000
@@ -9,10 +9,13 @@
 #import <UIKit/UIKit.h>
 
 
-@interface DetailViewController : UIViewController <UIPopoverControllerDelegate, UISplitViewControllerDelegate>  {
+@interface DetailViewController : UIViewController <UITableViewDelegate, UITableViewDataSource,
+                    UINavigationBarDelegate, UIPopoverControllerDelegate, UISplitViewControllerDelegate>  {
     UIPopoverController *popoverController;
     UINavigationBar *navigationBar;
-    
+    NSArray *optionList;
+	UITableView * table;
+
     id detailItem;
     UILabel *test;
 }
@@ -21,6 +24,8 @@
 @property (nonatomic, retain) IBOutlet UINavigationBar *navigationBar;
 @property (nonatomic, retain) IBOutlet UILabel *test;
 @property (nonatomic, retain) id detailItem;
+@property (nonatomic, retain) NSArray *optionList;
+@property (nonatomic, retain) IBOutlet UITableView *table;
 
 -(IBAction) dismissSplitView;
 

--- a/cocoaTouch/iPad/DetailViewController.m	Mon Mar 29 20:49:36 2010 +0000
+++ b/cocoaTouch/iPad/DetailViewController.m	Mon Mar 29 23:20:34 2010 +0000
@@ -10,7 +10,7 @@
 
 
 @implementation DetailViewController
-@synthesize navigationBar, popoverController, detailItem, test;
+@synthesize navigationBar, popoverController, detailItem, test, optionList,table;
 
 /*
  // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
@@ -26,6 +26,11 @@
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 - (void)viewDidLoad {
     [super viewDidLoad];
+        optionList = [[NSArray alloc] initWithObjects:NSLocalizedString(@"General",@""),
+                                                  NSLocalizedString(@"Teams",@""),
+                                                  NSLocalizedString(@"Weapons",@""),
+                                                  NSLocalizedString(@"Schemes",@""),
+                                                  nil];
 }
 
 
@@ -45,11 +50,37 @@
 
 
 - (void)dealloc {
+    [optionList release];
     [navigationBar release];
     [popoverController release];
     [detailItem release];
     [super dealloc];
 }
+
+#pragma mark -
+#pragma mark Table view data source
+
+-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+
+
+-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return [optionList count];
+}
+
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    static NSString *CellIdentifier = @"Cell";
+    
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    if (cell == nil) {
+        cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+        cell.textLabel.text = [optionList objectAtIndex:[indexPath row]];
+    }
+    
+    return cell;
+}
+
 #pragma mark -
 #pragma mark Managing the popover controller
 

--- a/cocoaTouch/iPad/DetailViewController.xib	Mon Mar 29 20:49:36 2010 +0000
+++ b/cocoaTouch/iPad/DetailViewController.xib	Mon Mar 29 23:20:34 2010 +0000
@@ -37,65 +37,88 @@
 				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 			</object>
-			<object class="IBUIView" id="529367241">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUINavigationBar" id="810093952">
-						<reference key="NSNextResponder" ref="529367241"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrameSize">{1024, 44}</string>
-						<reference key="NSSuperview" ref="529367241"/>
-						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-						<object class="NSArray" key="IBUIItems">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBUINavigationItem" id="891675002">
-								<reference key="IBUINavigationBar" ref="810093952"/>
-								<string key="IBUITitle">Title</string>
-								<object class="IBUIBarButtonItem" key="IBUILeftBarButtonItem" id="1043383875">
+			<object class="IBUIViewController" id="908968585">
+				<object class="IBUIView" key="IBUIView" id="529367241">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">292</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="IBUILabel" id="360158240">
+							<reference key="NSNextResponder" ref="529367241"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{491, 393}, {42, 21}}</string>
+							<reference key="NSSuperview" ref="529367241"/>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClipsSubviews">YES</bool>
+							<int key="IBUIContentMode">7</int>
+							<bool key="IBUIUserInteractionEnabled">NO</bool>
+							<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+							<string key="IBUIText">Label</string>
+							<object class="NSColor" key="IBUITextColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MCAwIDAAA</bytes>
+							</object>
+							<nil key="IBUIHighlightedColor"/>
+							<int key="IBUIBaselineAdjustment">1</int>
+							<float key="IBUIMinimumFontSize">10</float>
+						</object>
+						<object class="IBUITableView" id="836945484">
+							<reference key="NSNextResponder" ref="529367241"/>
+							<int key="NSvFlags">274</int>
+							<string key="NSFrame">{{563, 127}, {423, 435}}</string>
+							<reference key="NSSuperview" ref="529367241"/>
+							<object class="NSColor" key="IBUIBackgroundColor">
+								<int key="NSColorSpace">3</int>
+								<bytes key="NSWhite">MQA</bytes>
+							</object>
+							<bool key="IBUIClipsSubviews">YES</bool>
+							<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+							<bool key="IBUIBouncesZoom">NO</bool>
+							<int key="IBUISeparatorStyle">1</int>
+							<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+							<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+							<float key="IBUIRowHeight">44</float>
+							<float key="IBUISectionHeaderHeight">22</float>
+							<float key="IBUISectionFooterHeight">22</float>
+						</object>
+						<object class="IBUINavigationBar" id="810093952">
+							<reference key="NSNextResponder" ref="529367241"/>
+							<int key="NSvFlags">290</int>
+							<string key="NSFrameSize">{1024, 44}</string>
+							<reference key="NSSuperview" ref="529367241"/>
+							<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+							<object class="NSArray" key="IBUIItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="IBUINavigationItem" id="891675002">
+									<reference key="IBUINavigationBar" ref="810093952"/>
+									<string key="IBUITitle">Title</string>
+									<object class="IBUIBarButtonItem" key="IBUILeftBarButtonItem" id="1043383875">
+										<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+										<int key="IBUIStyle">1</int>
+										<reference key="IBUINavigationItem" ref="891675002"/>
+										<int key="IBUISystemItemIdentifier">0</int>
+									</object>
 									<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-									<int key="IBUIStyle">1</int>
-									<reference key="IBUINavigationItem" ref="891675002"/>
-									<int key="IBUISystemItemIdentifier">0</int>
 								</object>
-								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 							</object>
 						</object>
 					</object>
-					<object class="IBUILabel" id="360158240">
-						<reference key="NSNextResponder" ref="529367241"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{491, 393}, {42, 21}}</string>
-						<reference key="NSSuperview" ref="529367241"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<int key="IBUIContentMode">7</int>
-						<bool key="IBUIUserInteractionEnabled">NO</bool>
-						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-						<string key="IBUIText">Label</string>
-						<object class="NSColor" key="IBUITextColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MCAwIDAAA</bytes>
-						</object>
-						<nil key="IBUIHighlightedColor"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">10</float>
+					<string key="NSFrameSize">{1024, 768}</string>
+					<reference key="NSSuperview"/>
+					<object class="NSColor" key="IBUIBackgroundColor">
+						<int key="NSColorSpace">1</int>
+						<bytes key="NSRGB">MC40MDAwMDAwMDYgMC44MDAwMDAwMTE5IDEAA</bytes>
 					</object>
-				</object>
-				<string key="NSFrameSize">{1024, 768}</string>
-				<reference key="NSSuperview"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
+					<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+						<int key="interfaceOrientation">3</int>
 					</object>
+					<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 				</object>
 				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 					<int key="interfaceOrientation">3</int>
 				</object>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+				<bool key="IBUIHorizontal">YES</bool>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -110,20 +133,28 @@
 					<int key="connectionID">22</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">dismissSplitView</string>
-						<reference key="source" ref="1043383875"/>
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="836945484"/>
 						<reference key="destination" ref="841351856"/>
 					</object>
-					<int key="connectionID">31</int>
+					<int key="connectionID">35</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">test</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="360158240"/>
+						<string key="label">delegate</string>
+						<reference key="source" ref="836945484"/>
+						<reference key="destination" ref="841351856"/>
 					</object>
-					<int key="connectionID">33</int>
+					<int key="connectionID">36</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="810093952"/>
+						<reference key="destination" ref="841351856"/>
+					</object>
+					<int key="connectionID">38</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -147,14 +178,34 @@
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">52</int>
+						<reference key="object" ref="908968585"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="529367241"/>
+						</object>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">21</int>
 						<reference key="object" ref="529367241"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="360158240"/>
 							<reference ref="810093952"/>
-							<reference ref="360158240"/>
+							<reference ref="836945484"/>
 						</object>
-						<reference key="parent" ref="0"/>
+						<reference key="parent" ref="908968585"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">34</int>
+						<reference key="object" ref="836945484"/>
+						<reference key="parent" ref="529367241"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">32</int>
+						<reference key="object" ref="360158240"/>
+						<reference key="parent" ref="529367241"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">23</int>
@@ -179,11 +230,6 @@
 						<reference key="object" ref="1043383875"/>
 						<reference key="parent" ref="891675002"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">32</int>
-						<reference key="object" ref="360158240"/>
-						<reference key="parent" ref="529367241"/>
-					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -194,21 +240,29 @@
 					<string>-2.CustomClassName</string>
 					<string>21.IBEditorWindowLastContentRect</string>
 					<string>21.IBPluginDependency</string>
+					<string>23.IBEditorWindowLastContentRect</string>
 					<string>23.IBPluginDependency</string>
 					<string>24.IBPluginDependency</string>
 					<string>25.IBPluginDependency</string>
 					<string>32.IBPluginDependency</string>
+					<string>34.IBPluginDependency</string>
+					<string>52.IBEditorWindowLastContentRect</string>
+					<string>52.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>DetailViewController</string>
+					<string>UINavigationController</string>
 					<string>UIResponder</string>
 					<string>{{62, 248}, {1024, 768}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>{{42, 1078}, {1024, 44}}</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>{{63, 388}, {1024, 768}}</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -227,42 +281,9 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">33</int>
+			<int key="maxID">52</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">DetailViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">dismissSplitView</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>detailItem</string>
-							<string>navigationBar</string>
-							<string>rootController</string>
-							<string>test</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>UINavigationBar</string>
-							<string>id</string>
-							<string>UILabel</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../cocoaTouch/iPad/DetailViewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">

--- a/cocoaTouch/iPad/MainMenuViewController.h	Mon Mar 29 20:49:36 2010 +0000
+++ b/cocoaTouch/iPad/MainMenuViewController.h	Mon Mar 29 23:20:34 2010 +0000
@@ -17,6 +17,7 @@
 
 -(void) appear;
 -(void) disappear;
+-(void) hideBehind;
 
 -(IBAction) switchViews:(id)sender;
 @end

--- a/cocoaTouch/iPad/MainMenuViewController.m	Mon Mar 29 20:49:36 2010 +0000
+++ b/cocoaTouch/iPad/MainMenuViewController.m	Mon Mar 29 23:20:34 2010 +0000
@@ -97,12 +97,7 @@
 	self.view.alpha = 1;
 	[UIView commitAnimations];
     
-    // this is a silly way to hide the sdl contex that remained active
-    if (nil == cover) {
-        cover= [[UIView alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-        cover.backgroundColor = [UIColor blackColor];
-    }
-    [[SDLUIKitDelegate sharedAppDelegate].uiwindow insertSubview:cover belowSubview:self.view];
+    [NSTimer scheduledTimerWithTimeInterval:0.7 target:self selector:@selector(hideBehind) userInfo:nil repeats:NO];
 }
 
 -(void) disappear {
@@ -118,6 +113,15 @@
     [self.view removeFromSuperview];
 }
 
+// this is a silly way to hide the sdl contex that remained active
+-(void) hideBehind {
+    if (nil == cover) {
+        cover= [[UIView alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+        cover.backgroundColor = [UIColor blackColor];
+    }
+    [[SDLUIKitDelegate sharedAppDelegate].uiwindow insertSubview:cover belowSubview:self.view];
+}
+
 #pragma mark -
 -(IBAction) switchViews:(id) sender {
     UIButton *button = (UIButton *)sender;

--- a/cocoaTouch/iPad/MasterViewController.m	Mon Mar 29 20:49:36 2010 +0000
+++ b/cocoaTouch/iPad/MasterViewController.m	Mon Mar 29 23:20:34 2010 +0000
@@ -50,7 +50,6 @@
 
 // Customize the appearance of table view cells.
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    
     static NSString *CellIdentifier = @"Cell";
     
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
@@ -95,12 +94,11 @@
 -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     // Navigation logic may go here. Create and push another view controller.
 	/*
-	 <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil];
-     // ...
-     // Pass the selected object to the new view controller.
-	 [self.navigationController pushViewController:detailViewController animated:YES];
-	 [detailViewController release];
-	 */
+	DetailViewController *detailViewController = [[DetailViewController alloc] initWithNibName:@"DetailViewController" bundle:nil];
+    // Pass the selected object to the new view controller.
+	[self.navigationController pushViewController:detailViewController animated:YES];
+	[detailViewController release];
+	*/
     detailViewController.detailItem = [[NSString alloc] initWithFormat:@"%d", [indexPath row]];
 }
 

--- a/cocoaTouch/iPad/OverlayViewController.m	Mon Mar 29 20:49:36 2010 +0000
+++ b/cocoaTouch/iPad/OverlayViewController.m	Mon Mar 29 23:20:34 2010 +0000
@@ -183,7 +183,8 @@
 -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
 	NSArray *twoTouches;
 	UITouch *touch = [touches anyObject];
-	
+	int width = [[UIScreen mainScreen] bounds].size.width;
+    
 	switch ([touches count]) {
 		case 1:
 			gestureStartPoint = [touch locationInView:self.view];
@@ -192,7 +193,7 @@
 				case 1:
 					NSLog(@"X:%d Y:%d", (int)gestureStartPoint.x, (int)gestureStartPoint.y );
 					SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window, 
-							      (int)gestureStartPoint.y, 320 - (int)gestureStartPoint.x);
+							      (int)gestureStartPoint.y, width - (int)gestureStartPoint.x);
 					HW_click();
 					break;
 				case 2:
@@ -235,13 +236,14 @@
 	NSArray *twoTouches;
 	CGPoint currentPosition;
 	UITouch *touch = [touches anyObject];
+	int width = [[UIScreen mainScreen] bounds].size.width;
 
 	switch ([touches count]) {
 		case 1:
 			currentPosition = [touch locationInView:self.view];
 			// panning
 			SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].window, 
-							(int)gestureStartPoint.y, 320 - (int)gestureStartPoint.x);
+							(int)gestureStartPoint.y, width - (int)gestureStartPoint.x);
 			// remember that we have x and y inverted
 			/* temporarily disabling hog movements for camera panning testing
 			CGFloat vertDiff = gestureStartPoint.x - currentPosition.x;

--- a/hedgewars/hwengine.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/hwengine.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -318,11 +318,8 @@
 
     MainLoop();
     OnDestroy();
-    if alsoShutdownFrontend then
-    begin
-        alsoShutdownFrontend:= false;
-        halt;
-    end;
+{$IFDEF HWLIBRARY}freeEverything();{$ENDIF}
+    if alsoShutdownFrontend then halt;
 end;
 
 procedure initEverything;

--- a/hedgewars/options.inc	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/options.inc	Mon Mar 29 23:20:34 2010 +0000
@@ -23,14 +23,16 @@
 {$ENDIF}
 
 {$MODE OBJFPC}
+{$MACRO ON}
+
+{$DEFINE GLunit:=GL,GLext} 
 
 {$IFDEF IPHONEOS}
   {$DEFINE SDL13}
-  {$DEFINE GLES11}
-  {$DEFINE LOWRES}
   {$DEFINE SDL_MIXER_NEWER}
   {$DEFINE SDL_IMAGE_NEWER}
   {$DEFINE HWLIBRARY}
+  {$DEFINE GLunit:=gles11} 
 {$ENDIF}
 
 {$IFNDEF DARWIN}

--- a/hedgewars/uAIActions.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uAIActions.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -22,7 +22,7 @@
 interface
 uses uGears, uFloat;
 
-const MAXACTIONS = 96;
+const MAXACTIONS     = 96;
       aia_none       = 0;
       aia_Left       = 1;
       aia_Right      = 2;

--- a/hedgewars/uConsts.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uConsts.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -21,12 +21,7 @@
 unit uConsts;
 interface
 
-uses    SDLh, uFloat, uLocale,
-{$IFDEF GLES11}
-    gles11;
-{$ELSE}
-    GL;
-{$ENDIF}
+uses    SDLh, uFloat, uLocale, GLunit;
 
 
 {$INCLUDE "config.inc"}

--- a/hedgewars/uGears.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uGears.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -96,12 +96,7 @@
 
 implementation
 uses uWorld, uMisc, uStore, uConsole, uSound, uTeams, uRandom, uCollisions, uLand, uIO, uLandGraphics,
-    uAIMisc, uLocale, uAI, uAmmos, uStats, uVisualGears, uScript, 
-{$IFDEF GLES11}
-    gles11;
-{$ELSE}
-    GL;
-{$ENDIF}
+    uAIMisc, uLocale, uAI, uAmmos, uStats, uVisualGears, uScript, GLunit;
 
 const MAXROPEPOINTS = 384;
 var RopePoints: record

--- a/hedgewars/uLand.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uLand.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -20,12 +20,7 @@
 
 unit uLand;
 interface
-uses SDLh, uLandTemplates, uFloat, uConsts,
-{$IFDEF GLES11}
-    gles11;
-{$ELSE}
-    GL;
-{$ENDIF}
+uses SDLh, uLandTemplates, uFloat, uConsts, GLunit;
 
 type TLandArray = packed array[0 .. LAND_HEIGHT - 1, 0 .. LAND_WIDTH - 1] of LongWord;
     TCollisionArray = packed array[0 .. LAND_HEIGHT - 1, 0 .. LAND_WIDTH - 1] of Word;

--- a/hedgewars/uLandObjects.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uLandObjects.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -29,12 +29,7 @@
 procedure AddOnLandObjects(Surface: PSDL_Surface);
 
 implementation
-uses uLand, uStore, uConsts, uMisc, uConsole, uRandom, uVisualGears, uFloat, uSound, uWorld,
-{$IFDEF GLES11}
-    gles11;
-{$ELSE}
-    GL;
-{$ENDIF}
+uses uLand, uStore, uConsts, uMisc, uConsole, uRandom, uVisualGears, uFloat, uSound, uWorld, GLunit;
 
 const MaxRects = 512;
       MAXOBJECTRECTS = 16;

--- a/hedgewars/uLandTexture.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uLandTexture.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -27,12 +27,7 @@
 procedure FreeLand;
 
 implementation
-uses uMisc, uLand, uStore, uConsts,
-{$IFDEF GLES11}
-    gles11;
-{$ELSE}
-    GL;
-{$ENDIF}
+uses uMisc, uLand, uStore, uConsts, GLunit;
 
 
 const TEXSIZE = 256;

--- a/hedgewars/uMisc.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uMisc.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -21,12 +21,7 @@
 unit uMisc;
 interface
 
-uses    SDLh, uConsts, uFloat,
-{$IFDEF GLES11}
-    gles11;
-{$ELSE}
-    GL;
-{$ENDIF}
+uses    SDLh, uConsts, uFloat, GLunit;
 
 var
     isCursorVisible : boolean;

--- a/hedgewars/uStore.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uStore.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -20,12 +20,7 @@
 
 unit uStore;
 interface
-uses sysutils, uConsts, uTeams, SDLh, uFloat,
-{$IFDEF GLES11}
-    gles11;
-{$ELSE}
-    GL, GLext;
-{$ENDIF}
+uses sysutils, uConsts, uTeams, SDLh, uFloat, GLunit;
 
 
 var PixelFormat: PSDL_PixelFormat;

--- a/hedgewars/uTeams.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uTeams.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -20,13 +20,7 @@
 
 unit uTeams;
 interface
-uses SDLh, uConsts, uKeys, uGears, uRandom, uFloat, uStats, uVisualGears, uCollisions, uLand,
-{$IFDEF GLES11}
-    gles11,
-{$ELSE}
-    GL,
-{$ENDIF}
-    uSound;
+uses SDLh, uConsts, uKeys, uGears, uRandom, uFloat, uStats, uVisualGears, uCollisions, uLand, GLunit, uSound;
 
 type PHHAmmo = ^THHAmmo;
     THHAmmo = array[0..cMaxSlotIndex, 0..cMaxSlotAmmoIndex] of TAmmo;

--- a/hedgewars/uVisualGears.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uVisualGears.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -20,12 +20,7 @@
 
 unit uVisualGears;
 interface
-uses SDLh, uConsts, uFloat, Math,
-{$IFDEF GLES11}
-    gles11;
-{$ELSE}
-    GL;
-{$ENDIF}
+uses SDLh, uConsts, uFloat, Math, GLunit;
 
 type PVisualGear = ^TVisualGear;
     TVGearStepProcedure = procedure (Gear: PVisualGear; Steps: Longword);

--- a/hedgewars/uWorld.pas	Mon Mar 29 20:49:36 2010 +0000
+++ b/hedgewars/uWorld.pas	Mon Mar 29 23:20:34 2010 +0000
@@ -47,12 +47,7 @@
 procedure ShakeCamera(amount: LongWord);
 
 implementation
-uses    uStore, uMisc, uTeams, uIO, uConsole, uKeys, uLocale, uSound, uAmmos, uVisualGears, uChat, uLandTexture, uLand,
-{$IFDEF GLES11}
-    gles11;
-{$ELSE}
-    GL;
-{$ENDIF}
+uses    uStore, uMisc, uTeams, uIO, uConsole, uKeys, uLocale, uSound, uAmmos, uVisualGears, uChat, uLandTexture, uLand, GLunit;
 
 type TCaptionStr = record
                    Tex: PTexture;

--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Mon Mar 29 20:49:36 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Mon Mar 29 23:20:34 2010 +0000
@@ -197,7 +197,88 @@
 	<key>Notifications</key>
 	<array/>
 	<key>OpenEditors</key>
-	<array/>
+	<array>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>61CCBF841161657400833FE8</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>uTeams.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>61CCBF851161657400833FE8</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>uTeams.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>61CCBF871161657400833FE8</string>
+						<key>history</key>
+						<array>
+							<string>61CCBF861161657400833FE8</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}, {938, 870}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>15 262 938 911 0 0 1920 1178 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>61CCBF5C1161640E00833FE8</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>hwengine.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>61CCBF5D1161640E00833FE8</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>hwengine.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>61CCBF881161657400833FE8</string>
+						<key>history</key>
+						<array>
+							<string>61CCBF58116163B000833FE8</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}, {897, 595}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>421 232 897 636 0 0 1920 1178 </string>
+			</dict>
+		</dict>
+	</array>
 	<key>PerspectiveWidths</key>
 	<array>
 		<integer>-1</integer>
@@ -265,14 +346,14 @@
 							<array>
 								<string>29B97314FDCFA39411CA2CEA</string>
 								<string>080E96DDFE201D6D7F000001</string>
+								<string>6100DAD4115446B000F455E0</string>
 								<string>1C37FBAC04509CD000000102</string>
 								<string>1C37FABC05509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>7</integer>
-									<integer>2</integer>
+									<integer>1</integer>
 									<integer>0</integer>
 								</array>
 							</array>
@@ -296,7 +377,7 @@
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>860 368 801 617 0 0 1920 1178 </string>
+						<string>1063 490 801 617 0 0 1920 1178 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -312,7 +393,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>PopupMenuViewController.m</string>
+								<string>uIO.pas</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -320,16 +401,14 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>PopupMenuViewController.m</string>
+										<string>uIO.pas</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>61CE264D115E89B50098C467</string>
+										<string>61CCBF831161657400833FE8</string>
 										<key>history</key>
 										<array>
-											<string>6179889C114AA5BD00BA94A9</string>
 											<string>6179889D114AA5BD00BA94A9</string>
-											<string>617988EA114AAB9E00BA94A9</string>
 											<string>61799342114B297000BA94A9</string>
 											<string>61799343114B297000BA94A9</string>
 											<string>61799354114BD5C300BA94A9</string>
@@ -339,7 +418,6 @@
 											<string>6179938511501FFA00BA94A9</string>
 											<string>6179943111502CEA00BA94A9</string>
 											<string>6194CC0711505FCF00A4BA5C</string>
-											<string>6194CCFC1151E00900A4BA5C</string>
 											<string>611FD81D1155111700C2203D</string>
 											<string>611FD81E1155111700C2203D</string>
 											<string>611FD81F1155111700C2203D</string>
@@ -357,48 +435,63 @@
 											<string>611FD95911551C3700C2203D</string>
 											<string>611FD96611551E8000C2203D</string>
 											<string>611FDAC41155B77500C2203D</string>
-											<string>611FDADF1155B83200C2203D</string>
 											<string>611FDB481155BCE500C2203D</string>
 											<string>611FDB6B1155C0B300C2203D</string>
 											<string>611FDB6C1155C0B300C2203D</string>
 											<string>611FDB6D1155C0B300C2203D</string>
 											<string>611FDBF71155D39400C2203D</string>
-											<string>611FDC1A1155D8E400C2203D</string>
 											<string>611FDC1B1155D8E400C2203D</string>
-											<string>61E2F07F1156B170002D33C1</string>
-											<string>61E2F0801156B170002D33C1</string>
 											<string>61E2F0811156B170002D33C1</string>
-											<string>61E2F0821156B170002D33C1</string>
-											<string>61E2F0831156B170002D33C1</string>
-											<string>618AFC06115BE92A003D411B</string>
 											<string>618AFC07115BE92A003D411B</string>
-											<string>618AFC14115BEA91003D411B</string>
-											<string>61FA748B115D739000DA6ED0</string>
-											<string>61FA7625115DA22500DA6ED0</string>
-											<string>61FA766D115DAB4C00DA6ED0</string>
-											<string>61FA766F115DAB4C00DA6ED0</string>
 											<string>61CE23E7115E49560098C467</string>
 											<string>61CE23FF115E4B290098C467</string>
 											<string>61CE2410115E4F620098C467</string>
-											<string>61CE2460115E56FD0098C467</string>
 											<string>61CE2461115E56FD0098C467</string>
 											<string>61CE24D4115E5E630098C467</string>
-											<string>61CE24D5115E5E630098C467</string>
 											<string>61CE24DC115E641F0098C467</string>
-											<string>61CE24E0115E648D0098C467</string>
-											<string>61CE24FB115E72A80098C467</string>
 											<string>61CE24FE115E72A80098C467</string>
 											<string>61CE2514115E74CC0098C467</string>
 											<string>61CE2515115E74CC0098C467</string>
 											<string>61CE251F115E75A70098C467</string>
-											<string>61CE2551115E77C50098C467</string>
 											<string>61CE2552115E77C50098C467</string>
 											<string>61CE2577115E78900098C467</string>
 											<string>61CE2578115E78900098C467</string>
 											<string>61CE25B4115E7C940098C467</string>
 											<string>61CE25B5115E7C940098C467</string>
-											<string>61CE260E115E84070098C467</string>
-											<string>61CE260F115E84070098C467</string>
+											<string>615E2350115ED80500B0ACA1</string>
+											<string>615E2395115F023B00B0ACA1</string>
+											<string>615E2396115F023B00B0ACA1</string>
+											<string>615E2397115F023B00B0ACA1</string>
+											<string>615E2398115F023B00B0ACA1</string>
+											<string>615E2399115F023B00B0ACA1</string>
+											<string>615E239A115F023B00B0ACA1</string>
+											<string>615E239B115F023B00B0ACA1</string>
+											<string>61CCBDA11160666200833FE8</string>
+											<string>61CCBDC711606DEA00833FE8</string>
+											<string>61CCBE60116135FF00833FE8</string>
+											<string>61CCBE6C116136F600833FE8</string>
+											<string>61CCBECC1161477A00833FE8</string>
+											<string>61CCBECD1161477A00833FE8</string>
+											<string>61CCBECE1161477A00833FE8</string>
+											<string>61CCBED01161477A00833FE8</string>
+											<string>61CCBEEB1161493800833FE8</string>
+											<string>61CCBF1E116162CA00833FE8</string>
+											<string>61CCBF1F116162CA00833FE8</string>
+											<string>61CCBF451161637F00833FE8</string>
+											<string>61CCBF461161637F00833FE8</string>
+											<string>61CCBF471161637F00833FE8</string>
+											<string>61CCBF481161637F00833FE8</string>
+											<string>61CCBF491161637F00833FE8</string>
+											<string>61CCBF791161657400833FE8</string>
+											<string>61CCBF7A1161657400833FE8</string>
+											<string>61CCBF7B1161657400833FE8</string>
+											<string>61CCBF7C1161657400833FE8</string>
+											<string>61CCBF7D1161657400833FE8</string>
+											<string>61CCBF7E1161657400833FE8</string>
+											<string>61CCBF7F1161657400833FE8</string>
+											<string>61CCBF801161657400833FE8</string>
+											<string>61CCBF811161657400833FE8</string>
+											<string>61CCBF821161657400833FE8</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -410,14 +503,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {593, 109}}</string>
+								<string>{{0, 0}, {593, 56}}</string>
 								<key>RubberWindowFrame</key>
-								<string>860 368 801 617 0 0 1920 1178 </string>
+								<string>1063 490 801 617 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>109pt</string>
+							<string>56pt</string>
 						</dict>
 						<dict>
 							<key>BecomeActive</key>
@@ -432,14 +525,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 114}, {593, 462}}</string>
+								<string>{{0, 61}, {593, 515}}</string>
 								<key>RubberWindowFrame</key>
-								<string>860 368 801 617 0 0 1920 1178 </string>
+								<string>1063 490 801 617 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>462pt</string>
+							<string>515pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -458,9 +551,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>61CE25AC115E7BC20098C467</string>
+				<string>61CCBDA41160666200833FE8</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>61CE25AD115E7BC20098C467</string>
+				<string>61CCBDA51160666200833FE8</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -598,15 +691,23 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>61CE25E8115E7EB80098C467</string>
-		<string>61CE25D2115E7D3B0098C467</string>
+		<string>61CCBF891161657400833FE8</string>
+		<string>61CCBF8A1161657400833FE8</string>
+		<string>61CCBF8B1161657400833FE8</string>
+		<string>61CCBF8C1161657400833FE8</string>
+		<string>61CCBF8D1161657400833FE8</string>
+		<string>61CCBF8E1161657400833FE8</string>
+		<string>61CCBDDB11606DED00833FE8</string>
+		<string>61CCBDD611606DEA00833FE8</string>
 		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>61798848114AA42600BA94A9</string>
+		<string>61CCBF5C1161640E00833FE8</string>
+		<string>61CCBF841161657400833FE8</string>
 		<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>860 368 801 617 0 0 1920 1178 </string>
+	<string>1063 490 801 617 0 0 1920 1178 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -622,12 +723,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>uKeys.pas</string>
+								<string>uLand.pas</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -636,7 +739,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {847, 230}}</string>
 								<key>RubberWindowFrame</key>
-								<string>330 341 847 561 0 0 1920 1178 </string>
+								<string>161 276 847 561 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -644,8 +747,6 @@
 							<string>230pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -662,7 +763,7 @@
 								<key>Frame</key>
 								<string>{{0, 235}, {847, 285}}</string>
 								<key>RubberWindowFrame</key>
-								<string>330 341 847 561 0 0 1920 1178 </string>
+								<string>161 276 847 561 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXBuildResultsModule</string>
@@ -685,7 +786,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>61798848114AA42600BA94A9</string>
-				<string>61CE25AE115E7BC20098C467</string>
+				<string>61CCBDA01160666200833FE8</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -694,7 +795,7 @@
 			<key>WindowContentMinSize</key>
 			<string>486 300</string>
 			<key>WindowString</key>
-			<string>330 341 847 561 0 0 1920 1178 </string>
+			<string>161 276 847 561 0 0 1920 1178 </string>
 			<key>WindowToolGUID</key>
 			<string>61798848114AA42600BA94A9</string>
 			<key>WindowToolIsVisible</key>
@@ -807,13 +908,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>61CE25CA115E7D3B0098C467</string>
+				<string>61CCBDCE11606DEA00833FE8</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>61CE25CB115E7D3B0098C467</string>
-				<string>61CE25CC115E7D3B0098C467</string>
-				<string>61CE25CD115E7D3B0098C467</string>
-				<string>61CE25CE115E7D3B0098C467</string>
-				<string>61CE25CF115E7D3B0098C467</string>
+				<string>61CCBDCF11606DEA00833FE8</string>
+				<string>61CCBDD011606DEA00833FE8</string>
+				<string>61CCBDD111606DEA00833FE8</string>
+				<string>61CCBDD211606DEA00833FE8</string>
+				<string>61CCBDD311606DEA00833FE8</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -954,7 +1055,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {656, 344}}</string>
 								<key>RubberWindowFrame</key>
-								<string>1296 355 656 385 0 0 1920 1178 </string>
+								<string>1229 297 656 385 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXDebugCLIModule</string>
@@ -977,13 +1078,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>61CE25D0115E7D3B0098C467</string>
+				<string>61CCBDD411606DEA00833FE8</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.consoleV3</string>
 			<key>WindowString</key>
-			<string>1296 355 656 385 0 0 1920 1178 </string>
+			<string>1229 297 656 385 0 0 1920 1178 </string>
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>

--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Mon Mar 29 20:49:36 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Mon Mar 29 23:20:34 2010 +0000
@@ -94,83 +94,99 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 291404730;
-			PBXWorkspaceStateSaveDate = 291404730;
+			PBXPerProjectTemplateStateSaveDate = 291595640;
+			PBXWorkspaceStateSaveDate = 291595640;
 		};
 		perUserProjectItems = {
-			611FD81D1155111700C2203D /* PBXTextBookmark */ = 611FD81D1155111700C2203D /* PBXTextBookmark */;
-			611FD81E1155111700C2203D /* PBXTextBookmark */ = 611FD81E1155111700C2203D /* PBXTextBookmark */;
-			611FD81F1155111700C2203D /* PBXTextBookmark */ = 611FD81F1155111700C2203D /* PBXTextBookmark */;
-			611FD8201155111700C2203D /* PBXTextBookmark */ = 611FD8201155111700C2203D /* PBXTextBookmark */;
-			611FD8211155111700C2203D /* PBXTextBookmark */ = 611FD8211155111700C2203D /* PBXTextBookmark */;
-			611FD8281155111700C2203D /* PBXTextBookmark */ = 611FD8281155111700C2203D /* PBXTextBookmark */;
-			611FD8291155111700C2203D /* PBXTextBookmark */ = 611FD8291155111700C2203D /* PBXTextBookmark */;
-			611FD82A1155111700C2203D /* PBXTextBookmark */ = 611FD82A1155111700C2203D /* PBXTextBookmark */;
-			611FD82B1155111700C2203D /* PBXTextBookmark */ = 611FD82B1155111700C2203D /* PBXTextBookmark */;
-			611FD82C1155111700C2203D /* PBXTextBookmark */ = 611FD82C1155111700C2203D /* PBXTextBookmark */;
-			611FD82D1155111700C2203D /* PBXTextBookmark */ = 611FD82D1155111700C2203D /* PBXTextBookmark */;
-			611FD94E11551BD300C2203D /* PBXTextBookmark */ = 611FD94E11551BD300C2203D /* PBXTextBookmark */;
-			611FD95711551C3700C2203D /* PBXTextBookmark */ = 611FD95711551C3700C2203D /* PBXTextBookmark */;
-			611FD95811551C3700C2203D /* PBXBookmark */ = 611FD95811551C3700C2203D /* PBXBookmark */;
-			611FD95911551C3700C2203D /* PBXBookmark */ = 611FD95911551C3700C2203D /* PBXBookmark */;
-			611FD96611551E8000C2203D /* PBXBookmark */ = 611FD96611551E8000C2203D /* PBXBookmark */;
-			611FDAC41155B77500C2203D /* PBXTextBookmark */ = 611FDAC41155B77500C2203D /* PBXTextBookmark */;
-			611FDADF1155B83200C2203D /* PBXTextBookmark */ = 611FDADF1155B83200C2203D /* PBXTextBookmark */;
-			611FDB481155BCE500C2203D /* PBXTextBookmark */ = 611FDB481155BCE500C2203D /* PBXTextBookmark */;
-			611FDB6B1155C0B300C2203D /* PBXBookmark */ = 611FDB6B1155C0B300C2203D /* PBXBookmark */;
-			611FDB6C1155C0B300C2203D /* PBXBookmark */ = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
-			611FDB6D1155C0B300C2203D /* PBXBookmark */ = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
-			611FDBF71155D39400C2203D /* PBXTextBookmark */ = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
-			611FDC1A1155D8E400C2203D /* PBXTextBookmark */ = 611FDC1A1155D8E400C2203D /* PBXTextBookmark */;
-			611FDC1B1155D8E400C2203D /* PBXTextBookmark */ = 611FDC1B1155D8E400C2203D /* PBXTextBookmark */;
-			6179889C114AA5BD00BA94A9 /* PBXTextBookmark */ = 6179889C114AA5BD00BA94A9 /* PBXTextBookmark */;
-			6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
-			617988EA114AAB9E00BA94A9 /* PBXTextBookmark */ = 617988EA114AAB9E00BA94A9 /* 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 */;
-			618AFC06115BE92A003D411B /* PBXTextBookmark */ = 618AFC06115BE92A003D411B /* PBXTextBookmark */;
-			618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */;
-			618AFC14115BEA91003D411B /* PBXTextBookmark */ = 618AFC14115BEA91003D411B /* PBXTextBookmark */;
-			6194CC0711505FCF00A4BA5C /* PlistBookmark */ = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
-			6194CCFC1151E00900A4BA5C /* PBXTextBookmark */ = 6194CCFC1151E00900A4BA5C /* PBXTextBookmark */;
-			61CE23E7115E49560098C467 /* PBXTextBookmark */ = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
-			61CE23FF115E4B290098C467 /* PBXBookmark */ = 61CE23FF115E4B290098C467 /* PBXBookmark */;
-			61CE2410115E4F620098C467 /* PBXBookmark */ = 61CE2410115E4F620098C467 /* PBXBookmark */;
-			61CE2460115E56FD0098C467 /* PBXTextBookmark */ = 61CE2460115E56FD0098C467 /* PBXTextBookmark */;
-			61CE2461115E56FD0098C467 /* PBXTextBookmark */ = 61CE2461115E56FD0098C467 /* PBXTextBookmark */;
-			61CE24D4115E5E630098C467 /* PBXTextBookmark */ = 61CE24D4115E5E630098C467 /* PBXTextBookmark */;
-			61CE24D5115E5E630098C467 /* PBXTextBookmark */ = 61CE24D5115E5E630098C467 /* PBXTextBookmark */;
-			61CE24DC115E641F0098C467 /* PBXTextBookmark */ = 61CE24DC115E641F0098C467 /* PBXTextBookmark */;
-			61CE24E0115E648D0098C467 /* PBXTextBookmark */ = 61CE24E0115E648D0098C467 /* PBXTextBookmark */;
-			61CE24FB115E72A80098C467 /* PBXTextBookmark */ = 61CE24FB115E72A80098C467 /* PBXTextBookmark */;
-			61CE24FE115E72A80098C467 /* PBXTextBookmark */ = 61CE24FE115E72A80098C467 /* PBXTextBookmark */;
-			61CE2514115E74CC0098C467 /* PBXBookmark */ = 61CE2514115E74CC0098C467 /* PBXBookmark */;
-			61CE2515115E74CC0098C467 /* PBXTextBookmark */ = 61CE2515115E74CC0098C467 /* PBXTextBookmark */;
-			61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */;
-			61CE2551115E77C50098C467 /* PBXTextBookmark */ = 61CE2551115E77C50098C467 /* PBXTextBookmark */;
-			61CE2552115E77C50098C467 /* PBXTextBookmark */ = 61CE2552115E77C50098C467 /* PBXTextBookmark */;
-			61CE2577115E78900098C467 /* PBXTextBookmark */ = 61CE2577115E78900098C467 /* PBXTextBookmark */;
-			61CE2578115E78900098C467 /* PBXTextBookmark */ = 61CE2578115E78900098C467 /* PBXTextBookmark */;
-			61CE25B4115E7C940098C467 /* PBXTextBookmark */ = 61CE25B4115E7C940098C467 /* PBXTextBookmark */;
-			61CE25B5115E7C940098C467 /* PBXTextBookmark */ = 61CE25B5115E7C940098C467 /* PBXTextBookmark */;
-			61CE260E115E84070098C467 /* PBXTextBookmark */ = 61CE260E115E84070098C467 /* PBXTextBookmark */;
-			61CE260F115E84070098C467 /* PBXTextBookmark */ = 61CE260F115E84070098C467 /* PBXTextBookmark */;
-			61CE264D115E89B50098C467 /* PBXTextBookmark */ = 61CE264D115E89B50098C467 /* PBXTextBookmark */;
-			61E2F07F1156B170002D33C1 /* PBXTextBookmark */ = 61E2F07F1156B170002D33C1 /* PBXTextBookmark */;
-			61E2F0801156B170002D33C1 /* PBXTextBookmark */ = 61E2F0801156B170002D33C1 /* PBXTextBookmark */;
-			61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
-			61E2F0821156B170002D33C1 /* PBXTextBookmark */ = 61E2F0821156B170002D33C1 /* PBXTextBookmark */;
-			61E2F0831156B170002D33C1 /* PBXTextBookmark */ = 61E2F0831156B170002D33C1 /* PBXTextBookmark */;
-			61FA748B115D739000DA6ED0 /* PBXTextBookmark */ = 61FA748B115D739000DA6ED0 /* PBXTextBookmark */;
-			61FA7625115DA22500DA6ED0 /* PBXTextBookmark */ = 61FA7625115DA22500DA6ED0 /* PBXTextBookmark */;
-			61FA766D115DAB4C00DA6ED0 /* PBXTextBookmark */ = 61FA766D115DAB4C00DA6ED0 /* PBXTextBookmark */;
-			61FA766F115DAB4C00DA6ED0 /* PBXTextBookmark */ = 61FA766F115DAB4C00DA6ED0 /* 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 */;
+			611FD94E11551BD300C2203D = 611FD94E11551BD300C2203D /* 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 */;
+			611FDC1B1155D8E400C2203D = 611FDC1B1155D8E400C2203D /* PBXTextBookmark */;
+			615E2350115ED80500B0ACA1 = 615E2350115ED80500B0ACA1 /* PBXTextBookmark */;
+			615E2395115F023B00B0ACA1 = 615E2395115F023B00B0ACA1 /* PBXTextBookmark */;
+			615E2396115F023B00B0ACA1 = 615E2396115F023B00B0ACA1 /* PBXTextBookmark */;
+			615E2397115F023B00B0ACA1 = 615E2397115F023B00B0ACA1 /* PBXTextBookmark */;
+			615E2398115F023B00B0ACA1 = 615E2398115F023B00B0ACA1 /* PBXTextBookmark */;
+			615E2399115F023B00B0ACA1 = 615E2399115F023B00B0ACA1 /* PBXTextBookmark */;
+			615E239A115F023B00B0ACA1 = 615E239A115F023B00B0ACA1 /* PBXTextBookmark */;
+			615E239B115F023B00B0ACA1 = 615E239B115F023B00B0ACA1 /* 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 */;
+			61CCBDA11160666200833FE8 = 61CCBDA11160666200833FE8 /* PBXTextBookmark */;
+			61CCBDC711606DEA00833FE8 = 61CCBDC711606DEA00833FE8 /* PBXTextBookmark */;
+			61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
+			61CCBE6C116136F600833FE8 = 61CCBE6C116136F600833FE8 /* PBXTextBookmark */;
+			61CCBECC1161477A00833FE8 = 61CCBECC1161477A00833FE8 /* PBXTextBookmark */;
+			61CCBECD1161477A00833FE8 = 61CCBECD1161477A00833FE8 /* PBXTextBookmark */;
+			61CCBECE1161477A00833FE8 = 61CCBECE1161477A00833FE8 /* PBXTextBookmark */;
+			61CCBED01161477A00833FE8 = 61CCBED01161477A00833FE8 /* PBXTextBookmark */;
+			61CCBEEB1161493800833FE8 = 61CCBEEB1161493800833FE8 /* PBXTextBookmark */;
+			61CCBF1E116162CA00833FE8 = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
+			61CCBF1F116162CA00833FE8 = 61CCBF1F116162CA00833FE8 /* PBXTextBookmark */;
+			61CCBF451161637F00833FE8 = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF461161637F00833FE8 = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF471161637F00833FE8 = 61CCBF471161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF481161637F00833FE8 = 61CCBF481161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF491161637F00833FE8 = 61CCBF491161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF58116163B000833FE8 = 61CCBF58116163B000833FE8 /* PBXBookmark */;
+			61CCBF791161657400833FE8 = 61CCBF791161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7A1161657400833FE8 = 61CCBF7A1161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7B1161657400833FE8 = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7C1161657400833FE8 = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7D1161657400833FE8 = 61CCBF7D1161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7E1161657400833FE8 = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7F1161657400833FE8 = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */;
+			61CCBF801161657400833FE8 = 61CCBF801161657400833FE8 /* PBXTextBookmark */;
+			61CCBF811161657400833FE8 = 61CCBF811161657400833FE8 /* PBXTextBookmark */;
+			61CCBF821161657400833FE8 = 61CCBF821161657400833FE8 /* PBXBookmark */;
+			61CCBF831161657400833FE8 = 61CCBF831161657400833FE8 /* PBXTextBookmark */;
+			61CCBF861161657400833FE8 = 61CCBF861161657400833FE8 /* PBXTextBookmark */;
+			61CCBF871161657400833FE8 = 61CCBF871161657400833FE8 /* PBXTextBookmark */;
+			61CCBF881161657400833FE8 = 61CCBF881161657400833FE8 /* PBXTextBookmark */;
+			61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
+			61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */;
+			61CE2410115E4F620098C467 = 61CE2410115E4F620098C467 /* PBXBookmark */;
+			61CE2461115E56FD0098C467 = 61CE2461115E56FD0098C467 /* PBXTextBookmark */;
+			61CE24D4115E5E630098C467 = 61CE24D4115E5E630098C467 /* PBXTextBookmark */;
+			61CE24DC115E641F0098C467 = 61CE24DC115E641F0098C467 /* PBXTextBookmark */;
+			61CE24FE115E72A80098C467 = 61CE24FE115E72A80098C467 /* PBXTextBookmark */;
+			61CE2514115E74CC0098C467 = 61CE2514115E74CC0098C467 /* PBXBookmark */;
+			61CE2515115E74CC0098C467 = 61CE2515115E74CC0098C467 /* PBXTextBookmark */;
+			61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */;
+			61CE2552115E77C50098C467 = 61CE2552115E77C50098C467 /* PBXTextBookmark */;
+			61CE2577115E78900098C467 = 61CE2577115E78900098C467 /* PBXTextBookmark */;
+			61CE2578115E78900098C467 = 61CE2578115E78900098C467 /* PBXTextBookmark */;
+			61CE25B4115E7C940098C467 = 61CE25B4115E7C940098C467 /* PBXTextBookmark */;
+			61CE25B5115E7C940098C467 = 61CE25B5115E7C940098C467 /* PBXTextBookmark */;
+			61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
 		userBuildSettings = {
@@ -373,16 +389,6 @@
 		vrLen = 382;
 		vrLoc = 1853;
 	};
-	611FDADF1155B83200C2203D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987F9114AA34C00BA94A9 /* uConsts.pas */;
-		name = "uConsts.pas: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 266;
-		vrLoc = 186;
-	};
 	611FDB481155BCE500C2203D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61798878114AA4D000BA94A9 /* TeamEditViewController.m */;
@@ -415,16 +421,6 @@
 		vrLen = 201;
 		vrLoc = 686;
 	};
-	611FDC1A1155D8E400C2203D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987F5114AA34C00BA94A9 /* uAmmos.pas */;
-		name = "uAmmos.pas: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 316;
-		vrLoc = 0;
-	};
 	611FDC1B1155D8E400C2203D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 617987FC114AA34C00BA94A9 /* uGears.pas */;
@@ -435,6 +431,86 @@
 		vrLen = 316;
 		vrLoc = 0;
 	};
+	615E2350115ED80500B0ACA1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */;
+		name = "PopupMenuViewController.m: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 149;
+		vrLoc = 7;
+	};
+	615E2395115F023B00B0ACA1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
+		name = "MainMenuViewController.m: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 69;
+		vrLoc = 147;
+	};
+	615E2396115F023B00B0ACA1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */;
+		name = "OverlayViewController.h: 14";
+		rLen = 0;
+		rLoc = 281;
+		rType = 0;
+		vrLen = 184;
+		vrLoc = 180;
+	};
+	615E2397115F023B00B0ACA1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */;
+		name = "MainMenuViewController.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 122;
+		vrLoc = 85;
+	};
+	615E2398115F023B00B0ACA1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
+		name = "MainMenuViewController.m: 1";
+		rLen = 0;
+		rLoc = 2;
+		rType = 0;
+		vrLen = 131;
+		vrLoc = 147;
+	};
+	615E2399115F023B00B0ACA1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */;
+		name = "SplitViewRootController.m: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 120;
+		vrLoc = 262;
+	};
+	615E239A115F023B00B0ACA1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */;
+		name = "MasterViewController.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 124;
+		vrLoc = 53;
+	};
+	615E239B115F023B00B0ACA1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
+		name = "MasterViewController.m: 42";
+		rLen = 0;
+		rLoc = 1399;
+		rType = 0;
+		vrLen = 269;
+		vrLoc = 1592;
+	};
 	617987D7114AA2CD00BA94A9 /* HedgewarsMobile */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
@@ -515,147 +591,287 @@
 	};
 	617987E7114AA34C00BA94A9 /* hwengine.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {789, 7722}}";
-			sepNavSelRange = "{6567, 0}";
-			sepNavVisRange = "{6429, 872}";
-			sepNavWindowFrame = "{{373, 65}, {803, 674}}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 7891}}";
+			sepNavSelRange = "{9414, 0}";
+			sepNavVisRange = "{6700, 1065}";
+			sepNavWindowFrame = "{{421, 176}, {897, 692}}";
 		};
 	};
 	617987E9114AA34C00BA94A9 /* hwLibrary.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {677, 247}}";
+			sepNavIntBoundsRect = "{{0, 0}, {677, 221}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 678}";
+			sepNavVisRange = "{0, 14}";
 		};
 	};
 	617987EB114AA34C00BA94A9 /* options.inc */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {544, 533}}";
+			sepNavIntBoundsRect = "{{0, 0}, {532, 572}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 187}";
+			sepNavVisRange = "{0, 49}";
 			sepNavWindowFrame = "{{864, 517}, {921, 605}}";
 		};
 	};
 	617987EC114AA34C00BA94A9 /* PascalExports.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {696, 2028}}";
-			sepNavSelRange = "{1952, 0}";
-			sepNavVisRange = "{1781, 249}";
+			sepNavIntBoundsRect = "{{0, 0}, {744, 1677}}";
+			sepNavSelRange = "{1932, 0}";
+			sepNavVisRange = "{0, 757}";
 			sepNavWindowFrame = "{{238, 238}, {803, 674}}";
 		};
 	};
 	617987ED114AA34C00BA94A9 /* SDLh.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1202, 9802}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{19987, 3110}";
+			sepNavIntBoundsRect = "{{0, 0}, {532, 10582}}";
+			sepNavSelRange = "{12867, 0}";
+			sepNavVisRange = "{12812, 28}";
 			sepNavWindowFrame = "{{15, 455}, {927, 718}}";
 		};
 	};
 	617987F0114AA34C00BA94A9 /* SinTable.inc */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {620, 13598}}";
+			sepNavIntBoundsRect = "{{0, 0}, {532, 13936}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 49}";
+		};
+	};
+	617987F1114AA34C00BA94A9 /* uAI.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 4862}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 869}";
+			sepNavVisRange = "{0, 1860}";
+			sepNavWindowFrame = "{{15, 206}, {938, 967}}";
+		};
+	};
+	617987F2114AA34C00BA94A9 /* uAIActions.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 2847}}";
+			sepNavSelRange = "{878, 0}";
+			sepNavVisRange = "{0, 2061}";
+			sepNavWindowFrame = "{{38, 185}, {938, 967}}";
+		};
+	};
+	617987F3114AA34C00BA94A9 /* uAIAmmoTests.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1174, 8190}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{18811, 1378}";
+			sepNavWindowFrame = "{{61, 164}, {938, 967}}";
+		};
+	};
+	617987F4114AA34C00BA94A9 /* uAIMisc.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {719, 6279}}";
+			sepNavSelRange = "{6716, 0}";
+			sepNavVisRange = "{2094, 49}";
+			sepNavWindowFrame = "{{84, 143}, {938, 967}}";
 		};
 	};
 	617987F5114AA34C00BA94A9 /* uAmmos.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {868, 5161}}";
-			sepNavSelRange = "{9166, 0}";
-			sepNavVisRange = "{8555, 1563}";
+			sepNavIntBoundsRect = "{{0, 0}, {868, 4966}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 1559}";
 			sepNavWindowFrame = "{{38, 434}, {927, 718}}";
 		};
 	};
 	617987F6114AA34C00BA94A9 /* uChat.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {532, 3822}}";
+			sepNavIntBoundsRect = "{{0, 0}, {879, 3848}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 181}";
+			sepNavVisRange = "{0, 1960}";
+			sepNavWindowFrame = "{{15, 206}, {938, 967}}";
 		};
 	};
 	617987F7114AA34C00BA94A9 /* uCollisions.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {532, 4212}}";
+			sepNavIntBoundsRect = "{{0, 0}, {532, 4238}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 186}";
+			sepNavVisRange = "{111, 3}";
+			sepNavWindowFrame = "{{38, 185}, {938, 967}}";
+		};
+	};
+	617987F8114AA34C00BA94A9 /* uConsole.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 4407}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 2119}";
+			sepNavWindowFrame = "{{61, 164}, {938, 967}}";
 		};
 	};
 	617987F9114AA34C00BA94A9 /* uConsts.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {532, 23088}}";
+			sepNavIntBoundsRect = "{{0, 0}, {532, 24284}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{186, 266}";
+			sepNavVisRange = "{114, 72}";
+			sepNavWindowFrame = "{{162, 164}, {938, 967}}";
 		};
 	};
 	617987FA114AA34C00BA94A9 /* uFloat.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {532, 4810}}";
+			sepNavIntBoundsRect = "{{0, 0}, {532, 4797}}";
 			sepNavSelRange = "{0, 0}";
 			sepNavVisRange = "{0, 49}";
+			sepNavWindowFrame = "{{84, 143}, {938, 967}}";
 		};
 	};
 	617987FB114AA34C00BA94A9 /* uGame.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {868, 1053}}";
+			sepNavIntBoundsRect = "{{0, 0}, {621, 1040}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{1104, 1325}";
+			sepNavVisRange = "{49, 62}";
 			sepNavWindowFrame = "{{15, 455}, {927, 718}}";
 		};
 	};
 	617987FC114AA34C00BA94A9 /* uGears.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {698, 30095}}";
-			sepNavSelRange = "{82225, 0}";
-			sepNavVisRange = "{40425, 1087}";
+			sepNavIntBoundsRect = "{{0, 0}, {768, 30953}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{258, 58}";
 			sepNavWindowFrame = "{{61, 413}, {927, 718}}";
 		};
 	};
+	617987FD114AA34C00BA94A9 /* uIO.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 4810}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 1848}";
+			sepNavWindowFrame = "{{15, 206}, {938, 967}}";
+		};
+	};
 	617987FE114AA34C00BA94A9 /* uKeys.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {786, 6864}}";
-			sepNavSelRange = "{2954, 0}";
-			sepNavVisRange = "{2695, 364}";
+			sepNavIntBoundsRect = "{{0, 0}, {862, 6877}}";
+			sepNavSelRange = "{3005, 0}";
+			sepNavVisRange = "{0, 1189}";
 			sepNavWindowFrame = "{{674, 505}, {921, 605}}";
 		};
 	};
 	617987FF114AA34C00BA94A9 /* uLand.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {744, 11557}}";
-			sepNavSelRange = "{25431, 10}";
-			sepNavVisRange = "{24585, 1062}";
-			sepNavWindowFrame = "{{945, 206}, {803, 674}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1734, 15977}}";
+			sepNavSelRange = "{34921, 0}";
+			sepNavVisRange = "{700, 1528}";
+			sepNavWindowFrame = "{{287, 275}, {803, 674}}";
 		};
 	};
 	61798800114AA34C00BA94A9 /* uLandGraphics.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {544, 7631}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1027, 7241}}";
 			sepNavSelRange = "{204, 0}";
-			sepNavVisRange = "{0, 860}";
+			sepNavVisRange = "{5200, 1985}";
 			sepNavWindowFrame = "{{61, 457}, {803, 674}}";
 		};
 	};
 	61798801114AA34C00BA94A9 /* uLandObjects.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1356, 6890}}";
+			sepNavIntBoundsRect = "{{0, 0}, {744, 6812}}";
+			sepNavSelRange = "{1189, 0}";
+			sepNavVisRange = "{114, 1541}";
+			sepNavWindowFrame = "{{84, 436}, {803, 674}}";
+		};
+	};
+	61798802114AA34C00BA94A9 /* uLandTemplates.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 26650}}";
+			sepNavSelRange = "{1407, 0}";
+			sepNavVisRange = "{0, 2653}";
+			sepNavWindowFrame = "{{38, 185}, {938, 967}}";
+		};
+	};
+	61798803114AA34C00BA94A9 /* uLandTexture.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {845, 1664}}";
+			sepNavSelRange = "{3388, 0}";
+			sepNavVisRange = "{3748, 5}";
+			sepNavWindowFrame = "{{400, 151}, {938, 967}}";
+		};
+	};
+	61798804114AA34C00BA94A9 /* uLocale.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 1846}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{1890, 1195}";
-			sepNavWindowFrame = "{{84, 436}, {803, 674}}";
+			sepNavVisRange = "{0, 2884}";
+			sepNavWindowFrame = "{{61, 164}, {938, 967}}";
+		};
+	};
+	61798805114AA34C00BA94A9 /* uMisc.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {537, 10101}}";
+			sepNavSelRange = "{853, 0}";
+			sepNavVisRange = "{814, 41}";
+			sepNavWindowFrame = "{{84, 143}, {938, 967}}";
+		};
+	};
+	61798806114AA34C00BA94A9 /* uRandom.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 1235}}";
+			sepNavSelRange = "{1113, 0}";
+			sepNavVisRange = "{0, 1817}";
+			sepNavWindowFrame = "{{15, 206}, {938, 967}}";
+		};
+	};
+	61798807114AA34C00BA94A9 /* uScript.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {607, 11297}}";
+			sepNavSelRange = "{1143, 0}";
+			sepNavVisRange = "{1004, 219}";
+			sepNavWindowFrame = "{{38, 185}, {938, 967}}";
+		};
+	};
+	61798808114AA34C00BA94A9 /* uSHA.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 2028}}";
+			sepNavSelRange = "{1408, 0}";
+			sepNavVisRange = "{0, 1914}";
+			sepNavWindowFrame = "{{749, 211}, {938, 967}}";
+		};
+	};
+	61798809114AA34C00BA94A9 /* uSound.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {544, 3302}}";
+			sepNavSelRange = "{1282, 0}";
+			sepNavVisRange = "{1229, 128}";
+			sepNavWindowFrame = "{{61, 164}, {938, 967}}";
+		};
+	};
+	6179880A114AA34C00BA94A9 /* uStats.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 3042}}";
+			sepNavSelRange = "{905, 0}";
+			sepNavVisRange = "{0, 2007}";
+			sepNavWindowFrame = "{{84, 143}, {938, 967}}";
 		};
 	};
 	6179880B114AA34C00BA94A9 /* uStore.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {696, 19630}}";
-			sepNavSelRange = "{36975, 0}";
-			sepNavVisRange = "{36771, 571}";
+			sepNavIntBoundsRect = "{{0, 0}, {532, 19773}}";
+			sepNavSelRange = "{36904, 0}";
+			sepNavVisRange = "{0, 49}";
 			sepNavWindowFrame = "{{38, 478}, {803, 674}}";
 		};
 	};
+	6179880C114AA34C00BA94A9 /* uTeams.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {879, 6175}}";
+			sepNavSelRange = "{932, 0}";
+			sepNavVisRange = "{0, 2245}";
+			sepNavWindowFrame = "{{15, 206}, {938, 967}}";
+		};
+	};
+	6179880E114AA34C00BA94A9 /* uVisualGears.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {544, 11154}}";
+			sepNavSelRange = "{873, 0}";
+			sepNavVisRange = "{822, 53}";
+			sepNavWindowFrame = "{{38, 185}, {938, 967}}";
+		};
+	};
 	6179880F114AA34C00BA94A9 /* uWorld.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {754, 13104}}";
-			sepNavSelRange = "{27227, 0}";
-			sepNavVisRange = "{26379, 622}";
+			sepNavIntBoundsRect = "{{0, 0}, {901, 13247}}";
+			sepNavSelRange = "{1635, 0}";
+			sepNavVisRange = "{3460, 1435}";
 			sepNavWindowFrame = "{{158, 270}, {960, 678}}";
 		};
 	};
@@ -744,9 +960,9 @@
 	};
 	6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {901, 2379}}";
-			sepNavSelRange = "{3972, 0}";
-			sepNavVisRange = "{3215, 960}";
+			sepNavIntBoundsRect = "{{0, 0}, {537, 2405}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{147, 69}";
 			sepNavWindowFrame = "{{525, 308}, {775, 623}}";
 		};
 	};
@@ -770,13 +986,14 @@
 			sepNavIntBoundsRect = "{{0, 0}, {868, 717}}";
 			sepNavSelRange = "{822, 67}";
 			sepNavVisRange = "{0, 1130}";
+			sepNavWindowFrame = "{{38, 307}, {927, 845}}";
 		};
 	};
 	61798875114AA4D000BA94A9 /* SettingsViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {868, 4251}}";
-			sepNavSelRange = "{2443, 294}";
-			sepNavVisRange = "{1975, 1372}";
+			sepNavIntBoundsRect = "{{0, 0}, {901, 4173}}";
+			sepNavSelRange = "{6297, 0}";
+			sepNavVisRange = "{8001, 1601}";
 			sepNavWindowFrame = "{{38, 307}, {927, 845}}";
 		};
 	};
@@ -812,29 +1029,19 @@
 	};
 	61798887114AA4E600BA94A9 /* GameSetup.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1209, 758}}";
-			sepNavSelRange = "{135, 33}";
-			sepNavVisRange = "{0, 551}";
+			sepNavIntBoundsRect = "{{0, 0}, {1020, 742}}";
+			sepNavSelRange = "{550, 0}";
+			sepNavVisRange = "{0, 550}";
 		};
 	};
 	61798888114AA4E600BA94A9 /* GameSetup.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1510, 3562}}";
-			sepNavSelRange = "{8314, 0}";
-			sepNavVisRange = "{7936, 467}";
-			sepNavWindowFrame = "{{766, 218}, {1079, 870}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1510, 3848}}";
+			sepNavSelRange = "{8993, 0}";
+			sepNavVisRange = "{3875, 1912}";
+			sepNavWindowFrame = "{{799, 274}, {1079, 870}}";
 		};
 	};
-	6179889C114AA5BD00BA94A9 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987F0114AA34C00BA94A9 /* SinTable.inc */;
-		name = "SinTable.inc: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 869;
-		vrLoc = 0;
-	};
 	6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61798852114AA44900BA94A9 /* config.inc */;
@@ -845,16 +1052,6 @@
 		vrLen = 874;
 		vrLoc = 0;
 	};
-	617988EA114AAB9E00BA94A9 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987ED114AA34C00BA94A9 /* SDLh.pas */;
-		name = "SDLh.pas: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 829;
-		vrLoc = 0;
-	};
 	6179928B114AE0C800BA94A9 /* UpdateDataFolder */ = {
 		activeExec = 0;
 	};
@@ -896,30 +1093,10 @@
 		isa = PBXBookmark;
 		fRef = 6179936711501D3D00BA94A9 /* arrowDown.png */;
 	};
-	618AFC06115BE92A003D411B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
-		name = "uFloat.pas: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 49;
-		vrLoc = 0;
-	};
 	618AFC07115BE92A003D411B /* PBXBookmark */ = {
 		isa = PBXBookmark;
 		fRef = 61798A20114ADD2600BA94A9 /* backgroundLeft.png */;
 	};
-	618AFC14115BEA91003D411B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */;
-		name = "uStore.pas: 1121";
-		rLen = 0;
-		rLoc = 36975;
-		rType = 0;
-		vrLen = 49;
-		vrLoc = 0;
-	};
 	6194CC0711505FCF00A4BA5C /* PlistBookmark */ = {
 		isa = PlistBookmark;
 		fRef = 8D1107310486CEB800E47090 /* Info.plist */;
@@ -932,22 +1109,310 @@
 		rLen = 0;
 		rLoc = 9223372036854775808;
 	};
-	6194CCFC1151E00900A4BA5C /* PBXTextBookmark */ = {
+	61CCBDA11160666200833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
+		name = "DetailViewController.m: 13";
+		rLen = 0;
+		rLoc = 229;
+		rType = 0;
+		vrLen = 83;
+		vrLoc = 229;
+	};
+	61CCBDC711606DEA00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
+		name = "GameSetup.m: 271";
+		rLen = 0;
+		rLoc = 8148;
+		rType = 0;
+		vrLen = 132;
+		vrLoc = 7056;
+	};
+	61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61798800114AA34C00BA94A9 /* uLandGraphics.pas */;
 		name = "uLandGraphics.pas: 6";
 		rLen = 0;
 		rLoc = 204;
 		rType = 0;
-		vrLen = 860;
+		vrLen = 130;
+		vrLoc = 186;
+	};
+	61CCBE6C116136F600833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
+		name = "uKeys.pas: 105";
+		rLen = 0;
+		rLoc = 2954;
+		rType = 0;
+		vrLen = 67;
+		vrLoc = 2933;
+	};
+	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;
+	};
+	61CCBECE1161477A00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
+		name = "PascalExports.pas: 120";
+		rLen = 0;
+		rLoc = 1932;
+		rType = 0;
+		vrLen = 70;
+		vrLoc = 1891;
+	};
+	61CCBED01161477A00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987FF114AA34C00BA94A9 /* uLand.pas */;
+		name = "uLand.pas: 917";
+		rLen = 0;
+		rLoc = 25370;
+		rType = 0;
+		vrLen = 80;
+		vrLoc = 25499;
+	};
+	61CCBEEB1161493800833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61798802114AA34C00BA94A9 /* uLandTemplates.pas */;
+		name = "uLandTemplates.pas: 37";
+		rLen = 0;
+		rLoc = 1407;
+		rType = 0;
+		vrLen = 177;
+		vrLoc = 1273;
+	};
+	61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987F3114AA34C00BA94A9 /* uAIAmmoTests.pas */;
+		name = "uAIAmmoTests.pas: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 125;
+		vrLoc = 3102;
+	};
+	61CCBF1F116162CA00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987ED114AA34C00BA94A9 /* SDLh.pas */;
+		name = "SDLh.pas: 488";
+		rLen = 0;
+		rLoc = 12867;
+		rType = 0;
+		vrLen = 28;
+		vrLoc = 12812;
+	};
+	61CCBF451161637F00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987F0114AA34C00BA94A9 /* SinTable.inc */;
+		name = "SinTable.inc: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 49;
 		vrLoc = 0;
 	};
+	61CCBF461161637F00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987F4114AA34C00BA94A9 /* uAIMisc.pas */;
+		name = "uAIMisc.pas: 205";
+		rLen = 0;
+		rLoc = 6716;
+		rType = 0;
+		vrLen = 49;
+		vrLoc = 2094;
+	};
+	61CCBF471161637F00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987F5114AA34C00BA94A9 /* uAmmos.pas */;
+		name = "uAmmos.pas: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 130;
+		vrLoc = 186;
+	};
+	61CCBF481161637F00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987F7114AA34C00BA94A9 /* uCollisions.pas */;
+		name = "uCollisions.pas: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 75;
+		vrLoc = 111;
+	};
+	61CCBF491161637F00833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987F9114AA34C00BA94A9 /* uConsts.pas */;
+		name = "uConsts.pas: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 202;
+		vrLoc = 114;
+	};
+	61CCBF58116163B000833FE8 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
+	};
+	61CCBF791161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987EB114AA34C00BA94A9 /* options.inc */;
+		name = "options.inc: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 49;
+		vrLoc = 0;
+	};
+	61CCBF7A1161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6179880C114AA34C00BA94A9 /* uTeams.pas */;
+		name = "uTeams.pas: 23";
+		rLen = 0;
+		rLoc = 932;
+		rType = 0;
+		vrLen = 121;
+		vrLoc = 821;
+	};
+	61CCBF7B1161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
+		name = "uFloat.pas: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 49;
+		vrLoc = 0;
+	};
+	61CCBF7C1161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6179880E114AA34C00BA94A9 /* uVisualGears.pas */;
+		name = "uVisualGears.pas: 23";
+		rLen = 0;
+		rLoc = 873;
+		rType = 0;
+		vrLen = 53;
+		vrLoc = 822;
+	};
+	61CCBF7D1161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */;
+		name = "uStore.pas: 1115";
+		rLen = 0;
+		rLoc = 36904;
+		rType = 0;
+		vrLen = 49;
+		vrLoc = 0;
+	};
+	61CCBF7E1161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61798809114AA34C00BA94A9 /* uSound.pas */;
+		name = "uSound.pas: 42";
+		rLen = 0;
+		rLoc = 1282;
+		rType = 0;
+		vrLen = 128;
+		vrLoc = 1229;
+	};
+	61CCBF7F1161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61798807114AA34C00BA94A9 /* uScript.pas */;
+		name = "uScript.pas: 32";
+		rLen = 0;
+		rLoc = 1143;
+		rType = 0;
+		vrLen = 219;
+		vrLoc = 1004;
+	};
+	61CCBF801161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61798805114AA34C00BA94A9 /* uMisc.pas */;
+		name = "uMisc.pas: 24";
+		rLen = 0;
+		rLoc = 853;
+		rType = 0;
+		vrLen = 41;
+		vrLoc = 814;
+	};
+	61CCBF811161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61798803114AA34C00BA94A9 /* uLandTexture.pas */;
+		name = "uLandTexture.pas: 107";
+		rLen = 0;
+		rLoc = 3388;
+		rType = 0;
+		vrLen = 5;
+		vrLoc = 3748;
+	};
+	61CCBF821161657400833FE8 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 617987FD114AA34C00BA94A9 /* uIO.pas */;
+	};
+	61CCBF831161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987FD114AA34C00BA94A9 /* uIO.pas */;
+		name = "uIO.pas: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 49;
+		vrLoc = 0;
+	};
+	61CCBF861161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6179880C114AA34C00BA94A9 /* uTeams.pas */;
+		name = "uTeams.pas: 23";
+		rLen = 0;
+		rLoc = 932;
+		rType = 0;
+		vrLen = 1689;
+		vrLoc = 7334;
+	};
+	61CCBF871161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6179880C114AA34C00BA94A9 /* uTeams.pas */;
+		name = "uTeams.pas: 23";
+		rLen = 0;
+		rLoc = 932;
+		rType = 0;
+		vrLen = 2200;
+		vrLoc = 0;
+	};
+	61CCBF881161657400833FE8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
+		name = "hwengine.pas: 322";
+		rLen = 0;
+		rLoc = 9414;
+		rType = 0;
+		vrLen = 1065;
+		vrLoc = 6700;
+	};
 	61CE23E7115E49560098C467 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6179880F114AA34C00BA94A9 /* uWorld.pas */;
 		name = "uWorld.pas: 526";
 		rLen = 0;
-		rLoc = 16742;
+		rLoc = 16649;
 		rType = 0;
 		vrLen = 482;
 		vrLoc = 16577;
@@ -960,16 +1425,6 @@
 		isa = PBXBookmark;
 		fRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */;
 	};
-	61CE2460115E56FD0098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
-		name = "DetailViewController.m: 13";
-		rLen = 0;
-		rLoc = 229;
-		rType = 0;
-		vrLen = 386;
-		vrLoc = 157;
-	};
 	61CE2461115E56FD0098C467 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 617987E4114AA34C00BA94A9 /* GSHandlers.inc */;
@@ -990,16 +1445,6 @@
 		vrLen = 174;
 		vrLoc = 3;
 	};
-	61CE24D5115E5E630098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
-		name = "MasterViewController.m: 42";
-		rLen = 0;
-		rLoc = 1399;
-		rType = 0;
-		vrLen = 379;
-		vrLoc = 1696;
-	};
 	61CE24DC115E641F0098C467 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */;
@@ -1010,28 +1455,19 @@
 		vrLen = 177;
 		vrLoc = 3;
 	};
-	61CE24E0115E648D0098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
-		name = "MainMenuViewController.m: 1";
-		rLen = 0;
-		rLoc = 2;
-		rType = 0;
-		vrLen = 197;
-		vrLoc = 45;
-	};
 	61CE24EA115E71C20098C467 /* OverlayViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {551, 468}}";
+			sepNavIntBoundsRect = "{{0, 0}, {551, 494}}";
 			sepNavSelRange = "{281, 0}";
-			sepNavVisRange = "{150, 169}";
+			sepNavVisRange = "{180, 184}";
+			sepNavWindowFrame = "{{15, 206}, {938, 967}}";
 		};
 	};
 	61CE24EB115E71C20098C467 /* OverlayViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {915, 3718}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 154}";
+			sepNavIntBoundsRect = "{{0, 0}, {915, 3705}}";
+			sepNavSelRange = "{1629, 123}";
+			sepNavVisRange = "{0, 2263}";
 			sepNavWindowFrame = "{{38, 185}, {938, 967}}";
 		};
 	};
@@ -1046,20 +1482,10 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {532, 1807}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{7, 152}";
+			sepNavVisRange = "{7, 149}";
 			sepNavWindowFrame = "{{15, 206}, {938, 967}}";
 		};
 	};
-	61CE24FB115E72A80098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */;
-		name = "SplitViewRootController.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 291;
-		vrLoc = 262;
-	};
 	61CE24FE115E72A80098C467 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */;
@@ -1104,16 +1530,6 @@
 		isa = PBXBookmark;
 		fRef = 61798A28114ADD2600BA94A9 /* playButton.png */;
 	};
-	61CE2551115E77C50098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */;
-		name = "OverlayViewController.h: 14";
-		rLen = 0;
-		rLoc = 281;
-		rType = 0;
-		vrLen = 169;
-		vrLoc = 150;
-	};
 	61CE2552115E77C50098C467 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61CE24EB115E71C20098C467 /* OverlayViewController.m */;
@@ -1164,56 +1580,6 @@
 		vrLen = 152;
 		vrLoc = 3;
 	};
-	61CE260E115E84070098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
-		name = "uKeys.pas: 105";
-		rLen = 0;
-		rLoc = 2954;
-		rType = 0;
-		vrLen = 140;
-		vrLoc = 2888;
-	};
-	61CE260F115E84070098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */;
-		name = "PopupMenuViewController.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 152;
-		vrLoc = 7;
-	};
-	61CE264D115E89B50098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */;
-		name = "PopupMenuViewController.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 152;
-		vrLoc = 7;
-	};
-	61E2F07F1156B170002D33C1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987FF114AA34C00BA94A9 /* uLand.pas */;
-		name = "uLand.pas: 872";
-		rLen = 0;
-		rLoc = 25647;
-		rType = 0;
-		vrLen = 106;
-		vrLoc = 25530;
-	};
-	61E2F0801156B170002D33C1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987EB114AA34C00BA94A9 /* options.inc */;
-		name = "options.inc: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 187;
-		vrLoc = 0;
-	};
 	61E2F0811156B170002D33C1 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 617987F6114AA34C00BA94A9 /* uChat.pas */;
@@ -1224,62 +1590,22 @@
 		vrLen = 181;
 		vrLoc = 0;
 	};
-	61E2F0821156B170002D33C1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */;
-		name = "PascalExports.pas: 86";
-		rLen = 0;
-		rLoc = 1932;
-		rType = 0;
-		vrLen = 104;
-		vrLoc = 1855;
-	};
-	61E2F0831156B170002D33C1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987F7114AA34C00BA94A9 /* uCollisions.pas */;
-		name = "uCollisions.pas: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 186;
-		vrLoc = 0;
-	};
-	61FA748B115D739000DA6ED0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 265";
-		rLen = 0;
-		rLoc = 8314;
-		rType = 0;
-		vrLen = 467;
-		vrLoc = 7936;
-	};
 	61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {868, 717}}";
-			sepNavSelRange = "{328, 0}";
-			sepNavVisRange = "{0, 407}";
+			sepNavIntBoundsRect = "{{0, 0}, {532, 312}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{85, 122}";
 			sepNavWindowFrame = "{{275, 284}, {927, 845}}";
 		};
 	};
 	61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1055, 1937}}";
-			sepNavSelRange = "{4843, 0}";
-			sepNavVisRange = "{3233, 1942}";
+			sepNavIntBoundsRect = "{{0, 0}, {824, 2288}}";
+			sepNavSelRange = "{2, 0}";
+			sepNavVisRange = "{147, 131}";
 			sepNavWindowFrame = "{{815, 219}, {927, 845}}";
 		};
 	};
-	61FA7625115DA22500DA6ED0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
-		name = "MainMenuViewController.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 216;
-		vrLoc = 0;
-	};
 	61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {579, 299}}";
@@ -1290,65 +1616,44 @@
 	};
 	61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {663, 806}}";
+			sepNavIntBoundsRect = "{{0, 0}, {663, 793}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{262, 291}";
+			sepNavVisRange = "{262, 120}";
 			sepNavWindowFrame = "{{60, 197}, {927, 845}}";
 		};
 	};
 	61FA765A115DAACC00DA6ED0 /* MasterViewController.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {868, 717}}";
-			sepNavSelRange = "{328, 10}";
+			sepNavSelRange = "{426, 51}";
 			sepNavVisRange = "{0, 483}";
 			sepNavWindowFrame = "{{199, 160}, {927, 845}}";
 		};
 	};
 	61FA765B115DAACC00DA6ED0 /* MasterViewController.m */ = {
 		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            l = DetailViewController;\n            r = \"{3390, 24}\";\n            s = 1;\n        },\n                {\n            l = DetailViewController;\n            r = \"{3441, 24}\";\n            s = 1;\n        },\n                {\n            l = \"Nib name\";\n            r = \"{3491, 12}\";\n            s = 1;\n        }\n    );\n    r = \"{0, 4184}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {908, 1716}}";
-			sepNavSelRange = "{1399, 0}";
-			sepNavVisRange = "{1696, 379}";
-			sepNavWindowFrame = "{{414, 191}, {927, 845}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1048, 1612}}";
+			sepNavSelRange = "{3308, 10}";
+			sepNavVisRange = "{2508, 1654}";
+			sepNavWindowFrame = "{{92, 210}, {927, 845}}";
 		};
 	};
 	61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {868, 717}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 697}";
+			sepNavIntBoundsRect = "{{0, 0}, {868, 692}}";
+			sepNavSelRange = "{678, 13}";
+			sepNavVisRange = "{0, 939}";
 			sepNavWindowFrame = "{{862, 170}, {927, 845}}";
 		};
 	};
 	61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1503, 1365}}";
-			sepNavSelRange = "{3143, 0}";
-			sepNavVisRange = "{1221, 1945}";
+			sepNavIntBoundsRect = "{{0, 0}, {1146, 1781}}";
+			sepNavSelRange = "{229, 0}";
+			sepNavVisRange = "{229, 83}";
 			sepNavWindowFrame = "{{862, 170}, {927, 845}}";
 		};
 	};
-	61FA766D115DAB4C00DA6ED0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 207;
-		vrLoc = 0;
-	};
-	61FA766F115DAB4C00DA6ED0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */;
-		name = "MasterViewController.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 178;
-		vrLoc = 0;
-	};
 	928301160F10CAFC00CC5A3C /* fpc */ = {
 		activeExec = 0;
 	};