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.27 by root, Sat Apr 14 07:22:59 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 ()
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_longname: f.get (rgn->longname); break;
224 thawer.get (rgn->longname); 202 case KW_match: f.get (rgn->match); break;
225 break; 203 case KW_jail_map: f.get (rgn->jailmap); break;
226 204 case KW_jail_x: f.get (rgn->jailx); break;
227 case KW_jail_map: 205 case KW_jail_y: f.get (rgn->jaily); break;
228 thawer.get (rgn->jailmap); 206 case KW_fallback: f.get (rgn->fallback); break;
229 break; 207 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); 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:
240 thawer.get_ml (KW_endmsg, rgn->msg);
241 break;
242
243 case KW_fallback:
244 thawer.get (rgn->fallback);
245 break;
246 208
247 case KW_end: 209 case KW_end:
210 for_all_regions (old)
211 if (old->name == rgn->name)
212 {
213 // replace, copy new values (ugly)
214 rgn->index = old->index;
215 *old = *rgn;
216 delete rgn;
217
218 return old;
219 }
220
221 // just append
222 regions.push_back (rgn);
248 return true; 223 return rgn;
249 224
250 default: 225 default:
251 if (!thawer.parse_error (kw, "region", rgn->name)) 226 if (!f.parse_error ("region", rgn->name))
227 {
228 delete rgn;
252 return false; 229 return 0;
230 }
253 break; 231 break;
254 } 232 }
233
234 f.next ();
255 } 235 }
256} 236}
257 237
258/* 238/*
259 * First initialises the archtype hash-table (init_archetable()). 239 * First initialises the archtype hash-table (init_archetable()).
262 * Then initialises treasures by calling load_treasures(). 242 * Then initialises treasures by calling load_treasures().
263 */ 243 */
264void 244void
265init_regions (void) 245init_regions (void)
266{ 246{
267 char filename[MAX_BUF];
268 int comp;
269
270 if (!regions.size ()) 247 if (!regions.size ())
271 { 248 {
272 // make sure one region is always available 249 // make sure one region is always available
273 region *rgn = new region; 250 region *rgn = new region;
274 rgn->name = "<builtin>"; 251 rgn->name = "<builtin>";
275 rgn->longname = "Built-in Region"; 252 rgn->longname = "Built-in Region";
276 regions.push_back (rgn); 253 regions.push_back (rgn);
277 } 254 }
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} 255}
256

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines