--- deliantra/server/common/region.C 2007/07/11 16:55:18 1.34
+++ deliantra/server/common/region.C 2007/11/08 19:43:23 1.37
@@ -1,11 +1,11 @@
/*
- * 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
+ * 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 3 of the License, or
* (at your option) any later version.
@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
#include
@@ -116,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)
{
@@ -186,6 +195,8 @@
assert (f.kw == KW_region);
region *rgn = new region;
+ rgn->refcnt_inc ();
+
f.get (rgn->name);
f.next ();
@@ -215,15 +226,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 +239,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;