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.50 by root, Mon Apr 16 13:02:28 2007 UTC vs.
Revision 1.53 by root, Tue Apr 17 18:40:31 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 {
331 archetype *at = get (f.get_str ()); 335 archetype *at = get (f.get_str ());
332 object *op = object::create (); 336 object *op = object::create ();
333 337
345 349
346 { 350 {
347 archetype *head = parts.front ().first; 351 archetype *head = parts.front ().first;
348 352
349 // check that all archetypes belong to the same object or are heads 353 // check that all archetypes belong to the same object or are heads
350 for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) 354 for (auto (p, parts.begin ()); p != parts.end (); ++p)
351 { 355 {
352 archetype *at = p->first; 356 archetype *at = p->first;
353 357
354 if (at->head != head && at->head) 358 if (at->head != head && at->head)
355 { 359 {
386 first_archetype = head; 390 first_archetype = head;
387 } 391 }
388 392
389 // reassemble new chain 393 // reassemble new chain
390 archetype *prev = head; 394 archetype *prev = head;
391 for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p) 395 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
392 { 396 {
393 archetype *at = p->first; 397 archetype *at = p->first;
394 overwrite (at, p->second); 398 overwrite (at, p->second);
395 399
396 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 400 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
401 prev->more = at; 405 prev->more = at;
402 prev->clone.more = &at->clone; 406 prev->clone.more = &at->clone;
403 407
404 prev = at; 408 prev = at;
405 } 409 }
410
411 loading_arch = false;
412 return head;
406 } 413 }
407 414
408 return true;
409
410fail: 415fail:
411 for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) 416 for (auto (p, parts.begin ()); p != parts.end (); ++p)
412 p->second->destroy (true); 417 p->second->destroy (true);
413 418
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; 419 loading_arch = false;
437 continue; 420 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} 421}
450 422
451/* 423/*
452 * First initialises the archtype hash-table (init_archetable()). 424 * Initialize global archtype pointers:
453 * Reads and parses the archetype file (with the first and second-pass
454 * functions).
455 */ 425 */
456bool 426void
457load_archetype_file (const char *filename) 427init_archetype_pointers ()
458{ 428{
459 object_thawer f (filename); 429 ring_arch = archetype::find ("ring");
460 430 amulet_arch = archetype::find ("amulet");
461 f.next (); 431 staff_arch = archetype::find ("staff");
462 432 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"); 433 empty_archetype = archetype::find ("empty_archetype");
472 if (!empty_archetype)
473 return false;
474
475 coroapi::cede ();
476
477 return true;
478} 434}
479 435
480/* 436/*
481 * Creates and returns a new object which is a copy of the given archetype. 437 * Creates and returns a new object which is a copy of the given archetype.
482 * This function returns NULL on failure. 438 * This function returns NULL on failure.
484object * 440object *
485arch_to_object (archetype *at) 441arch_to_object (archetype *at)
486{ 442{
487 if (!at) 443 if (!at)
488 { 444 {
489 if (warn_archetypes)
490 LOG (llevError, "Couldn't find archetype.\n"); 445 LOG (llevError, "Couldn't find archetype.\n");
491
492 return NULL; 446 return 0;
493 } 447 }
494 448
495 object *op = at->clone.clone (); 449 object *op = at->clone.clone ();
496 op->arch = at; 450 op->arch = at;
497 op->instantiate (); 451 op->instantiate ();
452
498 return op; 453 return op;
499} 454}
500 455
501/* 456/*
502 * Creates an object. This function is called by get_archetype() 457 * Creates an object. This function is called by get_archetype()
540archetype::find (const char *name) 495archetype::find (const char *name)
541{ 496{
542 if (!name) 497 if (!name)
543 return 0; 498 return 0;
544 499
545 AUTODECL (i, ht.find (name)); 500 auto (i, ht.find (name));
546 501
547 if (i == ht.end ()) 502 if (i == ht.end ())
548 return 0; 503 return 0;
549 else 504 else
550 return i->second; 505 return i->second;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines