--- deliantra/server/common/map.C	2006/12/10 01:16:27	1.35
+++ deliantra/server/common/map.C	2006/12/11 02:41:25	1.36
@@ -862,27 +862,30 @@
     {
       buf[HUGE_BUF - 1] = 0;
       key = buf;
+
       while (isspace (*key))
         key++;
+
       if (*key == 0)
         continue;               /* empty line */
+
       value = strchr (key, ' ');
+
       if (!value)
         {
-          end = strchr (key, '\n');
-          if (end != NULL)
-            {
-              *end = 0;
-            }
+          if (end = strchr (key, '\n'))
+            *end = 0;
         }
       else
         {
           *value = 0;
           value++;
           end = strchr (value, '\n');
+
           while (isspace (*value))
             {
               value++;
+
               if (*value == '\0' || value == end)
                 {
                   /* Nothing but spaces. */