X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=ddfa9d5457b309f80a9fd8a48bad537fcee7ff06;hb=e0c80253cb799426fc412aa9cfd773c111f50565;hp=95a8c2c9b75253b17cc4debd169d312ca3cf43f5;hpb=c8f76edcbc66e1466db1cfef4bc314a7261670e8;p=chaz%2Fcarfire
diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 95a8c2c..ddfa9d5 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -7,6 +7,7 @@ using System.Runtime.Serialization;
using System.Diagnostics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
+using System.Reflection;
namespace CarFire
{
@@ -21,9 +22,33 @@ namespace CarFire
// DEBUG: Tilesets not implemented at all.
public static Texture2D DefaultTile;
+ #region Public Exceptions
+
+ ///
+ /// 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.
+ ///
+ 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
- public const float PixelsToUnitSquares = 64.0f;
+ public const float PixelsToUnitSquares = 60.0f;
#endregion
@@ -33,7 +58,7 @@ namespace CarFire
///
/// The type of a map helps determine how the map is intended to be used.
///
- public enum Type
+ public enum Mode
{
None,
Campaign,
@@ -46,7 +71,7 @@ namespace CarFire
public class Metadata
{
public string Name;
- public Type Type;
+ public Mode Type;
public string Author;
public HashSet NumPlayers = new HashSet();
public string Tileset;
@@ -54,6 +79,16 @@ namespace CarFire
public int GridHeight;
}
+ ///
+ /// The container class for information about an entity defined in the map.
+ ///
+ public class RawEntity
+ {
+ public char Id;
+ public Point Position;
+ public Dictionary Attributes = new Dictionary();
+ }
+
#endregion
@@ -67,7 +102,7 @@ namespace CarFire
///
/// Get the type of the map.
///
- //public Type Type { get { return mData.mMetadata.Type; } }
+ public Mode Type { get { return mData.Metadata.Type; } }
///
/// Get the author of the map.
@@ -92,6 +127,11 @@ namespace CarFire
// TODO: This should return whatever object we end up using for tilesets.
public string Tileset { get { return mData.Metadata.Tileset; } }
+ ///
+ /// Get a list of the raw entity containers loaded with the map.
+ ///
+ public List RawEntities { get { return mData.Entities; } }
+
///
/// Get and set the coordinate of the grid cell that should be in
@@ -111,8 +151,10 @@ namespace CarFire
///
/// Construct a map with the provided map data.
///
- /// Map data.
- public Map(Metadata metadata, char[,] grid, Dictionary> entities)
+ /// The metadata.
+ /// The grid.
+ /// The entities.
+ public Map(Metadata metadata, char[,] grid, List entities)
{
mData = new Modal(metadata, grid, entities);
mView = new View(mData);
@@ -186,7 +228,7 @@ namespace CarFire
///
/// Determine whether or not a cell can be occupied by a game entity.
///
- /// X,Y-coordinates.
+ /// X,Y-coordinates.
/// True if cell can be occupied, false otherwise.
public bool IsCellOpen(Point point)
{
@@ -195,14 +237,24 @@ namespace CarFire
///
- /// Get the entities loaded from the map file.
+ /// Get all the entities loaded from the map file. Exceptions could be
+ /// thrown if there are entities without associated classes.
///
- /// Dictionary of entities. The keys are the entity
- /// identifiers and the value is a dictionary of key-value pairs
- /// associated with that entity.
- public Dictionary> GetEntities()
+ /// List of entity objects loaded.
+ public List