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.4 by root, Sun Aug 27 16:15:11 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.4 2006/08/27 16:15:11 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
164 /* GROS - find_best_weapon_used_match and item_matched_string moved there */
165object *find_best_weapon_used_match(object *pl, const char *params)
166 {
167 object *tmp, *best=NULL;
168 int match_val=0,tmpmatch;
169
170 for (tmp=pl->inv; tmp; tmp=tmp->below) {
171 if (tmp->invisible) continue;
172 if ((tmpmatch=item_matched_string(pl, tmp, params))>match_val)
173 {
174 if ((QUERY_FLAG(tmp, FLAG_APPLIED))&&(tmp->type==WEAPON))
175 {
176 match_val=tmpmatch;
177 best=tmp;
178 };
179 }
180 }
181 return best;
182 }
183 163
184 /* This is a subset of the parse_id command. Basically, name can be 164 /* This is a subset of the parse_id command. Basically, name can be
185 * a string seperated lists of things to match, with certain keywords. 165 * a string seperated lists of things to match, with certain keywords.
186 * pl is the player (only needed to set count properly) 166 * pl is the player (only needed to set count properly)
187 * op is the item we are trying to match. Calling function takes care 167 * op is the item we are trying to match. Calling function takes care
… …
203 char *cp, local_name[MAX_BUF]; 183 char *cp, local_name[MAX_BUF];
204 int count,retval=0; 184 int count,retval=0;
205 strcpy(local_name, name); /* strtok is destructive to name */ 185 strcpy(local_name, name); /* strtok is destructive to name */
206 186
207 for (cp=strtok(local_name,","); cp; cp=strtok(NULL,",")) { 187 for (cp=strtok(local_name,","); cp; cp=strtok(NULL,",")) {
208 while (cp[0]==' ') ++cp; /* get rid of spaces */ 188 while (cp[0]==' ') ++cp; /* get rid of spaces */
209 189
210 /* LOG(llevDebug,"Trying to match %s\n", cp);*/ 190 /* LOG(llevDebug,"Trying to match %s\n", cp);*/
211 /* All is a very generic match - low match value */ 191 /* All is a very generic match - low match value */
212 if (!strcmp(cp,"all")) return 1; 192 if (!strcmp(cp,"all")) return 1;
213 193
214 /* unpaid is a little more specific */ 194 /* unpaid is a little more specific */
215 if (!strcmp(cp,"unpaid") && QUERY_FLAG(op,FLAG_UNPAID)) return 2; 195 if (!strcmp(cp,"unpaid") && QUERY_FLAG(op,FLAG_UNPAID)) return 2;
216 if (!strcmp(cp,"cursed") && QUERY_FLAG(op,FLAG_KNOWN_CURSED) && 196 if (!strcmp(cp,"cursed") && QUERY_FLAG(op,FLAG_KNOWN_CURSED) &&
217 (QUERY_FLAG(op,FLAG_CURSED) ||QUERY_FLAG(op,FLAG_DAMNED))) 197 (QUERY_FLAG(op,FLAG_CURSED) ||QUERY_FLAG(op,FLAG_DAMNED)))
218 return 2; 198 return 2;
219 199
220 if (!strcmp(cp,"unlocked") && !QUERY_FLAG(op, FLAG_INV_LOCKED)) 200 if (!strcmp(cp,"unlocked") && !QUERY_FLAG(op, FLAG_INV_LOCKED))
221 return 2; 201 return 2;
222 202
223 /* Allow for things like '100 arrows' */ 203 /* Allow for things like '100 arrows' */
224 if ((count=atoi(cp))!=0) { 204 if ((count=atoi(cp))!=0) {
225 cp=strchr(cp, ' '); 205 cp=strchr(cp, ' ');
226 while (cp && cp[0]==' ') ++cp; /* get rid of spaces */ 206 while (cp && cp[0]==' ') ++cp; /* get rid of spaces */
227 } 207 }
228 else { 208 else {
229 if (pl->type==PLAYER) 209 if (pl->type==PLAYER)
230 count=pl->contr->count; 210 count=pl->contr->count;
231 else 211 else
232 count = 0; 212 count = 0;
233 } 213 }
234 214
235 if (!cp || cp[0]=='\0' || count<0) return 0; 215 if (!cp || cp[0]=='\0' || count<0) return 0;
236 216
237 217
238 /* The code here should go from highest retval to lowest. That 218 /* The code here should go from highest retval to lowest. That
239 * 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
240 * 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
241 * 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
242 * match first, and work downward. 222 * match first, and work downward.
243 */ 223 */
244 if (!strcasecmp(cp,query_name(op))) retval=20; 224 if (!strcasecmp(cp,query_name(op))) retval=20;
245 else if (!strcasecmp(cp,query_short_name(op))) retval=18; 225 else if (!strcasecmp(cp,query_short_name(op))) retval=18;
246 else if (!strcasecmp(cp,query_base_name(op,0))) retval=16; 226 else if (!strcasecmp(cp,query_base_name(op,0))) retval=16;
247 else if (!strcasecmp(cp,query_base_name(op,1))) retval=16; 227 else if (!strcasecmp(cp,query_base_name(op,1))) retval=16;
248 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;
249 else if (!strncasecmp(cp,query_base_name(op,0), 229 else if (!strncasecmp(cp,query_base_name(op,0),
250 strlen(cp))) retval=14; 230 strlen(cp))) retval=14;
251 else if (!strncasecmp(cp,query_base_name(op,1), 231 else if (!strncasecmp(cp,query_base_name(op,1),
252 strlen(cp))) retval=14; 232 strlen(cp))) retval=14;
253 233
254 /* Do substring checks, so things like 'Str+1' will match. 234 /* Do substring checks, so things like 'Str+1' will match.
255 * retval of these should perhaps be lower - they are lower 235 * retval of these should perhaps be lower - they are lower
256 * then the specific strcasecmp aboves, but still higher than 236 * then the specific strcasecmp aboves, but still higher than
257 * some other match criteria. 237 * some other match criteria.
258 */ 238 */
259 else if (strstr(query_base_name(op,1), cp)) retval = 12; 239 else if (strstr(query_base_name(op,1), cp)) retval = 12;
260 else if (strstr(query_base_name(op,0), cp)) retval = 12; 240 else if (strstr(query_base_name(op,0), cp)) retval = 12;
261 else if (strstr(query_short_name(op), cp)) retval = 12; 241 else if (strstr(query_short_name(op), cp)) retval = 12;
262 242
263 /* Check against plural/non plural based on count. */ 243 /* Check against plural/non plural based on count. */
264 else if (count>1 && !strcasecmp(cp,op->name_pl)) { 244 else if (count>1 && !strcasecmp(cp,op->name_pl)) {
265 retval=6; 245 retval=6;
266 } 246 }
267 else if (count==1 && !strcasecmp(op->name,cp)) { 247 else if (count==1 && !strcasecmp(op->name,cp)) {
268 retval=6; 248 retval=6;
269 } 249 }
270 /* base name matched - not bad */ 250 /* base name matched - not bad */
271 else if (strcasecmp(cp,op->name)==0 && !count) retval=4; 251 else if (strcasecmp(cp,op->name)==0 && !count) retval=4;
272 /* Check for partial custom name, but give a real low priority */ 252 /* Check for partial custom name, but give a real low priority */
273 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;
274 254
275 if (retval) { 255 if (retval) {
276 if (pl->type == PLAYER) 256 if (pl->type == PLAYER)
277 pl->contr->count=count; 257 pl->contr->count=count;
278 return retval; 258 return retval;
279 } 259 }
280 } 260 }
281 return 0; 261 return 0;
282} 262}
283 263
284/* 264/*
… …
353{ 333{
354 archetype *at, *next; 334 archetype *at, *next;
355 int i=0,f=0; 335 int i=0,f=0;
356 336
357 for (at=first_archetype; at!=NULL; at=next) { 337 for (at=first_archetype; at!=NULL; at=next) {
358 if (at->more) next=at->more; 338 if (at->more) next=at->more;
359 else next=at->next; 339 else next=at->next;
360 if (at->name) free_string(at->name); 340
361 if (at->clone.name) free_string(at->clone.name); 341 delete at;
362 if (at->clone.name_pl) free_string(at->clone.name_pl); 342 i++;
363 if (at->clone.title) free_string(at->clone.title);
364 if (at->clone.race) free_string(at->clone.race);
365 if (at->clone.slaying) free_string(at->clone.slaying);
366 if (at->clone.msg) free_string(at->clone.msg);
367 free(at);
368 i++;
369 } 343 }
370 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f); 344 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f);
371} 345}
372 346
373/* 347/*
374 * Allocates, initialises and returns the pointer to an archetype structure. 348 * Allocates, initialises and returns the pointer to an archetype structure.
375 */ 349 */
376 350// TODO: should become constructor
377archetype *get_archetype_struct(void) { 351archetype *get_archetype_struct(void) {
378 archetype *arch; 352 archetype *arch;
379 353
380 arch=(archetype *)CALLOC(1,sizeof(archetype)); 354 arch = new archetype;
381 if(arch==NULL) 355
382 fatal(OUT_OF_MEMORY);
383 arch->next=NULL;
384 arch->name=NULL;
385 arch->clone.other_arch=NULL;
386 arch->clone.name=NULL;
387 arch->clone.name_pl=NULL;
388 arch->clone.title=NULL;
389 arch->clone.race=NULL;
390 arch->clone.slaying=NULL;
391 arch->clone.msg=NULL;
392 clear_object(&arch->clone); /* to initial state other also */ 356 clear_object (&arch->clone); /* to initial state other also */
393 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() */
394 SET_FLAG((&arch->clone), FLAG_REMOVED); /* doesn't copy these flags... */ 358 SET_FLAG (&arch->clone, FLAG_REMOVED); /* doesn't copy these flags... */
395 arch->head=NULL; 359
396 arch->more=NULL;
397 return arch; 360 return arch;
398} 361}
399 362
400/* 363/*
401 * Reads/parses the archetype-file, and copies into a linked list 364 * Reads/parses the archetype-file, and copies into a linked list
402 * of archetype-structures. 365 * of archetype-structures.
403 */ 366 */
404void first_arch_pass(FILE *fp) { 367void first_arch_pass(object_thawer &fp) {
405 object *op; 368 object *op;
406 archetype *at,*head=NULL,*last_more=NULL; 369 archetype *at,*head=NULL,*last_more=NULL;
407 int i,first=2; 370 int i;
408
409 object_thawer thawer;
410 371
411 op=get_object(); 372 op=get_object();
412 op->arch=first_archetype=at=get_archetype_struct(); 373 op->arch=first_archetype=at=get_archetype_struct();
413 374
414 while((i=load_object(fp,thawer,op,first,0))) { 375 while((i=load_object(fp,op,0))) {
415 first=0;
416 copy_object(op,&at->clone); 376 copy_object(op,&at->clone);
417 at->clone.speed_left= (float) (-0.1); 377 at->clone.speed_left= (float) (-0.1);
418 /* 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
419 * 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.
420 * 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
421 * values for the body_used info, so when items are created 381 * values for the body_used info, so when items are created
422 * for it, they can be properly equipped. 382 * for it, they can be properly equipped.
423 */ 383 */
424 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));
425 385
426 switch(i) { 386 switch(i) {
427 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 */
428 if(last_more!=NULL) 388 if(last_more!=NULL)
429 last_more->next=at; 389 last_more->next=at;
430 if(head!=NULL) 390 if(head!=NULL)
431 head->next=at; 391 head->next=at;
432 head=last_more=at; 392 head=last_more=at;
433#if 0 393#if 0
434 if(!op->type) 394 if(!op->type)
435 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);
436#endif 396#endif
437 at->tail_x = 0; 397 at->tail_x = 0;
438 at->tail_y = 0; 398 at->tail_y = 0;
439 break; 399 break;
440 400
441 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 */
442 402
443 at->head=head; 403 at->head=head;
444 at->clone.head = &head->clone; 404 at->clone.head = &head->clone;
445 if(last_more!=NULL) { 405 if(last_more!=NULL) {
446 last_more->more=at; 406 last_more->more=at;
447 last_more->clone.more = &at->clone; 407 last_more->clone.more = &at->clone;
448 } 408 }
449 last_more=at; 409 last_more=at;
450 410
451 /* If this multipart image is still composed of individual small 411 /* If this multipart image is still composed of individual small
452 * 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,
453 * 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
454 * 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.
455 */ 415 */
456 if (at->clone.face != head->clone.face) { 416 if (at->clone.face != head->clone.face) {
457 head->tail_x = 0; 417 head->tail_x = 0;
458 head->tail_y = 0; 418 head->tail_y = 0;
459 } else { 419 } else {
460 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;
461 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;
462 } 422 }
463 break; 423 break;
464 424
465 } 425 }
466 426
467 at=get_archetype_struct(); 427 at=get_archetype_struct();
468 clear_object(op); 428 clear_object(op);
469 op->arch=at; 429 op->arch=at;
470 } 430 }
471 free(at); 431
432 delete at;
472 free_object(op); 433 free_object(op);
473} 434}
474 435
475/* 436/*
476 * Reads the archetype file once more, and links all pointers between 437 * Reads the archetype file once more, and links all pointers between
477 * archetypes. 438 * archetypes.
478 */ 439 */
479 440
480void second_arch_pass(FILE *fp) { 441void second_arch_pass(object_thawer &thawer) {
481 char buf[MAX_BUF],*variable=buf,*argument,*cp; 442 char buf[MAX_BUF],*variable=buf,*argument,*cp;
482 archetype *at=NULL,*other; 443 archetype *at=NULL,*other;
483 444
484 while(fgets(buf,MAX_BUF,fp)!=NULL) { 445 while(fgets(buf,MAX_BUF,thawer)!=NULL) {
485 if(*buf=='#') 446 if(*buf=='#')
486 continue; 447 continue;
487 if((argument=strchr(buf,' '))!=NULL) { 448 if((argument=strchr(buf,' '))!=NULL) {
488 *argument='\0',argument++; 449 *argument='\0',argument++;
489 cp = argument + strlen(argument)-1; 450 cp = argument + strlen(argument)-1;
490 while (isspace(*cp)) { 451 while (isspace(*cp)) {
491 *cp='\0'; 452 *cp='\0';
492 cp--; 453 cp--;
493 } 454 }
494 } 455 }
495 if(!strcmp("Object",variable)) { 456 if(!strcmp("Object",variable)) {
496 if((at=find_archetype(argument))==NULL) 457 if((at=find_archetype(argument))==NULL)
497 LOG(llevError,"Warning: failed to find arch %s\n",argument); 458 LOG(llevError,"Warning: failed to find arch %s\n",argument);
498 } else if(!strcmp("other_arch",variable)) { 459 } else if(!strcmp("other_arch",variable)) {
… …
504 } 465 }
505 } else if(!strcmp("randomitems",variable)) { 466 } else if(!strcmp("randomitems",variable)) {
506 if(at!=NULL) { 467 if(at!=NULL) {
507 treasurelist *tl=find_treasurelist(argument); 468 treasurelist *tl=find_treasurelist(argument);
508 if(tl==NULL) 469 if(tl==NULL)
509 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);
510 else 471 else
511 at->clone.randomitems=tl; 472 at->clone.randomitems=tl;
512 } 473 }
513 } 474 }
514 } 475 }
… …
517#ifdef DEBUG 478#ifdef DEBUG
518void check_generators(void) { 479void check_generators(void) {
519 archetype *at; 480 archetype *at;
520 for(at=first_archetype;at!=NULL;at=at->next) 481 for(at=first_archetype;at!=NULL;at=at->next)
521 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)
522 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);
523 at->name);
524} 484}
525#endif 485#endif
526 486
527/* 487/*
528 * First initialises the archtype hash-table (init_archetable()). 488 * First initialises the archtype hash-table (init_archetable()).
529 * 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
530 * functions). 490 * functions).
531 * Then initialises treasures by calling load_treasures(). 491 * Then initialises treasures by calling load_treasures().
532 */ 492 */
533 493
494void
534void load_archetypes(void) { 495load_archetypes (void)
535 FILE *fp; 496{
536 char filename[MAX_BUF]; 497 char filename[MAX_BUF];
537 int comp; 498 int comp;
538#if TIME_ARCH_LOAD 499#if TIME_ARCH_LOAD
539 struct timeval tv1,tv2; 500 struct timeval tv1, tv2;
540#endif 501#endif
541 502
542 sprintf(filename,"%s/%s",settings.datadir,settings.archetypes); 503 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
543 LOG(llevDebug,"Reading archetypes from %s...\n",filename); 504 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
544 if((fp=open_and_uncompress(filename,0,&comp))==NULL) { 505
545 LOG(llevError," Can't open archetype file.\n"); 506 {
546 return; 507 object_thawer thawer (filename);
547 } 508
548 clear_archetable(); 509 clear_archetable ();
549 LOG(llevDebug," arch-pass 1...\n"); 510 LOG (llevDebug, " arch-pass 1...\n");
550#if TIME_ARCH_LOAD 511 first_arch_pass (thawer);
551 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 ();
552#endif 528#endif
553 first_arch_pass(fp); 529 }
554#if TIME_ARCH_LOAD
555 { int sec, usec;
556 GETTIMEOFDAY(&tv2);
557 sec = tv2.tv_sec - tv1.tv_sec;
558 usec = tv2.tv_usec - tv1.tv_usec;
559 if (usec<0) { usec +=1000000; sec--;}
560 LOG(llevDebug,"Load took %d.%06d seconds\n", sec, usec);
561 }
562#endif
563
564 LOG(llevDebug," done\n"); 530 LOG (llevDebug, " done\n");
565 init_archetable();
566 warn_archetypes=1;
567
568 /* do a close and reopen instead of a rewind - necessary in case the
569 * file has been compressed.
570 */
571 close_and_delete(fp, comp);
572 fp=open_and_uncompress(filename,0,&comp);
573
574 LOG(llevDebug," loading treasure...\n");
575 load_treasures();
576 LOG(llevDebug," done\n arch-pass 2...\n");
577 second_arch_pass(fp);
578 LOG(llevDebug," done\n");
579#ifdef DEBUG
580 check_generators();
581#endif
582 close_and_delete(fp, comp);
583 LOG(llevDebug," done\n");
584} 531}
585 532
586/* 533/*
587 * 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.
588 * This function returns NULL on failure. 535 * This function returns NULL on failure.
… …
612object *create_singularity(const char *name) { 559object *create_singularity(const char *name) {
613 object *op; 560 object *op;
614 char buf[MAX_BUF]; 561 char buf[MAX_BUF];
615 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); 562 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name);
616 op = get_object(); 563 op = get_object();
617 op->name = add_string(buf); 564 op->name = op->name_pl = buf;
618 op->name_pl = add_string(buf);
619 SET_FLAG(op,FLAG_NO_PICK); 565 SET_FLAG(op,FLAG_NO_PICK);
620 return op; 566 return op;
621} 567}
622 568
623/* 569/*
… …
636/* 582/*
637 * Hash-function used by the arch-hashtable. 583 * Hash-function used by the arch-hashtable.
638 */ 584 */
639 585
640unsigned long 586unsigned long
641hasharch(const char *str, int tablesize) { 587hasharch(const char *str, int tablesize)
588{
642 unsigned long hash = 0; 589 unsigned long hash = 0;
643 int i = 0; 590 unsigned int i = 0;
644 const char *p; 591 const char *p;
645 592
646 /* use the one-at-a-time hash function, which supposedly is 593 /* use the one-at-a-time hash function, which supposedly is
647 * better than the djb2-like one used by perl5.005, but 594 * better than the djb2-like one used by perl5.005, but
648 * certainly is better then the bug used here before. 595 * certainly is better then the bug used here before.
649 * see http://burtleburtle.net/bob/hash/doobs.html 596 * see http://burtleburtle.net/bob/hash/doobs.html
650 */ 597 */
651 for (p = str; i < MAXSTRING && *p; p++, i++) { 598 for (p = str; i < MAXSTRING && *p; p++, i++)
599 {
652 hash += *p; 600 hash += *p;
653 hash += hash << 10; 601 hash += hash << 10;
654 hash ^= hash >> 6; 602 hash ^= hash >> 6;
655 } 603 }
604
656 hash += hash << 3; 605 hash += hash << 3;
657 hash ^= hash >> 11; 606 hash ^= hash >> 11;
658 hash += hash << 15; 607 hash += hash << 15;
608
659 return hash % tablesize; 609 return hash % tablesize;
660} 610}
661 611
662/* 612/*
663 * Finds, using the hashtable, which archetype matches the given name. 613 * Finds, using the hashtable, which archetype matches the given name.
664 * returns a pointer to the found archetype, otherwise NULL. 614 * returns a pointer to the found archetype, otherwise NULL.
… …
679 if(warn_archetypes) 629 if(warn_archetypes)
680 LOG(llevError,"Couldn't find archetype %s\n",name); 630 LOG(llevError,"Couldn't find archetype %s\n",name);
681 return NULL; 631 return NULL;
682 } 632 }
683 arch_cmp++; 633 arch_cmp++;
684 if (!strcmp(at->name,name)) 634 if (!strcmp((const char *)at->name,name))
685 return at; 635 return at;
686 if(++index>=ARCHTABLE) 636 if(++index>=ARCHTABLE)
687 index=0; 637 index=0;
688 } 638 }
689} 639}
… …
691/* 641/*
692 * Adds an archetype to the hashtable. 642 * Adds an archetype to the hashtable.
693 */ 643 */
694 644
695static void add_arch(archetype *at) { 645static void add_arch(archetype *at) {
696 int index=hasharch(at->name, ARCHTABLE),org_index=index; 646 int index=hasharch((const char *)at->name, ARCHTABLE),org_index=index;
697 for(;;) { 647 for(;;) {
698 if(arch_table[index]==NULL) { 648 if(arch_table[index]==NULL) {
699 arch_table[index]=at; 649 arch_table[index]=at;
700 return; 650 return;
701 } 651 }

Diff Legend

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