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.3 by root, Sat Aug 26 23:36:28 2006 UTC vs.
Revision 1.8 by root, Wed Aug 30 06:06:26 2006 UTC

1/* 1/*
2 * static char *rcsid_arch_c = 2 * static char *rcsid_arch_c =
3 * "$Id: arch.C,v 1.3 2006/08/26 23:36:28 root Exp $"; 3 * "$Id: arch.C,v 1.8 2006/08/30 06:06:26 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 if (at->name) free_string(at->name);
361 if (at->clone.name) free_string(at->clone.name); 341 if (at->clone.name) free_string(at->clone.name);
362 if (at->clone.name_pl) free_string(at->clone.name_pl); 342 if (at->clone.name_pl) free_string(at->clone.name_pl);
363 if (at->clone.title) free_string(at->clone.title); 343 if (at->clone.title) free_string(at->clone.title);
364 if (at->clone.race) free_string(at->clone.race); 344 if (at->clone.race) free_string(at->clone.race);
365 if (at->clone.slaying) free_string(at->clone.slaying); 345 if (at->clone.slaying) free_string(at->clone.slaying);
366 if (at->clone.msg) free_string(at->clone.msg); 346 if (at->clone.msg) free_string(at->clone.msg);
367 free(at); 347 free(at);
368 i++; 348 i++;
369 } 349 }
370 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f); 350 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f);
371} 351}
372 352
373/* 353/*
… …
399 379
400/* 380/*
401 * Reads/parses the archetype-file, and copies into a linked list 381 * Reads/parses the archetype-file, and copies into a linked list
402 * of archetype-structures. 382 * of archetype-structures.
403 */ 383 */
404void first_arch_pass(FILE *fp) { 384void first_arch_pass(object_thawer &fp) {
405 object *op; 385 object *op;
406 archetype *at,*head=NULL,*last_more=NULL; 386 archetype *at,*head=NULL,*last_more=NULL;
407 int i,first=2; 387 int i,first=2;
408 388
409 op=get_object(); 389 op=get_object();
410 op->arch=first_archetype=at=get_archetype_struct(); 390 op->arch=first_archetype=at=get_archetype_struct();
411 391
412 while((i=load_object(fp,op,first,0))) { 392 while((i=load_object(fp,op,first,0))) {
413 first=0; 393 first=0;
414 copy_object(op,&at->clone); 394 copy_object(op,&at->clone);
415 at->clone.speed_left= (float) (-0.1); 395 at->clone.speed_left= (float) (-0.1);
416 /* copy the body_info to the body_used - this is only really 396 /* copy the body_info to the body_used - this is only really
417 * need for monsters, but doesn't hurt to do it for everything. 397 * need for monsters, but doesn't hurt to do it for everything.
418 * by doing so, when a monster is created, it has good starting 398 * by doing so, when a monster is created, it has good starting
419 * values for the body_used info, so when items are created 399 * values for the body_used info, so when items are created
420 * for it, they can be properly equipped. 400 * for it, they can be properly equipped.
421 */ 401 */
422 memcpy(&at->clone.body_used, &op->body_info, sizeof(op->body_info)); 402 memcpy(&at->clone.body_used, &op->body_info, sizeof(op->body_info));
423 403
424 switch(i) { 404 switch(i) {
425 case LL_NORMAL: /* A new archetype, just link it with the previous */ 405 case LL_NORMAL: /* A new archetype, just link it with the previous */
426 if(last_more!=NULL) 406 if(last_more!=NULL)
427 last_more->next=at; 407 last_more->next=at;
428 if(head!=NULL) 408 if(head!=NULL)
429 head->next=at; 409 head->next=at;
430 head=last_more=at; 410 head=last_more=at;
431#if 0 411#if 0
432 if(!op->type) 412 if(!op->type)
433 LOG(llevDebug," WARNING: Archetype %s has no type info!\n", op->arch->name); 413 LOG(llevDebug," WARNING: Archetype %s has no type info!\n", op->arch->name);
434#endif 414#endif
435 at->tail_x = 0; 415 at->tail_x = 0;
436 at->tail_y = 0; 416 at->tail_y = 0;
437 break; 417 break;
438 418
439 case LL_MORE: /* Another part of the previous archetype, link it correctly */ 419 case LL_MORE: /* Another part of the previous archetype, link it correctly */
440 420
441 at->head=head; 421 at->head=head;
442 at->clone.head = &head->clone; 422 at->clone.head = &head->clone;
443 if(last_more!=NULL) { 423 if(last_more!=NULL) {
444 last_more->more=at; 424 last_more->more=at;
445 last_more->clone.more = &at->clone; 425 last_more->clone.more = &at->clone;
446 } 426 }
447 last_more=at; 427 last_more=at;
448 428
449 /* If this multipart image is still composed of individual small 429 /* If this multipart image is still composed of individual small
450 * images, don't set the tail_.. values. We can't use them anyways, 430 * images, don't set the tail_.. values. We can't use them anyways,
451 * and setting these to zero makes the map sending to the client much 431 * and setting these to zero makes the map sending to the client much
452 * easier as just looking at the head, we know what to do. 432 * easier as just looking at the head, we know what to do.
453 */ 433 */
454 if (at->clone.face != head->clone.face) { 434 if (at->clone.face != head->clone.face) {
455 head->tail_x = 0; 435 head->tail_x = 0;
456 head->tail_y = 0; 436 head->tail_y = 0;
457 } else { 437 } else {
458 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 438 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
459 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y; 439 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
460 } 440 }
461 break; 441 break;
462 442
463 } 443 }
464 444
465 at=get_archetype_struct(); 445 at=get_archetype_struct();
466 clear_object(op); 446 clear_object(op);
467 op->arch=at; 447 op->arch=at;
468 } 448 }
469 free(at); 449 free(at);
470 free_object(op); 450 free_object(op);
471} 451}
472 452
… …
481 461
482 while(fgets(buf,MAX_BUF,fp)!=NULL) { 462 while(fgets(buf,MAX_BUF,fp)!=NULL) {
483 if(*buf=='#') 463 if(*buf=='#')
484 continue; 464 continue;
485 if((argument=strchr(buf,' '))!=NULL) { 465 if((argument=strchr(buf,' '))!=NULL) {
486 *argument='\0',argument++; 466 *argument='\0',argument++;
487 cp = argument + strlen(argument)-1; 467 cp = argument + strlen(argument)-1;
488 while (isspace(*cp)) { 468 while (isspace(*cp)) {
489 *cp='\0'; 469 *cp='\0';
490 cp--; 470 cp--;
491 } 471 }
492 } 472 }
493 if(!strcmp("Object",variable)) { 473 if(!strcmp("Object",variable)) {
494 if((at=find_archetype(argument))==NULL) 474 if((at=find_archetype(argument))==NULL)
495 LOG(llevError,"Warning: failed to find arch %s\n",argument); 475 LOG(llevError,"Warning: failed to find arch %s\n",argument);
496 } else if(!strcmp("other_arch",variable)) { 476 } else if(!strcmp("other_arch",variable)) {
… …
527 * Reads and parses the archetype file (with the first and second-pass 507 * Reads and parses the archetype file (with the first and second-pass
528 * functions). 508 * functions).
529 * Then initialises treasures by calling load_treasures(). 509 * Then initialises treasures by calling load_treasures().
530 */ 510 */
531 511
512void
532void load_archetypes(void) { 513load_archetypes (void)
533 FILE *fp; 514{
534 char filename[MAX_BUF]; 515 char filename[MAX_BUF];
535 int comp; 516 int comp;
536#if TIME_ARCH_LOAD 517#if TIME_ARCH_LOAD
537 struct timeval tv1,tv2; 518 struct timeval tv1, tv2;
538#endif 519#endif
539 520
540 sprintf(filename,"%s/%s",settings.datadir,settings.archetypes); 521 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
541 LOG(llevDebug,"Reading archetypes from %s...\n",filename); 522 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
542 if((fp=open_and_uncompress(filename,0,&comp))==NULL) { 523
543 LOG(llevError," Can't open archetype file.\n"); 524 {
544 return; 525 object_thawer thawer (filename);
545 } 526
546 clear_archetable(); 527 clear_archetable ();
547 LOG(llevDebug," arch-pass 1...\n"); 528 LOG (llevDebug, " arch-pass 1...\n");
548#if TIME_ARCH_LOAD 529 first_arch_pass (thawer);
549 GETTIMEOFDAY(&tv1); 530 LOG (llevDebug, " done\n");
531
532 init_archetable ();
533 warn_archetypes = 1;
534 }
535
536 {
537 object_thawer thawer (filename);
538
539 LOG (llevDebug, " loading treasure...\n");
540 load_treasures ();
541 LOG (llevDebug, " done\n arch-pass 2...\n");
542 second_arch_pass (thawer);
543 LOG (llevDebug, " done\n");
544#ifdef DEBUG
545 check_generators ();
550#endif 546#endif
551 first_arch_pass(fp); 547 }
552#if TIME_ARCH_LOAD
553 { int sec, usec;
554 GETTIMEOFDAY(&tv2);
555 sec = tv2.tv_sec - tv1.tv_sec;
556 usec = tv2.tv_usec - tv1.tv_usec;
557 if (usec<0) { usec +=1000000; sec--;}
558 LOG(llevDebug,"Load took %d.%06d seconds\n", sec, usec);
559 }
560#endif
561
562 LOG(llevDebug," done\n"); 548 LOG (llevDebug, " done\n");
563 init_archetable();
564 warn_archetypes=1;
565
566 /* do a close and reopen instead of a rewind - necessary in case the
567 * file has been compressed.
568 */
569 close_and_delete(fp, comp);
570 fp=open_and_uncompress(filename,0,&comp);
571
572 LOG(llevDebug," loading treasure...\n");
573 load_treasures();
574 LOG(llevDebug," done\n arch-pass 2...\n");
575 second_arch_pass(fp);
576 LOG(llevDebug," done\n");
577#ifdef DEBUG
578 check_generators();
579#endif
580 close_and_delete(fp, comp);
581 LOG(llevDebug," done\n");
582} 549}
583 550
584/* 551/*
585 * Creates and returns a new object which is a copy of the given archetype. 552 * Creates and returns a new object which is a copy of the given archetype.
586 * This function returns NULL on failure. 553 * This function returns NULL on failure.

Diff Legend

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