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.7 by root, Tue Aug 29 08:01:35 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.7 2006/08/29 08:01:35 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 if (at->name) free_string(at->name);
341 if (at->clone.name) free_string(at->clone.name); 341 if (at->clone.name) free_string(at->clone.name);
342 if (at->clone.name_pl) free_string(at->clone.name_pl); 342 if (at->clone.name_pl) free_string(at->clone.name_pl);
343 if (at->clone.title) free_string(at->clone.title); 343 if (at->clone.title) free_string(at->clone.title);
344 if (at->clone.race) free_string(at->clone.race); 344 if (at->clone.race) free_string(at->clone.race);
345 if (at->clone.slaying) free_string(at->clone.slaying); 345 if (at->clone.slaying) free_string(at->clone.slaying);
346 if (at->clone.msg) free_string(at->clone.msg); 346 if (at->clone.msg) free_string(at->clone.msg);
347 free(at); 347 free(at);
348 i++; 348 i++;
349 } 349 }
350 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f); 350 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f);
351} 351}
352 352
353/* 353/*
… …
388 388
389 op=get_object(); 389 op=get_object();
390 op->arch=first_archetype=at=get_archetype_struct(); 390 op->arch=first_archetype=at=get_archetype_struct();
391 391
392 while((i=load_object(fp,op,first,0))) { 392 while((i=load_object(fp,op,first,0))) {
393 first=0; 393 first=0;
394 copy_object(op,&at->clone); 394 copy_object(op,&at->clone);
395 at->clone.speed_left= (float) (-0.1); 395 at->clone.speed_left= (float) (-0.1);
396 /* 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
397 * 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.
398 * 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
399 * values for the body_used info, so when items are created 399 * values for the body_used info, so when items are created
400 * for it, they can be properly equipped. 400 * for it, they can be properly equipped.
401 */ 401 */
402 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));
403 403
404 switch(i) { 404 switch(i) {
405 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 */
406 if(last_more!=NULL) 406 if(last_more!=NULL)
407 last_more->next=at; 407 last_more->next=at;
408 if(head!=NULL) 408 if(head!=NULL)
409 head->next=at; 409 head->next=at;
410 head=last_more=at; 410 head=last_more=at;
411#if 0 411#if 0
412 if(!op->type) 412 if(!op->type)
413 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);
414#endif 414#endif
415 at->tail_x = 0; 415 at->tail_x = 0;
416 at->tail_y = 0; 416 at->tail_y = 0;
417 break; 417 break;
418 418
419 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 */
420 420
421 at->head=head; 421 at->head=head;
422 at->clone.head = &head->clone; 422 at->clone.head = &head->clone;
423 if(last_more!=NULL) { 423 if(last_more!=NULL) {
424 last_more->more=at; 424 last_more->more=at;
425 last_more->clone.more = &at->clone; 425 last_more->clone.more = &at->clone;
426 } 426 }
427 last_more=at; 427 last_more=at;
428 428
429 /* If this multipart image is still composed of individual small 429 /* If this multipart image is still composed of individual small
430 * 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,
431 * 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
432 * 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.
433 */ 433 */
434 if (at->clone.face != head->clone.face) { 434 if (at->clone.face != head->clone.face) {
435 head->tail_x = 0; 435 head->tail_x = 0;
436 head->tail_y = 0; 436 head->tail_y = 0;
437 } else { 437 } else {
438 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;
439 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;
440 } 440 }
441 break; 441 break;
442 442
443 } 443 }
444 444
445 at=get_archetype_struct(); 445 at=get_archetype_struct();
446 clear_object(op); 446 clear_object(op);
447 op->arch=at; 447 op->arch=at;
448 } 448 }
449 free(at); 449 free(at);
450 free_object(op); 450 free_object(op);
451} 451}
452 452
… …
461 461
462 while(fgets(buf,MAX_BUF,fp)!=NULL) { 462 while(fgets(buf,MAX_BUF,fp)!=NULL) {
463 if(*buf=='#') 463 if(*buf=='#')
464 continue; 464 continue;
465 if((argument=strchr(buf,' '))!=NULL) { 465 if((argument=strchr(buf,' '))!=NULL) {
466 *argument='\0',argument++; 466 *argument='\0',argument++;
467 cp = argument + strlen(argument)-1; 467 cp = argument + strlen(argument)-1;
468 while (isspace(*cp)) { 468 while (isspace(*cp)) {
469 *cp='\0'; 469 *cp='\0';
470 cp--; 470 cp--;
471 } 471 }
472 } 472 }
473 if(!strcmp("Object",variable)) { 473 if(!strcmp("Object",variable)) {
474 if((at=find_archetype(argument))==NULL) 474 if((at=find_archetype(argument))==NULL)
475 LOG(llevError,"Warning: failed to find arch %s\n",argument); 475 LOG(llevError,"Warning: failed to find arch %s\n",argument);
476 } else if(!strcmp("other_arch",variable)) { 476 } else if(!strcmp("other_arch",variable)) {
… …
518#endif 518#endif
519 519
520 sprintf(filename,"%s/%s",settings.datadir,settings.archetypes); 520 sprintf(filename,"%s/%s",settings.datadir,settings.archetypes);
521 LOG(llevDebug,"Reading archetypes from %s...\n",filename); 521 LOG(llevDebug,"Reading archetypes from %s...\n",filename);
522 if((fp=open_and_uncompress(filename,0,&comp))==NULL) { 522 if((fp=open_and_uncompress(filename,0,&comp))==NULL) {
523 LOG(llevError," Can't open archetype file.\n"); 523 LOG(llevError," Can't open archetype file.\n");
524 return; 524 return;
525 } 525 }
526 clear_archetable(); 526 clear_archetable();
527 LOG(llevDebug," arch-pass 1...\n"); 527 LOG(llevDebug," arch-pass 1...\n");
528#if TIME_ARCH_LOAD 528#if TIME_ARCH_LOAD
529 GETTIMEOFDAY(&tv1); 529 GETTIMEOFDAY(&tv1);
530#endif 530#endif
531 { 531 {
532 object_thawer thawer (fp); 532 object_thawer thawer (fp);
533 first_arch_pass (thawer); 533 first_arch_pass (thawer);
534 } 534 }
535#if TIME_ARCH_LOAD 535#if TIME_ARCH_LOAD
536 { int sec, usec; 536 { int sec, usec;
537 GETTIMEOFDAY(&tv2); 537 GETTIMEOFDAY(&tv2);
538 sec = tv2.tv_sec - tv1.tv_sec; 538 sec = tv2.tv_sec - tv1.tv_sec;
539 usec = tv2.tv_usec - tv1.tv_usec; 539 usec = tv2.tv_usec - tv1.tv_usec;
540 if (usec<0) { usec +=1000000; sec--;} 540 if (usec<0) { usec +=1000000; sec--;}
541 LOG(llevDebug,"Load took %d.%06d seconds\n", sec, usec); 541 LOG(llevDebug,"Load took %d.%06d seconds\n", sec, usec);
542 } 542 }
543#endif 543#endif
544 544
545 LOG(llevDebug," done\n"); 545 LOG(llevDebug," done\n");
546 init_archetable(); 546 init_archetable();

Diff Legend

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