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.23 by root, Thu Feb 1 19:40:42 2007 UTC vs.
Revision 1.31 by root, Tue May 22 10:49:59 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
… …
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <unistd.h> 26#include <unistd.h>
27
28#include "loader.h"
29 27
30regionvec regions; 28regionvec regions;
31 29
32region * 30region *
33region::default_region () 31region::default_region ()
… …
181 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name); 179 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name);
182 180
183 return 0; 181 return 0;
184} 182}
185 183
186region *loader_region::get_region (const char *name) 184region *
185region::read (object_thawer &f)
187{ 186{
187 assert (f.kw == KW_region);
188
188 region *rgn = new region; 189 region *rgn = new region;
189 rgn->name = name; 190 f.get (rgn->name);
190 return rgn; 191 f.next ();
191}
192 192
193void loader_region::put_region (region *rgn)
194{
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
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 (;;) 193 for (;;)
214 { 194 {
215 keyword kw = thawer.get_kv ();
216
217 switch (kw) 195 switch (f.kw)
218 { 196 {
219 case KW_parent: 197 case KW_parent:
220 rgn->parent = region::find (thawer.get_str ()); 198 rgn->parent = region::find (f.get_str ());
221 break; 199 break;
222 200
223 case KW_longname: 201 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
224 thawer.get (rgn->longname); 202 case KW_longname: f.get (rgn->longname); break;
225 break; 203 case KW_match: f.get (rgn->match); break;
204 case KW_jail_map: f.get (rgn->jailmap); break;
205 case KW_jail_x: f.get (rgn->jailx); break;
206 case KW_jail_y: f.get (rgn->jaily); break;
207 case KW_portal_map: f.get (rgn->portalmap);break;
208 case KW_portal_x: f.get (rgn->portalx); break;
209 case KW_portal_y: f.get (rgn->portaly); break;
210 case KW_fallback: f.get (rgn->fallback); break;
211 case KW_chance: f.get (rgn->treasure_density); break;
226 212
227 case KW_jail_map:
228 thawer.get (rgn->jailmap);
229 break;
230
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: 213 case KW_randomitems:
240 thawer.get_ml (KW_endmsg, rgn->msg); 214 rgn->treasure = treasurelist::get (f.get_str ());
241 break; 215 break;
242 216
243 case KW_fallback:
244 thawer.get (rgn->fallback);
245 break;
246
247 case KW_end: 217 case KW_end:
218 f.next ();
219
220 for_all_regions (old)
221 if (old->name == rgn->name)
222 {
223 // replace, copy new values (ugly)
224 rgn->index = old->index;
225 *old = *rgn;
226 delete rgn;
227
228 return old;
229 }
230
231 // just append
232 regions.push_back (rgn);
248 return true; 233 return rgn;
249 234
250 default: 235 default:
251 if (!thawer.parse_error (kw, "region", rgn->name)) 236 if (!f.parse_error ("region", rgn->name))
237 {
238 delete rgn;
252 return false; 239 return 0;
240 }
253 break; 241 break;
254 } 242 }
243
244 f.next ();
255 } 245 }
256} 246}
257 247
258/* 248/*
259 * First initialises the archtype hash-table (init_archetable()). 249 * First initialises the archtype hash-table (init_archetable()).
260 * Reads and parses the archetype file (with the first and second-pass 250 * Reads and parses the archetype file (with the first and second-pass
261 * functions). 251 * functions).
262 * Then initialises treasures by calling load_treasures().
263 */ 252 */
264void 253void
265init_regions (void) 254init_regions (void)
266{ 255{
267 if (!regions.size ()) 256 if (!regions.size ())
… …
271 rgn->name = "<builtin>"; 260 rgn->name = "<builtin>";
272 rgn->longname = "Built-in Region"; 261 rgn->longname = "Built-in Region";
273 regions.push_back (rgn); 262 regions.push_back (rgn);
274 } 263 }
275} 264}
265

Diff Legend

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