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.37 by root, Thu Nov 8 19:43:23 2007 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 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
… …
115 } 114 }
116 115
117 return default_region (); 116 return default_region ();
118} 117}
119 118
119void
120region::do_destroy ()
121{
122 regions.erase (this);
123
124 attachable::do_destroy ();
125
126 refcnt_dec ();
127}
128
120/* 129/*
121 * returns 1 if the player is in the region reg, or a child region thereof 130 * returns 1 if the player is in the region reg, or a child region thereof
122 * otherwise returns 0 131 * otherwise returns 0
123 * if passed a NULL region returns -1 132 * if passed a NULL region returns -1
124 */ 133 */
125
126static int 134static int
127region_is_child_of_region (const region * child, const region * r) 135region_is_child_of_region (const region * child, const region * r)
128{ 136{
129 137
130 if (r == NULL) 138 if (r == NULL)
… …
185region::read (object_thawer &f) 193region::read (object_thawer &f)
186{ 194{
187 assert (f.kw == KW_region); 195 assert (f.kw == KW_region);
188 196
189 region *rgn = new region; 197 region *rgn = new region;
198 rgn->refcnt_inc ();
199
190 f.get (rgn->name); 200 f.get (rgn->name);
191 f.next (); 201 f.next ();
192 202
193 for (;;) 203 for (;;)
194 { 204 {
… …
198 rgn->parent = region::find (f.get_str ()); 208 rgn->parent = region::find (f.get_str ());
199 break; 209 break;
200 210
201 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 211 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
202 case KW_longname: f.get (rgn->longname); break; 212 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; 213 case KW_jail_map: f.get (rgn->jailmap); break;
205 case KW_jail_x: f.get (rgn->jailx); break; 214 case KW_jail_x: f.get (rgn->jailx); break;
206 case KW_jail_y: f.get (rgn->jaily); break; 215 case KW_jail_y: f.get (rgn->jaily); break;
207 case KW_portal_map: f.get (rgn->portalmap);break; 216 case KW_portal_map: f.get (rgn->portalmap);break;
208 case KW_portal_x: f.get (rgn->portalx); break; 217 case KW_portal_x: f.get (rgn->portalx); break;
… …
215 break; 224 break;
216 225
217 case KW_end: 226 case KW_end:
218 f.next (); 227 f.next ();
219 228
229 // cannot use find as that will request the default region
220 for_all_regions (old) 230 for_all_regions (old)
221 if (old->name == rgn->name) 231 if (old->name == rgn->name)
222 { 232 {
223 // replace, copy new values (ugly) 233 old->destroy ();
224 rgn->index = old->index;
225 *old = *rgn;
226 delete rgn;
227
228 return old; 234 break;
229 } 235 }
230 236
231 // just append 237 // just append
232 regions.push_back (rgn); 238 regions.push_back (rgn);
233 return rgn; 239 return rgn;
234 240
241 case KW_ERROR:
242 rgn->set_key_text (f.kw_str, f.value);
243 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
244 break;
245
235 default: 246 default:
236 if (!f.parse_error ("region", rgn->name)) 247 if (!f.parse_error ("region", rgn->name))
237 { 248 {
238 delete rgn; 249 rgn->destroy ();
239 return 0; 250 return 0;
240 } 251 }
241 break; 252 break;
242 } 253 }
243 254

Diff Legend

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