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

Comparing deliantra/server/common/region.C (file contents):
Revision 1.41 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.55 by root, Mon Oct 29 23:55:52 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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 <support@deliantra.net>
  */
 #include <global.h>
 #include <unistd.h>
       return rgn;
   return regions [0];
 }
-/*
- * Pass a char array, returns a pointer to the region of the same name.
- * if it can't find a region of the same name it returns the first region
- * with the 'fallback' property set.
- * if it can't find a matching name /or/ a fallback region it logs an info message
- * message and returns NULL
- * used by the map parsing code.
- */
 region *
 region::find (shstr_cmp name)
 {
   for_all_regions (rgn)
     if (rgn->name == name)
       return rgn;
-  LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name);
   return default_region ();
 }
-/*
+void
- * Tries to find a region that 'name' corresponds to.
+object_thawer::get (region_ptr &r) const
- * 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)
 {
-  if (!name)
+  shstr_cmp name = get_str ();
-    return default_region ();
-  // TODO: bug, changes possibly const string
-  char *p = strchr (name, '\n');
-  if (p)
-    *p = '\0';
   for_all_regions (rgn)
-    if (rgn->name.eq_nc (name))
+    if (rgn->name == name)
+      {
+        r = rgn;
-      return rgn;
+        return;
+      }
-  for_all_regions (rgn)
+  parse_error (format ("region called %s requested, but not found, using fallback.\n", get_str ()));
-    if (rgn->longname.eq_nc (name))
-      return rgn;
-  for_all_regions (rgn)
-    if (rgn->longname.contains (name))
-      return rgn;
-  for_all_regions (rgn)
-    /*
-     * 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 (rgn->longname && rgn->name.contains (name))
-      return rgn;
-  for_all_regions (rgn)
-    if (rgn->name.contains (name))
-      return rgn;
-  return default_region ();
+  r = region::default_region ();
 }
 void
 region::do_destroy ()
 {
   attachable::do_destroy ();
   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
       if (reg->jailmap)
         {
           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;
         }
       else
   LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name);
   return 0;
 }
+//-GPL
 region *
 region::read (object_thawer &f)
 {
   assert (f.kw == KW_region);
   for (;;)
     {
       switch (f.kw)
         {
           case KW_parent:
-            rgn->parent = region::find (f.get_str ());
+            f.get (rgn->parent);
             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_randomitems:
             rgn->treasure = treasurelist::get (f.get_str ());
       f.next ();
     }
 }
-/*
- * 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);
-    }
-}

Diff Legend

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

Comparing deliantra/server/common/region.C (file contents): Revision 1.41 by root, Thu Jan 1 11:41:17 2009 UTC vs. Revision 1.55 by root, Mon Oct 29 23:55:52 2012 UTC

Diff Legend

Comparing deliantra/server/common/region.C (file contents):
Revision 1.41 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.55 by root, Mon Oct 29 23:55:52 2012 UTC