From c5daf1d9adca0c3a826dfa2ac7b6d4f8a64c84a3 Mon Sep 17 00:00:00 2001
From: Charles <Charles@92bb83a3-7c8f-8a45-bc97-515c4e399668>
Date: Mon, 12 Apr 2010 01:09:04 +0000
Subject: [PATCH] created a new project MapProcessorLib to for importing map
 files determined that `cfmap' will be the extension we'll use for map files
 added map reader with a module for general-purpose parsing

git-svn-id: https://bd85.net/svn/cs3505_group@62 92bb83a3-7c8f-8a45-bc97-515c4e399668
---
 CarFire/CarFire/CarFire.sln                   |  38 ++-
 CarFire/CarFire/CarFire.suo                   | Bin 23040 -> 41984 bytes
 CarFire/CarFire/CarFire/CarFire.csproj        |   3 +
 .../CarFire/Content/Content.contentproj       |  11 +
 CarFire/CarFire/CarFire/Game.cs               |   2 +-
 CarFire/CarFire/CarFire/Map.cs                |  50 +++
 CarFire/CarFire/CarFire/MapReader.cs          | 287 ++++++++++++++++++
 CarFire/CarFire/CarFire/Parse.cs              | 205 +++++++++++++
 CarFire/CarFire/CarFire/ScreenManager.cs      |   2 +-
 .../CarFire/MapProcessorLib/MapImporter.cs    |  28 ++
 .../MapProcessorLib/MapProcessorLib.csproj    | 122 ++++++++
 .../CarFire/MapProcessorLib/MapSourceCode.cs  |  22 ++
 CarFire/CarFire/MapProcessorLib/MapWriter.cs  |  38 +++
 .../Properties/AssemblyInfo.cs                |  33 ++
 14 files changed, 837 insertions(+), 4 deletions(-)
 create mode 100644 CarFire/CarFire/CarFire/Map.cs
 create mode 100644 CarFire/CarFire/CarFire/MapReader.cs
 create mode 100644 CarFire/CarFire/CarFire/Parse.cs
 create mode 100644 CarFire/CarFire/MapProcessorLib/MapImporter.cs
 create mode 100644 CarFire/CarFire/MapProcessorLib/MapProcessorLib.csproj
 create mode 100644 CarFire/CarFire/MapProcessorLib/MapSourceCode.cs
 create mode 100644 CarFire/CarFire/MapProcessorLib/MapWriter.cs
 create mode 100644 CarFire/CarFire/MapProcessorLib/Properties/AssemblyInfo.cs

diff --git a/CarFire/CarFire/CarFire.sln b/CarFire/CarFire/CarFire.sln
index 6ed4e2b..2583a8e 100644
--- a/CarFire/CarFire/CarFire.sln
+++ b/CarFire/CarFire/CarFire.sln
@@ -5,6 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarFire", "CarFire\CarFire.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharacterTestBed", "CharacterTestBed\CharacterTestBed.csproj", "{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapProcessorLib", "MapProcessorLib\MapProcessorLib.csproj", "{EA5996C5-17A9-4827-AAB8-884B476B62EE}"
+EndProject
 Global
 	GlobalSection(SubversionScc) = preSolution
 		Svn-Managed = True
@@ -12,21 +14,53 @@ Global
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
+		Debug|Xbox 360 = Debug|Xbox 360
+		Debug|Zune = Debug|Zune
 		Release|x86 = Release|x86
+		Release|Xbox 360 = Release|Xbox 360
+		Release|Zune = Release|Zune
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Debug|x86.ActiveCfg = Debug|x86
 		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Debug|x86.Build.0 = Debug|x86
+		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Debug|Xbox 360.ActiveCfg = Debug|x86
+		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Debug|Zune.ActiveCfg = Debug|x86
 		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Release|x86.ActiveCfg = Release|x86
 		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Release|x86.Build.0 = Release|x86
-		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Debug|x86.ActiveCfg = Debug|x86
-		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Release|x86.ActiveCfg = Release|x86
+		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Release|Xbox 360.ActiveCfg = Release|x86
+		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Release|Zune.ActiveCfg = Release|x86
 		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Debug|x86.ActiveCfg = Debug|x86
 		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Debug|x86.Build.0 = Debug|x86
+		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Debug|Xbox 360.ActiveCfg = Debug|x86
+		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Debug|Zune.ActiveCfg = Debug|x86
 		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Release|x86.ActiveCfg = Release|x86
 		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Release|x86.Build.0 = Release|x86
+		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Release|Xbox 360.ActiveCfg = Release|x86
+		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Release|Zune.ActiveCfg = Release|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Debug|x86.ActiveCfg = Debug|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Debug|Xbox 360.ActiveCfg = Debug|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Debug|Zune.ActiveCfg = Debug|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Release|x86.ActiveCfg = Release|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Release|Xbox 360.ActiveCfg = Release|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Release|Zune.ActiveCfg = Release|x86
 		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Debug|x86.ActiveCfg = Debug|x86
+		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Debug|Xbox 360.ActiveCfg = Debug|x86
+		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Debug|Zune.ActiveCfg = Debug|x86
 		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Release|x86.ActiveCfg = Release|x86
+		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Release|Xbox 360.ActiveCfg = Release|x86
+		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Release|Zune.ActiveCfg = Release|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|x86.ActiveCfg = Debug|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|x86.Build.0 = Debug|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|Zune.ActiveCfg = Debug|Zune
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|Zune.Build.0 = Debug|Zune
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|x86.ActiveCfg = Release|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|x86.Build.0 = Release|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|Xbox 360.Build.0 = Release|Xbox 360
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|Zune.ActiveCfg = Release|Zune
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|Zune.Build.0 = Release|Zune
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CarFire/CarFire/CarFire.suo b/CarFire/CarFire/CarFire.suo
index dd09ba19fe9e56eed8d46944c6f342d3069547ce..19bb6f3115c95d0caa2968cc36a974b6fb4b536b 100644
GIT binary patch
literal 41984
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

delta 1447
zcmb7?Uu@G=6vuz}*W2#*YsYUb>*Pl_EPodQRo2>Jbt9B@8!)D8yMdeN?3AHfx(&7J
z*37hv3-O^3@H<1rxrLyK4<Z4t(KoULV$7n(KM$JtvL!tDgb((Cn6Uc26?G<%z)e2)
zo_p@O_ndpq$$zcpKWCSwRho8~o|RImv_nypoj}SfmlNI0;+?FLHgUhPH2=qZ{+C5&
z!*M=9S^gc@AyTw=J1uCO#_gSKBQ5XsQv-KX-r#i8er$~ill342W@*T=m&>Q=g2UWU
z_96X%MjY=3kAetzjF#0}7NuKiQ?3j9I7omb=mtIDFgOC90==LQJPnS5XTY<dA3O(A
zU;sQ1UI53yAUF<Q1TTRhFbw8E8jJwMCcdnww5dwPe_zwNxanN9H8KW^-()_N8s$2_
zs5%v;R2ozjsh1=2#Ce&b^4Qo}mUZ##u+A*^HO&t78c<GP(cQz>{j<q<;?(MCsH}!!
z%!LVqo*WoB5DYyMZbX{y;?1E{C^9Ao?0w~1it_Cz;kCc7+$c%C^d@WJr5}uHW{6v!
z7_+>snhKqCBO`Ihix(8idb5sNh)Xv5)4Qlitqez+xMaZ~%Rz~?K{`==iWVbI`aV=I
zK3iunikQvR91PL<NF)8k{bIp<i|I-g>}%v5>E<B_4=~F54pPj$$Eq#5{Lp;i!32w`
z^-c76oe!xUv<9}>#*|UY)lFILUcHD<>~HCgb<n0Q6LeyqL7%1!y+33>BYU%JwN}LU
zKWG#DP*N2OTWl3{wKhn_9dYLTx00Eic~=<z+{WK-PtT2rbl_)ISLD}aVP&i$v#Y?W
z?^Mb+(xa^Y9?R|;?PFFrzzg!#hOikV2s7Xecn7=--UDaB`#@&-gWK!8TxlZQb-5?P
z=*oycaMvcdQ=Gd}(`@@aH|WuqGxuRV+s_#rB4g~;`-n-^#ccmLqpjS-Lb4mFP<5cn
zi(j^Y+dWJB`fBLMIg>7(-6|&cOsj0O7;D<VC>bwMW}=;<Stl(;H`7Y9mokZhm6>60
z)9L6CrE{h@_gcM5OXD*XA3sIcW9_t%HR+?a0L#Lpi#oCmc;h5{ojlPtob6^aG<7&9
z9-a)VFdr7_T$~AaRAX#XUJzGW>KQu;F-JFAldF7J(l>8v%tgzwgA{FRrz2X2b*_%;
uk{{Dm9u&o7kB!T=maSyJ2;nPAXou+9hs~7ITK~7cvdu@n-s8}xR`VB5x_box

diff --git a/CarFire/CarFire/CarFire/CarFire.csproj b/CarFire/CarFire/CarFire/CarFire.csproj
index 9d05f39..30d2d0d 100644
--- a/CarFire/CarFire/CarFire/CarFire.csproj
+++ b/CarFire/CarFire/CarFire/CarFire.csproj
@@ -88,7 +88,10 @@
     <Compile Include="Game.cs" />
     <Compile Include="IDeterministicGame.cs" />
     <Compile Include="IScreenManager.cs" />
+    <Compile Include="Map.cs" />
+    <Compile Include="MapReader.cs" />
     <Compile Include="NetworkManager.cs" />
+    <Compile Include="Parse.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="XnaGame.cs" />
diff --git a/CarFire/CarFire/CarFire/Content/Content.contentproj b/CarFire/CarFire/CarFire/Content/Content.contentproj
index 6128e00..077c9a1 100644
--- a/CarFire/CarFire/CarFire/Content/Content.contentproj
+++ b/CarFire/CarFire/CarFire/Content/Content.contentproj
@@ -104,6 +104,17 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MapProcessorLib\MapProcessorLib.csproj">
+      <Project>{EA5996C5-17A9-4827-AAB8-884B476B62EE}</Project>
+      <Name>MapProcessorLib</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Maps\sandbox.cfmap">
+      <Name>sandbox</Name>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\v3.0\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index 1650634..38d86b8 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -9,7 +9,7 @@ using Microsoft.Xna.Framework.Input;
 
 namespace CarFire
 {
-    class Game : IDeterministicGame
+    public class Game : IDeterministicGame
     {
         #region IDeterministicGame Members
 
diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
new file mode 100644
index 0000000..ed8c39f
--- /dev/null
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Runtime.Serialization;
+using System.Diagnostics;
+
+namespace CarFire
+{
+    /// <summary>
+    /// A map object represents the map or virtual world where players and other
+    /// game entities exist.  The map consists of a grid where each grid space can
+    /// contain static scenery and/or game entities which can move and interact
+    /// with other game entities.
+    /// </summary>
+    public class Map
+    {
+        #region Types
+
+        public class Data
+        {
+            public string Author;
+            public string Name;
+            public int MinNumPlayers;
+            public int MaxNumPlayers;
+            public Point Dimensions;
+            public string Tileset;        // TODO: this should be a tilemap object
+            public Type Type;
+            public char[,] Grid;
+        }
+        
+        public enum Type
+        {
+            None,
+            Campaign,
+            Battle
+        }
+
+        #endregion
+
+
+        public Map(Data data)
+        {
+            Console.WriteLine("Read map " + data.Name + " of type " + data.Type + " written by " + data.Author);
+        }
+    }
+}
diff --git a/CarFire/CarFire/CarFire/MapReader.cs b/CarFire/CarFire/CarFire/MapReader.cs
new file mode 100644
index 0000000..35089ba
--- /dev/null
+++ b/CarFire/CarFire/CarFire/MapReader.cs
@@ -0,0 +1,287 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text.RegularExpressions;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Content;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace CarFire
+{
+    /// <summary>
+    /// This class will be instantiated by the XNA Framework Content
+    /// Pipeline to read cfmap files from binary .xnb format.
+    /// </summary>
+    public class MapReader : ContentTypeReader<Map>
+    {
+        public class ParserException : System.ApplicationException
+        {
+            public ParserException()
+            {
+            }
+
+            public ParserException(string message) :
+                base(message)
+            {
+            }
+
+            public ParserException(string message, System.Exception inner) :
+                base(message, inner)
+            {
+            }
+
+            protected ParserException(SerializationInfo info, StreamingContext context) :
+                base(info, context)
+            {
+            }
+        }
+
+        ContentReader mInput;
+        int mLineNumber = 0;
+        int mExpectedNumberOfLines;
+
+        Map.Data mData;
+
+
+        protected override Map Read(ContentReader input, Map existingInstance)
+        {
+            mInput = input;
+            mExpectedNumberOfLines =  mInput.ReadInt32();
+
+            ReadData();
+
+            return new Map(mData);
+        }
+
+
+        #region Private Reading Methods
+        
+        string ReadLine()
+        {
+            return mInput.ReadString();
+        }
+
+        void ReadData()
+        {
+            mData = new Map.Data();
+
+            while (mLineNumber < mExpectedNumberOfLines)
+            {
+                string line = ReadLine();
+                mLineNumber++;
+
+                while (line != null)
+                {
+                    if (!IsLineSignificant(line)) break;
+
+                    string section = Parse.IniSectionHeader(line);
+                    if (section != null)
+                    {
+                        if (section == "metadata")
+                        {
+                            line = ReadMetadataSection();
+                        }
+                        else if (section == "maptable")
+                        {
+                            line = ReadMapTableSection();
+                        }
+                        else if (section.Length == 1)
+                        {
+                            line = ReadEntitySection(section[0]);
+                        }
+                        else
+                        {
+                            ThrowException("Unknown section", section);
+                        }
+                    }
+                    else
+                    {
+                        ThrowException("Unexpected text", line);
+                    }
+                }
+            }
+        }
+
+        string ReadMetadataSection()
+        {
+            while (mLineNumber < mExpectedNumberOfLines)
+            {
+                string line = ReadLine();
+                mLineNumber++;
+
+                if (!IsLineSignificant(line)) continue;
+
+                string[] pair = Parse.KeyValuePair(line);
+                if (pair != null)
+                {
+                    if (pair[0] == "type")
+                    {
+                        object type = Parse.Constant<Map.Type>(pair[1]);
+                        if (type != null)
+                        {
+                            mData.Type = (Map.Type)type;
+                        }
+                        else
+                        {
+                            ThrowException("Invalid type", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "dimensions")
+                    {
+                        Point? dimensions = Parse.Coordinates(pair[1]);
+                        if (dimensions != null)
+                        {
+                            mData.Dimensions = dimensions.Value;
+                            if (mData.Dimensions.X <= 0 || mData.Dimensions.Y <= 0)
+                            {
+                                ThrowException("Invalid dimensions", pair[1]);
+                            }
+                        }
+                        else
+                        {
+                            ThrowException("Invalid value", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "tileset")
+                    {
+                        string tileset = Parse.String(pair[1]);
+                        if (tileset != null)
+                        {
+                            mData.Tileset = tileset;
+                        }
+                        else
+                        {
+                            ThrowException("Invalid tileset", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "numplayers")
+                    {
+                        int[] numPlayers = Parse.Range(pair[1]);
+                        if (numPlayers != null)
+                        {
+                            mData.MinNumPlayers = numPlayers[0];
+                            mData.MaxNumPlayers = numPlayers[1];
+                            if (mData.MinNumPlayers <= 0 || mData.MaxNumPlayers <= 0 ||
+                                mData.MinNumPlayers > mData.MaxNumPlayers)
+                            {
+                                ThrowException("Invalid range", pair[1]);
+                            }
+                        }
+                        else
+                        {
+                            ThrowException("Invalid value", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "author")
+                    {
+                        string author = Parse.String(pair[1]);
+                        if (author != null)
+                        {
+                            mData.Author = author;
+                        }
+                        else
+                        {
+                            ThrowException("Invalid value", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "levelname")
+                    {
+                        string level = Parse.String(pair[1]);
+                        if (level != null)
+                        {
+                            mData.Name = level;
+                        }
+                        else
+                        {
+                            ThrowException("Invalid value", pair[1]);
+                        }
+                    }
+                    else
+                    {
+                        Console.WriteLine("Unimplemented key: " + pair[0]);
+                    }
+                }
+                else
+                {
+                    return line;
+                }
+            }
+
+            return null;
+        }
+
+        string ReadMapTableSection()
+        {
+            if (mData.Dimensions.X == 0 || mData.Dimensions.Y == 0)
+            {
+                ThrowException("Unexpected section", "You must define the map dimensions before this section.");
+            }
+
+            mData.Grid = new char[mData.Dimensions.X, mData.Dimensions.Y];
+
+            int y;
+            for (y = 0; y < mData.Dimensions.Y && mLineNumber < mExpectedNumberOfLines; y++)
+            {
+                string line = ReadLine();
+                mLineNumber++;
+
+                if (line.Length < mData.Dimensions.X)
+                {
+                    ThrowException("Not enough characters", "Expecting " + mData.Dimensions.X + " characters.");
+                }
+
+                for (int x = 0; x < mData.Dimensions.X; x++)
+                {
+                    mData.Grid[x, y] = line[x];
+                }
+            }
+
+            if (y < mData.Dimensions.Y)
+            {
+                ThrowException("Unexpected ", "");
+            }
+
+            return null;
+        }
+
+        string ReadEntitySection(char entity)
+        {
+            while (mLineNumber < mExpectedNumberOfLines)
+            {
+                string line = ReadLine();
+                mLineNumber++;
+
+                string[] pair = Parse.KeyValuePair(line);
+                if (pair != null)
+                {
+                    // TODO
+                }
+                else
+                {
+                    return line;
+                }
+            }
+
+            return null;
+        }
+
+        #endregion
+
+
+        #region Private Methods
+
+        bool IsLineSignificant(string line)
+        {
+            if (line.Length == 0 || Regex.IsMatch(line, @"^;|^\s*$")) return false;
+            return true;
+        }
+
+        void ThrowException(string problem, string text)
+        {
+            throw new ParserException(problem + " on line " + mLineNumber + ": " + text);
+        }
+
+        #endregion
+    }
+}
diff --git a/CarFire/CarFire/CarFire/Parse.cs b/CarFire/CarFire/CarFire/Parse.cs
new file mode 100644
index 0000000..e1a482e
--- /dev/null
+++ b/CarFire/CarFire/CarFire/Parse.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Microsoft.Xna.Framework;
+
+namespace CarFire
+{
+    /// <summary>
+    /// Class with handy static methods taking strings and returning objects
+    /// parsed from those strings.
+    /// </summary>
+    public class Parse
+    {
+        /// <summary>
+        /// Parses a section header of an INI file.
+        /// </summary>
+        /// <param name="line">Text.</param>
+        /// <returns>The section header, or null if parsing failed.</returns>
+        public static string IniSectionHeader(string line)
+        {
+            Match match = Regex.Match(line, @"^\s*\[(\w+)\]\s*$");
+            if (match.Success) return match.Groups[1].Value;
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a key-value pair.
+        /// </summary>
+        /// <param name="line">Text.</param>
+        /// <returns>An array of two strings containg the key and value,
+        /// in that order, or null if parsing failed.</returns>
+        public static string[] KeyValuePair(string line)
+        {
+            Match match = Regex.Match(line, @"^\s*(\w+)\s*=\s*(.+)\s*$");
+            if (match.Success)
+            {
+                string[] pair = { match.Groups[1].Value, match.Groups[2].Value };
+                return pair;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a pair of coordinates.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>The coordinates, or null if parsing failed.</returns>
+        public static Point? Coordinates(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*\[(\S+?)\s*,\s*(\S+?)\]\s*$");
+            if (match.Success)
+            {
+                int? x = Integer(match.Groups[1].Value);
+                int? y = Integer(match.Groups[2].Value);
+                if (x != null && y != null)
+                {
+                    return new Point(x.Value, y.Value);
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a range of integers.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>An array of two integers containing the min and max,
+        /// in that order, or null if parsing failed.</returns>
+        public static int[] Range(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*<(\S+?)\s*,\s*(\S+?)>\s*$");
+            if (match.Success)
+            {
+                int? min = Integer(match.Groups[1].Value);
+                int? max = Integer(match.Groups[2].Value);
+                if (min != null && max != null)
+                {
+                    int[] range = { min.Value, max.Value };
+                    return range;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a string.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>The string, or null if parsing failed.</returns>
+        public static string String(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*(""?)(.*)\1\s*$");
+            if (match.Success) return match.Groups[2].Value;
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a constant from an enum.
+        /// </summary>
+        /// <typeparam name="T">An enumeration.</typeparam>
+        /// <param name="atom">Text.</param>
+        /// <returns>The constant, or null if parsing failed.</returns>
+        public static T Constant<T>(string atom)
+        {
+            string constant = String(atom);
+            if (constant != null)
+            {
+                foreach (string enumConstant in System.Enum.GetNames(typeof(T)))
+                {
+                    if (constant == enumConstant)
+                    {
+                        return (T)System.Enum.Parse(typeof(T), constant);
+                    }
+                }
+            }
+            return default(T);
+        }
+
+        /// <summary>
+        /// Parses an integer.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>The integer, or null if parsing failed.</returns>
+        public static int? Integer(string atom)
+        {
+            try
+            {
+                int integer = Convert.ToInt32(atom.Trim());
+                return integer;
+            }
+#pragma warning disable 0168
+            catch (System.Exception ex)
+#pragma warning restore 0168
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Parses a boolean value.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>True or false, or null if parsing failed.</returns>
+        public static bool? Boolean(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*(true|false)\s*$", RegexOptions.IgnoreCase);
+            if (match.Success)
+            {
+                if (match.Groups[1].Value[0] == 't' || match.Groups[1].Value[0] == 'T') return true;
+                else return false;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a function.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>An array two strings containing the function name and
+        /// parameter-list, in that order, or null if parsing failed.</returns>
+        public static string[] Function(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*(\w+)\((.*)\)\s*$");
+            if (match.Success)
+            {
+                string[] pair = { match.Groups[1].Value, match.Groups[2].Value };
+                return pair;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a comma-separated list of atoms.
+        /// </summary>
+        /// <param name="text">Text.</param>
+        /// <returns>An array of strings containing the atoms, or null
+        /// if parsing failed.</returns>
+        public static string[] ParameterList(string text)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a whitespace-separated list of atoms.
+        /// </summary>
+        /// <param name="text">Text.</param>
+        /// <returns>An array of atoms, or null if parsing failed.</returns>
+        public static string[] List(string text)
+        {
+            List<string> list = new List<string>();
+
+            MatchCollection matches = Regex.Matches(text, @"\s*("".*?"")|(\w+\(.*?\))|(\[.*?\])|(<.*?>)|(\S+)(?:\s+|$)");
+            // FIXME: This may barf all over itself if there are nested parentheses, doublequotes, brackets, etc.
+            foreach (Match match in matches)
+            {
+                Console.WriteLine("matched: " + match.Value);
+                list.Add(match.Value);
+            }
+
+            return list.ToArray();
+        }
+    }
+}
diff --git a/CarFire/CarFire/CarFire/ScreenManager.cs b/CarFire/CarFire/CarFire/ScreenManager.cs
index 0c58e77..4998eac 100644
--- a/CarFire/CarFire/CarFire/ScreenManager.cs
+++ b/CarFire/CarFire/CarFire/ScreenManager.cs
@@ -12,7 +12,7 @@ using Microsoft.Xna.Framework.Content;
 
 namespace CarFire
 {
-    class ScreenManager : IScreenManager
+    public class ScreenManager : IScreenManager
     {
         #region local variables
         float scale;
diff --git a/CarFire/CarFire/MapProcessorLib/MapImporter.cs b/CarFire/CarFire/MapProcessorLib/MapImporter.cs
new file mode 100644
index 0000000..e208785
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/MapImporter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Content.Pipeline;
+using Microsoft.Xna.Framework.Content.Pipeline.Graphics;
+
+using TImport = MapProcessorLib.MapSourceCode;
+
+namespace MapProcessorLib
+{
+    /// <summary>
+    /// This class will be instantiated by the XNA Framework Content Pipeline
+    /// to import a file from disk into the specified type, TImport.
+    /// 
+    /// This should be part of a Content Pipeline Extension Library project.
+    /// </summary>
+    [ContentImporter(".cfmap", DisplayName = "CarFire Map Importer", DefaultProcessor = "PassThroughProcessor")]
+    public class MapImporter : ContentImporter<TImport>
+    {
+        public override TImport Import(string filename, ContentImporterContext context)
+        {
+            string[] lines = System.IO.File.ReadAllLines(filename);
+            return new MapSourceCode(lines);
+        }
+    }
+}
diff --git a/CarFire/CarFire/MapProcessorLib/MapProcessorLib.csproj b/CarFire/CarFire/MapProcessorLib/MapProcessorLib.csproj
new file mode 100644
index 0000000..83ba3d2
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/MapProcessorLib.csproj
@@ -0,0 +1,122 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <ProjectGuid>{EA5996C5-17A9-4827-AAB8-884B476B62EE}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MapProcessorLib</RootNamespace>
+    <AssemblyName>MapProcessorLib</AssemblyName>
+    <XnaFrameworkVersion>v3.0</XnaFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\x86\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Windows</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\x86\Release</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Windows</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Xbox 360' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Xbox 360\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Xbox 360</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Xbox 360' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Xbox 360\Release</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Xbox 360</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Zune' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Zune\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Zune</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Zune' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Zune\Release</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Zune</XnaPlatform>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Xna.Framework, Version=3.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=x86">
+      <Private>False</Private>
+      <SpecificVersion>True</SpecificVersion>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Game, Version=3.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <SpecificVersion>True</SpecificVersion>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Content.Pipeline, Version=3.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=x86">
+      <Private>False</Private>
+      <SpecificVersion>true</SpecificVersion>
+    </Reference>
+    <Reference Include="System">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MapWriter.cs" />
+    <Compile Include="MapImporter.cs" />
+    <Compile Include="MapSourceCode.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.ContentPipelineExtensions.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+     Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/CarFire/CarFire/MapProcessorLib/MapSourceCode.cs b/CarFire/CarFire/MapProcessorLib/MapSourceCode.cs
new file mode 100644
index 0000000..2ec33af
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/MapSourceCode.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework.Content.Pipeline;
+
+namespace MapProcessorLib
+{
+    /// <summary>
+    /// Container for the map file before it is rewritten as an XNB file.
+    /// </summary>
+    public class MapSourceCode
+    {
+        string[] mLines;
+        public string[] Lines { get { return mLines; } }
+
+        public MapSourceCode(string[] lines)
+        {
+            mLines = lines;
+        }
+    }
+}
diff --git a/CarFire/CarFire/MapProcessorLib/MapWriter.cs b/CarFire/CarFire/MapProcessorLib/MapWriter.cs
new file mode 100644
index 0000000..3cdcfad
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/MapWriter.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Content.Pipeline;
+using Microsoft.Xna.Framework.Content.Pipeline.Graphics;
+using Microsoft.Xna.Framework.Content.Pipeline.Processors;
+using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Compiler;
+
+using TWrite = MapProcessorLib.MapSourceCode;
+
+namespace MapProcessorLib
+{
+    /// <summary>
+    /// This class will be instantiated by the XNA Framework Content Pipeline
+    /// to write the specified data type into binary .xnb format.
+    ///
+    /// This should be part of a Content Pipeline Extension Library project.
+    /// </summary>
+    [ContentTypeWriter]
+    public class MapWriter : ContentTypeWriter<TWrite>
+    {
+        protected override void Write(ContentWriter output, TWrite value)
+        {
+            output.Write(value.Lines.Length);
+            foreach (string line in value.Lines)
+            {
+                output.Write(line);
+            }
+        }
+
+        public override string GetRuntimeReader(TargetPlatform targetPlatform)
+        {
+            return "CarFire.MapReader, CarFire";
+        }
+    }
+}
diff --git a/CarFire/CarFire/MapProcessorLib/Properties/AssemblyInfo.cs b/CarFire/CarFire/MapProcessorLib/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..591c56a
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MapProcessorLib")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MapProcessorLib")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f2f52768-d8d6-47ee-8ee8-ef34e3f2d195")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
-- 
2.45.2