new graphics from Tiy and frontend is loaded in landscape mode
authorkoda
Mon, 01 Feb 2010 21:26:15 +0000 (2010-02-01)
changeset 2738 bfccb2ec4334
parent 2737 4d1406bc8b3e
child 2739 f860f27028cc
new graphics from Tiy and frontend is loaded in landscape mode
cocoaTouch/GameSetup.m
cocoaTouch/MainMenuViewController.m
cocoaTouch/MainMenuViewController.xib
cocoaTouch/MainWindow.xib
cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h
cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m
cocoaTouch/SDLOverrides/SDL_uikitview.h
cocoaTouch/SDLOverrides/SDL_uikitview.m
cocoaTouch/resources/Background.png
cocoaTouch/resources/Button_network.png
cocoaTouch/resources/Button_play.png
cocoaTouch/resources/Button_store.png
cocoaTouch/resources/Default.png
cocoaTouch/resources/background.png
cocoaTouch/resources/networkButton.png
cocoaTouch/resources/playButton.png
cocoaTouch/resources/storeButton.png
cocoaTouch/resources/tabButton1.png
cocoaTouch/resources/tabButton2.png
cocoaTouch/resources/tabButton3.png
cocoaTouch/resources/tabButton4.png
cocoaTouch/resources/title.png
hedgewars/CCHandlers.inc
--- a/cocoaTouch/GameSetup.m	Mon Feb 01 19:43:57 2010 +0000
+++ b/cocoaTouch/GameSetup.m	Mon Feb 01 21:26:15 2010 +0000
@@ -172,7 +172,7 @@
 				[self sendToEngine:@"ehat Bunny"];
 				
 				// team 2 ammostore
-				[self sendToEngine:@"eammstore 93919294221991210322351110012010000002110404000441400444645644444774776112211144"];
+				[self sendToEngine:@"eammstore 20501090003040000009000000000000000000010404000441400444645644444774776112211144"];
 				
 				clientQuit = NO;
 			} else {
--- a/cocoaTouch/MainMenuViewController.m	Mon Feb 01 19:43:57 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m	Mon Feb 01 21:26:15 2010 +0000
@@ -30,13 +30,10 @@
     [super viewDidLoad];
 }
 
-/*
-// Override to allow orientations other than the default portrait orientation.
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    // Return YES for supported orientations
-    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
+	if (interfaceOrientation == UIInterfaceOrientationLandscapeRight) return YES;
+	else return NO;
 }
-*/
 
 /*
 - (void)didReceiveMemoryWarning {
--- a/cocoaTouch/MainMenuViewController.xib	Mon Feb 01 19:43:57 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.xib	Mon Feb 01 21:26:15 2010 +0000
@@ -12,6 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="4"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -42,9 +43,8 @@
 					<object class="IBUIImageView" id="478425539">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">274</int>
-						<string key="NSFrameSize">{320, 431}</string>
+						<string key="NSFrameSize">{480, 320}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MCAwAA</bytes>
@@ -54,15 +54,14 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<object class="NSCustomResource" key="IBUIImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">Background.png</string>
+							<string key="NSResourceName">background.png</string>
 						</object>
 					</object>
 					<object class="IBUIButton" id="685977989">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{44, 131}, {232, 61}}</string>
+						<string key="NSFrame">{{223, 46}, {232, 61}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MCAwIDAgMAA</bytes>
@@ -90,15 +89,14 @@
 						</object>
 						<object class="NSCustomResource" key="IBUINormalImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">Button_play.png</string>
+							<string key="NSResourceName">playButton.png</string>
 						</object>
 					</object>
 					<object class="IBUIButton" id="1049354127">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 215}, {232, 61}}</string>
+						<string key="NSFrame">{{199, 130}, {232, 61}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MCAwIDAgMAA</bytes>
@@ -116,15 +114,14 @@
 						<reference key="IBUINormalTitleShadowColor" ref="112471976"/>
 						<object class="NSCustomResource" key="IBUINormalImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">Button_network.png</string>
+							<string key="NSResourceName">networkButton.png</string>
 						</object>
 					</object>
 					<object class="IBUIButton" id="995155642">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{44, 298}, {232, 61}}</string>
+						<string key="NSFrame">{{223, 213}, {232, 61}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MCAwIDAgMAA</bytes>
@@ -142,7 +139,7 @@
 						<reference key="IBUINormalTitleShadowColor" ref="111038951"/>
 						<object class="NSCustomResource" key="IBUINormalImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">Button_store.png</string>
+							<string key="NSResourceName">storeButton.png</string>
 						</object>
 					</object>
 					<object class="IBUILabel" id="168836711">
@@ -150,7 +147,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{44, 384}, {232, 21}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -170,11 +166,9 @@
 						<int key="IBUITextAlignment">2</int>
 					</object>
 				</object>
-				<string key="NSFrameSize">{320, 431}</string>
+				<string key="NSFrameSize">{480, 320}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="IBUIBackgroundColor" ref="918890028"/>
-				<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -263,10 +257,10 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="478425539"/>
+							<reference ref="168836711"/>
 							<reference ref="685977989"/>
 							<reference ref="1049354127"/>
 							<reference ref="995155642"/>
-							<reference ref="168836711"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -326,7 +320,7 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>MainMenuViewController</string>
 					<string>UIResponder</string>
-					<string>{{493, 454}, {320, 480}}</string>
+					<string>{{493, 614}, {480, 320}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
--- a/cocoaTouch/MainWindow.xib	Mon Feb 01 19:43:57 2010 +0000
+++ b/cocoaTouch/MainWindow.xib	Mon Feb 01 21:26:15 2010 +0000
@@ -12,7 +12,6 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="13"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,90 +36,21 @@
 			</object>
 			<object class="IBUICustomObject" id="664661524"/>
 			<object class="IBUIWindow" id="380026005">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">1316</int>
 				<object class="NSPSMatrix" key="NSFrameMatrix"/>
-				<string key="NSFrameSize">{320, 480}</string>
+				<string key="NSFrameSize">{480, 320}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MCAwIDAAA</bytes>
 				</object>
 				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 			</object>
-			<object class="IBUITabBarController" id="949193037">
-				<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
-				<bool key="IBUIWantsFullScreenLayout">YES</bool>
-				<object class="IBUIViewController" key="IBUISelectedViewController" id="56776854">
-					<string key="IBUITitle">Item 2</string>
-					<object class="IBUITabBarItem" key="IBUITabBarItem" id="121845716">
-						<int key="IBUITag">1</int>
-						<string key="IBUITitle">Teams</string>
-						<object class="NSCustomResource" key="IBUIImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">tabButton2.png</string>
-						</object>
-						<reference key="IBUITabBar"/>
-					</object>
-					<reference key="IBUIParentViewController" ref="949193037"/>
-					<string key="IBUINibName">TeamEditViewController</string>
-				</object>
-				<object class="NSMutableArray" key="IBUIViewControllers">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUIViewController" id="316666609">
-						<string key="IBUITitle">Item 1</string>
-						<object class="IBUITabBarItem" key="IBUITabBarItem" id="649951061">
-							<string key="IBUITitle">Main</string>
-							<object class="NSCustomResource" key="IBUIImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">tabButton1.png</string>
-							</object>
-							<reference key="IBUITabBar"/>
-						</object>
-						<reference key="IBUIParentViewController" ref="949193037"/>
-						<string key="IBUINibName">MainMenuViewController</string>
-					</object>
-					<reference ref="56776854"/>
-					<object class="IBUIViewController" id="18996086">
-						<string key="IBUITitle">Item 3</string>
-						<object class="IBUITabBarItem" key="IBUITabBarItem" id="588275822">
-							<int key="IBUITag">2</int>
-							<string key="IBUITitle">Schemes</string>
-							<object class="NSCustomResource" key="IBUIImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">tabButton3.png</string>
-							</object>
-							<reference key="IBUITabBar"/>
-						</object>
-						<reference key="IBUIToolbarItems" ref="0"/>
-						<reference key="IBUIParentViewController" ref="949193037"/>
-						<string key="IBUINibName">SchemeEditViewController</string>
-					</object>
-					<object class="IBUIViewController" id="78432802">
-						<string key="IBUITitle">Item 4</string>
-						<object class="IBUITabBarItem" key="IBUITabBarItem" id="457331497">
-							<int key="IBUITag">3</int>
-							<string key="IBUITitle">Settings</string>
-							<object class="NSCustomResource" key="IBUIImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">tabButton4.png</string>
-							</object>
-							<reference key="IBUITabBar"/>
-						</object>
-						<reference key="IBUIToolbarItems" ref="0"/>
-						<reference key="IBUIParentViewController" ref="949193037"/>
-						<string key="IBUINibName">SettingsViewController</string>
-					</object>
-				</object>
-				<object class="IBUITabBar" key="IBUITabBar" id="906583108">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">266</int>
-					<string key="NSFrame">{{129, 330}, {163, 49}}</string>
-					<object class="NSColor" key="IBUIBackgroundColor">
-						<int key="NSColorSpace">3</int>
-						<bytes key="NSWhite">MCAwAA</bytes>
-					</object>
-					<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-				</object>
+			<object class="IBUIViewController" id="402149676">
+				<string key="IBUINibName">MainMenuViewController</string>
+				<bool key="IBUIHorizontal">YES</bool>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -136,20 +66,20 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">controller</string>
-						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="949193037"/>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">uiwindow</string>
 						<reference key="source" ref="664661524"/>
 						<reference key="destination" ref="380026005"/>
 					</object>
 					<int key="connectionID">25</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">viewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="402149676"/>
+					</object>
+					<int key="connectionID">28</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -185,79 +115,10 @@
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="949193037"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="906583108"/>
-							<reference ref="316666609"/>
-							<reference ref="56776854"/>
-							<reference ref="18996086"/>
-							<reference ref="78432802"/>
-						</object>
+						<int key="objectID">26</int>
+						<reference key="object" ref="402149676"/>
 						<reference key="parent" ref="0"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="906583108"/>
-						<reference key="parent" ref="949193037"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="316666609"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="649951061"/>
-						</object>
-						<reference key="parent" ref="949193037"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="56776854"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="121845716"/>
-						</object>
-						<reference key="parent" ref="949193037"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="121845716"/>
-						<reference key="parent" ref="56776854"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="649951061"/>
-						<reference key="parent" ref="316666609"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="18996086"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="588275822"/>
-						</object>
-						<reference key="parent" ref="949193037"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="588275822"/>
-						<reference key="parent" ref="18996086"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">18</int>
-						<reference key="object" ref="78432802"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="457331497"/>
-						</object>
-						<reference key="parent" ref="949193037"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="457331497"/>
-						<reference key="parent" ref="78432802"/>
-					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -266,20 +127,12 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>-1.CustomClassName</string>
 					<string>-2.CustomClassName</string>
-					<string>10.IBEditorWindowLastContentRect</string>
-					<string>10.IBPluginDependency</string>
-					<string>11.IBPluginDependency</string>
-					<string>12.CustomClassName</string>
-					<string>12.IBPluginDependency</string>
-					<string>13.CustomClassName</string>
-					<string>13.IBPluginDependency</string>
-					<string>14.IBPluginDependency</string>
-					<string>15.IBPluginDependency</string>
-					<string>16.CustomClassName</string>
-					<string>18.CustomClassName</string>
 					<string>2.IBAttributePlaceholdersKey</string>
 					<string>2.IBEditorWindowLastContentRect</string>
 					<string>2.IBPluginDependency</string>
+					<string>26.CustomClassName</string>
+					<string>26.IBEditorWindowLastContentRect</string>
+					<string>26.IBPluginDependency</string>
 					<string>3.CustomClassName</string>
 					<string>3.IBPluginDependency</string>
 				</object>
@@ -287,17 +140,6 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>UIApplication</string>
 					<string>UIResponder</string>
-					<string>{{144, 608}, {320, 480}}</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>MainMenuViewController</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>TeamEditViewController</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>SchemeEditViewController</string>
-					<string>SettingsViewController</string>
 					<object class="NSMutableDictionary">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<reference key="dict.sortedKeys" ref="0"/>
@@ -305,7 +147,10 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 						</object>
 					</object>
-					<string>{{820, 472}, {320, 480}}</string>
+					<string>{{530, 261}, {480, 320}}</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>MainMenuViewController</string>
+					<string>{{349, 679}, {480, 320}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>SDLUIKitDelegate</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -327,7 +172,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">25</int>
+			<int key="maxID">28</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -377,13 +222,13 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>controller</string>
 							<string>uiwindow</string>
+							<string>viewController</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UITabBarController</string>
 							<string>UIWindow</string>
+							<string>UIViewController</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -391,83 +236,6 @@
 						<string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SchemeEditViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>cell0</string>
-							<string>table</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UITableViewCell</string>
-							<string>UITableView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SchemeEditViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SettingsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>backgroundTap:</string>
-							<string>deleteData:</string>
-							<string>sliderChanged:</string>
-							<string>textFieldDoneEditing:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>buttonContainer</string>
-							<string>password</string>
-							<string>table</string>
-							<string>username</string>
-							<string>volumeCell</string>
-							<string>volumeLabel</string>
-							<string>volumeSlider</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UIView</string>
-							<string>UITextField</string>
-							<string>UITableView</string>
-							<string>UITextField</string>
-							<string>UITableViewCell</string>
-							<string>UILabel</string>
-							<string>UISlider</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SettingsViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TeamEditViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../../hedge.build/trunk/cocoaTouch/TeamEditViewController.h</string>
-					</object>
-				</object>
 			</object>
 			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
 				<bool key="EncodedWithXMLCoder">YES</bool>
@@ -613,14 +381,6 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">UIBarItem</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">UIButton</string>
 					<string key="superclassName">UIControl</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -650,14 +410,6 @@
 					<reference key="sourceIdentifier" ref="186590129"/>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">UIScrollView</string>
-					<string key="superclassName">UIView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">UISearchBar</string>
 					<string key="superclassName">UIView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -674,67 +426,14 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">UISlider</string>
-					<string key="superclassName">UIControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UISlider.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UITabBar</string>
-					<string key="superclassName">UIView</string>
+					<string key="className">UIView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UITabBar.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UITabBarController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="779948122">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UITabBarItem</string>
-					<string key="superclassName">UIBarItem</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UITabBarItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UITableView</string>
-					<string key="superclassName">UIScrollView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UITableViewCell</string>
-					<string key="superclassName">UIView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UITableViewCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UITextField</string>
-					<string key="superclassName">UIControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="1045548135">
-						<string key="majorKey">IBFrameworkSource</string>
 						<string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIView</string>
-					<reference key="sourceIdentifier" ref="1045548135"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIView</string>
 					<string key="superclassName">UIResponder</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
@@ -750,7 +449,10 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIViewController</string>
-					<reference key="sourceIdentifier" ref="779948122"/>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIViewController</string>
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h	Mon Feb 01 19:43:57 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h	Mon Feb 01 21:26:15 2010 +0000
@@ -26,13 +26,13 @@
 @interface SDLUIKitDelegate:NSObject <UIApplicationDelegate> {
 	SDL_Window *window;
 	UIWindow *uiwindow;
-	UITabBarController *controller;
+	UIViewController *viewController;
 }
 
 // the outlets are set in MainWindow.xib
 @property (readwrite, assign) SDL_Window *window;
 @property (readwrite, retain) IBOutlet UIWindow *uiwindow;
-@property (nonatomic, retain) IBOutlet UITabBarController *controller;
+@property (nonatomic, retain) IBOutlet UIViewController *viewController;
 
 +(SDLUIKitDelegate *)sharedAppDelegate;
 -(NSString *)dataFilePath:(NSString *)fileName;
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m	Mon Feb 01 19:43:57 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m	Mon Feb 01 21:26:15 2010 +0000
@@ -47,7 +47,7 @@
 
 @implementation SDLUIKitDelegate
 
-@synthesize uiwindow, window, controller;
+@synthesize uiwindow, window, viewController;
 
 /* convenience method */
 +(SDLUIKitDelegate *)sharedAppDelegate {
@@ -59,12 +59,12 @@
 	self = [super init];
 	self.uiwindow = nil;
 	self.window = NULL;
-	self.controller = nil;
+	self.viewController = nil;
 	return self;
 }
 
 -(void) dealloc {
-	[controller release];
+	[viewController release];
 	[uiwindow release];
 	[super dealloc];
 }
@@ -80,9 +80,9 @@
 	// remove the current view to free resources
 	[UIView beginAnimations:@"removing main controller" context:NULL];
 	[UIView setAnimationDuration:1];
-	controller.view.alpha = 0;
+	viewController.view.alpha = 0;
 	[UIView commitAnimations];
-	[controller.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1];
+	[viewController.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1];
 
 	NSLog(@"Game is launching...");
 	const char **gameArgs = [setup getSettings];
@@ -94,15 +94,14 @@
 	free(gameArgs);
 	NSLog(@"Game is exting...");
 	
-	[[uiwindow viewWithTag:54321] removeFromSuperview];
 	[setup release];
 
 	[UIView beginAnimations:@"inserting main controller" context:NULL];
 	[UIView setAnimationDuration:1];
-	controller.view.alpha = 1;
+	viewController.view.alpha = 1;
 	[UIView commitAnimations];
 	
-	[uiwindow addSubview: controller.view];
+	[uiwindow addSubview: viewController.view];
 	[uiwindow makeKeyAndVisible];
 	
 	[internal_pool release];
@@ -152,16 +151,19 @@
 
 #pragma mark -
 #pragma mark SDLUIKitDelegate methods
+
+
 // override the direct execution of SDL_main to allow us to implement the frontend (even using a nib)
 -(void) applicationDidFinishLaunching:(UIApplication *)application {
 	[application setStatusBarHidden:YES animated:NO];
-
+	[application setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO];  
+	
 	[self checkFirstRun];
 	
 	/* Set working directory to resource path */
 	[[NSFileManager defaultManager] changeCurrentDirectoryPath: [[NSBundle mainBundle] resourcePath]];
 
-	[uiwindow addSubview:controller.view];
+	[uiwindow addSubview:viewController.view];
 	[uiwindow makeKeyAndVisible];
 }
 
--- a/cocoaTouch/SDLOverrides/SDL_uikitview.h	Mon Feb 01 19:43:57 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitview.h	Mon Feb 01 21:26:15 2010 +0000
@@ -58,9 +58,6 @@
 +(void) attackButtonPressed;
 +(void) attackButtonReleased;
 
-@property CGFloat initialDistance;
-@property CGPoint gestureStartPoint;
-
 #if SDL_IPHONE_KEYBOARD
 - (void)showKeyboard;
 - (void)hideKeyboard;
--- a/cocoaTouch/SDLOverrides/SDL_uikitview.m	Mon Feb 01 19:43:57 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitview.m	Mon Feb 01 21:26:15 2010 +0000
@@ -276,13 +276,11 @@
 			if (0 == initialDistanceForPinching) 
 				initialDistanceForPinching = currentDistanceOfPinching;
 
-			if (currentDistanceOfPinching < initialDistanceForPinching + kMinimumPinchDelta) {
-				NSLog(@"Outward pinch detected");
+			if (currentDistanceOfPinching < initialDistanceForPinching + kMinimumPinchDelta)
 				HW_zoomOut();
-			} else if (currentDistanceOfPinching > initialDistanceForPinching + kMinimumPinchDelta){
-				NSLog(@"Inward pinch detected");
+			else if (currentDistanceOfPinching > initialDistanceForPinching + kMinimumPinchDelta)
 				HW_zoomIn();
-			} 			
+
 			currentDistanceOfPinching = initialDistanceForPinching;
 			break;
 		default:
Binary file cocoaTouch/resources/Background.png has changed
Binary file cocoaTouch/resources/Button_network.png has changed
Binary file cocoaTouch/resources/Button_play.png has changed
Binary file cocoaTouch/resources/Button_store.png has changed
Binary file cocoaTouch/resources/Default.png has changed
Binary file cocoaTouch/resources/background.png has changed
Binary file cocoaTouch/resources/networkButton.png has changed
Binary file cocoaTouch/resources/playButton.png has changed
Binary file cocoaTouch/resources/storeButton.png has changed
Binary file cocoaTouch/resources/tabButton1.png has changed
Binary file cocoaTouch/resources/tabButton2.png has changed
Binary file cocoaTouch/resources/tabButton3.png has changed
Binary file cocoaTouch/resources/tabButton4.png has changed
Binary file cocoaTouch/resources/title.png has changed
--- a/hedgewars/CCHandlers.inc	Mon Feb 01 19:43:57 2010 +0000
+++ b/hedgewars/CCHandlers.inc	Mon Feb 01 21:26:15 2010 +0000
@@ -631,8 +631,7 @@
 	end;
 	
 {$IFDEF SDL13}
-	window:= SDL_CreateWindow('Hedgewars', 0, 0,
-		{$IFDEF IPHONEOS}cScreenHeight, cScreenWidth,{$ELSE}cScreenWidth, cScreenHeight,{$ENDIF}
+	window:= SDL_CreateWindow('Hedgewars', 0, 0, cScreenWidth, cScreenHeight,
 		SDL_WINDOW_OPENGL or SDL_WINDOW_SHOWN 	 
 	        {$IFDEF IPHONEOS} or SDL_WINDOW_BORDERLESS{$ENDIF}); 	 
 	SDL_CreateRenderer(window, -1, 0);