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.54 by root, Tue Apr 17 18:59:05 2007 UTC

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 ();
333 339
334 if (!op->parse_kv (f)) 340 if (!op->parse_kv (f))
335 goto fail; 341 goto fail;
336 342
337 parts.push_back (std::make_pair (at, op)); 343 parts.push_back (std::make_pair (at, op));
338 344
339 if (f.kw != KW_more) 345 if (f.kw != KW_more)
340 break; 346 break;
341 347
342 f.next (); 348 f.next ();
349
343 assert (f.kw == KW_object); 350 if (f.kw != KW_object)
351 {
352 f.parse_error ("more object");
353 goto fail;
354 }
344 } 355 }
345 356
346 { 357 {
347 archetype *head = parts.front ().first; 358 archetype *head = parts.front ().first;
348 359
401 prev->more = at; 412 prev->more = at;
402 prev->clone.more = &at->clone; 413 prev->clone.more = &at->clone;
403 414
404 prev = at; 415 prev = at;
405 } 416 }
417
418 loading_arch = false;
419 return head;
406 } 420 }
407
408 return true;
409 421
410fail: 422fail:
411 for (auto (p, parts.begin ()); p != parts.end (); ++p) 423 for (auto (p, parts.begin ()); p != parts.end (); ++p)
412 p->second->destroy (true); 424 p->second->destroy (true);
413 425
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; 426 loading_arch = false;
437 continue; 427 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} 428}
450 429
451/* 430/*
452 * First initialises the archtype hash-table (init_archetable()). 431 * Initialize global archtype pointers:
453 * Reads and parses the archetype file (with the first and second-pass
454 * functions).
455 */ 432 */
456bool 433void
457load_archetype_file (const char *filename) 434init_archetype_pointers ()
458{ 435{
459 object_thawer f (filename); 436 ring_arch = archetype::find ("ring");
460 437 amulet_arch = archetype::find ("amulet");
461 f.next (); 438 staff_arch = archetype::find ("staff");
462 439 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"); 440 empty_archetype = archetype::find ("empty_archetype");
472 if (!empty_archetype)
473 return false;
474
475 coroapi::cede ();
476
477 return true;
478} 441}
479 442
480/* 443/*
481 * Creates and returns a new object which is a copy of the given archetype. 444 * Creates and returns a new object which is a copy of the given archetype.
482 * This function returns NULL on failure. 445 * This function returns NULL on failure.
484object * 447object *
485arch_to_object (archetype *at) 448arch_to_object (archetype *at)
486{ 449{
487 if (!at) 450 if (!at)
488 { 451 {
489 if (warn_archetypes)
490 LOG (llevError, "Couldn't find archetype.\n"); 452 LOG (llevError, "Couldn't find archetype.\n");
491
492 return NULL; 453 return 0;
493 } 454 }
494 455
495 object *op = at->clone.clone (); 456 object *op = at->clone.clone ();
496 op->arch = at; 457 op->arch = at;
497 op->instantiate (); 458 op->instantiate ();
459
498 return op; 460 return op;
499} 461}
500 462
501/* 463/*
502 * Creates an object. This function is called by get_archetype() 464 * Creates an object. This function is called by get_archetype()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines