Began porting to iOS. Starting to run, but lots of bugs

jconbere · Aug 5, 2012 · 7000fa9 · 7000fa9
1 parent 12231d3
commit 7000fa9
Show file tree

Hide file tree

Showing 13 changed files with 877 additions and 8 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
-*.user
+*.user 
+*.userprefs
 *.suo
-BearGame/BearGame/bin/
+.DS_Store
-BearGame/BearGame/obj/
+bin
-BearGame/BearGameContent/bin/
+obj
-BearGame/BearGameContent/obj/
 *.cachefile
diff --git a/BearGame/.DS_Store b/BearGame/.DS_Store
diff --git a/BearGame/BearGame/Achievement.cs b/BearGame/BearGame/Achievement.cs
@@ -43,7 +43,9 @@ public virtual void Update(GameTime time)
                 {
                     _showTime = now;
                     IsVisible = true;
-                    AchievementSound.Play();
+					if (AchievementSound != null) {
+	                    AchievementSound.Play();
+					}
                 }
             }
         }

diff --git a/BearGame/BearGame/GameState.cs b/BearGame/BearGame/GameState.cs
@@ -95,7 +95,11 @@ public override void LoadContent(GraphicsDevice graphics, ContentManager Content
             Daredevil.DaredevilSound = new RandomSound(Content, "Audio\\thump_01", "Audio\\thump_02", "Audio\\thump_03");
             RunOver.TricycleBodyImpactSound = new RandomSound(Content, "Audio\\tricycle_body_impact_01");
             Honey._beehiveBuzz = Content.Load<SoundEffect>("Audio\\beehive_buzz_01");
+
+#if IOS
+#else
             Achievement.AchievementSound = new RandomSound(Content, "Audio\\Achievement-mp3-sound");
+#endif
 
             Bear.bearGruntSound = new RandomSound(Content, "Audio\\bear_desperate_whining_01", "Audio\\bear_desperate_whining_02", "Audio\\bear_desperate_whining_03", "Audio\\bear_desperate_whining_04", "Audio\\bear_desperate_whining_05");
             Bear.bearHappySound = new RandomSound(Content, "Audio\\bear_happy_singing_01", "Audio\\bear_happy_singing_02", "Audio\\bear_happy_singing_03");
@@ -267,7 +271,10 @@ public override void LoadContent(GraphicsDevice graphics, ContentManager Content
             _woosh = Content.Load<SoundEffect>("Audio\\whoosh_01");
 
             // make me a font for the intro
+#if IOS
+#else
             introFont = Content.Load<SpriteFont>("UI\\IntroFont");
+#endif
 
             //load images for the intro
             SplashScreen tempSplash = new SplashScreen(Content.Load<Texture2D>("SplashUI\\Splash_Steam"), 700,300, 300);
@@ -522,7 +529,10 @@ public override void LoadContent(GraphicsDevice graphics, ContentManager Content
             _uiBatch = new SpriteBatch(graphics);
 
             // make me a font for the intro
+#if IOS
+#else
             introFont = Content.Load<SpriteFont>("UI\\UIFont");
+#endif
 
 
             // testing, read from file or something later?
@@ -637,7 +647,10 @@ public override void LoadContent(GraphicsDevice graphics, ContentManager Content
             _uiBatch = new SpriteBatch(graphics);
 
             // make me a font for the intro
+#if IOS
+#else
             introFont = Content.Load<SpriteFont>("UI\\UIFont");
+#endif
 
 
             // testing, read from file or something later?
@@ -817,7 +830,10 @@ public override void LoadContent(GraphicsDevice graphics, ContentManager Content
             _uiBatch = new SpriteBatch(graphics);
 
             // make me a font for the intro
+#if IOS
+#else
             introFont = Content.Load<SpriteFont>("UI\\UIFont");
+#endif
 
 
             // testing, read from file or something later?

diff --git a/BearGame/BearGame/GameView.cs b/BearGame/BearGame/GameView.cs
@@ -67,7 +67,10 @@ public void LoadContent(GraphicsDevice device, ContentManager content)
             _persondeadTexture = content.Load<Texture2D>("UI\\facesDead");
 
             //Load Fonts
+#if IOS
+#else
             _uiFont = content.Load<SpriteFont>("UI\\UIFont");
+#endif
 
             //Load UI_Items
             _uiitemhoneyTexture = content.Load<Texture2D>("UI\\Honey");
@@ -149,7 +152,9 @@ public void Draw()
 
                 }
                 _uiBatch.Draw(healthTexture, new Rectangle(xPeople, yPeople + (70 * (_world.AllVillagers.IndexOf(person))), 64, 64), Color.White);
-                _uiBatch.DrawString(_uiFont, person.Name.ToString(), new Vector2(xPeople + 70, yPeople + 20 + (70 * (_world.AllVillagers.IndexOf(person)))), fontColor);
+				if (_uiFont != null) {
+	                _uiBatch.DrawString(_uiFont, person.Name.ToString(), new Vector2(xPeople + 70, yPeople + 20 + (70 * (_world.AllVillagers.IndexOf(person)))), fontColor);
+				}
             }
 
             //Draw Inventory Item

diff --git a/BearGame/BearGame/Layer.cs b/BearGame/BearGame/Layer.cs
@@ -20,7 +20,8 @@ public char GetTile(int column, int row)
 
         public void LoadTiles(string path)
         {
-            using (var reader = File.OpenText(path))
+			var cleanPath = path.Replace ('\\', System.IO.Path.DirectorySeparatorChar);
+            using (var reader = File.OpenText(cleanPath))
             {
                 _rows = new List<string>();
                 for (var line = reader.ReadLine(); line != null; line = reader.ReadLine())

diff --git a/BearGame/BearGameContent/.DS_Store b/BearGame/BearGameContent/.DS_Store
diff --git a/BearGame/BearGameiOS/AppDelegate.cs b/BearGame/BearGameiOS/AppDelegate.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+
+namespace BearGame.iOS
+{
+	[Register ("AppDelegate")]
+	public partial class AppDelegate : UIApplicationDelegate
+	{
+		public override bool FinishedLaunching (UIApplication app, NSDictionary options)
+		{
+			var game = new Game1 ();
+			game.Run ();
+			return true;
+		}
+	}
+}
+