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.11 by root, Sun Sep 3 22:45:55 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.11 2006/09/03 22:45:55 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
382 * of archetype-structures. 365 * of archetype-structures.
383 */ 366 */
384void first_arch_pass(object_thawer &fp) { 367void first_arch_pass(object_thawer &fp) {
385 object *op; 368 object *op;
386 archetype *at,*head=NULL,*last_more=NULL; 369 archetype *at,*head=NULL,*last_more=NULL;
387 int i,first=2; 370 int i;
388 371
389 op=get_object(); 372 op=get_object();
390 op->arch=first_archetype=at=get_archetype_struct(); 373 op->arch=first_archetype=at=get_archetype_struct();
391 374
392 while((i=load_object(fp,op,first,0))) { 375 while((i=load_object(fp,op,0))) {
393 first=0;
394 copy_object(op,&at->clone); 376 copy_object(op,&at->clone);
395 at->clone.speed_left= (float) (-0.1); 377 at->clone.speed_left= (float) (-0.1);
396 /* copy the body_info to the body_used - this is only really 378 /* copy the body_info to the body_used - this is only really
397 * need for monsters, but doesn't hurt to do it for everything. 379 * need for monsters, but doesn't hurt to do it for everything.
398 * by doing so, when a monster is created, it has good starting 380 * by doing so, when a monster is created, it has good starting
… …
444 426
445 at=get_archetype_struct(); 427 at=get_archetype_struct();
446 clear_object(op); 428 clear_object(op);
447 op->arch=at; 429 op->arch=at;
448 } 430 }
449 free(at); 431
432 delete at;
450 free_object(op); 433 free_object(op);
451} 434}
452 435
453/* 436/*
454 * Reads the archetype file once more, and links all pointers between 437 * Reads the archetype file once more, and links all pointers between
… …
482 } 465 }
483 } else if(!strcmp("randomitems",variable)) { 466 } else if(!strcmp("randomitems",variable)) {
484 if(at!=NULL) { 467 if(at!=NULL) {
485 treasurelist *tl=find_treasurelist(argument); 468 treasurelist *tl=find_treasurelist(argument);
486 if(tl==NULL) 469 if(tl==NULL)
487 LOG(llevError,"Failed to link treasure to arch (%s): %s\n",at->name, argument); 470 LOG(llevError,"Failed to link treasure to arch (%s): %s\n", &at->name, argument);
488 else 471 else
489 at->clone.randomitems=tl; 472 at->clone.randomitems=tl;
490 } 473 }
491 } 474 }
492 } 475 }
… …
495#ifdef DEBUG 478#ifdef DEBUG
496void check_generators(void) { 479void check_generators(void) {
497 archetype *at; 480 archetype *at;
498 for(at=first_archetype;at!=NULL;at=at->next) 481 for(at=first_archetype;at!=NULL;at=at->next)
499 if(QUERY_FLAG(&at->clone,FLAG_GENERATOR)&&at->clone.other_arch==NULL) 482 if(QUERY_FLAG(&at->clone,FLAG_GENERATOR)&&at->clone.other_arch==NULL)
500 LOG(llevError,"Warning: %s is generator but lacks other_arch.\n", 483 LOG(llevError,"Warning: %s is generator but lacks other_arch.\n", &at->name);
501 at->name);
502} 484}
503#endif 485#endif
504 486
505/* 487/*
506 * First initialises the archtype hash-table (init_archetable()). 488 * First initialises the archtype hash-table (init_archetable()).
… …
577object *create_singularity(const char *name) { 559object *create_singularity(const char *name) {
578 object *op; 560 object *op;
579 char buf[MAX_BUF]; 561 char buf[MAX_BUF];
580 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); 562 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name);
581 op = get_object(); 563 op = get_object();
582 op->name = add_string(buf); 564 op->name = op->name_pl = buf;
583 op->name_pl = add_string(buf);
584 SET_FLAG(op,FLAG_NO_PICK); 565 SET_FLAG(op,FLAG_NO_PICK);
585 return op; 566 return op;
586} 567}
587 568
588/* 569/*
… …
601/* 582/*
602 * Hash-function used by the arch-hashtable. 583 * Hash-function used by the arch-hashtable.
603 */ 584 */
604 585
605unsigned long 586unsigned long
606hasharch(const char *str, int tablesize) { 587hasharch(const char *str, int tablesize)
588{
607 unsigned long hash = 0; 589 unsigned long hash = 0;
608 int i = 0; 590 unsigned int i = 0;
609 const char *p; 591 const char *p;
610 592
611 /* use the one-at-a-time hash function, which supposedly is 593 /* use the one-at-a-time hash function, which supposedly is
612 * better than the djb2-like one used by perl5.005, but 594 * better than the djb2-like one used by perl5.005, but
613 * certainly is better then the bug used here before. 595 * certainly is better then the bug used here before.
614 * see http://burtleburtle.net/bob/hash/doobs.html 596 * see http://burtleburtle.net/bob/hash/doobs.html
615 */ 597 */
616 for (p = str; i < MAXSTRING && *p; p++, i++) { 598 for (p = str; i < MAXSTRING && *p; p++, i++)
599 {
617 hash += *p; 600 hash += *p;
618 hash += hash << 10; 601 hash += hash << 10;
619 hash ^= hash >> 6; 602 hash ^= hash >> 6;
620 } 603 }
604
621 hash += hash << 3; 605 hash += hash << 3;
622 hash ^= hash >> 11; 606 hash ^= hash >> 11;
623 hash += hash << 15; 607 hash += hash << 15;
608
624 return hash % tablesize; 609 return hash % tablesize;
625} 610}
626 611
627/* 612/*
628 * Finds, using the hashtable, which archetype matches the given name. 613 * Finds, using the hashtable, which archetype matches the given name.
629 * returns a pointer to the found archetype, otherwise NULL. 614 * returns a pointer to the found archetype, otherwise NULL.
… …
644 if(warn_archetypes) 629 if(warn_archetypes)
645 LOG(llevError,"Couldn't find archetype %s\n",name); 630 LOG(llevError,"Couldn't find archetype %s\n",name);
646 return NULL; 631 return NULL;
647 } 632 }
648 arch_cmp++; 633 arch_cmp++;
649 if (!strcmp(at->name,name)) 634 if (!strcmp((const char *)at->name,name))
650 return at; 635 return at;
651 if(++index>=ARCHTABLE) 636 if(++index>=ARCHTABLE)
652 index=0; 637 index=0;
653 } 638 }
654} 639}
… …
656/* 641/*
657 * Adds an archetype to the hashtable. 642 * Adds an archetype to the hashtable.
658 */ 643 */
659 644
660static void add_arch(archetype *at) { 645static void add_arch(archetype *at) {
661 int index=hasharch(at->name, ARCHTABLE),org_index=index; 646 int index=hasharch((const char *)at->name, ARCHTABLE),org_index=index;
662 for(;;) { 647 for(;;) {
663 if(arch_table[index]==NULL) { 648 if(arch_table[index]==NULL) {
664 arch_table[index]=at; 649 arch_table[index]=at;
665 return; 650 return;
666 } 651 }

Diff Legend

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