--- deliantra/server/common/region.C	2007/02/15 21:07:48	1.25
+++ deliantra/server/common/region.C	2008/05/06 16:55:25	1.39
@@ -1,32 +1,29 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * 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
  * 
- * This program is free software; you can redistribute it and/or modify
+ * Deliantra 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 2 of the License, or
+ * 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
+ * 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #include <global.h>
 #include <unistd.h>
 
-#include "loader.h"
-
 regionvec regions;
 
 region *
@@ -119,12 +116,21 @@
   return default_region ();
 }
 
+void
+region::do_destroy ()
+{
+  regions.erase (this);
+
+  attachable::do_destroy ();
+
+  refcnt_dec ();
+}
+
 /* 
  * 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)
 {
@@ -152,21 +158,18 @@
 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);
@@ -184,11 +187,15 @@
 }
 
 region *
-region::load (object_f &f)
+region::read (object_thawer &f)
 {
+  assert (f.kw == KW_region);
+
   region *rgn = new region;
+  rgn->refcnt_inc ();
+
   f.get (rgn->name);
-  f.next_kv ();
+  f.next ();
 
   for (;;)
     {
@@ -198,56 +205,51 @@
             rgn->parent = region::find (f.get_str ());
             break;
 
-          case KW_longname:
-            f.get (rgn->longname);
-            break;
+          case KW_msg:        f.get_ml (KW_endmsg, rgn->msg); break;
+          case KW_longname:   f.get (rgn->longname); break;
+          case KW_jail_map:   f.get (rgn->jailmap);  break;
+          case KW_jail_x:     f.get (rgn->jailx);    break;
+          case KW_jail_y:     f.get (rgn->jaily);    break;
+          case KW_portal_map: f.get (rgn->portalmap);break;
+          case KW_portal_x:   f.get (rgn->portalx);  break;
+          case KW_portal_y:   f.get (rgn->portaly);  break;
+          case KW_fallback:   f.get (rgn->fallback); break;
+          case KW_chance:     f.get (rgn->treasure_density); break;
 
-          case KW_jail_map:
-            f.get (rgn->jailmap);
-            break;
-
-          case KW_jail_x:
-            f.get (rgn->jailx);
-            break;
-
-          case KW_jail_y:
-            f.get (rgn->jaily);
-            break;
-
-          case KW_msg:
-            f.get_ml (KW_endmsg, rgn->msg);
-            break;
-
-          case KW_fallback:
-            f.get (rgn->fallback);
+          case KW_randomitems:
+            rgn->treasure = treasurelist::get (f.get_str ());
             break;
 
           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
             regions.push_back (rgn);
             return rgn;
 
+          case KW_ERROR:
+            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;
         }
 
-      f.next_kv ();
+      f.next ();
     }
 }
 
@@ -255,7 +257,6 @@
  * First initialises the archtype hash-table (init_archetable()).
  * Reads and parses the archetype file (with the first and second-pass
  * functions).
- * Then initialises treasures by calling load_treasures().
  */
 void
 init_regions (void)