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.9 by root, Wed Aug 30 11:02:15 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.9 2006/08/30 11:02:15 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
… …
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()).
… …
577object *create_singularity(const char *name) { 560object *create_singularity(const char *name) {
578 object *op; 561 object *op;
579 char buf[MAX_BUF]; 562 char buf[MAX_BUF];
580 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); 563 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name);
581 op = get_object(); 564 op = get_object();
582 op->name = add_string(buf); 565 op->name = op->name_pl = buf;
583 op->name_pl = add_string(buf);
584 SET_FLAG(op,FLAG_NO_PICK); 566 SET_FLAG(op,FLAG_NO_PICK);
585 return op; 567 return op;
586} 568}
587 569
588/* 570/*
… …
601/* 583/*
602 * Hash-function used by the arch-hashtable. 584 * Hash-function used by the arch-hashtable.
603 */ 585 */
604 586
605unsigned long 587unsigned long
606hasharch(const char *str, int tablesize) { 588hasharch(const char *str, int tablesize)
589{
607 unsigned long hash = 0; 590 unsigned long hash = 0;
608 int i = 0; 591 unsigned int i = 0;
609 const char *p; 592 const char *p;
610 593
611 /* use the one-at-a-time hash function, which supposedly is 594 /* use the one-at-a-time hash function, which supposedly is
612 * better than the djb2-like one used by perl5.005, but 595 * better than the djb2-like one used by perl5.005, but
613 * certainly is better then the bug used here before. 596 * certainly is better then the bug used here before.
614 * see http://burtleburtle.net/bob/hash/doobs.html 597 * see http://burtleburtle.net/bob/hash/doobs.html
615 */ 598 */
616 for (p = str; i < MAXSTRING && *p; p++, i++) { 599 for (p = str; i < MAXSTRING && *p; p++, i++)
600 {
617 hash += *p; 601 hash += *p;
618 hash += hash << 10; 602 hash += hash << 10;
619 hash ^= hash >> 6; 603 hash ^= hash >> 6;
620 } 604 }
605
621 hash += hash << 3; 606 hash += hash << 3;
622 hash ^= hash >> 11; 607 hash ^= hash >> 11;
623 hash += hash << 15; 608 hash += hash << 15;
609
624 return hash % tablesize; 610 return hash % tablesize;
625} 611}
626 612
627/* 613/*
628 * Finds, using the hashtable, which archetype matches the given name. 614 * Finds, using the hashtable, which archetype matches the given name.
629 * returns a pointer to the found archetype, otherwise NULL. 615 * returns a pointer to the found archetype, otherwise NULL.
… …
644 if(warn_archetypes) 630 if(warn_archetypes)
645 LOG(llevError,"Couldn't find archetype %s\n",name); 631 LOG(llevError,"Couldn't find archetype %s\n",name);
646 return NULL; 632 return NULL;
647 } 633 }
648 arch_cmp++; 634 arch_cmp++;
649 if (!strcmp(at->name,name)) 635 if (!strcmp((const char *)at->name,name))
650 return at; 636 return at;
651 if(++index>=ARCHTABLE) 637 if(++index>=ARCHTABLE)
652 index=0; 638 index=0;
653 } 639 }
654} 640}
… …
656/* 642/*
657 * Adds an archetype to the hashtable. 643 * Adds an archetype to the hashtable.
658 */ 644 */
659 645
660static void add_arch(archetype *at) { 646static void add_arch(archetype *at) {
661 int index=hasharch(at->name, ARCHTABLE),org_index=index; 647 int index=hasharch((const char *)at->name, ARCHTABLE),org_index=index;
662 for(;;) { 648 for(;;) {
663 if(arch_table[index]==NULL) { 649 if(arch_table[index]==NULL) {
664 arch_table[index]=at; 650 arch_table[index]=at;
665 return; 651 return;
666 } 652 }

Diff Legend

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