--- deliantra/server/include/region.h 2007/07/11 16:55:18 1.7
+++ deliantra/server/include/region.h 2009/10/12 14:00:58 1.14
@@ -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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2002-2005,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.
+ * 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 .
+ * 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
+ * .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
/*
@@ -29,6 +30,8 @@
#ifndef REGION_H
#define REGION_H
+typedef refptr region_ptr;
+
/*
* Each map is in a given region of the game world and links to a region definition, so
* they have to appear here in the headers, before the mapdef
@@ -37,7 +40,7 @@
struct region : zero_initialised, attachable
{
shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */
- region *ACC (RW, parent); /*
+ region_ptr ACC (RW, parent); /*
* Pointer to the region that is a parent of the current
* region, if a value isn't defined in the current region
* we traverse this series of pointers until it is.
@@ -50,16 +53,16 @@
shstr ACC (RW, portalmap);
sint16 ACC (RW, portalx), ACC (RW, portaly);
object_vector_index ACC (RW, index);
- uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
bool ACC (RW, fallback); /* whether, in the event of a region not existing,
* this should be the one we fall back on as the default */
float treasure_density; // chance of treasure per mapspace
treasurelist *treasure; // treasure to generate (mostly monsters)
static region *default_region ();
- static region *find (const char *name);
- static region *find_fuzzy (const char *name);
+ static region *find (shstr_cmp name);
static region *read (object_thawer &f);
+
+ void do_destroy ();
};
typedef object_vector regionvec;