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.25 by root, Thu Feb 15 21:07:48 2007 UTC vs.
Revision 1.29 by root, Tue Apr 17 18:24:30 2007 UTC

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 ()
182 180
183 return 0; 181 return 0;
184} 182}
185 183
186region * 184region *
187region::load (object_f &f) 185region::read (object_thawer &f)
188{ 186{
187 assert (f.kw == KW_region);
188
189 region *rgn = new region; 189 region *rgn = new region;
190 f.get (rgn->name); 190 f.get (rgn->name);
191 f.next_kv (); 191 f.next ();
192 192
193 for (;;) 193 for (;;)
194 { 194 {
195 switch (f.kw) 195 switch (f.kw)
196 { 196 {
197 case KW_parent: 197 case KW_parent:
198 rgn->parent = region::find (f.get_str ()); 198 rgn->parent = region::find (f.get_str ());
199 break; 199 break;
200 200
201 case KW_longname: 201 case KW_longname: f.get (rgn->longname); break;
202 f.get (rgn->longname); 202 case KW_match: f.get (rgn->match); break;
203 break; 203 case KW_jail_map: f.get (rgn->jailmap); break;
204 204 case KW_jail_x: f.get (rgn->jailx); break;
205 case KW_jail_map: 205 case KW_jail_y: f.get (rgn->jaily); break;
206 f.get (rgn->jailmap); 206 case KW_fallback: f.get (rgn->fallback); break;
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:
218 f.get_ml (KW_endmsg, rgn->msg); 207 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
219 break;
220
221 case KW_fallback:
222 f.get (rgn->fallback);
223 break;
224 208
225 case KW_end: 209 case KW_end:
210 f.next ();
211
226 for_all_regions (old) 212 for_all_regions (old)
227 if (old->name == rgn->name) 213 if (old->name == rgn->name)
228 { 214 {
229 // replace, copy new values (ugly) 215 // replace, copy new values (ugly)
230 rgn->index = old->index; 216 rgn->index = old->index;
245 return 0; 231 return 0;
246 } 232 }
247 break; 233 break;
248 } 234 }
249 235
250 f.next_kv (); 236 f.next ();
251 } 237 }
252} 238}
253 239
254/* 240/*
255 * First initialises the archtype hash-table (init_archetable()). 241 * First initialises the archtype hash-table (init_archetable()).
256 * Reads and parses the archetype file (with the first and second-pass 242 * Reads and parses the archetype file (with the first and second-pass
257 * functions). 243 * functions).
258 * Then initialises treasures by calling load_treasures().
259 */ 244 */
260void 245void
261init_regions (void) 246init_regions (void)
262{ 247{
263 if (!regions.size ()) 248 if (!regions.size ())

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines