--- deliantra/server/common/region.C 2007/01/29 15:04:21 1.20 +++ deliantra/server/common/region.C 2007/02/15 21:07:48 1.25 @@ -25,14 +25,18 @@ #include #include +#include "loader.h" + +regionvec regions; + region * region::default_region () { - for (region *reg = first_region; reg; reg = reg->next) - if (reg->fallback) - return reg; + for_all_regions (rgn) + if (rgn->fallback) + return rgn; - return first_region; + return regions [0]; } /* @@ -46,9 +50,9 @@ region * region::find (const char *name) { - for (region *reg = first_region; reg; reg = reg->next) - if (!strcmp (reg->name, name)) - return reg; + for_all_regions (rgn) + if (!strcmp (rgn->name, name)) + return rgn; LOG (llevError, "region called %s requested, but not found, using fallback.\n", name); @@ -70,42 +74,31 @@ region * region::find_fuzzy (const char *name) { - region *reg; - char *substr; - char *p; - - if (name == NULL) - { - for (reg = first_region; reg->parent; reg = reg->parent) - ; - - return reg; - } + if (!name) + return default_region (); - p = strchr (name, '\n'); + char *p = strchr (name, '\n'); if (p) *p = '\0'; - for (reg = first_region; reg; reg = reg->next) - if (!strcasecmp (reg->name, name)) - return reg; - - for (reg = first_region; reg; reg = reg->next) - if (reg->longname) - if (!strcasecmp (reg->longname, name)) - return reg; - - substr = NULL; - for (reg = first_region; reg; reg = reg->next) - if (reg->longname) + for_all_regions (rgn) + if (!strcasecmp (rgn->name, name)) + return rgn; + + for_all_regions (rgn) + if (rgn->longname) + if (!strcasecmp (rgn->longname, name)) + return rgn; + + for_all_regions (rgn) + if (rgn->longname) { - substr = strstr (reg->longname, name); - if (substr) - return reg; + if (strstr (rgn->longname, name)) + return rgn; } - for (reg = first_region; reg; reg = reg->next) - if (reg->longname) + for_all_regions (rgn) + if (rgn->longname) { /* * This is not a bug, we want the region that is most identifiably a discrete @@ -113,23 +106,17 @@ * 'scornarena', regardless of their order on the list so we only look at those * regions with a longname set. */ - substr = strstr (reg->name, name); - if (substr) - return reg; + if (strstr (rgn->name, name)) + return rgn; } - for (reg = first_region; reg; reg = reg->next) + for_all_regions (rgn) { - substr = strstr (reg->name, name); - if (substr) - return reg; + if (strstr (rgn->name, name)) + return rgn; } - /* if we are still here, we are going to have to give up, and give the top level region */ - for (reg = first_region; reg->parent; reg = reg->parent) - ; - - return reg; + return default_region (); } /* @@ -191,117 +178,76 @@ reg = reg->parent; } - LOG (llevDebug, "No suitable jailmap for region %s was found.\n", ®->name); - return NULL; -} - -static void -assign_region_parents (void) -{ - region *reg; - uint32 parent_count = 0; - uint32 region_count = 0; - - for (reg = first_region; reg && reg->next; reg = reg->next) - { - if (reg->parent_name) - { - reg->parent = region::find (reg->parent_name); - parent_count++; - } + LOG (llevError, "No suitable jailmap for region %s was found.\n", ®->name); - region_count++; - } - - LOG (llevDebug, "Assigned %u regions with %u parents.\n", region_count, parent_count); + return 0; } -/* - * Reads/parses the region file, and copies into a linked list - * of region structs. - */ -static bool -parse_regions (object_thawer &fp) +region * +region::load (object_f &f) { - region *newreg; - region *reg; + region *rgn = new region; + f.get (rgn->name); + f.next_kv (); - newreg = NULL; for (;;) { - keyword kw = fp.get_kv (); - - switch (kw) + switch (f.kw) { - case KW_EOF: - if (newreg) - { - LOG (llevError, "%s: end of file while reading regions.\n", fp.name); - return false; - } - else - return true; - - case KW_end: - /* Place this new region last on the list, if the list is empty put it first */ - for (reg = first_region; reg && reg->next; reg = reg->next) - ; - - if (!reg) - first_region = newreg; - else - reg->next = newreg; - - newreg = 0; - break; - - default: - case KW_ERROR: - LOG (llevError, "%s: skipping errornous line (%s) while reading regions.\n", fp.name, fp.last_keyword); - break; - - case KW_region: - newreg = new region; - fp.get (newreg->name); - break; - case KW_parent: - /* - * Note that this is in the initialisation code, so we don't actually - * assign the pointer to the parent yet, because it might not have been - * parsed. - */ - fp.get (newreg->parent_name); + rgn->parent = region::find (f.get_str ()); break; case KW_longname: - newreg->longname = strdup (fp.get_str ()); - break; + f.get (rgn->longname); + break; case KW_jail_map: - fp.get (newreg->jailmap); - break; + f.get (rgn->jailmap); + break; case KW_jail_x: - fp.get (newreg->jailx); - break; + f.get (rgn->jailx); + break; case KW_jail_y: - fp.get (newreg->jaily); - break; + f.get (rgn->jaily); + break; case KW_msg: - fp.get_ml (KW_endmsg, newreg->msg); + f.get_ml (KW_endmsg, rgn->msg); break; case KW_fallback: - fp.get (newreg->fallback); + f.get (rgn->fallback); break; - case KW_nomore: - /* we have reached the end of the region specs.... */ - return true; + case KW_end: + for_all_regions (old) + if (old->name == rgn->name) + { + // replace, copy new values (ugly) + rgn->index = old->index; + *old = *rgn; + delete rgn; + + return old; + } + + // just append + regions.push_back (rgn); + return rgn; + + default: + if (!f.parse_error ("region", rgn->name)) + { + delete rgn; + return 0; + } + break; } + + f.next_kv (); } } @@ -314,30 +260,13 @@ void init_regions (void) { - char filename[MAX_BUF]; - int comp; - - if (first_region != NULL) /* Only do this once */ - return; - - // make sure one region is always available - first_region = new region; - first_region->name = ""; - first_region->longname = strdup ("Built-in Region"); - - sprintf (filename, "%s/%s/%s", settings.datadir, settings.mapdir, settings.regions); - LOG (llevDebug, "Reading regions from %s...\n", filename); - - object_thawer fp (filename); - - if (!fp) + if (!regions.size ()) { - LOG (llevError, " Can't open regions file %s in init_regions.\n", filename); - return; + // make sure one region is always available + region *rgn = new region; + rgn->name = ""; + rgn->longname = "Built-in Region"; + regions.push_back (rgn); } - - parse_regions (fp); - - assign_region_parents (); - LOG (llevDebug, " done\n"); } +