From 7fa101e60a4bc35dfd5dabf8f66811e3f8cfa673 Mon Sep 17 00:00:00 2001
From: Charles <Charles@92bb83a3-7c8f-8a45-bc97-515c4e399668>
Date: Mon, 12 Apr 2010 01:36:42 +0000
Subject: [PATCH] map constants should be case-insensitive

git-svn-id: https://bd85.net/svn/cs3505_group@64 92bb83a3-7c8f-8a45-bc97-515c4e399668
---
 .../CarFire/Content/Maps/sandbox.cfmap        |  2 +-
 CarFire/CarFire/CarFire/Parse.cs              | 31 ++++++-------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/CarFire/CarFire/CarFire/Content/Maps/sandbox.cfmap b/CarFire/CarFire/CarFire/Content/Maps/sandbox.cfmap
index f537127..48338b3 100644
--- a/CarFire/CarFire/CarFire/Content/Maps/sandbox.cfmap
+++ b/CarFire/CarFire/CarFire/Content/Maps/sandbox.cfmap
@@ -6,7 +6,7 @@
 [metadata]
 	author = Chaz McGarvey
 	levelname = Sandbox
-	type = Campaign
+	type = campaign
 	dimensions = [80,21]
 	tileset = FuturisticBuilding
 	numplayers = <1,4>
diff --git a/CarFire/CarFire/CarFire/Parse.cs b/CarFire/CarFire/CarFire/Parse.cs
index e1a482e..169cf30 100644
--- a/CarFire/CarFire/CarFire/Parse.cs
+++ b/CarFire/CarFire/CarFire/Parse.cs
@@ -101,21 +101,19 @@ namespace CarFire
         /// </summary>
         /// <typeparam name="T">An enumeration.</typeparam>
         /// <param name="atom">Text.</param>
-        /// <returns>The constant, or null if parsing failed.</returns>
+        /// <returns>The constant, or default(T) if parsing failed.</returns>
         public static T Constant<T>(string atom)
         {
-            string constant = String(atom);
-            if (constant != null)
+            try
             {
-                foreach (string enumConstant in System.Enum.GetNames(typeof(T)))
-                {
-                    if (constant == enumConstant)
-                    {
-                        return (T)System.Enum.Parse(typeof(T), constant);
-                    }
-                }
+                return (T)System.Enum.Parse(typeof(T), String(atom), true);
+            }
+#pragma warning disable 0168
+            catch (System.Exception ex)
+#pragma warning restore 0168
+            {
+                return default(T);
             }
-            return default(T);
         }
 
         /// <summary>
@@ -171,17 +169,6 @@ namespace CarFire
             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>
-- 
2.43.0