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.21 by root, Thu Feb 1 19:15:38 2007 UTC vs.
Revision 1.36 by root, Thu Aug 30 07:28:25 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <unistd.h> 25#include <unistd.h>
27
28#include "loader.h"
29 26
30regionvec regions; 27regionvec regions;
31 28
32region * 29region *
33region::default_region () 30region::default_region ()
… …
117 } 114 }
118 115
119 return default_region (); 116 return default_region ();
120} 117}
121 118
119void
120region::do_destroy ()
121{
122 regions.erase (this);
123
124 attachable::do_destroy ();
125
126 refcnt_dec ();
127}
128
122/* 129/*
123 * 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
124 * otherwise returns 0 131 * otherwise returns 0
125 * if passed a NULL region returns -1 132 * if passed a NULL region returns -1
126 */ 133 */
127
128static int 134static int
129region_is_child_of_region (const region * child, const region * r) 135region_is_child_of_region (const region * child, const region * r)
130{ 136{
131 137
132 if (r == NULL) 138 if (r == NULL)
… …
181 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name); 187 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name);
182 188
183 return 0; 189 return 0;
184} 190}
185 191
186region *loader_region::get_region (const char *name) 192region *
193region::read (object_thawer &f)
187{ 194{
195 assert (f.kw == KW_region);
196
188 region *rgn = new region; 197 region *rgn = new region;
189 rgn->name = name; 198 rgn->refcnt_inc ();
190 return rgn;
191}
192 199
193void loader_region::put_region (region *rgn) 200 f.get (rgn->name);
194{ 201 f.next ();
195 for_all_regions (old)
196 if (old->name == rgn->name)
197 {
198 // replace, copy new values (ugly)
199 rgn->index = old->index;
200 *old = *rgn;
201 delete rgn;
202 202
203 return;
204 }
205
206 // just append
207 regions.push_back (rgn);
208}
209
210bool
211loader_base::parse_region (object_thawer &thawer, region *rgn)
212{
213 for (;;) 203 for (;;)
214 { 204 {
215 keyword kw = thawer.get_kv ();
216
217 switch (kw) 205 switch (f.kw)
218 { 206 {
219 case KW_parent: 207 case KW_parent:
220 rgn->parent = region::find (thawer.get_str ()); 208 rgn->parent = region::find (f.get_str ());
221 break;
222
223 case KW_longname:
224 thawer.get (rgn->longname);
225 break; 209 break;
226 210
227 case KW_jail_map: 211 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
228 thawer.get (rgn->jailmap); 212 case KW_longname: f.get (rgn->longname); break;
229 break; 213 case KW_jail_map: f.get (rgn->jailmap); break;
214 case KW_jail_x: f.get (rgn->jailx); break;
215 case KW_jail_y: f.get (rgn->jaily); break;
216 case KW_portal_map: f.get (rgn->portalmap);break;
217 case KW_portal_x: f.get (rgn->portalx); break;
218 case KW_portal_y: f.get (rgn->portaly); break;
219 case KW_fallback: f.get (rgn->fallback); break;
220 case KW_chance: f.get (rgn->treasure_density); break;
230 221
231 case KW_jail_x:
232 thawer.get (rgn->jailx);
233 break;
234
235 case KW_jail_y:
236 thawer.get (rgn->jaily);
237 break;
238
239 case KW_msg: 222 case KW_randomitems:
240 thawer.get_ml (KW_endmsg, rgn->msg); 223 rgn->treasure = treasurelist::get (f.get_str ());
241 break;
242
243 case KW_fallback:
244 thawer.get (rgn->fallback);
245 break; 224 break;
246 225
247 case KW_end: 226 case KW_end:
227 f.next ();
228
229 // cannot use find as that will request the default region
230 for_all_regions (old)
231 if (old->name == rgn->name)
232 {
233 old->destroy ();
234 break;
235 }
236
237 // just append
238 regions.push_back (rgn);
248 return true; 239 return rgn;
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;
249 245
250 default: 246 default:
251 if (!thawer.parse_error (kw, "region", rgn->name)) 247 if (!f.parse_error ("region", rgn->name))
248 {
249 rgn->destroy ();
252 return false; 250 return 0;
251 }
253 break; 252 break;
254 } 253 }
254
255 f.next ();
255 } 256 }
256} 257}
257 258
258/* 259/*
259 * First initialises the archtype hash-table (init_archetable()). 260 * First initialises the archtype hash-table (init_archetable()).
260 * Reads and parses the archetype file (with the first and second-pass 261 * Reads and parses the archetype file (with the first and second-pass
261 * functions). 262 * functions).
262 * Then initialises treasures by calling load_treasures().
263 */ 263 */
264void 264void
265init_regions (void) 265init_regions (void)
266{ 266{
267 char filename[MAX_BUF];
268 int comp;
269
270 if (!regions.size ()) 267 if (!regions.size ())
271 { 268 {
272 // make sure one region is always available 269 // make sure one region is always available
273 region *rgn = new region; 270 region *rgn = new region;
274 rgn->name = "<builtin>"; 271 rgn->name = "<builtin>";
275 rgn->longname = "Built-in Region"; 272 rgn->longname = "Built-in Region";
276 regions.push_back (rgn); 273 regions.push_back (rgn);
277 } 274 }
278
279 sprintf (filename, "%s/%s/%s", settings.datadir, settings.mapdir, settings.regions);
280 LOG (llevDebug, "Reading regions from %s...\n", filename);
281
282 loader_region loader;
283
284 if (!loader.load (filename))
285 {
286 LOG (llevError, " Can't open regions file %s in init_regions.\n", filename);
287 return;
288 }
289
290 if (!loader.load (filename))
291 {
292 LOG (llevError, " Can't open regions file %s in init_regions.\n", filename);
293 return;
294 }
295
296 LOG (llevDebug, " done\n");
297} 275}
276

Diff Legend

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