Merge branch 'master' of github.com:zzorn/Spike3D

zzorn · May 21, 2010 · d3237a8 · d3237a8
2 parents a1bc2be + 31e3176
commit d3237a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/SpaceRun/SpaceRun/Game1.cs b/SpaceRun/SpaceRun/Game1.cs
@@ -23,6 +23,8 @@ public class Game1 : Microsoft.Xna.Framework.Game
 
         public SpriteFont debugFont;
 
+        public Network network;
+
         public Game1()
         {
             graphics = new GraphicsDeviceManager(this);
@@ -37,6 +39,10 @@ public Game1()
         /// </summary>
         protected override void Initialize()
         {
+            Components.Add(new GamerServicesComponent(this));
+
+            network = new Network();
+
             base.Initialize();
         }
 
@@ -93,6 +99,11 @@ protected override void Update(GameTime gameTime)
             if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed)
                 this.Exit();
 
+            if (GamePad.GetState(PlayerIndex.One).Buttons.Start == ButtonState.Pressed)
+                network.HostGame();
+            else if (GamePad.GetState(PlayerIndex.One).Buttons.Y == ButtonState.Pressed)
+                network.JoinGame();
+
             EntityManager.get().updateEntities(gameTime);
 
             base.Update(gameTime);

diff --git a/SpaceRun/SpaceRun/Network.cs b/SpaceRun/SpaceRun/Network.cs
@@ -14,7 +14,7 @@
 
 namespace SpaceRun
 {
-    class Network
+    public class Network
     {
         private enum EntityEventType { State, Remove }
         private enum GamePacketType { PlayerShip, Ship, Asteroid }