X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=0e66b139221bf27d1206517e32461d3993fa879c;hb=d167160264cd2c33de81a71039eddbb959c40bb2;hp=26b74e9ac8fa2d9c5f557c60ea8f1bb0f4c99f1e;hpb=8438a35a901cf43ef85f226f58b5627b376a23c4;p=chaz%2Fcarfire
diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 26b74e9..0e66b13 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -22,33 +22,10 @@ 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 = 8.0f;
+ public const float PixelsToUnitSquares = 64.0f;
#endregion
@@ -92,7 +69,7 @@ namespace CarFire
#endregion
- #region Public Attributes
+ #region Public Properties
///
/// Get the name of the map.
@@ -128,14 +105,27 @@ namespace CarFire
public string Tileset { get { return mData.Metadata.Tileset; } }
///
- /// Get a list of the raw entity containers loaded with the map.
+ /// Get the current grid of open cells. On the grid, true means
+ /// the cell is open (i.e. an entity can occupy that cell), and false
+ /// means the cell is closed. Note that, just like Map.IsCellOpen,
+ /// only static scenery is considered; the grid cannot tell you
+ /// whether or not an entity is already occupying the cell.
+ ///
+ public bool[,] Grid { get { return mData.Grid; } }
+
+ ///
+ /// Get a list of the raw entity containers loaded with the map. If you
+ /// want to get the actual entity objects, use Map.GetEntities and
+ /// Map.GetAllEntities instead.
///
public List RawEntities { get { return mData.Entities; } }
///
/// Get and set the coordinate of the grid cell that should be in
- /// the center of the screen when the map is drawn.
+ /// the center of the screen when the map is drawn. Setting this
+ /// will change the viewport of the map and will effect the return
+ /// values of Map.GetPointFromCoordinates and Map.GetRectangleFromCoordinates.
///
public Vector2 CenterCell
{
@@ -143,6 +133,16 @@ namespace CarFire
set { mView.CenterCell = value; }
}
+ ///
+ /// Get and set the zoom of the map view. The default zoom is
+ /// Map.PixelsToUnitSquares.
+ ///
+ public float Zoom
+ {
+ get { return mView.Zoom; }
+ set { mView.Zoom = value; }
+ }
+
#endregion
@@ -154,9 +154,10 @@ namespace CarFire
/// The metadata.
/// The grid.
/// The entities.
- public Map(Metadata metadata, char[,] grid, List entities)
+ public Map(Metadata metadata, char[,] grid, char defaultTile,
+ List entities, Point[] playerPositions)
{
- mData = new Modal(metadata, grid, entities);
+ mData = new Model(metadata, grid, defaultTile, entities, playerPositions);
mView = new View(mData);
}
@@ -236,25 +237,92 @@ namespace CarFire
}
+ ///
+ /// Get the starting position of a player.
+ ///
+ /// The number of the player (i.e. 1-4).
+ /// This number must be a valid player number.
+ /// The starting position of the player.
+ public Point GetStartingPositionForPlayer(int playerNumber)
+ {
+ Debug.Assert(1 <= playerNumber && playerNumber <= NumPlayers.Max());
+ return mData.PlayerPositions[playerNumber];
+ }
+
+
///
/// Get all the entities loaded from the map file. Exceptions could be
/// thrown if there are entities without associated classes.
///
+ /// The game reference to be passed to entities.
/// List of entity objects loaded.
- public List