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.56 by root, Wed Apr 18 07:59:55 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 {
… …
377 overwrite (head, parts.front ().second); 401 overwrite (head, parts.front ().second);
378 head->tail_x = 0; 402 head->tail_x = 0;
379 head->tail_y = 0; 403 head->tail_y = 0;
380 404
381 // link into list of heads, if not already there 405 // link into list of heads, if not already there
382 if (!head->next) 406 if (!head->linked)
383 { 407 {
408 head->linked = true;
384 head->next = first_archetype; 409 head->next = first_archetype;
385 first_archetype = head; 410 first_archetype = head;
386 } 411 }
387 412
388 // reassemble new chain 413 // reassemble new chain
389 archetype *prev = head; 414 archetype *prev = head;
390 for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p) 415 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
391 { 416 {
392 archetype *at = p->first; 417 archetype *at = p->first;
393 overwrite (at, p->second); 418 overwrite (at, p->second);
394 419
395 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;
… …
400 prev->more = at; 425 prev->more = at;
401 prev->clone.more = &at->clone; 426 prev->clone.more = &at->clone;
402 427
403 prev = at; 428 prev = at;
404 } 429 }
430
431 loading_arch = false;
432 return head;
405 } 433 }
406 434
407 return true;
408
409fail: 435fail:
410 for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) 436 for (auto (p, parts.begin ()); p != parts.end (); ++p)
411 p->second->destroy (true); 437 p->second->destroy (true);
412 438
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; 439 loading_arch = false;
436 continue; 440 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} 441}
449 442
450/* 443/*
451 * First initialises the archtype hash-table (init_archetable()). 444 * Initialize global archtype pointers:
452 * Reads and parses the archetype file (with the first and second-pass
453 * functions).
454 */ 445 */
455bool 446void
456load_archetype_file (const char *filename) 447init_archetype_pointers ()
457{ 448{
458 object_thawer f (filename); 449 ring_arch = archetype::find ("ring");
459 450 amulet_arch = archetype::find ("amulet");
460 f.next (); 451 staff_arch = archetype::find ("staff");
461 452 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"); 453 empty_archetype = archetype::find ("empty_archetype");
471 if (!empty_archetype)
472 return false;
473
474 coroapi::cede ();
475
476 return true;
477} 454}
478 455
479/* 456/*
480 * 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.
481 * This function returns NULL on failure. 458 * This function returns NULL on failure.
… …
483object * 460object *
484arch_to_object (archetype *at) 461arch_to_object (archetype *at)
485{ 462{
486 if (!at) 463 if (!at)
487 { 464 {
488 if (warn_archetypes)
489 LOG (llevError, "Couldn't find archetype.\n"); 465 LOG (llevError, "Couldn't find archetype.\n");
490
491 return NULL; 466 return 0;
492 } 467 }
493 468
494 object *op = at->clone.clone (); 469 object *op = at->clone.clone ();
495 op->arch = at; 470 op->arch = at;
496 op->instantiate (); 471 op->instantiate ();
472
497 return op; 473 return op;
498} 474}
499 475
500/* 476/*
501 * Creates an object. This function is called by get_archetype() 477 * Creates an object. This function is called by get_archetype()
… …
530 506
531 return arch_to_object (at); 507 return arch_to_object (at);
532} 508}
533 509
534/* 510/*
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. 511 * Finds, using the hashtable, which archetype matches the given name.
566 * returns a pointer to the found archetype, otherwise NULL. 512 * returns a pointer to the found archetype, otherwise NULL.
567 */ 513 */
568archetype * 514archetype *
569archetype::find (const char *name) 515archetype::find (const char *name)
570{ 516{
571 if (!name) 517 if (!name)
572 return 0; 518 return 0;
573 519
574 AUTODECL (i, ht.find (name)); 520 auto (i, ht.find (name));
575 521
576 if (i == ht.end ()) 522 if (i == ht.end ())
577 return 0; 523 return 0;
578 else 524 else
579 return i->second; 525 return i->second;

Diff Legend

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