X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FGame.cs;fp=CarFire%2FCarFire%2FCarFire%2FGame.cs;h=63ed26deed977cd5993c8844496f1f26dfac6852;hp=56507110fac10ba1c10502be051f1cf11545dc1f;hb=9fc306c489b446612f0fc1b363e490a5ff217d2c;hpb=122c062297acac44673e947b666c1d72cd23fb1b

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index 5650711..63ed26d 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -309,6 +309,15 @@ namespace CarFire
         public void AdvanceLevel()
         {
             // TODO: Load the next map, etc...
+            //TODO somehow get next map
+            State.Entities.Clear();
+            String nextMap = State.Map.Next;
+            State.Map = mContentManager.Load<Map>("Maps/"+nextMap);
+            for (int i = 0; i < State.mCharacters.Length; i++)
+            {
+                State.mCharacters[i].Coordinates = State.Map.GetStartingPositionForPlayer(i + 1);
+            }
+            State.Entities = State.Map.GetAllEntities(this);
         }
 
         /// <summary>
@@ -324,21 +333,6 @@ namespace CarFire
         public Game()
         {
            
-        }
-        /// <summary>
-        /// This method should be called whenever the players want to move to a new map.
-        /// Not implemented yet.  Need some way to get next map.
-        /// </summary>
-        public void startNewMap()
-        {
-            //TODO somehow get next map
-            State.Entities.Clear();
-            //State.Map = State.Map.getNextMap();
-            for (int i = 0; i < State.mCharacters.Length; i++)
-            {
-                State.mCharacters[i].Coordinates = State.Map.GetStartingPositionForPlayer(i + 1);
-            }
-            State.Entities = State.Map.GetAllEntities(this);
         }
         public void LoadContent(ContentManager contentManager)
         {