[ViewVC] Diff of: cvs/deliantra/server/common/region.C

Comparing deliantra/server/common/region.C (file contents):
Revision 1.34 by root, Wed Jul 11 16:55:18 2007 UTC vs.
Revision 1.35 by root, Fri Jul 13 15:54:40 2007 UTC

     }
   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)
 {
   if (r == NULL)
 region::read (object_thawer &f)
 {
   assert (f.kw == KW_region);
   region *rgn = new region;
+  rgn->refcnt_inc ();
   f.get (rgn->name);
   f.next ();
   for (;;)
     {
             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)
+                  old->destroy ();
-                  rgn->index = old->index;
-                  *old = *rgn;
-                  delete rgn;
-                  return old;
+                  break;
                 }
             // just append
             regions.push_back (rgn);
             return rgn;
             break;
           default:
             if (!f.parse_error ("region", rgn->name))
               {
-                delete rgn;
+                rgn->destroy ();
                 return 0;
               }
             break;
         }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines