X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=0e66b139221bf27d1206517e32461d3993fa879c;hb=d167160264cd2c33de81a71039eddbb959c40bb2;hp=2440f121ac6014a16cfdff81984e1348081afe44;hpb=1368c1af3d7a4a12b0b0577dbe3edbfd254e2d04;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 2440f12..0e66b13 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -22,29 +22,6 @@ namespace CarFire
         // DEBUG: Tilesets not implemented at all.
         public static Texture2D DefaultTile;
 
-        #region Public Exceptions
-
-        /// <summary>
-        /// This exception is thrown during the loading of a map if any
-        /// part of the map file is inconsistent with the expected format
-        /// and order.
-        /// </summary>
-        public class RuntimeException : System.ApplicationException
-        {
-            public RuntimeException() { }
-
-            public RuntimeException(string message) :
-                base(message) { }
-
-            public RuntimeException(string message, System.Exception inner) :
-                base(message, inner) { }
-
-            protected RuntimeException(SerializationInfo info, StreamingContext context) :
-                base(info, context) { }
-        }
-
-        #endregion
-
 
         #region Public Constants
 
@@ -156,6 +133,10 @@ namespace CarFire
             set { mView.CenterCell = value; }
         }
 
+        /// <summary>
+        /// Get and set the zoom of the map view.  The default zoom is
+        /// Map.PixelsToUnitSquares.
+        /// </summary>
         public float Zoom
         {
             get { return mView.Zoom; }
@@ -176,7 +157,7 @@ namespace CarFire
         public Map(Metadata metadata, char[,] grid, char defaultTile,
             List<RawEntity> entities, Point[] playerPositions)
         {
-            mData = new Modal(metadata, grid, defaultTile, entities, playerPositions);
+            mData = new Model(metadata, grid, defaultTile, entities, playerPositions);
             mView = new View(mData);
         }
 
@@ -273,21 +254,23 @@ namespace CarFire
         /// Get all the entities loaded from the map file.  Exceptions could be
         /// thrown if there are entities without associated classes.
         /// </summary>
+        /// <param name="game">The game reference to be passed to entities.</param>
         /// <returns>List of entity objects loaded.</returns>
-        public List<object> GetAllEntities()
+        public List<IEntity> GetAllEntities(Game game)
         {
-            return mData.GetAllEntities();
+            return mData.GetAllEntities(game);
         }
 
         /// <summary>
         /// Get the entities of a certain type loaded from the map file.  Exceptions
         /// could be thrown if there are entities without associated classes.
         /// </summary>
+        /// <param name="game">The game reference to be passed to entities.</param>
         /// <typeparam name="T">Type of the entity you want a list of.</typeparam>
         /// <returns>List of entity objects loaded.</returns>
-        public List<T> GetEntities<T>()
+        public List<T> GetEntities<T>(Game game)
         {
-            return mData.GetEntities<T>();
+            return mData.GetEntities<T>(game);
         }
 
 
@@ -347,7 +330,7 @@ namespace CarFire
 
         #region Private Types
 
-        class Modal
+        class Model
         {
             public Metadata Metadata { get { return mMetadata; } }
             public List<RawEntity> Entities { get { return mEntities; } }
@@ -355,7 +338,7 @@ namespace CarFire
             public bool[,] Grid { get { return mBooleanGrid; } }
 
 
-            public Modal(Metadata metadata, char[,] grid, char defaultTile,
+            public Model(Metadata metadata, char[,] grid, char defaultTile,
                 List<RawEntity> entities, Point[] playerPositions)
             {
                 Debug.Assert(metadata != null);
@@ -422,9 +405,9 @@ namespace CarFire
             }
 
 
-            public List<object> GetAllEntities()
+            public List<IEntity> GetAllEntities(Game game)
             {
-                List<object> list = new List<object>();
+                List<IEntity> list = new List<IEntity>();
 
                 foreach (RawEntity raw in mEntities)
                 {
@@ -432,23 +415,27 @@ namespace CarFire
                     {
                         string typename = raw.Attributes["type"];
 
-                        object[] args = new object[3];
+                        object[] args = new object[4];
                         args[0] = raw.Id;
                         args[1] = raw.Position;
                         args[2] = raw.Attributes;
+                        args[3] = game;
 
                         try
                         {
-
-                            object entity = Activator.CreateInstance(System.Type.GetType("CarFire." + typename), args);
-                            if (entity != null) list.Add(entity);
-                            else throw new RuntimeException();
+                            IEntity entity = (IEntity)Activator.CreateInstance(System.Type.GetType("CarFire." + typename), args);
+                            if (entity != null)
+                            {
+                                entity.LoadContent(game.ContentManager);
+                                list.Add(entity);
+                            }
+                            else throw new Exception();
                         }
 #pragma warning disable 0168
                         catch (System.Exception ex)
 #pragma warning restore 0168
                         {
-                            throw new RuntimeException("Entity of type " + typename + " not loaded because an entity class can't be found.");
+                            throw new Exception("Entity of type " + typename + " not loaded because an entity class can't be found.");
                         }
                     }
                     else
@@ -460,7 +447,7 @@ namespace CarFire
                 return list;
             }
 
-            public List<T> GetEntities<T>()
+            public List<T> GetEntities<T>(Game game)
             {
                 System.Type type = typeof(T);
                 List<T> list = new List<T>();
@@ -470,14 +457,19 @@ namespace CarFire
                 {
                     if (raw.Attributes.ContainsKey("type") && typename == raw.Attributes["type"])
                     {
-                        object[] args = new object[3];
+                        object[] args = new object[4];
                         args[0] = raw.Id;
                         args[1] = raw.Position;
                         args[2] = raw.Attributes;
+                        args[3] = game;
 
                         T entity = (T)Activator.CreateInstance(type, args);
-                        if (entity != null) list.Add(entity);
-                        else throw new RuntimeException("Entity of type " + typename + " not loaded because an entity class can't be found.");
+                        if (entity != null)
+                        {
+                            ((IEntity)entity).LoadContent(game.ContentManager);
+                            list.Add(entity);
+                        }
+                        else throw new Exception("Entity of type " + typename + " not loaded because an entity class can't be found.");
                     }
                 }
 
@@ -500,7 +492,7 @@ namespace CarFire
             public float Zoom;
 
 
-            public View(Modal data)
+            public View(Model data)
             {
                 Debug.Assert(data != null);
                 mData = data;
@@ -581,7 +573,7 @@ namespace CarFire
             }
 
 
-            Modal mData;
+            Model mData;
             Viewport mViewport;
         }
 
@@ -590,7 +582,7 @@ namespace CarFire
 
         #region Private Variables
 
-        Modal mData;
+        Model mData;
         View mView;
 
         #endregion