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.58 by root, Sat Apr 21 11:55:36 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 0
341 if (f.kw == KW_inherit)
342 {
343 if (archetype *at = find (f.get_str ()))
344 *op = at->clone;
345 else
346 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
347 &at->name, f.get_str ());
348
349 f.next ();
350 }
351#endif
333 352
334 if (!op->parse_kv (f)) 353 if (!op->parse_kv (f))
335 goto fail; 354 goto fail;
336 355
337 parts.push_back (std::make_pair (at, op)); 356 parts.push_back (std::make_pair (at, op));
338 357
339 if (f.kw != KW_more) 358 if (f.kw != KW_more)
340 break; 359 break;
341 360
342 f.next (); 361 f.next ();
362
343 assert (f.kw == KW_object); 363 if (f.kw != KW_object)
364 {
365 f.parse_error ("more object");
366 goto fail;
367 }
344 } 368 }
345 369
346 { 370 {
347 archetype *head = parts.front ().first; 371 archetype *head = parts.front ().first;
348 372
349 // check that all archetypes belong to the same object or are heads 373 // check that all archetypes belong to the same object or are heads
350 for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) 374 for (auto (p, parts.begin ()); p != parts.end (); ++p)
351 { 375 {
352 archetype *at = p->first; 376 archetype *at = p->first;
353 377
354 if (at->head != head && at->head) 378 if (at->head != head && at->head)
355 { 379 {
… …
386 first_archetype = head; 410 first_archetype = head;
387 } 411 }
388 412
389 // reassemble new chain 413 // reassemble new chain
390 archetype *prev = head; 414 archetype *prev = head;
391 for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p) 415 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
392 { 416 {
393 archetype *at = p->first; 417 archetype *at = p->first;
394 overwrite (at, p->second); 418 overwrite (at, p->second);
395 419
396 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 420 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
… …
401 prev->more = at; 425 prev->more = at;
402 prev->clone.more = &at->clone; 426 prev->clone.more = &at->clone;
403 427
404 prev = at; 428 prev = at;
405 } 429 }
430
431 loading_arch = false;
432 return head;
406 } 433 }
407 434
408 return true;
409
410fail: 435fail:
411 for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) 436 for (auto (p, parts.begin ()); p != parts.end (); ++p)
412 p->second->destroy (true); 437 p->second->destroy (true);
413 438
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; 439 loading_arch = false;
437 continue; 440 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} 441}
450 442
451/* 443/*
452 * First initialises the archtype hash-table (init_archetable()). 444 * Initialize global archtype pointers:
453 * Reads and parses the archetype file (with the first and second-pass
454 * functions).
455 */ 445 */
456bool 446void
457load_archetype_file (const char *filename) 447init_archetype_pointers ()
458{ 448{
459 object_thawer f (filename); 449 ring_arch = archetype::find ("ring");
460 450 amulet_arch = archetype::find ("amulet");
461 f.next (); 451 staff_arch = archetype::find ("staff");
462 452 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"); 453 empty_archetype = archetype::find ("empty_archetype");
472 if (!empty_archetype)
473 return false;
474
475 coroapi::cede ();
476
477 return true;
478} 454}
479 455
480/* 456/*
481 * Creates and returns a new object which is a copy of the given archetype. 457 * Creates and returns a new object which is a copy of the given archetype.
482 * This function returns NULL on failure. 458 * This function returns NULL on failure.
… …
484object * 460object *
485arch_to_object (archetype *at) 461arch_to_object (archetype *at)
486{ 462{
487 if (!at) 463 if (!at)
488 { 464 {
489 if (warn_archetypes)
490 LOG (llevError, "Couldn't find archetype.\n"); 465 LOG (llevError, "Couldn't find archetype.\n");
491
492 return NULL; 466 return 0;
493 } 467 }
494 468
495 object *op = at->clone.clone (); 469 object *op = at->clone.clone ();
496 op->arch = at; 470 op->arch = at;
497 op->instantiate (); 471 op->instantiate ();
472
498 return op; 473 return op;
499} 474}
500 475
501/* 476/*
502 * Creates an object. This function is called by get_archetype() 477 * Creates an object. This function is called by get_archetype()
… …
540archetype::find (const char *name) 515archetype::find (const char *name)
541{ 516{
542 if (!name) 517 if (!name)
543 return 0; 518 return 0;
544 519
545 AUTODECL (i, ht.find (name)); 520 auto (i, ht.find (name));
546 521
547 if (i == ht.end ()) 522 if (i == ht.end ())
548 return 0; 523 return 0;
549 else 524 else
550 return i->second; 525 return i->second;
551} 526}
552 527
553archetype * 528archetype *
554archetype::get (const char *name) 529archetype::get (const char *name)
555{ 530{
531 if (!name)
532 {
533 LOG (llevError, "null archetype requested\n");
534 name = "(null)";
535 }
536
556 archetype *at = find (name); 537 archetype *at = find (name);
557 538
558 if (!at) 539 if (!at)
559 { 540 {
560 archetypes.push_back (at = new archetype); 541 archetypes.push_back (at = new archetype);
561 at->name = name; 542 at->name = at->clone.name = at->clone.name_pl = name;
562 at->hash_add (); 543 at->hash_add ();
563 } 544 }
564 545
565 return at; 546 return at;
566} 547}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines