| version 1.4 | | version 1.5 |
|---|
| | |
| t->keycode = 0; | | t->keycode = 0; |
| t->title = NULL; | | t->title = NULL; |
| t->arch_name = NULL; | | t->arch_name = NULL; |
| | | t->skill = NULL; |
| | | t->cauldron = NULL; |
| t->ingred = NULL; | | t->ingred = NULL; |
| t->next=NULL; | | t->next=NULL; |
| return t; | | return t; |
| | |
| } else if (!strncmp(cp, "arch",4)) { | | } else if (!strncmp(cp, "arch",4)) { |
| formula->arch_name = add_string(strchr(cp,' ')+1); | | formula->arch_name = add_string(strchr(cp,' ')+1); |
| (void) check_recipe(formula); | | (void) check_recipe(formula); |
| | | } else if (!strncmp(cp, "skill", 5)) { |
| | | formula->skill = add_string(strchr(cp, ' ')+1); |
| | | } else if (!strncmp(cp, "cauldron", 8)) { |
| | | formula->cauldron = add_string(strchr(cp, ' ')+1); |
| } else | | } else |
| LOG(llevError,"Unknown input in file %s: %s\n", filename, buf); | | LOG(llevError,"Unknown input in file %s: %s\n", filename, buf); |
| } | | } |
| | |
| fprintf(logfile,"\n"); | | fprintf(logfile,"\n"); |
| if(tval!=formula->index) fprintf(logfile, "WARNING:ingredient list and formula values not equal.\n"); | | if(tval!=formula->index) fprintf(logfile, "WARNING:ingredient list and formula values not equal.\n"); |
| } | | } |
| | | if (formula->skill != NULL) |
| | | fprintf(logfile, "\tSkill Required: %s", formula->skill); |
| | | if (formula->cauldron != NULL) |
| | | fprintf(logfile, "\tCauldron: %s\n", formula->cauldron); |
| } | | } |
| } else | | } else |
| LOG(llevError,"Can't find archetype:%s for formula %s\n", string, | | LOG(llevError,"Can't find archetype:%s for formula %s\n", string, |
| | |
| for (formula=fl->items; formula!=NULL; formula=next) { | | for (formula=fl->items; formula!=NULL; formula=next) { |
| next=formula->next; | | next=formula->next; |
| | | |
| if (formula->arch_name) free_string(formula->arch_name); | | if (formula->arch_name) |
| if (formula->title) free_string(formula->title); | | free_string(formula->arch_name); |
| | | if (formula->title) |
| | | free_string(formula->title); |
| | | if (formula->skill) |
| | | free_string(formula->skill); |
| | | if (formula->cauldron) |
| | | free_string(formula->cauldron); |
| for (lchar=formula->ingred; lchar; lchar=charnext) { | | for (lchar=formula->ingred; lchar; lchar=charnext) { |
| charnext=lchar->next; | | charnext=lchar->next; |
| free_string(lchar->name); | | free_string(lchar->name); |