X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=8c744bad3e8a96962288d966ea47c991911d099a;hb=287423f09852acd3ef65226813eb536bd2687f29;hp=3b10663d089a9f06242b68aa0082625a40876cf5;hpb=2069ccccbb9dc0007f36555862615e684e93a8b2;p=chaz%2Fcarfire
diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 3b10663..8c744ba 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -48,7 +48,7 @@ namespace CarFire
#region Public Constants
- public const float PixelsToUnitSquares = 8.0f;
+ public const float PixelsToUnitSquares = 64.0f;
#endregion
@@ -58,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,
@@ -71,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;
@@ -92,7 +92,7 @@ namespace CarFire
#endregion
- #region Public Attributes
+ #region Public Properties
///
/// Get the name of the map.
@@ -102,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.
@@ -128,14 +128,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 +156,26 @@ 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; }
+ }
+
+
+ ///
+ /// Get and set the associated game object.
+ ///
+ public Game Game
+ {
+ get { return mData.Game; }
+ set { mData.Game = value; }
+ }
+
#endregion
@@ -151,10 +184,13 @@ namespace CarFire
///
/// Construct a map with the provided map data.
///
- /// Map data.
- public Map(Metadata metadata, char[,] grid, List entities)
+ /// The metadata.
+ /// The grid.
+ /// The 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);
}
@@ -234,12 +270,25 @@ 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.
///
/// List of entity objects loaded.
- public List