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.32 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.42 by root, Thu Jan 1 20:49:48 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <unistd.h> 25#include <unistd.h>
27 26
… …
44 * if it can't find a matching name /or/ a fallback region it logs an info message 43 * if it can't find a matching name /or/ a fallback region it logs an info message
45 * message and returns NULL 44 * message and returns NULL
46 * used by the map parsing code. 45 * used by the map parsing code.
47 */ 46 */
48region * 47region *
49region::find (const char *name) 48region::find (shstr_cmp name)
50{ 49{
51 for_all_regions (rgn) 50 for_all_regions (rgn)
52 if (!strcmp (rgn->name, name)) 51 if (rgn->name == name)
53 return rgn; 52 return rgn;
54 53
55 LOG (llevError, "region called %s requested, but not found, using fallback.\n", name); 54 LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name);
56 55
57 return default_region (); 56 return default_region ();
58} 57}
59 58
60/* 59void
61 * Tries to find a region that 'name' corresponds to. 60region::do_destroy ()
62 * It looks, in order, for:
63 * an exact match to region name (case insensitive)
64 * an exact match to longname (case insensitive)
65 * a substring that matches to the longname (eg Kingdom)
66 * a substring that matches to the region name (eg nav)
67 * if it can find none of these it returns the first parentless region
68 * (there should be only one of these - the top level one)
69 * If we got a NULL, then just return the top level region
70 *
71 */
72region *
73region::find_fuzzy (const char *name)
74{ 61{
75 if (!name) 62 regions.erase (this);
76 return default_region ();
77 63
78 char *p = strchr (name, '\n'); 64 attachable::do_destroy ();
79 if (p)
80 *p = '\0';
81 65
82 for_all_regions (rgn) 66 refcnt_dec ();
83 if (!strcasecmp (rgn->name, name))
84 return rgn;
85
86 for_all_regions (rgn)
87 if (rgn->longname)
88 if (!strcasecmp (rgn->longname, name))
89 return rgn;
90
91 for_all_regions (rgn)
92 if (rgn->longname)
93 {
94 if (strstr (rgn->longname, name))
95 return rgn;
96 }
97
98 for_all_regions (rgn)
99 if (rgn->longname)
100 {
101 /*
102 * This is not a bug, we want the region that is most identifiably a discrete
103 * area in the game, eg if we have 'scor', we want to return 'scorn' and not
104 * 'scornarena', regardless of their order on the list so we only look at those
105 * regions with a longname set.
106 */
107 if (strstr (rgn->name, name))
108 return rgn;
109 }
110
111 for_all_regions (rgn)
112 {
113 if (strstr (rgn->name, name))
114 return rgn;
115 }
116
117 return default_region ();
118} 67}
119 68
120/* 69/*
121 * returns 1 if the player is in the region reg, or a child region thereof 70 * returns 1 if the player is in the region reg, or a child region thereof
122 * otherwise returns 0 71 * otherwise returns 0
123 * if passed a NULL region returns -1 72 * if passed a NULL region returns -1
124 */ 73 */
125
126static int 74static int
127region_is_child_of_region (const region * child, const region * r) 75region_is_child_of_region (const region * child, const region * r)
128{ 76{
129 77 if (!r)
130 if (r == NULL)
131 return -1; 78 return -1;
132 79
133 if (child == NULL) 80 if (!child)
134 return 0; 81 return 0;
135 82
136 if (!strcmp (child->name, r->name)) 83 if (child->name == r->name)
137 return 1; 84 return 1;
138 85
139 else if (child->parent != NULL) 86 if (child->parent)
140 return region_is_child_of_region (child->parent, r); 87 return region_is_child_of_region (child->parent, r);
141 else 88
142 return 0; 89 return 0;
143} 90}
144 91
145/** Returns an object which is an exit through which the player represented by op should be 92/** Returns an object which is an exit through which the player represented by op should be
146 * sent in order to be imprisoned. If there is no suitable place to which an exit can be 93 * sent in order to be imprisoned. If there is no suitable place to which an exit can be
147 * constructed, then NULL will be returned. The caller is responsible for freeing the object 94 * constructed, then NULL will be returned. The caller is responsible for freeing the object
148 * created by this function. 95 * created by this function.
149 */ 96 */
150object * 97object *
151get_jail_exit (object *op) 98get_jail_exit (object *op)
152{ 99{
153 region *reg;
154 object *exit;
155
156 if (op->type != PLAYER) 100 if (op->type != PLAYER)
157 { 101 {
158 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 102 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
159 return NULL; 103 return NULL;
160 } 104 }
161 105
162 reg = op->region (); 106 region *reg = op->region ();
163 while (reg) 107 while (reg)
164 { 108 {
165 if (reg->jailmap) 109 if (reg->jailmap)
166 { 110 {
167 exit = object::create (); 111 object *exit = object::create ();
168 EXIT_PATH (exit) = reg->jailmap; 112 EXIT_PATH (exit) = reg->jailmap;
169 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 113 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
170 SET_FLAG (exit, FLAG_DAMNED); 114 SET_FLAG (exit, FLAG_DAMNED);
171 EXIT_X (exit) = reg->jailx; 115 EXIT_X (exit) = reg->jailx;
172 EXIT_Y (exit) = reg->jaily; 116 EXIT_Y (exit) = reg->jaily;
… …
185region::read (object_thawer &f) 129region::read (object_thawer &f)
186{ 130{
187 assert (f.kw == KW_region); 131 assert (f.kw == KW_region);
188 132
189 region *rgn = new region; 133 region *rgn = new region;
134 rgn->refcnt_inc ();
135
190 f.get (rgn->name); 136 f.get (rgn->name);
191 f.next (); 137 f.next ();
192 138
193 for (;;) 139 for (;;)
194 { 140 {
… …
198 rgn->parent = region::find (f.get_str ()); 144 rgn->parent = region::find (f.get_str ());
199 break; 145 break;
200 146
201 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 147 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
202 case KW_longname: f.get (rgn->longname); break; 148 case KW_longname: f.get (rgn->longname); break;
203 case KW_match: f.get (rgn->match); break;
204 case KW_jail_map: f.get (rgn->jailmap); break; 149 case KW_jail_map: f.get (rgn->jailmap); break;
205 case KW_jail_x: f.get (rgn->jailx); break; 150 case KW_jail_x: f.get (rgn->jailx); break;
206 case KW_jail_y: f.get (rgn->jaily); break; 151 case KW_jail_y: f.get (rgn->jaily); break;
207 case KW_portal_map: f.get (rgn->portalmap);break; 152 case KW_portal_map: f.get (rgn->portalmap);break;
208 case KW_portal_x: f.get (rgn->portalx); break; 153 case KW_portal_x: f.get (rgn->portalx); break;
… …
215 break; 160 break;
216 161
217 case KW_end: 162 case KW_end:
218 f.next (); 163 f.next ();
219 164
165 // cannot use find as that will request the default region
220 for_all_regions (old) 166 for_all_regions (old)
221 if (old->name == rgn->name) 167 if (old->name == rgn->name)
222 { 168 {
223 // replace, copy new values (ugly) 169 old->destroy ();
224 rgn->index = old->index;
225 *old = *rgn;
226 delete rgn;
227
228 return old; 170 break;
229 } 171 }
230 172
231 // just append 173 // just append
232 regions.push_back (rgn); 174 regions.push_back (rgn);
233 return rgn; 175 return rgn;
234 176
177 case KW_ERROR:
178 rgn->set_key_text (f.kw_str, f.value);
179 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
180 break;
181
235 default: 182 default:
236 if (!f.parse_error ("region", rgn->name)) 183 if (!f.parse_error ("region", rgn->name))
237 { 184 {
238 delete rgn; 185 rgn->destroy ();
239 return 0; 186 return 0;
240 } 187 }
241 break; 188 break;
242 } 189 }
243 190

Diff Legend

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