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

Diff Legend

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