X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=504a68ce7f9dca706131c80835b2c67c3b1fcce1;hp=6727133bc79c1ee72471e67d8f30c0fd2fa7349e;hb=08f41ef45f3c41ca6302150bc6d5270c8e7143db;hpb=b92963913e205b5370c112dd5cbf96f91194bc50;ds=sidebyside
diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 6727133..504a68c 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -19,36 +19,9 @@ namespace CarFire
///
public class Map
{
- // 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 = 60.0f;
+ public const float PixelsToUnitSquares = 64.0f;
#endregion
@@ -73,6 +46,7 @@ namespace CarFire
public string Name;
public Mode Type;
public string Author;
+ public string Next;
public HashSet NumPlayers = new HashSet();
public string Tileset;
public int GridWidth;
@@ -92,7 +66,7 @@ namespace CarFire
#endregion
- #region Public Attributes
+ #region Public Properties
///
/// Get the name of the map.
@@ -109,6 +83,11 @@ namespace CarFire
///
public string Author { get { return mData.Metadata.Author; } }
+ ///
+ /// Get the name of the next map to load after this one.
+ ///
+ public string Next { get { return mData.Metadata.Next; } }
+
///
/// Get a set of integers containing each allowable number of players.
///
@@ -124,7 +103,9 @@ namespace CarFire
///
public int Height { get { return mData.Metadata.GridHeight; } }
- // TODO: This should return whatever object we end up using for tilesets.
+ ///
+ /// Get the name of the tileset.
+ ///
public string Tileset { get { return mData.Metadata.Tileset; } }
///
@@ -156,6 +137,25 @@ namespace CarFire
set { mView.CenterCell = value; }
}
+ ///
+ /// Get and set the tilemap with its associated texture and tile
+ /// character to coordinate mappings. This effects what the map looks
+ /// like when it is drawn. You will need to reset any map instances
+ /// after setting a new tilemap. You should also set a tilemap before
+ /// instantiating any maps.
+ ///
+ public static Tilemap Tilemap;
+
+ ///
+ /// 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
@@ -170,7 +170,7 @@ namespace CarFire
public Map(Metadata metadata, char[,] grid, char defaultTile,
List entities, Point[] playerPositions)
{
- mData = new Modal(metadata, grid, defaultTile, entities, playerPositions);
+ mData = new Model(metadata, grid, defaultTile, entities, playerPositions);
mView = new View(mData);
}
@@ -239,6 +239,16 @@ namespace CarFire
return mData.IsCellOpen(x, y);
}
+ ///
+ /// created by Brady for AI precalculations
+ ///
+ /// X-coordinate.
+ /// Y-coordinate.
+ public bool IsWall(int x, int y)
+ {
+ return mData.IsWall(x, y);
+ }
+
///
/// Determine whether or not a cell can be occupied by a game entity.
///
@@ -267,21 +277,23 @@ namespace CarFire
/// 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