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.26 by root, Fri Feb 16 19:43:41 2007 UTC vs.
Revision 1.38 by root, Sun May 4 15:23:04 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <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)
… …
148 * created by this function. 156 * created by this function.
149 */ 157 */
150object * 158object *
151get_jail_exit (object *op) 159get_jail_exit (object *op)
152{ 160{
153 region *reg;
154 object *exit;
155
156 if (op->type != PLAYER) 161 if (op->type != PLAYER)
157 { 162 {
158 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 163 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
159 return NULL; 164 return NULL;
160 } 165 }
161 166
162 reg = op->region (); 167 region *reg = op->region ();
163 while (reg) 168 while (reg)
164 { 169 {
165 if (reg->jailmap) 170 if (reg->jailmap)
166 { 171 {
167 exit = object::create (); 172 object *exit = object::create ();
168 EXIT_PATH (exit) = reg->jailmap; 173 EXIT_PATH (exit) = reg->jailmap;
169 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 174 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
170 SET_FLAG (exit, FLAG_DAMNED); 175 SET_FLAG (exit, FLAG_DAMNED);
171 EXIT_X (exit) = reg->jailx; 176 EXIT_X (exit) = reg->jailx;
172 EXIT_Y (exit) = reg->jaily; 177 EXIT_Y (exit) = reg->jaily;
… …
185region::read (object_thawer &f) 190region::read (object_thawer &f)
186{ 191{
187 assert (f.kw == KW_region); 192 assert (f.kw == KW_region);
188 193
189 region *rgn = new region; 194 region *rgn = new region;
195 rgn->refcnt_inc ();
196
190 f.get (rgn->name); 197 f.get (rgn->name);
191 f.next (); 198 f.next ();
192 199
193 for (;;) 200 for (;;)
194 { 201 {
… …
196 { 203 {
197 case KW_parent: 204 case KW_parent:
198 rgn->parent = region::find (f.get_str ()); 205 rgn->parent = region::find (f.get_str ());
199 break; 206 break;
200 207
201 case KW_longname: 208 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
202 f.get (rgn->longname); 209 case KW_longname: f.get (rgn->longname); break;
203 break; 210 case KW_jail_map: f.get (rgn->jailmap); break;
211 case KW_jail_x: f.get (rgn->jailx); break;
212 case KW_jail_y: f.get (rgn->jaily); break;
213 case KW_portal_map: f.get (rgn->portalmap);break;
214 case KW_portal_x: f.get (rgn->portalx); break;
215 case KW_portal_y: f.get (rgn->portaly); break;
216 case KW_fallback: f.get (rgn->fallback); break;
217 case KW_chance: f.get (rgn->treasure_density); break;
204 218
205 case KW_jail_map:
206 f.get (rgn->jailmap);
207 break;
208
209 case KW_jail_x:
210 f.get (rgn->jailx);
211 break;
212
213 case KW_jail_y:
214 f.get (rgn->jaily);
215 break;
216
217 case KW_msg: 219 case KW_randomitems:
218 f.get_ml (KW_endmsg, rgn->msg); 220 rgn->treasure = treasurelist::get (f.get_str ());
219 break;
220
221 case KW_fallback:
222 f.get (rgn->fallback);
223 break; 221 break;
224 222
225 case KW_end: 223 case KW_end:
224 f.next ();
225
226 // cannot use find as that will request the default region
226 for_all_regions (old) 227 for_all_regions (old)
227 if (old->name == rgn->name) 228 if (old->name == rgn->name)
228 { 229 {
229 // replace, copy new values (ugly) 230 old->destroy ();
230 rgn->index = old->index;
231 *old = *rgn;
232 delete rgn;
233
234 return old; 231 break;
235 } 232 }
236 233
237 // just append 234 // just append
238 regions.push_back (rgn); 235 regions.push_back (rgn);
239 return rgn; 236 return rgn;
240 237
238 case KW_ERROR:
239 rgn->set_key_text (f.kw_str, f.value);
240 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
241 break;
242
241 default: 243 default:
242 if (!f.parse_error ("region", rgn->name)) 244 if (!f.parse_error ("region", rgn->name))
243 { 245 {
244 delete rgn; 246 rgn->destroy ();
245 return 0; 247 return 0;
246 } 248 }
247 break; 249 break;
248 } 250 }
249 251
… …
253 255
254/* 256/*
255 * First initialises the archtype hash-table (init_archetable()). 257 * First initialises the archtype hash-table (init_archetable()).
256 * Reads and parses the archetype file (with the first and second-pass 258 * Reads and parses the archetype file (with the first and second-pass
257 * functions). 259 * functions).
258 * Then initialises treasures by calling load_treasures().
259 */ 260 */
260void 261void
261init_regions (void) 262init_regions (void)
262{ 263{
263 if (!regions.size ()) 264 if (!regions.size ())

Diff Legend

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