ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/recipe.C
(Generate patch)

Comparing deliantra/server/common/recipe.C (file contents):
Revision 1.3 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.4 by elmex, Sun Sep 3 14:33:48 2006 UTC

… …
81 result = 1; 81 result = 1;
82 for (i = 0; i < rp->arch_names; i++) { 82 for (i = 0; i < rp->arch_names; i++) {
83 if (find_archetype(rp->arch_name[i]) != NULL) { 83 if (find_archetype(rp->arch_name[i]) != NULL) {
84 artifact *art = locate_recipe_artifact(rp, i); 84 artifact *art = locate_recipe_artifact(rp, i);
85 if (!art && strcmp(rp->title, "NONE") != 0) { 85 if (!art && strcmp(rp->title, "NONE") != 0) {
86 LOG(llevError,"\nWARNING: Formula %s of %s has no artifact.\n", rp->arch_name[i], rp->title); 86 LOG(llevError,"\nWARNING: Formula %s of %s has no artifact.\n", rp->arch_name[i], &rp->title);
87 result = 0; 87 result = 0;
88 } 88 }
89 } else { 89 } else {
90 LOG(llevError,"\nWARNING: Can't find archetype %s for formula %s\n", rp->arch_name[i], rp->title); 90 LOG(llevError,"\nWARNING: Can't find archetype %s for formula %s\n", rp->arch_name[i], &rp->title);
91 result = 0; 91 result = 0;
92 } 92 }
93 } 93 }
94 94
95 return result; 95 return result;
… …
207 for (formula=fl->items; formula!=NULL; formula=formula->next) 207 for (formula=fl->items; formula!=NULL; formula=formula->next)
208 for (check=formula->next; check!=NULL; check=check->next) 208 for (check=formula->next; check!=NULL; check=check->next)
209 if(check->index==formula->index) { 209 if(check->index==formula->index) {
210 LOG(llevError," ERROR: On %d ingred list: ", numb); 210 LOG(llevError," ERROR: On %d ingred list: ", numb);
211 LOG(llevError, "Formulae [%s] of %s and [%s] of %s have matching index id (%d)\n", 211 LOG(llevError, "Formulae [%s] of %s and [%s] of %s have matching index id (%d)\n",
212 formula->arch_name[0],formula->title,check->arch_name[0],check->title,formula->index); 212 formula->arch_name[0],&formula->title,check->arch_name[0],&check->title,formula->index);
213 } 213 }
214 numb++; 214 numb++;
215 } 215 }
216 216
217 LOG(llevDebug,"done.\n"); 217 LOG(llevDebug,"done.\n");
… …
238 for (i = 0; i < formula->arch_names; i++) { 238 for (i = 0; i < formula->arch_names; i++) {
239 const char *string = formula->arch_name[i]; 239 const char *string = formula->arch_name[i];
240 if(find_archetype(string)!=NULL) { 240 if(find_archetype(string)!=NULL) {
241 art = locate_recipe_artifact(formula, i); 241 art = locate_recipe_artifact(formula, i);
242 if (!art && strcmp(formula->title,"NONE")) 242 if (!art && strcmp(formula->title,"NONE"))
243 LOG(llevError,"Formula %s has no artifact\n",formula->title); 243 LOG(llevError,"Formula %s has no artifact\n",&formula->title);
244 else { 244 else {
245 if(strcmp(formula->title,"NONE")) 245 if(strcmp(formula->title,"NONE"))
246 sprintf(buf,"%s of %s",string,formula->title); 246 sprintf(buf,"%s of %s",string,&formula->title);
247 else 247 else
248 sprintf(buf,"%s",string); 248 sprintf(buf,"%s",string);
249 fprintf(logfile,"%-30s(%d) bookchance %3d ",buf,formula->index, 249 fprintf(logfile,"%-30s(%d) bookchance %3d ",buf,formula->index,
250 formula->chance); 250 formula->chance);
251 fprintf(logfile,"skill %s",formula->skill); 251 fprintf(logfile,"skill %s",&formula->skill);
252 fprintf(logfile,"\n"); 252 fprintf(logfile,"\n");
253 if (formula->ingred !=NULL) { 253 if (formula->ingred !=NULL) {
254 int nval=0,tval=0; 254 int nval=0,tval=0;
255 fprintf(logfile,"\tIngred: "); 255 fprintf(logfile,"\tIngred: ");
256 for (next=formula->ingred; next!=NULL; next=next->next) { 256 for (next=formula->ingred; next!=NULL; next=next->next) {
… …
260 } 260 }
261 fprintf(logfile,"\n"); 261 fprintf(logfile,"\n");
262 if(tval!=formula->index) fprintf(logfile, "WARNING:ingredient list and formula values not equal.\n"); 262 if(tval!=formula->index) fprintf(logfile, "WARNING:ingredient list and formula values not equal.\n");
263 } 263 }
264 if (formula->skill != NULL) 264 if (formula->skill != NULL)
265 fprintf(logfile, "\tSkill Required: %s", formula->skill); 265 fprintf(logfile, "\tSkill Required: %s", &formula->skill);
266 if (formula->cauldron != NULL) 266 if (formula->cauldron != NULL)
267 fprintf(logfile, "\tCauldron: %s\n", formula->cauldron); 267 fprintf(logfile, "\tCauldron: %s\n", &formula->cauldron);
268 fprintf(logfile, "\tDifficulty: %d\t Exp: %d\n", formula->diff, 268 fprintf(logfile, "\tDifficulty: %d\t Exp: %d\n", formula->diff,
269 formula->exp); 269 formula->exp);
270 } 270 }
271 } else 271 } else
272 LOG(llevError,"Can't find archetype:%s for formula %s\n", string, 272 LOG(llevError,"Can't find archetype:%s for formula %s\n", string,
273 formula->title); 273 &formula->title);
274 } 274 }
275 } 275 }
276 fprintf(logfile,"\n"); 276 fprintf(logfile,"\n");
277 fl = fl->next; 277 fl = fl->next;
278 num_ingred++; 278 num_ingred++;
… …
434 for (i = 0; i < formula->arch_names; i++) { 434 for (i = 0; i < formula->arch_names; i++) {
435 const char *string = formula->arch_name[i]; 435 const char *string = formula->arch_name[i];
436 if ((at = find_archetype (string)) != NULL) { 436 if ((at = find_archetype (string)) != NULL) {
437 art = locate_recipe_artifact (formula, i); 437 art = locate_recipe_artifact (formula, i);
438 if (!art && strcmp (formula->title,"NONE")) 438 if (!art && strcmp (formula->title,"NONE"))
439 LOG (llevError, "Formula %s has no artifact\n", formula->title); 439 LOG (llevError, "Formula %s has no artifact\n", &formula->title);
440 else 440 else
441 { 441 {
442 if (! strcmp (formula->title, "NONE")) 442 if (! strcmp (formula->title, "NONE"))
443 sprintf (buf, "%s", string); 443 sprintf (buf, "%s", string);
444 else 444 else
445 sprintf (buf, "%s of %s", string, formula->title); 445 sprintf (buf, "%s of %s", string, &formula->title);
446 fprintf (logfile, "\n%-40s bookchance %3d skill %s\n", 446 fprintf (logfile, "\n%-40s bookchance %3d skill %s\n",
447 buf, formula->chance, formula->skill); 447 buf, formula->chance, &(formula->skill));
448 if (formula->ingred !=NULL) 448 if (formula->ingred !=NULL)
449 { 449 {
450 tcost = 0; 450 tcost = 0;
451 for (next = formula->ingred; next != NULL; next = next->next) 451 for (next = formula->ingred; next != NULL; next = next->next)
452 { 452 {
… …
486 } 486 }
487 } 487 }
488 } 488 }
489 else 489 else
490 LOG(llevError, "Can't find archetype:%s for formula %s\n", string, 490 LOG(llevError, "Can't find archetype:%s for formula %s\n", string,
491 formula->title); 491 &formula->title);
492 } 492 }
493 } 493 }
494 fprintf (logfile,"\n"); 494 fprintf (logfile,"\n");
495 fl = fl->next; 495 fl = fl->next;
496 num_ingred++; 496 num_ingred++;

Diff Legend

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