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.49 by root, Mon Apr 16 12:37:08 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
349 // check that all archetypes belong to the same object or are heads 360 // check that all archetypes belong to the same object or are heads
350 for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) 361 for (auto (p, parts.begin ()); p != parts.end (); ++p)
351 { 362 {
352 archetype *at = p->first; 363 archetype *at = p->first;
353 364
354 if (at->head != head && at->head) 365 if (at->head != head && at->head)
355 { 366 {
377 overwrite (head, parts.front ().second); 388 overwrite (head, parts.front ().second);
378 head->tail_x = 0; 389 head->tail_x = 0;
379 head->tail_y = 0; 390 head->tail_y = 0;
380 391
381 // link into list of heads, if not already there 392 // link into list of heads, if not already there
382 if (!head->next) 393 if (!head->linked)
383 { 394 {
395 head->linked = true;
384 head->next = first_archetype; 396 head->next = first_archetype;
385 first_archetype = head; 397 first_archetype = head;
386 } 398 }
387 399
388 // reassemble new chain 400 // reassemble new chain
389 archetype *prev = head; 401 archetype *prev = head;
390 for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p) 402 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
391 { 403 {
392 archetype *at = p->first; 404 archetype *at = p->first;
393 overwrite (at, p->second); 405 overwrite (at, p->second);
394 406
395 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 407 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
400 prev->more = at; 412 prev->more = at;
401 prev->clone.more = &at->clone; 413 prev->clone.more = &at->clone;
402 414
403 prev = at; 415 prev = at;
404 } 416 }
417
418 loading_arch = false;
419 return head;
405 } 420 }
406 421
407 return true;
408
409fail: 422fail:
410 for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) 423 for (auto (p, parts.begin ()); p != parts.end (); ++p)
411 p->second->destroy (true); 424 p->second->destroy (true);
412 425
413 return false;
414}
415
416/*
417 * Reads/parses the archetype-file, and copies into a linked list
418 * of archetype-structures.
419 */
420static bool
421load_archetypes (object_thawer &f)
422{
423 for (;;)
424 {
425 switch (f.kw)
426 {
427 case KW_object:
428 loading_arch = true;
429 if (!archetype::load (f))
430 {
431 loading_arch = false;
432 return false;
433 }
434
435 loading_arch = false; 426 loading_arch = false;
436 continue; 427 return 0;
437
438 case KW_EOF:
439 return true;
440
441 default:
442 if (!f.parse_error ("archetypes file"))
443 return false;
444 }
445
446 f.next ();
447 }
448} 428}
449 429
450/* 430/*
451 * First initialises the archtype hash-table (init_archetable()). 431 * Initialize global archtype pointers:
452 * Reads and parses the archetype file (with the first and second-pass
453 * functions).
454 */ 432 */
455bool 433void
456load_archetype_file (const char *filename) 434init_archetype_pointers ()
457{ 435{
458 object_thawer f (filename); 436 ring_arch = archetype::find ("ring");
459 437 amulet_arch = archetype::find ("amulet");
460 f.next (); 438 staff_arch = archetype::find ("staff");
461 439 crown_arch = archetype::find ("crown");
462 // make sure the next - long - step is only done after a tick
463 coroapi::wait_for_tick_begin ();
464
465 if (!load_archetypes (f))
466 return false;
467
468 warn_archetypes = 1;
469
470 empty_archetype = archetype::find ("empty_archetype"); 440 empty_archetype = archetype::find ("empty_archetype");
471 if (!empty_archetype)
472 return false;
473
474 coroapi::cede ();
475
476 return true;
477} 441}
478 442
479/* 443/*
480 * 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.
481 * This function returns NULL on failure. 445 * This function returns NULL on failure.
483object * 447object *
484arch_to_object (archetype *at) 448arch_to_object (archetype *at)
485{ 449{
486 if (!at) 450 if (!at)
487 { 451 {
488 if (warn_archetypes)
489 LOG (llevError, "Couldn't find archetype.\n"); 452 LOG (llevError, "Couldn't find archetype.\n");
490
491 return NULL; 453 return 0;
492 } 454 }
493 455
494 object *op = at->clone.clone (); 456 object *op = at->clone.clone ();
495 op->arch = at; 457 op->arch = at;
496 op->instantiate (); 458 op->instantiate ();
459
497 return op; 460 return op;
498} 461}
499 462
500/* 463/*
501 * Creates an object. This function is called by get_archetype() 464 * Creates an object. This function is called by get_archetype()
530 493
531 return arch_to_object (at); 494 return arch_to_object (at);
532} 495}
533 496
534/* 497/*
535 * Hash-function used by the arch-hashtable.
536 */
537
538unsigned long
539hasharch (const char *str, int tablesize)
540{
541 unsigned long hash = 0;
542 unsigned int i = 0;
543 const char *p;
544
545 /* use the one-at-a-time hash function, which supposedly is
546 * better than the djb2-like one used by perl5.005, but
547 * certainly is better then the bug used here before.
548 * see http://burtleburtle.net/bob/hash/doobs.html
549 */
550 for (p = str; i < MAXSTRING && *p; p++, i++)
551 {
552 hash += *p;
553 hash += hash << 10;
554 hash ^= hash >> 6;
555 }
556
557 hash += hash << 3;
558 hash ^= hash >> 11;
559 hash += hash << 15;
560
561 return hash % tablesize;
562}
563
564/*
565 * Finds, using the hashtable, which archetype matches the given name. 498 * Finds, using the hashtable, which archetype matches the given name.
566 * returns a pointer to the found archetype, otherwise NULL. 499 * returns a pointer to the found archetype, otherwise NULL.
567 */ 500 */
568archetype * 501archetype *
569archetype::find (const char *name) 502archetype::find (const char *name)
570{ 503{
571 if (!name) 504 if (!name)
572 return 0; 505 return 0;
573 506
574 AUTODECL (i, ht.find (name)); 507 auto (i, ht.find (name));
575 508
576 if (i == ht.end ()) 509 if (i == ht.end ())
577 return 0; 510 return 0;
578 else 511 else
579 return i->second; 512 return i->second;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines