X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=504a68ce7f9dca706131c80835b2c67c3b1fcce1;hp=f4d7ea4fa61a2637b90abff61392efcf52d58ce1;hb=08f41ef45f3c41ca6302150bc6d5270c8e7143db;hpb=beb1ce501897ce4c00f7e97c6923ba0af2451732
diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index f4d7ea4..504a68c 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -19,33 +19,6 @@ 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 = 64.0f;
@@ -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;
@@ -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,15 @@ 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.
@@ -249,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.
///
@@ -368,6 +368,7 @@ namespace CarFire
Debug.Assert(grid != null);
Debug.Assert(entities != null);
Debug.Assert(metadata.GridWidth * metadata.GridHeight == grid.Length);
+ Debug.Assert(Tilemap != null);
mMetadata = metadata;
mCleanGrid = grid;
@@ -403,9 +404,15 @@ namespace CarFire
public bool IsCellOpen(int x, int y)
{
- // TODO: Still need to define characters for types of scenery.
- if (IsOnMap(x, y)) return mGrid[x, y] == ' ';
- return false;
+ if (!IsOnMap(x, y)) return false;
+ return (Tilemap.GetTileFlags(mGrid[x, y]) & TileFlags.Open) == TileFlags.Open;
+ }
+
+ //created by Brady for AI precalculations
+ public bool IsWall(int x, int y)
+ {
+ if (!IsOnMap(x, y)) return false;
+ return (Tilemap.GetTileFlags(mGrid[x, y]) & TileFlags.Wall) == TileFlags.Wall;
}
public void SetCell(int x, int y, char tile)
@@ -417,6 +424,12 @@ namespace CarFire
}
}
+ public char GetCell(int x, int y)
+ {
+ if (IsOnMap(x, y)) return mGrid[x, y];
+ return mDefaultTile;
+ }
+
public void ClearCell(int x, int y)
{
SetCell(x, y, mDefaultTile);
@@ -452,13 +465,13 @@ namespace CarFire
entity.LoadContent(game.ContentManager);
list.Add(entity);
}
- else throw new RuntimeException();
+ 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
@@ -492,7 +505,7 @@ namespace CarFire
((IEntity)entity).LoadContent(game.ContentManager);
list.Add(entity);
}
- else throw new RuntimeException("Entity of type " + typename + " not loaded because an entity class can't be found.");
+ else throw new Exception("Entity of type " + typename + " not loaded because an entity class can't be found.");
}
}
@@ -533,21 +546,14 @@ namespace CarFire
public void Draw(SpriteBatch spriteBatch)
{
+ if (Tilemap == null) throw new Exception("Cannot draw map without first setting the tilemap.");
mViewport = spriteBatch.GraphicsDevice.Viewport;
- // TODO: There is no culling yet, but it runs so fast that it probably won't ever need it.
for (int y = 0; y < mData.Metadata.GridHeight; y++)
{
for (int x = 0; x < mData.Metadata.GridWidth; x++)
{
- if (mData.IsCellOpen(x, y))
- {
- spriteBatch.Draw(Map.DefaultTile, GetRectangleFromCoordinates(x, y), Color.White);
- }
- else
- {
- spriteBatch.Draw(Map.DefaultTile, GetRectangleFromCoordinates(x, y), Color.DarkBlue);
- }
+ Tilemap.Draw(spriteBatch, mData.GetCell(x, y), GetRectangleFromCoordinates(x, y));
}
}
}