ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/region.C
(Generate patch)

Comparing deliantra/server/common/region.C (file contents):
Revision 1.40 by root, Wed Dec 31 17:35:37 2008 UTC vs.
Revision 1.50 by root, Sun Apr 25 10:45:38 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
34 return rgn; 35 return rgn;
35 36
36 return regions [0]; 37 return regions [0];
37} 38}
38 39
39/*
40 * Pass a char array, returns a pointer to the region of the same name.
41 * if it can't find a region of the same name it returns the first region
42 * with the 'fallback' property set.
43 * if it can't find a matching name /or/ a fallback region it logs an info message
44 * message and returns NULL
45 * used by the map parsing code.
46 */
47region * 40region *
48region::find (const char *name) 41region::find (shstr_cmp name)
49{ 42{
50 for_all_regions (rgn) 43 for_all_regions (rgn)
51 if (!strcmp (rgn->name, name)) 44 if (rgn->name == name)
52 return rgn; 45 return rgn;
53 46
54 LOG (llevError, "region called %s requested, but not found, using fallback.\n", name);
55
56 return default_region (); 47 return default_region ();
57} 48}
58 49
59/*
60 * Tries to find a region that 'name' corresponds to.
61 * It looks, in order, for:
62 * an exact match to region name (case insensitive)
63 * an exact match to longname (case insensitive)
64 * a substring that matches to the longname (eg Kingdom)
65 * a substring that matches to the region name (eg nav)
66 * if it can find none of these it returns the first parentless region
67 * (there should be only one of these - the top level one)
68 * If we got a NULL, then just return the top level region
69 *
70 */
71region * 50region *
72region::find_fuzzy (const char *name) 51region::find (object_thawer &f)
73{ 52{
74 if (!name) 53 shstr_cmp name = f.get_str ();
75 return default_region ();
76
77 char *p = strchr (name, '\n');
78 if (p)
79 *p = '\0';
80 54
81 for_all_regions (rgn) 55 for_all_regions (rgn)
82 if (!strcasecmp (rgn->name, name)) 56 if (rgn->name == name)
83 return rgn; 57 return rgn;
84 58
85 for_all_regions (rgn) 59 f.parse_error (format ("region called %s requested, but not found, using fallback.\n", f.get_str ()));
86 if (rgn->longname)
87 if (!strcasecmp (rgn->longname, name))
88 return rgn;
89
90 for_all_regions (rgn)
91 if (rgn->longname)
92 {
93 if (strstr (rgn->longname, name))
94 return rgn;
95 }
96
97 for_all_regions (rgn)
98 if (rgn->longname)
99 {
100 /*
101 * This is not a bug, we want the region that is most identifiably a discrete
102 * area in the game, eg if we have 'scor', we want to return 'scorn' and not
103 * 'scornarena', regardless of their order on the list so we only look at those
104 * regions with a longname set.
105 */
106 if (strstr (rgn->name, name))
107 return rgn;
108 }
109
110 for_all_regions (rgn)
111 {
112 if (strstr (rgn->name, name))
113 return rgn;
114 }
115 60
116 return default_region (); 61 return default_region ();
117} 62}
118 63
119void 64void
… …
123 68
124 attachable::do_destroy (); 69 attachable::do_destroy ();
125 70
126 refcnt_dec (); 71 refcnt_dec ();
127} 72}
73
74//+GPL
128 75
129/* 76/*
130 * returns 1 if the player is in the region reg, or a child region thereof 77 * returns 1 if the player is in the region reg, or a child region thereof
131 * otherwise returns 0 78 * otherwise returns 0
132 * if passed a NULL region returns -1 79 * if passed a NULL region returns -1
… …
169 if (reg->jailmap) 116 if (reg->jailmap)
170 { 117 {
171 object *exit = object::create (); 118 object *exit = object::create ();
172 EXIT_PATH (exit) = reg->jailmap; 119 EXIT_PATH (exit) = reg->jailmap;
173 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 120 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
174 SET_FLAG (exit, FLAG_DAMNED); 121 exit->set_flag (FLAG_DAMNED);
175 EXIT_X (exit) = reg->jailx; 122 EXIT_X (exit) = reg->jailx;
176 EXIT_Y (exit) = reg->jaily; 123 EXIT_Y (exit) = reg->jaily;
177 return exit; 124 return exit;
178 } 125 }
179 else 126 else
… …
183 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name); 130 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name);
184 131
185 return 0; 132 return 0;
186} 133}
187 134
135//-GPL
136
188region * 137region *
189region::read (object_thawer &f) 138region::read (object_thawer &f)
190{ 139{
191 assert (f.kw == KW_region); 140 assert (f.kw == KW_region);
192 141
… …
199 for (;;) 148 for (;;)
200 { 149 {
201 switch (f.kw) 150 switch (f.kw)
202 { 151 {
203 case KW_parent: 152 case KW_parent:
204 rgn->parent = region::find (f.get_str ()); 153 rgn->parent = region::find (f);
205 break; 154 break;
206 155
207 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 156 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
208 case KW_longname: f.get (rgn->longname); break; 157 case KW_longname: f.get (rgn->longname); break;
209 case KW_jail_map: f.get (rgn->jailmap); break; 158 case KW_jail_map: f.get (rgn->jailmap); break;
… …
250 199
251 f.next (); 200 f.next ();
252 } 201 }
253} 202}
254 203
255/*
256 * First initialises the archtype hash-table (init_archetable()).
257 * Reads and parses the archetype file (with the first and second-pass
258 * functions).
259 */
260void
261init_regions (void)
262{
263 if (!regions.size ())
264 {
265 // make sure one region is always available
266 region *rgn = new region;
267 rgn->name = "<builtin>";
268 rgn->longname = "Built-in Region";
269 regions.push_back (rgn);
270 }
271}
272

Diff Legend

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