ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/arch.C
(Generate patch)

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.51 by root, Mon Apr 16 15:41:26 2007 UTC vs.
Revision 1.55 by root, Tue Apr 17 19:12:32 2007 UTC

309// dire hack, need to rationalise 309// dire hack, need to rationalise
310void 310void
311overwrite (archetype *at, object *op) 311overwrite (archetype *at, object *op)
312{ 312{
313 at->clone = *op; 313 at->clone = *op;
314
315 at->clone.arch = at; 314 at->clone.arch = at;
315
316 at->clone.inv = op->inv; op->inv = 0; 316 at->clone.inv = op->inv; op->inv = 0;
317 317
318 op->destroy (); 318 op->destroy ();
319} 319}
320 320
321bool 321archetype *
322archetype::load (object_thawer &f) 322archetype::read (object_thawer &f)
323{ 323{
324 assert (f.kw == KW_object); 324 assert (f.kw == KW_object);
325
326 loading_arch = true; // hack to tell parse_kv et al. to behave
325 327
326 typedef std::pair<archetype *, object *> part; 328 typedef std::pair<archetype *, object *> part;
327 std::vector<part> parts; 329 std::vector<part> parts;
328 330
331 coroapi::cede_to_tick_every (100);
332
329 for (;;) 333 for (;;)
330 { 334 {
335 object *op = object::create ();
331 archetype *at = get (f.get_str ()); 336 archetype *at = get (f.get_str ());
332 object *op = object::create (); 337 f.get (op->name);
338 f.next ();
339
340 if (f.kw == KW_inherit)
341 {
342 if (archetype *at = find (f.get_str ()))
343 *op = at->clone;
344 else
345 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
346 &at->name, f.get_str ());
347
348 f.next ();
349 }
333 350
334 if (!op->parse_kv (f)) 351 if (!op->parse_kv (f))
335 goto fail; 352 goto fail;
336 353
337 parts.push_back (std::make_pair (at, op)); 354 parts.push_back (std::make_pair (at, op));
338 355
339 if (f.kw != KW_more) 356 if (f.kw != KW_more)
340 break; 357 break;
341 358
342 f.next (); 359 f.next ();
360
343 assert (f.kw == KW_object); 361 if (f.kw != KW_object)
362 {
363 f.parse_error ("more object");
364 goto fail;
365 }
344 } 366 }
345 367
346 { 368 {
347 archetype *head = parts.front ().first; 369 archetype *head = parts.front ().first;
348 370
401 prev->more = at; 423 prev->more = at;
402 prev->clone.more = &at->clone; 424 prev->clone.more = &at->clone;
403 425
404 prev = at; 426 prev = at;
405 } 427 }
428
429 loading_arch = false;
430 return head;
406 } 431 }
407
408 return true;
409 432
410fail: 433fail:
411 for (auto (p, parts.begin ()); p != parts.end (); ++p) 434 for (auto (p, parts.begin ()); p != parts.end (); ++p)
412 p->second->destroy (true); 435 p->second->destroy (true);
413 436
414 return false;
415}
416
417/*
418 * Reads/parses the archetype-file, and copies into a linked list
419 * of archetype-structures.
420 */
421static bool
422load_archetypes (object_thawer &f)
423{
424 for (;;)
425 {
426 switch (f.kw)
427 {
428 case KW_object:
429 loading_arch = true;
430 if (!archetype::load (f))
431 {
432 loading_arch = false;
433 return false;
434 }
435
436 loading_arch = false; 437 loading_arch = false;
437 continue; 438 return 0;
438
439 case KW_EOF:
440 return true;
441
442 default:
443 if (!f.parse_error ("archetypes file"))
444 return false;
445 }
446
447 f.next ();
448 }
449} 439}
450 440
451/* 441/*
452 * First initialises the archtype hash-table (init_archetable()). 442 * Initialize global archtype pointers:
453 * Reads and parses the archetype file (with the first and second-pass
454 * functions).
455 */ 443 */
456bool 444void
457load_archetype_file (const char *filename) 445init_archetype_pointers ()
458{ 446{
459 object_thawer f (filename); 447 ring_arch = archetype::find ("ring");
460 448 amulet_arch = archetype::find ("amulet");
461 f.next (); 449 staff_arch = archetype::find ("staff");
462 450 crown_arch = archetype::find ("crown");
463 // make sure the next - long - step is only done after a tick
464 coroapi::wait_for_tick_begin ();
465
466 if (!load_archetypes (f))
467 return false;
468
469 warn_archetypes = 1;
470
471 empty_archetype = archetype::find ("empty_archetype"); 451 empty_archetype = archetype::find ("empty_archetype");
472 if (!empty_archetype)
473 return false;
474
475 coroapi::cede ();
476
477 return true;
478} 452}
479 453
480/* 454/*
481 * Creates and returns a new object which is a copy of the given archetype. 455 * Creates and returns a new object which is a copy of the given archetype.
482 * This function returns NULL on failure. 456 * This function returns NULL on failure.
484object * 458object *
485arch_to_object (archetype *at) 459arch_to_object (archetype *at)
486{ 460{
487 if (!at) 461 if (!at)
488 { 462 {
489 if (warn_archetypes)
490 LOG (llevError, "Couldn't find archetype.\n"); 463 LOG (llevError, "Couldn't find archetype.\n");
491
492 return NULL; 464 return 0;
493 } 465 }
494 466
495 object *op = at->clone.clone (); 467 object *op = at->clone.clone ();
496 op->arch = at; 468 op->arch = at;
497 op->instantiate (); 469 op->instantiate ();
470
498 return op; 471 return op;
499} 472}
500 473
501/* 474/*
502 * Creates an object. This function is called by get_archetype() 475 * Creates an object. This function is called by get_archetype()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines