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.7 by root, Tue Aug 29 08:01:35 2006 UTC vs.
Revision 1.10 by root, Sun Sep 3 00:18:39 2006 UTC

1/* 1/*
2 * static char *rcsid_arch_c = 2 * static char *rcsid_arch_c =
3 * "$Id: arch.C,v 1.7 2006/08/29 08:01:35 root Exp $"; 3 * "$Id: arch.C,v 1.10 2006/09/03 00:18:39 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
335 int i=0,f=0; 335 int i=0,f=0;
336 336
337 for (at=first_archetype; at!=NULL; at=next) { 337 for (at=first_archetype; at!=NULL; at=next) {
338 if (at->more) next=at->more; 338 if (at->more) next=at->more;
339 else next=at->next; 339 else next=at->next;
340 if (at->name) free_string(at->name); 340
341 if (at->clone.name) free_string(at->clone.name); 341 delete at;
342 if (at->clone.name_pl) free_string(at->clone.name_pl);
343 if (at->clone.title) free_string(at->clone.title);
344 if (at->clone.race) free_string(at->clone.race);
345 if (at->clone.slaying) free_string(at->clone.slaying);
346 if (at->clone.msg) free_string(at->clone.msg);
347 free(at);
348 i++; 342 i++;
349 } 343 }
350 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f); 344 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f);
351} 345}
352 346
353/* 347/*
354 * Allocates, initialises and returns the pointer to an archetype structure. 348 * Allocates, initialises and returns the pointer to an archetype structure.
355 */ 349 */
356 350// TODO: should become constructor
357archetype *get_archetype_struct(void) { 351archetype *get_archetype_struct(void) {
358 archetype *arch; 352 archetype *arch;
359 353
360 arch=(archetype *)CALLOC(1,sizeof(archetype)); 354 arch = new archetype;
361 if(arch==NULL) 355
362 fatal(OUT_OF_MEMORY);
363 arch->next=NULL;
364 arch->name=NULL;
365 arch->clone.other_arch=NULL;
366 arch->clone.name=NULL;
367 arch->clone.name_pl=NULL;
368 arch->clone.title=NULL;
369 arch->clone.race=NULL;
370 arch->clone.slaying=NULL;
371 arch->clone.msg=NULL;
372 clear_object(&arch->clone); /* to initial state other also */ 356 clear_object (&arch->clone); /* to initial state other also */
373 CLEAR_FLAG((&arch->clone),FLAG_FREED); /* This shouldn't matter, since copy_object() */ 357 CLEAR_FLAG (&arch->clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
374 SET_FLAG((&arch->clone), FLAG_REMOVED); /* doesn't copy these flags... */ 358 SET_FLAG (&arch->clone, FLAG_REMOVED); /* doesn't copy these flags... */
375 arch->head=NULL; 359
376 arch->more=NULL;
377 return arch; 360 return arch;
378} 361}
379 362
380/* 363/*
381 * Reads/parses the archetype-file, and copies into a linked list 364 * Reads/parses the archetype-file, and copies into a linked list
… …
444 427
445 at=get_archetype_struct(); 428 at=get_archetype_struct();
446 clear_object(op); 429 clear_object(op);
447 op->arch=at; 430 op->arch=at;
448 } 431 }
449 free(at); 432
433 delete at;
450 free_object(op); 434 free_object(op);
451} 435}
452 436
453/* 437/*
454 * Reads the archetype file once more, and links all pointers between 438 * Reads the archetype file once more, and links all pointers between
455 * archetypes. 439 * archetypes.
456 */ 440 */
457 441
458void second_arch_pass(FILE *fp) { 442void second_arch_pass(object_thawer &thawer) {
459 char buf[MAX_BUF],*variable=buf,*argument,*cp; 443 char buf[MAX_BUF],*variable=buf,*argument,*cp;
460 archetype *at=NULL,*other; 444 archetype *at=NULL,*other;
461 445
462 while(fgets(buf,MAX_BUF,fp)!=NULL) { 446 while(fgets(buf,MAX_BUF,thawer)!=NULL) {
463 if(*buf=='#') 447 if(*buf=='#')
464 continue; 448 continue;
465 if((argument=strchr(buf,' '))!=NULL) { 449 if((argument=strchr(buf,' '))!=NULL) {
466 *argument='\0',argument++; 450 *argument='\0',argument++;
467 cp = argument + strlen(argument)-1; 451 cp = argument + strlen(argument)-1;
… …
482 } 466 }
483 } else if(!strcmp("randomitems",variable)) { 467 } else if(!strcmp("randomitems",variable)) {
484 if(at!=NULL) { 468 if(at!=NULL) {
485 treasurelist *tl=find_treasurelist(argument); 469 treasurelist *tl=find_treasurelist(argument);
486 if(tl==NULL) 470 if(tl==NULL)
487 LOG(llevError,"Failed to link treasure to arch (%s): %s\n",at->name, argument); 471 LOG(llevError,"Failed to link treasure to arch (%s): %s\n", &at->name, argument);
488 else 472 else
489 at->clone.randomitems=tl; 473 at->clone.randomitems=tl;
490 } 474 }
491 } 475 }
492 } 476 }
… …
495#ifdef DEBUG 479#ifdef DEBUG
496void check_generators(void) { 480void check_generators(void) {
497 archetype *at; 481 archetype *at;
498 for(at=first_archetype;at!=NULL;at=at->next) 482 for(at=first_archetype;at!=NULL;at=at->next)
499 if(QUERY_FLAG(&at->clone,FLAG_GENERATOR)&&at->clone.other_arch==NULL) 483 if(QUERY_FLAG(&at->clone,FLAG_GENERATOR)&&at->clone.other_arch==NULL)
500 LOG(llevError,"Warning: %s is generator but lacks other_arch.\n", 484 LOG(llevError,"Warning: %s is generator but lacks other_arch.\n", &at->name);
501 at->name);
502} 485}
503#endif 486#endif
504 487
505/* 488/*
506 * First initialises the archtype hash-table (init_archetable()). 489 * First initialises the archtype hash-table (init_archetable()).
507 * Reads and parses the archetype file (with the first and second-pass 490 * Reads and parses the archetype file (with the first and second-pass
508 * functions). 491 * functions).
509 * Then initialises treasures by calling load_treasures(). 492 * Then initialises treasures by calling load_treasures().
510 */ 493 */
511 494
495void
512void load_archetypes(void) { 496load_archetypes (void)
513 FILE *fp; 497{
514 char filename[MAX_BUF]; 498 char filename[MAX_BUF];
515 int comp; 499 int comp;
516#if TIME_ARCH_LOAD 500#if TIME_ARCH_LOAD
517 struct timeval tv1,tv2; 501 struct timeval tv1, tv2;
518#endif 502#endif
519 503
520 sprintf(filename,"%s/%s",settings.datadir,settings.archetypes); 504 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
521 LOG(llevDebug,"Reading archetypes from %s...\n",filename); 505 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
522 if((fp=open_and_uncompress(filename,0,&comp))==NULL) { 506
523 LOG(llevError," Can't open archetype file.\n"); 507 {
524 return; 508 object_thawer thawer (filename);
525 } 509
526 clear_archetable(); 510 clear_archetable ();
527 LOG(llevDebug," arch-pass 1...\n"); 511 LOG (llevDebug, " arch-pass 1...\n");
528#if TIME_ARCH_LOAD 512 first_arch_pass (thawer);
529 GETTIMEOFDAY(&tv1); 513 LOG (llevDebug, " done\n");
514
515 init_archetable ();
516 warn_archetypes = 1;
517 }
518
519 {
520 object_thawer thawer (filename);
521
522 LOG (llevDebug, " loading treasure...\n");
523 load_treasures ();
524 LOG (llevDebug, " done\n arch-pass 2...\n");
525 second_arch_pass (thawer);
526 LOG (llevDebug, " done\n");
527#ifdef DEBUG
528 check_generators ();
530#endif 529#endif
531 {
532 object_thawer thawer (fp);
533 first_arch_pass (thawer);
534 } 530 }
535#if TIME_ARCH_LOAD
536 { int sec, usec;
537 GETTIMEOFDAY(&tv2);
538 sec = tv2.tv_sec - tv1.tv_sec;
539 usec = tv2.tv_usec - tv1.tv_usec;
540 if (usec<0) { usec +=1000000; sec--;}
541 LOG(llevDebug,"Load took %d.%06d seconds\n", sec, usec);
542 }
543#endif
544
545 LOG(llevDebug," done\n"); 531 LOG (llevDebug, " done\n");
546 init_archetable();
547 warn_archetypes=1;
548
549 /* do a close and reopen instead of a rewind - necessary in case the
550 * file has been compressed.
551 */
552 close_and_delete(fp, comp);
553 fp=open_and_uncompress(filename,0,&comp);
554
555 LOG(llevDebug," loading treasure...\n");
556 load_treasures();
557 LOG(llevDebug," done\n arch-pass 2...\n");
558 second_arch_pass(fp);
559 LOG(llevDebug," done\n");
560#ifdef DEBUG
561 check_generators();
562#endif
563 close_and_delete(fp, comp);
564 LOG(llevDebug," done\n");
565} 532}
566 533
567/* 534/*
568 * Creates and returns a new object which is a copy of the given archetype. 535 * Creates and returns a new object which is a copy of the given archetype.
569 * This function returns NULL on failure. 536 * This function returns NULL on failure.
… …
593object *create_singularity(const char *name) { 560object *create_singularity(const char *name) {
594 object *op; 561 object *op;
595 char buf[MAX_BUF]; 562 char buf[MAX_BUF];
596 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); 563 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name);
597 op = get_object(); 564 op = get_object();
598 op->name = add_string(buf); 565 op->name = op->name_pl = buf;
599 op->name_pl = add_string(buf);
600 SET_FLAG(op,FLAG_NO_PICK); 566 SET_FLAG(op,FLAG_NO_PICK);
601 return op; 567 return op;
602} 568}
603 569
604/* 570/*
… …
617/* 583/*
618 * Hash-function used by the arch-hashtable. 584 * Hash-function used by the arch-hashtable.
619 */ 585 */
620 586
621unsigned long 587unsigned long
622hasharch(const char *str, int tablesize) { 588hasharch(const char *str, int tablesize)
589{
623 unsigned long hash = 0; 590 unsigned long hash = 0;
624 int i = 0; 591 unsigned int i = 0;
625 const char *p; 592 const char *p;
626 593
627 /* use the one-at-a-time hash function, which supposedly is 594 /* use the one-at-a-time hash function, which supposedly is
628 * better than the djb2-like one used by perl5.005, but 595 * better than the djb2-like one used by perl5.005, but
629 * certainly is better then the bug used here before. 596 * certainly is better then the bug used here before.
630 * see http://burtleburtle.net/bob/hash/doobs.html 597 * see http://burtleburtle.net/bob/hash/doobs.html
631 */ 598 */
632 for (p = str; i < MAXSTRING && *p; p++, i++) { 599 for (p = str; i < MAXSTRING && *p; p++, i++)
600 {
633 hash += *p; 601 hash += *p;
634 hash += hash << 10; 602 hash += hash << 10;
635 hash ^= hash >> 6; 603 hash ^= hash >> 6;
636 } 604 }
605
637 hash += hash << 3; 606 hash += hash << 3;
638 hash ^= hash >> 11; 607 hash ^= hash >> 11;
639 hash += hash << 15; 608 hash += hash << 15;
609
640 return hash % tablesize; 610 return hash % tablesize;
641} 611}
642 612
643/* 613/*
644 * Finds, using the hashtable, which archetype matches the given name. 614 * Finds, using the hashtable, which archetype matches the given name.
645 * returns a pointer to the found archetype, otherwise NULL. 615 * returns a pointer to the found archetype, otherwise NULL.
… …
660 if(warn_archetypes) 630 if(warn_archetypes)
661 LOG(llevError,"Couldn't find archetype %s\n",name); 631 LOG(llevError,"Couldn't find archetype %s\n",name);
662 return NULL; 632 return NULL;
663 } 633 }
664 arch_cmp++; 634 arch_cmp++;
665 if (!strcmp(at->name,name)) 635 if (!strcmp((const char *)at->name,name))
666 return at; 636 return at;
667 if(++index>=ARCHTABLE) 637 if(++index>=ARCHTABLE)
668 index=0; 638 index=0;
669 } 639 }
670} 640}
… …
672/* 642/*
673 * Adds an archetype to the hashtable. 643 * Adds an archetype to the hashtable.
674 */ 644 */
675 645
676static void add_arch(archetype *at) { 646static void add_arch(archetype *at) {
677 int index=hasharch(at->name, ARCHTABLE),org_index=index; 647 int index=hasharch((const char *)at->name, ARCHTABLE),org_index=index;
678 for(;;) { 648 for(;;) {
679 if(arch_table[index]==NULL) { 649 if(arch_table[index]==NULL) {
680 arch_table[index]=at; 650 arch_table[index]=at;
681 return; 651 return;
682 } 652 }

Diff Legend

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