--- deliantra/server/common/region.C	2007/07/11 16:55:18	1.34
+++ deliantra/server/common/region.C	2010/04/11 00:34:05	1.49
@@ -1,24 +1,25 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
- * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #include <global.h>
@@ -45,100 +46,50 @@
  * used by the map parsing code. 
  */
 region *
-region::find (const char *name)
+region::find (shstr_cmp name)
 {
   for_all_regions (rgn)
-    if (!strcmp (rgn->name, name))
+    if (rgn->name == name)
       return rgn;
 
-  LOG (llevError, "region called %s requested, but not found, using fallback.\n", name);
+  LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name);
 
   return default_region ();
 }
 
-/*
- * Tries to find a region that 'name' corresponds to.
- * It looks, in order, for:
- * an exact match to region name (case insensitive)
- * an exact match to longname (case insensitive)
- * a substring that matches to the longname (eg Kingdom)
- * a substring that matches to the region name (eg nav)
- * if it can find none of these it returns the first parentless region 
- * (there should be only one of these - the top level one)
- * If we got a NULL, then just return the top level region
- * 
- */
-region *
-region::find_fuzzy (const char *name)
+void
+region::do_destroy ()
 {
-  if (!name)
-    return default_region ();
-
-  char *p = strchr (name, '\n');
-  if (p)
-    *p = '\0';
-
-  for_all_regions (rgn)
-    if (!strcasecmp (rgn->name, name))
-      return rgn;
+  regions.erase (this);
 
-  for_all_regions (rgn)
-    if (rgn->longname)
-      if (!strcasecmp (rgn->longname, name))
-        return rgn;
-
-  for_all_regions (rgn)
-    if (rgn->longname)
-      {
-        if (strstr (rgn->longname, name))
-          return rgn;
-      }
-
-  for_all_regions (rgn)
-    if (rgn->longname)
-      {
-        /* 
-         * This is not a bug, we want the region that is most identifiably a discrete 
-         * area in the game, eg if we have 'scor', we want to return 'scorn' and not 
-         * 'scornarena', regardless of their order on the list so we only look at those 
-         * regions with a longname set.
-         */
-        if (strstr (rgn->name, name))
-          return rgn;
-      }
-
-  for_all_regions (rgn)
-    {
-      if (strstr (rgn->name, name))
-        return rgn;
-    }
+  attachable::do_destroy ();
 
-  return default_region ();
+  refcnt_dec ();
 }
 
+//+GPL
+
 /* 
  * returns 1 if the player is in the region reg, or a child region thereof
  * otherwise returns 0
  * if passed a NULL region returns -1
  */
-
 static int
 region_is_child_of_region (const region * child, const region * r)
 {
-
-  if (r == NULL)
+  if (!r)
     return -1;
 
-  if (child == NULL)
+  if (!child)
     return 0;
 
-  if (!strcmp (child->name, r->name))
+  if (child->name == r->name)
     return 1;
 
-  else if (child->parent != NULL)
+  if (child->parent)
     return region_is_child_of_region (child->parent, r);
-  else
-    return 0;
+
+  return 0;
 }
 
 /** Returns an object which is an exit through which the player represented by op should be
@@ -149,24 +100,21 @@
 object *
 get_jail_exit (object *op)
 {
-  region *reg;
-  object *exit;
-
   if (op->type != PLAYER)
     {
       LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
       return NULL;
     }
 
-  reg = op->region ();
+  region *reg = op->region ();
   while (reg)
     {
       if (reg->jailmap)
         {
-          exit = object::create ();
+          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;
@@ -180,12 +128,16 @@
   return 0;
 }
 
+//-GPL
+
 region *
 region::read (object_thawer &f)
 {
   assert (f.kw == KW_region);
 
   region *rgn = new region;
+  rgn->refcnt_inc ();
+
   f.get (rgn->name);
   f.next ();
 
@@ -215,15 +167,12 @@
           case KW_end:
             f.next ();
 
+            // cannot use find as that will request the default region
             for_all_regions (old)
               if (old->name == rgn->name)
                 {
-                  // replace, copy new values (ugly)
-                  rgn->index = old->index;
-                  *old = *rgn;
-                  delete rgn;
-
-                  return old;
+                  old->destroy ();
+                  break;
                 }
 
             // just append
@@ -231,14 +180,14 @@
             return rgn;
 
           case KW_ERROR:
-            rgn->set_key (f.kw_str, f.value);
+            rgn->set_key_text (f.kw_str, f.value);
             //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
             break;
 
           default:
             if (!f.parse_error ("region", rgn->name))
               {
-                delete rgn;
+                rgn->destroy ();
                 return 0;
               }
             break;
@@ -248,21 +197,3 @@
     }
 }
 
-/*
- * First initialises the archtype hash-table (init_archetable()).
- * Reads and parses the archetype file (with the first and second-pass
- * functions).
- */
-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);
-    }
-}
-