new map

git-svn-id: https://bd85.net/svn/cs3505_group@109 92bb83a3-7c8f-8a45-bc97-515c4e399668

diff --git a/CarFire/CarFire/CarFire/Content/Content.contentproj b/CarFire/CarFire/CarFire/Content/Content.contentproj
index 818dbddd70cdf783952e66a4316c7df87090d0ca..4ba8949a588310419848a75bc9273053cccc0053 100644 (file)
--- a/CarFire/CarFire/CarFire/Content/Content.contentproj
+++ b/CarFire/CarFire/CarFire/Content/Content.contentproj
@@ -143,6 +143,13 @@
       <Processor>PassThroughProcessor</Processor>\r
     </Compile>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="Maps\colosseum.cfmap">\r
+      <Name>colosseum</Name>\r
+      <Importer>MapImporter</Importer>\r
+      <Processor>PassThroughProcessor</Processor>\r
+    </Compile>\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\v3.0\Microsoft.Xna.GameStudio.ContentPipeline.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r

diff --git a/CarFire/CarFire/CarFire/Content/Maps/colosseum.cfmap b/CarFire/CarFire/CarFire/Content/Maps/colosseum.cfmap
new file mode 100644 (file)
index 0000000..54c9faa
--- /dev/null
+++ b/CarFire/CarFire/CarFire/Content/Maps/colosseum.cfmap
@@ -0,0 +1,53 @@
+; This map should load and function just fine.\r
+\r
+[metadata]\r
+       author = Chaz McGarvey\r
+       levelname = Colosseum\r
+       type = Battle\r
+       dimensions = [41,41]\r
+       tileset = FuturisticBuilding\r
+       numplayers = <1,4>\r
+\r
+[maptable]\r
+                                         \r
+ +-------------------------------------+ \r
+ |                  /\                 | \r
+ | 1               /  \              2 | \r
+ |                /    \               | \r
+ |               /      \              | \r
+ |              /        \             | \r
+ |             /          \            | \r
+ |            /            \           | \r
+ |           /              \          | \r
+ |          /                \         | \r
+ |         /                  \        | \r
+ |        /                    \       | \r
+ |       /                      \      | \r
+ |      /                        \     | \r
+ |     /                          \    | \r
+ |    /                            \   | \r
+ |   /                              \  | \r
+ |  /                                \ | \r
+ | /                                  \| \r
+ |/                                   /| \r
+ |\                                  / | \r
+ | \                                /  | \r
+ |  \                              /   | \r
+ |   \                            /    | \r
+ |    \                          /     | \r
+ |     \                        /      | \r
+ |      \                      /       | \r
+ |       \                    /        | \r
+ |        \                  /         | \r
+ |         \                /          | \r
+ |          \              /           | \r
+ |           \            /            | \r
+ |            \          /             | \r
+ |             \        /              | \r
+ |              \      /               | \r
+ |               \    /                | \r
+ | 4              \  /               3 | \r
+ |                 \/                  | \r
+ +-------------------------------------+ \r
+                                         \r
+; vi:ft=dosini\r

diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 4fb11cb93ec65fd7b49ed08161b1cd4fbefb0102..93dc5ef6ba181c1f678298bf79015a0c62d6c118 100644 (file)
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -158,7 +158,7 @@ namespace CarFire
 \r
         /// <summary>\r
         /// Get and set the zoom of the map view.  The default zoom is\r
-        /// PixelsToUnitSquares.\r
+        /// Map.PixelsToUnitSquares.\r
         /// </summary>\r
         public float Zoom\r
         {\r