--- deliantra/server/common/region.C	2009/11/05 15:43:21	1.44
+++ deliantra/server/common/region.C	2010/04/25 10:45:38	1.50
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -37,14 +37,6 @@
   return regions [0];
 }
 
-/* 
- * Pass a char array, returns a pointer to the region of the same name.
- * if it can't find a region of the same name it returns the first region
- * with the 'fallback' property set.
- * if it can't find a matching name /or/ a fallback region it logs an info message 
- * message and returns NULL
- * used by the map parsing code. 
- */
 region *
 region::find (shstr_cmp name)
 {
@@ -52,7 +44,19 @@
     if (rgn->name == name)
       return rgn;
 
-  LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name);
+  return default_region ();
+}
+
+region *
+region::find (object_thawer &f)
+{
+  shstr_cmp name = f.get_str ();
+
+  for_all_regions (rgn)
+    if (rgn->name == name)
+      return rgn;
+
+  f.parse_error (format ("region called %s requested, but not found, using fallback.\n", f.get_str ()));
 
   return default_region ();
 }
@@ -114,7 +118,7 @@
           object *exit = object::create ();
           EXIT_PATH (exit) = reg->jailmap;
           /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
-          SET_FLAG (exit, FLAG_DAMNED);
+          exit->set_flag (FLAG_DAMNED);
           EXIT_X (exit) = reg->jailx;
           EXIT_Y (exit) = reg->jaily;
           return exit;
@@ -146,7 +150,7 @@
       switch (f.kw)
         {
           case KW_parent:
-            rgn->parent = region::find (f.get_str ());
+            rgn->parent = region::find (f);
             break;
 
           case KW_msg:        f.get_ml (KW_endmsg, rgn->msg); break;
@@ -197,16 +201,3 @@
     }
 }
 
-void
-init_regions (void)
-{
-  if (!regions.size ())
-    {
-      // make sure one region is always available
-      region *rgn = new region;
-      rgn->name = "<builtin>";
-      rgn->longname = "Built-in Region";
-      regions.push_back (rgn);
-    }
-}
-