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.6 by root, Tue Aug 29 05:03:54 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.6 2006/08/29 05:03:54 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
… …
64 */ 64 */
65archetype *find_archetype_by_object_name(const char *name) { 65archetype *find_archetype_by_object_name(const char *name) {
66 archetype *at; 66 archetype *at;
67 67
68 if (name == NULL) 68 if (name == NULL)
69 return (archetype *) NULL; 69 return (archetype *) NULL;
70 70
71 for(at = first_archetype;at!=NULL;at=at->next) { 71 for(at = first_archetype;at!=NULL;at=at->next) {
72 if (!strcmp(at->clone.name, name)) 72 if (!strcmp(at->clone.name, name))
73 return at; 73 return at;
74 } 74 }
75 return NULL; 75 return NULL;
76} 76}
77 77
78/** 78/**
… …
101 */ 101 */
102object *get_archetype_by_skill_name(const char *skill, int type) { 102object *get_archetype_by_skill_name(const char *skill, int type) {
103 archetype *at; 103 archetype *at;
104 104
105 if (skill == NULL) 105 if (skill == NULL)
106 return NULL; 106 return NULL;
107 107
108 for(at = first_archetype;at!=NULL;at=at->next) { 108 for(at = first_archetype;at!=NULL;at=at->next) {
109 if ( ((type == -1) || (type == at->clone.type)) && 109 if ( ((type == -1) || (type == at->clone.type)) &&
110 (!strcmp(at->clone.skill, skill))) 110 (!strcmp(at->clone.skill, skill)))
111 return arch_to_object(at); 111 return arch_to_object(at);
112 } 112 }
113 return NULL; 113 return NULL;
114} 114}
115 115
116/* similiar to above - this returns the first archetype 116/* similiar to above - this returns the first archetype
… …
122 */ 122 */
123archetype *get_archetype_by_type_subtype(int type, int subtype) { 123archetype *get_archetype_by_type_subtype(int type, int subtype) {
124 archetype *at; 124 archetype *at;
125 125
126 for(at = first_archetype;at!=NULL;at=at->next) { 126 for(at = first_archetype;at!=NULL;at=at->next) {
127 if ( ((type == -1) || (type == at->clone.type)) && 127 if ( ((type == -1) || (type == at->clone.type)) &&
128 (subtype == -1 || subtype == at->clone.subtype)) 128 (subtype == -1 || subtype == at->clone.subtype))
129 return at; 129 return at;
130 } 130 }
131 return NULL; 131 return NULL;
132} 132}
133 133
134/** 134/**
… …
149 int i; 149 int i;
150 150
151 strncpy(tmpname,name,MAX_BUF-1); 151 strncpy(tmpname,name,MAX_BUF-1);
152 tmpname[MAX_BUF-1] = 0; 152 tmpname[MAX_BUF-1] = 0;
153 for(i=strlen(tmpname); i>0; i--) { 153 for(i=strlen(tmpname); i>0; i--) {
154 tmpname[i] = 0; 154 tmpname[i] = 0;
155 at = find_archetype_by_object_name(tmpname); 155 at = find_archetype_by_object_name(tmpname);
156 if (at !=NULL) 156 if (at !=NULL)
157 { 157 {
158 return arch_to_object(at); 158 return arch_to_object(at);
159 } 159 }
160 } 160 }
161 return create_singularity(name); 161 return create_singularity(name);
162} 162}
163 163
… …
183 char *cp, local_name[MAX_BUF]; 183 char *cp, local_name[MAX_BUF];
184 int count,retval=0; 184 int count,retval=0;
185 strcpy(local_name, name); /* strtok is destructive to name */ 185 strcpy(local_name, name); /* strtok is destructive to name */
186 186
187 for (cp=strtok(local_name,","); cp; cp=strtok(NULL,",")) { 187 for (cp=strtok(local_name,","); cp; cp=strtok(NULL,",")) {
188 while (cp[0]==' ') ++cp; /* get rid of spaces */ 188 while (cp[0]==' ') ++cp; /* get rid of spaces */
189 189
190 /* LOG(llevDebug,"Trying to match %s\n", cp);*/ 190 /* LOG(llevDebug,"Trying to match %s\n", cp);*/
191 /* All is a very generic match - low match value */ 191 /* All is a very generic match - low match value */
192 if (!strcmp(cp,"all")) return 1; 192 if (!strcmp(cp,"all")) return 1;
193 193
194 /* unpaid is a little more specific */ 194 /* unpaid is a little more specific */
195 if (!strcmp(cp,"unpaid") && QUERY_FLAG(op,FLAG_UNPAID)) return 2; 195 if (!strcmp(cp,"unpaid") && QUERY_FLAG(op,FLAG_UNPAID)) return 2;
196 if (!strcmp(cp,"cursed") && QUERY_FLAG(op,FLAG_KNOWN_CURSED) && 196 if (!strcmp(cp,"cursed") && QUERY_FLAG(op,FLAG_KNOWN_CURSED) &&
197 (QUERY_FLAG(op,FLAG_CURSED) ||QUERY_FLAG(op,FLAG_DAMNED))) 197 (QUERY_FLAG(op,FLAG_CURSED) ||QUERY_FLAG(op,FLAG_DAMNED)))
198 return 2; 198 return 2;
199 199
200 if (!strcmp(cp,"unlocked") && !QUERY_FLAG(op, FLAG_INV_LOCKED)) 200 if (!strcmp(cp,"unlocked") && !QUERY_FLAG(op, FLAG_INV_LOCKED))
201 return 2; 201 return 2;
202 202
203 /* Allow for things like '100 arrows' */ 203 /* Allow for things like '100 arrows' */
204 if ((count=atoi(cp))!=0) { 204 if ((count=atoi(cp))!=0) {
205 cp=strchr(cp, ' '); 205 cp=strchr(cp, ' ');
206 while (cp && cp[0]==' ') ++cp; /* get rid of spaces */ 206 while (cp && cp[0]==' ') ++cp; /* get rid of spaces */
207 } 207 }
208 else { 208 else {
209 if (pl->type==PLAYER) 209 if (pl->type==PLAYER)
210 count=pl->contr->count; 210 count=pl->contr->count;
211 else 211 else
212 count = 0; 212 count = 0;
213 } 213 }
214 214
215 if (!cp || cp[0]=='\0' || count<0) return 0; 215 if (!cp || cp[0]=='\0' || count<0) return 0;
216 216
217 217
218 /* The code here should go from highest retval to lowest. That 218 /* The code here should go from highest retval to lowest. That
219 * is because of the 'else' handling - we don't want to match on 219 * is because of the 'else' handling - we don't want to match on
220 * something and set a low retval, even though it may match a higher retcal 220 * something and set a low retval, even though it may match a higher retcal
221 * later. So keep it in descending order here, so we try for the best 221 * later. So keep it in descending order here, so we try for the best
222 * match first, and work downward. 222 * match first, and work downward.
223 */ 223 */
224 if (!strcasecmp(cp,query_name(op))) retval=20; 224 if (!strcasecmp(cp,query_name(op))) retval=20;
225 else if (!strcasecmp(cp,query_short_name(op))) retval=18; 225 else if (!strcasecmp(cp,query_short_name(op))) retval=18;
226 else if (!strcasecmp(cp,query_base_name(op,0))) retval=16; 226 else if (!strcasecmp(cp,query_base_name(op,0))) retval=16;
227 else if (!strcasecmp(cp,query_base_name(op,1))) retval=16; 227 else if (!strcasecmp(cp,query_base_name(op,1))) retval=16;
228 else if (op->custom_name && !strcasecmp(cp,op->custom_name)) retval=15; 228 else if (op->custom_name && !strcasecmp(cp,op->custom_name)) retval=15;
229 else if (!strncasecmp(cp,query_base_name(op,0), 229 else if (!strncasecmp(cp,query_base_name(op,0),
230 strlen(cp))) retval=14; 230 strlen(cp))) retval=14;
231 else if (!strncasecmp(cp,query_base_name(op,1), 231 else if (!strncasecmp(cp,query_base_name(op,1),
232 strlen(cp))) retval=14; 232 strlen(cp))) retval=14;
233 233
234 /* Do substring checks, so things like 'Str+1' will match. 234 /* Do substring checks, so things like 'Str+1' will match.
235 * retval of these should perhaps be lower - they are lower 235 * retval of these should perhaps be lower - they are lower
236 * then the specific strcasecmp aboves, but still higher than 236 * then the specific strcasecmp aboves, but still higher than
237 * some other match criteria. 237 * some other match criteria.
238 */ 238 */
239 else if (strstr(query_base_name(op,1), cp)) retval = 12; 239 else if (strstr(query_base_name(op,1), cp)) retval = 12;
240 else if (strstr(query_base_name(op,0), cp)) retval = 12; 240 else if (strstr(query_base_name(op,0), cp)) retval = 12;
241 else if (strstr(query_short_name(op), cp)) retval = 12; 241 else if (strstr(query_short_name(op), cp)) retval = 12;
242 242
243 /* Check against plural/non plural based on count. */ 243 /* Check against plural/non plural based on count. */
244 else if (count>1 && !strcasecmp(cp,op->name_pl)) { 244 else if (count>1 && !strcasecmp(cp,op->name_pl)) {
245 retval=6; 245 retval=6;
246 } 246 }
247 else if (count==1 && !strcasecmp(op->name,cp)) { 247 else if (count==1 && !strcasecmp(op->name,cp)) {
248 retval=6; 248 retval=6;
249 } 249 }
250 /* base name matched - not bad */ 250 /* base name matched - not bad */
251 else if (strcasecmp(cp,op->name)==0 && !count) retval=4; 251 else if (strcasecmp(cp,op->name)==0 && !count) retval=4;
252 /* Check for partial custom name, but give a real low priority */ 252 /* Check for partial custom name, but give a real low priority */
253 else if (op->custom_name && strstr(op->custom_name, cp)) retval = 3; 253 else if (op->custom_name && strstr(op->custom_name, cp)) retval = 3;
254 254
255 if (retval) { 255 if (retval) {
256 if (pl->type == PLAYER) 256 if (pl->type == PLAYER)
257 pl->contr->count=count; 257 pl->contr->count=count;
258 return retval; 258 return retval;
259 } 259 }
260 } 260 }
261 return 0; 261 return 0;
262} 262}
263 263
264/* 264/*
… …
333{ 333{
334 archetype *at, *next; 334 archetype *at, *next;
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); 342 i++;
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++;
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
399 * values for the body_used info, so when items are created 381 * values for the body_used info, so when items are created
400 * for it, they can be properly equipped. 382 * for it, they can be properly equipped.
401 */ 383 */
402 memcpy(&at->clone.body_used, &op->body_info, sizeof(op->body_info)); 384 memcpy(&at->clone.body_used, &op->body_info, sizeof(op->body_info));
403 385
404 switch(i) { 386 switch(i) {
405 case LL_NORMAL: /* A new archetype, just link it with the previous */ 387 case LL_NORMAL: /* A new archetype, just link it with the previous */
406 if(last_more!=NULL) 388 if(last_more!=NULL)
407 last_more->next=at; 389 last_more->next=at;
408 if(head!=NULL) 390 if(head!=NULL)
409 head->next=at; 391 head->next=at;
410 head=last_more=at; 392 head=last_more=at;
411#if 0 393#if 0
412 if(!op->type) 394 if(!op->type)
413 LOG(llevDebug," WARNING: Archetype %s has no type info!\n", op->arch->name); 395 LOG(llevDebug," WARNING: Archetype %s has no type info!\n", op->arch->name);
414#endif 396#endif
415 at->tail_x = 0; 397 at->tail_x = 0;
416 at->tail_y = 0; 398 at->tail_y = 0;
417 break; 399 break;
418 400
419 case LL_MORE: /* Another part of the previous archetype, link it correctly */ 401 case LL_MORE: /* Another part of the previous archetype, link it correctly */
420 402
421 at->head=head; 403 at->head=head;
422 at->clone.head = &head->clone; 404 at->clone.head = &head->clone;
423 if(last_more!=NULL) { 405 if(last_more!=NULL) {
424 last_more->more=at; 406 last_more->more=at;
425 last_more->clone.more = &at->clone; 407 last_more->clone.more = &at->clone;
426 } 408 }
427 last_more=at; 409 last_more=at;
428 410
429 /* If this multipart image is still composed of individual small 411 /* If this multipart image is still composed of individual small
430 * images, don't set the tail_.. values. We can't use them anyways, 412 * images, don't set the tail_.. values. We can't use them anyways,
431 * and setting these to zero makes the map sending to the client much 413 * and setting these to zero makes the map sending to the client much
432 * easier as just looking at the head, we know what to do. 414 * easier as just looking at the head, we know what to do.
433 */ 415 */
434 if (at->clone.face != head->clone.face) { 416 if (at->clone.face != head->clone.face) {
435 head->tail_x = 0; 417 head->tail_x = 0;
436 head->tail_y = 0; 418 head->tail_y = 0;
437 } else { 419 } else {
438 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;
439 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y; 421 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
440 } 422 }
441 break; 423 break;
442 424
443 } 425 }
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
455 * archetypes. 438 * archetypes.
456 */ 439 */
457 440
458void second_arch_pass(FILE *fp) { 441void second_arch_pass(object_thawer &thawer) {
459 char buf[MAX_BUF],*variable=buf,*argument,*cp; 442 char buf[MAX_BUF],*variable=buf,*argument,*cp;
460 archetype *at=NULL,*other; 443 archetype *at=NULL,*other;
461 444
462 while(fgets(buf,MAX_BUF,fp)!=NULL) { 445 while(fgets(buf,MAX_BUF,thawer)!=NULL) {
463 if(*buf=='#') 446 if(*buf=='#')
464 continue; 447 continue;
465 if((argument=strchr(buf,' '))!=NULL) { 448 if((argument=strchr(buf,' '))!=NULL) {
466 *argument='\0',argument++; 449 *argument='\0',argument++;
467 cp = argument + strlen(argument)-1; 450 cp = argument + strlen(argument)-1;
468 while (isspace(*cp)) { 451 while (isspace(*cp)) {
469 *cp='\0'; 452 *cp='\0';
470 cp--; 453 cp--;
471 } 454 }
472 } 455 }
473 if(!strcmp("Object",variable)) { 456 if(!strcmp("Object",variable)) {
474 if((at=find_archetype(argument))==NULL) 457 if((at=find_archetype(argument))==NULL)
475 LOG(llevError,"Warning: failed to find arch %s\n",argument); 458 LOG(llevError,"Warning: failed to find arch %s\n",argument);
476 } else if(!strcmp("other_arch",variable)) { 459 } else if(!strcmp("other_arch",variable)) {
… …
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()).
507 * Reads and parses the archetype file (with the first and second-pass 489 * Reads and parses the archetype file (with the first and second-pass
508 * functions). 490 * functions).
509 * Then initialises treasures by calling load_treasures(). 491 * Then initialises treasures by calling load_treasures().
510 */ 492 */
511 493
494void
512void load_archetypes(void) { 495load_archetypes (void)
513 FILE *fp; 496{
514 char filename[MAX_BUF]; 497 char filename[MAX_BUF];
515 int comp; 498 int comp;
516#if TIME_ARCH_LOAD 499#if TIME_ARCH_LOAD
517 struct timeval tv1,tv2; 500 struct timeval tv1, tv2;
518#endif 501#endif
519 502
520 sprintf(filename,"%s/%s",settings.datadir,settings.archetypes); 503 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
521 LOG(llevDebug,"Reading archetypes from %s...\n",filename); 504 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
522 if((fp=open_and_uncompress(filename,0,&comp))==NULL) { 505
523 LOG(llevError," Can't open archetype file.\n"); 506 {
524 return; 507 object_thawer thawer (filename);
525 } 508
526 clear_archetable(); 509 clear_archetable ();
527 LOG(llevDebug," arch-pass 1...\n"); 510 LOG (llevDebug, " arch-pass 1...\n");
528#if TIME_ARCH_LOAD 511 first_arch_pass (thawer);
529 GETTIMEOFDAY(&tv1); 512 LOG (llevDebug, " done\n");
513
514 init_archetable ();
515 warn_archetypes = 1;
516 }
517
518 {
519 object_thawer thawer (filename);
520
521 LOG (llevDebug, " loading treasure...\n");
522 load_treasures ();
523 LOG (llevDebug, " done\n arch-pass 2...\n");
524 second_arch_pass (thawer);
525 LOG (llevDebug, " done\n");
526#ifdef DEBUG
527 check_generators ();
530#endif 528#endif
531 {
532 object_thawer thawer (fp);
533 first_arch_pass (thawer);
534 } 529 }
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"); 530 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} 531}
566 532
567/* 533/*
568 * Creates and returns a new object which is a copy of the given archetype. 534 * Creates and returns a new object which is a copy of the given archetype.
569 * This function returns NULL on failure. 535 * This function returns NULL on failure.
… …
593object *create_singularity(const char *name) { 559object *create_singularity(const char *name) {
594 object *op; 560 object *op;
595 char buf[MAX_BUF]; 561 char buf[MAX_BUF];
596 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); 562 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name);
597 op = get_object(); 563 op = get_object();
598 op->name = add_string(buf); 564 op->name = op->name_pl = buf;
599 op->name_pl = add_string(buf);
600 SET_FLAG(op,FLAG_NO_PICK); 565 SET_FLAG(op,FLAG_NO_PICK);
601 return op; 566 return op;
602} 567}
603 568
604/* 569/*
… …
617/* 582/*
618 * Hash-function used by the arch-hashtable. 583 * Hash-function used by the arch-hashtable.
619 */ 584 */
620 585
621unsigned long 586unsigned long
622hasharch(const char *str, int tablesize) { 587hasharch(const char *str, int tablesize)
588{
623 unsigned long hash = 0; 589 unsigned long hash = 0;
624 int i = 0; 590 unsigned int i = 0;
625 const char *p; 591 const char *p;
626 592
627 /* use the one-at-a-time hash function, which supposedly is 593 /* use the one-at-a-time hash function, which supposedly is
628 * better than the djb2-like one used by perl5.005, but 594 * better than the djb2-like one used by perl5.005, but
629 * certainly is better then the bug used here before. 595 * certainly is better then the bug used here before.
630 * see http://burtleburtle.net/bob/hash/doobs.html 596 * see http://burtleburtle.net/bob/hash/doobs.html
631 */ 597 */
632 for (p = str; i < MAXSTRING && *p; p++, i++) { 598 for (p = str; i < MAXSTRING && *p; p++, i++)
599 {
633 hash += *p; 600 hash += *p;
634 hash += hash << 10; 601 hash += hash << 10;
635 hash ^= hash >> 6; 602 hash ^= hash >> 6;
636 } 603 }
604
637 hash += hash << 3; 605 hash += hash << 3;
638 hash ^= hash >> 11; 606 hash ^= hash >> 11;
639 hash += hash << 15; 607 hash += hash << 15;
608
640 return hash % tablesize; 609 return hash % tablesize;
641} 610}
642 611
643/* 612/*
644 * Finds, using the hashtable, which archetype matches the given name. 613 * Finds, using the hashtable, which archetype matches the given name.
645 * returns a pointer to the found archetype, otherwise NULL. 614 * returns a pointer to the found archetype, otherwise NULL.
… …
660 if(warn_archetypes) 629 if(warn_archetypes)
661 LOG(llevError,"Couldn't find archetype %s\n",name); 630 LOG(llevError,"Couldn't find archetype %s\n",name);
662 return NULL; 631 return NULL;
663 } 632 }
664 arch_cmp++; 633 arch_cmp++;
665 if (!strcmp(at->name,name)) 634 if (!strcmp((const char *)at->name,name))
666 return at; 635 return at;
667 if(++index>=ARCHTABLE) 636 if(++index>=ARCHTABLE)
668 index=0; 637 index=0;
669 } 638 }
670} 639}
… …
672/* 641/*
673 * Adds an archetype to the hashtable. 642 * Adds an archetype to the hashtable.
674 */ 643 */
675 644
676static void add_arch(archetype *at) { 645static void add_arch(archetype *at) {
677 int index=hasharch(at->name, ARCHTABLE),org_index=index; 646 int index=hasharch((const char *)at->name, ARCHTABLE),org_index=index;
678 for(;;) { 647 for(;;) {
679 if(arch_table[index]==NULL) { 648 if(arch_table[index]==NULL) {
680 arch_table[index]=at; 649 arch_table[index]=at;
681 return; 650 return;
682 } 651 }

Diff Legend

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