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.52 by root, Tue Apr 17 10:06:32 2007 UTC vs.
Revision 1.59 by root, Mon May 7 06:01:47 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
329 coroapi::cede_to_tick_every (100); 331 coroapi::cede_to_tick_every (100);
330 332
331 for (;;) 333 for (;;)
332 { 334 {
335 object *op = object::create ();
333 archetype *at = get (f.get_str ()); 336 archetype *at = get (f.get_str ());
334 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
335 352
336 if (!op->parse_kv (f)) 353 if (!op->parse_kv (f))
337 goto fail; 354 goto fail;
338 355
356 op->post_load_check ();
357
339 parts.push_back (std::make_pair (at, op)); 358 parts.push_back (std::make_pair (at, op));
340 359
341 if (f.kw != KW_more) 360 if (f.kw != KW_more)
342 break; 361 break;
343 362
344 f.next (); 363 f.next ();
364
345 assert (f.kw == KW_object); 365 if (f.kw != KW_object)
366 {
367 f.parse_error ("more object");
368 goto fail;
369 }
346 } 370 }
347 371
348 { 372 {
349 archetype *head = parts.front ().first; 373 archetype *head = parts.front ().first;
350 374
… …
403 prev->more = at; 427 prev->more = at;
404 prev->clone.more = &at->clone; 428 prev->clone.more = &at->clone;
405 429
406 prev = at; 430 prev = at;
407 } 431 }
432
433 loading_arch = false;
434 return head;
408 } 435 }
409
410 return true;
411 436
412fail: 437fail:
413 for (auto (p, parts.begin ()); p != parts.end (); ++p) 438 for (auto (p, parts.begin ()); p != parts.end (); ++p)
414 p->second->destroy (true); 439 p->second->destroy (true);
415 440
416 return false;
417}
418
419/*
420 * Reads/parses the archetype-file, and copies into a linked list
421 * of archetype-structures.
422 */
423static bool
424load_archetypes (object_thawer &f)
425{
426 for (;;)
427 {
428 switch (f.kw)
429 {
430 case KW_object:
431 loading_arch = true;
432 if (!archetype::load (f))
433 {
434 loading_arch = false;
435 return false;
436 }
437
438 loading_arch = false; 441 loading_arch = false;
439 continue; 442 return 0;
440
441 case KW_EOF:
442 return true;
443
444 default:
445 if (!f.parse_error ("archetypes file"))
446 return false;
447 }
448
449 f.next ();
450 }
451} 443}
452 444
453/* 445/*
454 * First initialises the archtype hash-table (init_archetable()). 446 * Initialize global archtype pointers:
455 * Reads and parses the archetype file (with the first and second-pass
456 * functions).
457 */ 447 */
458bool 448void
459load_archetype_file (const char *filename) 449init_archetype_pointers ()
460{ 450{
461 object_thawer f (filename); 451 ring_arch = archetype::find ("ring");
462 452 amulet_arch = archetype::find ("amulet");
463 f.next (); 453 staff_arch = archetype::find ("staff");
464 454 crown_arch = archetype::find ("crown");
465 if (!load_archetypes (f))
466 return false;
467
468 warn_archetypes = 1;
469
470 empty_archetype = archetype::find ("empty_archetype"); 455 empty_archetype = archetype::find ("empty_archetype");
471 if (!empty_archetype)
472 return false;
473
474 return true;
475} 456}
476 457
477/* 458/*
478 * Creates and returns a new object which is a copy of the given archetype. 459 * Creates and returns a new object which is a copy of the given archetype.
479 * This function returns NULL on failure. 460 * This function returns NULL on failure.
… …
481object * 462object *
482arch_to_object (archetype *at) 463arch_to_object (archetype *at)
483{ 464{
484 if (!at) 465 if (!at)
485 { 466 {
486 if (warn_archetypes)
487 LOG (llevError, "Couldn't find archetype.\n"); 467 LOG (llevError, "Couldn't find archetype.\n");
488
489 return NULL; 468 return 0;
490 } 469 }
491 470
492 object *op = at->clone.clone (); 471 object *op = at->clone.clone ();
493 op->arch = at; 472 op->arch = at;
494 op->instantiate (); 473 op->instantiate ();
474
495 return op; 475 return op;
496} 476}
497 477
498/* 478/*
499 * Creates an object. This function is called by get_archetype() 479 * Creates an object. This function is called by get_archetype()
… …
548} 528}
549 529
550archetype * 530archetype *
551archetype::get (const char *name) 531archetype::get (const char *name)
552{ 532{
533 if (!name)
534 {
535 LOG (llevError, "null archetype requested\n");
536 name = "(null)";
537 }
538
553 archetype *at = find (name); 539 archetype *at = find (name);
554 540
555 if (!at) 541 if (!at)
556 { 542 {
557 archetypes.push_back (at = new archetype); 543 archetypes.push_back (at = new archetype);
558 at->name = name; 544 at->name = at->clone.name = at->clone.name_pl = name;
559 at->hash_add (); 545 at->hash_add ();
560 } 546 }
561 547
562 return at; 548 return at;
563} 549}

Diff Legend

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