StarterKits fixes for iOS

KonajuGames · Feb 17, 2012 · 7a0bb92 · 7a0bb92
1 parent d2a3cf5
commit 7a0bb92
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/MonoGame.StarterKits.iOS.sln b/MonoGame.StarterKits.iOS.sln
@@ -107,7 +107,7 @@ Global
 		{91CF4A04-9FDC-471D-AED0-D8F057068230} = {73DDE8DB-4345-43F2-9371-0A19FC669324}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = iOS\Platformer\Platformer.csproj
+		StartupItem = iOS\AlienGame\AlienGame.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1
 		$1.RemoveTrailingWhitespace = True

diff --git a/iOS/AlienGame/AlienGame.csproj b/iOS/AlienGame/AlienGame.csproj
@@ -45,7 +45,6 @@
     <MtouchDebug>true</MtouchDebug>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchI18n />
-    <MtouchSdkVersion>4.0</MtouchSdkVersion>
     <MtouchUseArmv7>false</MtouchUseArmv7>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -57,7 +56,6 @@
     <DefineConstants>IPHONE</DefineConstants>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchI18n />
-    <MtouchSdkVersion>4.0</MtouchSdkVersion>
     <MtouchUseArmv7>false</MtouchUseArmv7>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/iOS/AlienGame/GameplayScreen.cs b/iOS/AlienGame/GameplayScreen.cs
@@ -15,6 +15,7 @@
 using Microsoft.Xna.Framework.GamerServices;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
+using Microsoft.Xna.Framework.Input.Touch;
 using Microsoft.Xna.Framework.Storage;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Media;

diff --git a/iOS/Marblets/Marblets.csproj b/iOS/Marblets/Marblets.csproj
@@ -45,8 +45,8 @@
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>true</MtouchDebug>
     <MtouchI18n />
-    <MtouchSdkVersion>4.0</MtouchSdkVersion>
     <MtouchUseArmv7>false</MtouchUseArmv7>
+    <CodesignKey>iPhone Developer</CodesignKey>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -57,7 +57,6 @@
     <DefineConstants>IPHONE</DefineConstants>
     <MtouchI18n />
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchSdkVersion>4.0</MtouchSdkVersion>
     <MtouchUseArmv7>false</MtouchUseArmv7>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/iOS/Platformer/Info.plist b/iOS/Platformer/Info.plist
@@ -12,8 +12,8 @@
 	<string>3.1</string>
 	<key>UIDeviceFamily</key>
 	<array>
-		<string>1</string>
-		<string>2</string>
+		<integer>1</integer>
+		<integer>2</integer>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>

diff --git a/iOS/Platformer/Platformer.csproj b/iOS/Platformer/Platformer.csproj
@@ -47,10 +47,10 @@
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>true</MtouchDebug>
     <MtouchI18n />
-    <MtouchSdkVersion>4.0</MtouchSdkVersion>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <AssemblyName>Platformer</AssemblyName>
     <CodesignKey>iPhone Developer</CodesignKey>
+    <IpaPackageName />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -61,7 +61,6 @@
     <WarningLevel>4</WarningLevel>
     <MtouchI18n />
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchSdkVersion>4.0</MtouchSdkVersion>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <AssemblyName>Platformer</AssemblyName>
   </PropertyGroup>

diff --git a/iOS/Platformer/PlatformerGame.cs b/iOS/Platformer/PlatformerGame.cs
@@ -76,7 +76,7 @@ public PlatformerGame()
 			graphics.IsFullScreen = true;
 			graphics.SupportedOrientations =  DisplayOrientation.LandscapeLeft | DisplayOrientation.LandscapeRight;
 #endif		
-#if WINDOWS_PHONE
+#if WINDOWS_PHONE || ANDROID || IPHONE
             Accelerometer.Initialize();
 #endif
 
@@ -133,18 +133,27 @@ protected override void Update(GameTime gameTime)
         private void HandleInput()
         {
             // get all of our input states
+#if !WINDOWS_PHONE && !ANDROID && !IPHONE
             keyboardState = Keyboard.GetState();
+#endif
+#if !IPHONE
             gamePadState = GamePad.GetState(PlayerIndex.One);
+#endif
             touchState = TouchPanel.GetState();
             accelerometerState = Accelerometer.GetState();
 
+#if !IPHONE
             // Exit the game when back is pressed.
             if (gamePadState.Buttons.Back == ButtonState.Pressed)
                 Exit();
-
+#endif
             bool continuePressed =
+#if !WINDOWS_PHONE && !ANDROID && !IPHONE
                 keyboardState.IsKeyDown(Keys.Space) ||
+#endif
+#if !IPHONE
                 gamePadState.IsButtonDown(Buttons.A) ||
+#endif
                 touchState.AnyTouch();
 
             // Perform the appropriate action to advance the game and