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.40 by root, Wed Dec 31 17:35:37 2008 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
… …
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 if (!r)
130 if (r == NULL)
131 return -1; 138 return -1;
132 139
133 if (child == NULL) 140 if (!child)
134 return 0; 141 return 0;
135 142
136 if (!strcmp (child->name, r->name)) 143 if (child->name == r->name)
137 return 1; 144 return 1;
138 145
139 else if (child->parent != NULL) 146 if (child->parent)
140 return region_is_child_of_region (child->parent, r); 147 return region_is_child_of_region (child->parent, r);
141 else 148
142 return 0; 149 return 0;
143} 150}
144 151
145/** Returns an object which is an exit through which the player represented by op should be 152/** 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 153 * 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 154 * constructed, then NULL will be returned. The caller is responsible for freeing the object
148 * created by this function. 155 * created by this function.
149 */ 156 */
150object * 157object *
151get_jail_exit (object *op) 158get_jail_exit (object *op)
152{ 159{
153 region *reg;
154 object *exit;
155
156 if (op->type != PLAYER) 160 if (op->type != PLAYER)
157 { 161 {
158 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 162 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
159 return NULL; 163 return NULL;
160 } 164 }
161 165
162 reg = op->region (); 166 region *reg = op->region ();
163 while (reg) 167 while (reg)
164 { 168 {
165 if (reg->jailmap) 169 if (reg->jailmap)
166 { 170 {
167 exit = object::create (); 171 object *exit = object::create ();
168 EXIT_PATH (exit) = reg->jailmap; 172 EXIT_PATH (exit) = reg->jailmap;
169 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 173 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
170 SET_FLAG (exit, FLAG_DAMNED); 174 SET_FLAG (exit, FLAG_DAMNED);
171 EXIT_X (exit) = reg->jailx; 175 EXIT_X (exit) = reg->jailx;
172 EXIT_Y (exit) = reg->jaily; 176 EXIT_Y (exit) = reg->jaily;
… …
185region::read (object_thawer &f) 189region::read (object_thawer &f)
186{ 190{
187 assert (f.kw == KW_region); 191 assert (f.kw == KW_region);
188 192
189 region *rgn = new region; 193 region *rgn = new region;
194 rgn->refcnt_inc ();
195
190 f.get (rgn->name); 196 f.get (rgn->name);
191 f.next (); 197 f.next ();
192 198
193 for (;;) 199 for (;;)
194 { 200 {
… …
198 rgn->parent = region::find (f.get_str ()); 204 rgn->parent = region::find (f.get_str ());
199 break; 205 break;
200 206
201 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 207 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
202 case KW_longname: f.get (rgn->longname); break; 208 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; 209 case KW_jail_map: f.get (rgn->jailmap); break;
205 case KW_jail_x: f.get (rgn->jailx); break; 210 case KW_jail_x: f.get (rgn->jailx); break;
206 case KW_jail_y: f.get (rgn->jaily); break; 211 case KW_jail_y: f.get (rgn->jaily); break;
207 case KW_portal_map: f.get (rgn->portalmap);break; 212 case KW_portal_map: f.get (rgn->portalmap);break;
208 case KW_portal_x: f.get (rgn->portalx); break; 213 case KW_portal_x: f.get (rgn->portalx); break;
… …
215 break; 220 break;
216 221
217 case KW_end: 222 case KW_end:
218 f.next (); 223 f.next ();
219 224
225 // cannot use find as that will request the default region
220 for_all_regions (old) 226 for_all_regions (old)
221 if (old->name == rgn->name) 227 if (old->name == rgn->name)
222 { 228 {
223 // replace, copy new values (ugly) 229 old->destroy ();
224 rgn->index = old->index;
225 *old = *rgn;
226 delete rgn;
227
228 return old; 230 break;
229 } 231 }
230 232
231 // just append 233 // just append
232 regions.push_back (rgn); 234 regions.push_back (rgn);
233 return rgn; 235 return rgn;
234 236
237 case KW_ERROR:
238 rgn->set_key_text (f.kw_str, f.value);
239 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
240 break;
241
235 default: 242 default:
236 if (!f.parse_error ("region", rgn->name)) 243 if (!f.parse_error ("region", rgn->name))
237 { 244 {
238 delete rgn; 245 rgn->destroy ();
239 return 0; 246 return 0;
240 } 247 }
241 break; 248 break;
242 } 249 }
243 250

Diff Legend

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