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.17 by root, Thu Feb 8 03:09:31 2007 UTC vs.
Revision 1.28 by root, Mon Oct 12 14:00:57 2009 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
21 *
22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */
24
1/* Basic stuff for use with the alchemy code. Clearly some of this stuff 25/* Basic stuff for use with the alchemy code. Clearly some of this stuff
2 * could go into server/alchemy, but I left it here just in case it proves 26 * could go into server/alchemy, but I left it here just in case it proves
3 * more generally useful. 27 * more generally useful.
4 * 28 *
5 * Nov 1995 - file created by b.t. thomas@astro.psu.edu 29 * Nov 1995 - file created by b.t. thomas@astro.psu.edu
… …
10 * Ingredients are just comma delimited list of archetype (or object) 34 * Ingredients are just comma delimited list of archetype (or object)
11 * names. 35 * names.
12 */ 36 */
13 37
14/* Example 'formula' entry in libdir/formulae: 38/* Example 'formula' entry in libdir/formulae:
15 * Object transparency 39 * object transparency
16 * chance 10 40 * chance 10
17 * ingred dust of beholdereye,gem 41 * ingred dust of beholdereye,gem
18 * arch potion_generic 42 * arch potion_generic
19 */ 43 */
20 44
… …
32{ 56{
33 recipelist *tl = new recipelist; 57 recipelist *tl = new recipelist;
34 58
35 tl->total_chance = 0; 59 tl->total_chance = 0;
36 tl->number = 0; 60 tl->number = 0;
37 tl->items = NULL; 61 tl->items = 0;
38 tl->next = NULL; 62 tl->next = 0;
63
39 return tl; 64 return tl;
40} 65}
41 66
42static recipe * 67static recipe *
43get_empty_formula (void) 68get_empty_formula (void)
… …
60 t->next = NULL; 85 t->next = NULL;
61 return t; 86 return t;
62} 87}
63 88
64/* get_formulalist() - returns pointer to the formula list */ 89/* get_formulalist() - returns pointer to the formula list */
65
66recipelist * 90recipelist *
67get_formulalist (int i) 91get_formulalist (int i)
68{ 92{
69 recipelist *fl = formulalist; 93 recipelist *fl = formulalist;
70 int number = i; 94 int number = i;
… …
73 { 97 {
74 if (!(fl = fl->next)) 98 if (!(fl = fl->next))
75 break; 99 break;
76 number--; 100 number--;
77 } 101 }
102
78 return fl; 103 return fl;
79} 104}
80 105
81/* check_recipe() - makes sure we actually have the requested artifact 106/* check_recipe() - makes sure we actually have the requested artifact
82 * and archetype. */ 107 * and archetype. */
83
84static int 108static int
85check_recipe (const recipe *rp) 109check_recipe (const recipe *rp)
86{ 110{
87 size_t i; 111 size_t i;
88 int result; 112 int result = 1;
89 113
90 result = 1;
91 for (i = 0; i < rp->arch_names; i++) 114 for (i = 0; i < rp->arch_names; i++)
92 { 115 {
93 if (archetype::find (rp->arch_name[i]) != NULL) 116 if (archetype::find (rp->arch_name[i]))
94 { 117 {
95 artifact *art = locate_recipe_artifact (rp, i); 118 artifact *art = locate_recipe_artifact (rp, i);
96 119
97 if (!art && strcmp (rp->title, "NONE") != 0) 120 if (!art && rp->title != shstr_NONE)
98 { 121 {
99 LOG (llevError, "WARNING: Formula %s of %s has no artifact.\n", rp->arch_name[i], &rp->title); 122 LOG (llevError, "WARNING: Formula %s of %s has no artifact.\n", rp->arch_name[i], &rp->title);
100 result = 0; 123 result = 0;
101 } 124 }
102 } 125 }
… …
108 } 131 }
109 132
110 return result; 133 return result;
111} 134}
112 135
113
114/* 136/*
115 * init_formulae() - Builds up the lists of formula from the file in 137 * init_formulae() - Builds up the lists of formula from the file in
116 * the libdir. -b.t. 138 * the libdir. -b.t.
117 */ 139 */
118
119void 140void
120init_formulae (void) 141init_formulae (void)
121{ 142{
122 static int has_been_done = 0; 143 static int has_been_done = 0;
123 FILE *fp; 144 FILE *fp;
… …
151 *cp = '\0'; 172 *cp = '\0';
152 cp = buf; 173 cp = buf;
153 while (*cp == ' ') /* Skip blanks */ 174 while (*cp == ' ') /* Skip blanks */
154 cp++; 175 cp++;
155 176
156 if (!strncmp (cp, "Object", 6) || !strncmp (cp, "object", 6)) 177 if (!strncmp (cp, "object", 6))
157 { 178 {
158 formula = get_empty_formula (); 179 formula = get_empty_formula ();
159 formula->title = strchr (cp, ' ') + 1; 180 formula->title = strchr (cp, ' ') + 1;
160 } 181 }
161 else if (!strncmp (cp, "keycode", 7)) 182 else if (!strncmp (cp, "keycode", 7))
162 {
163 formula->keycode = strchr (cp, ' ') + 1; 183 formula->keycode = strchr (cp, ' ') + 1;
164 }
165 else if (sscanf (cp, "trans %d", &value)) 184 else if (sscanf (cp, "trans %d", &value))
166 {
167 formula->transmute = (uint16) value; 185 formula->transmute = (uint16) value;
168 }
169 else if (sscanf (cp, "yield %d", &value)) 186 else if (sscanf (cp, "yield %d", &value))
170 {
171 formula->yield = (uint16) value; 187 formula->yield = (uint16) value;
172 }
173 else if (sscanf (cp, "chance %d", &value)) 188 else if (sscanf (cp, "chance %d", &value))
174 {
175 formula->chance = (uint16) value; 189 formula->chance = (uint16) value;
176 }
177 else if (sscanf (cp, "exp %d", &value)) 190 else if (sscanf (cp, "exp %d", &value))
178 {
179 formula->exp = (uint16) value; 191 formula->exp = (uint16) value;
180 }
181 else if (sscanf (cp, "diff %d", &value)) 192 else if (sscanf (cp, "diff %d", &value))
182 {
183 formula->diff = (uint16) value; 193 formula->diff = (uint16) value;
184 }
185 else if (!strncmp (cp, "ingred", 6)) 194 else if (!strncmp (cp, "ingred", 6))
186 { 195 {
187 int numb_ingred = 1; 196 int numb_ingred = 1;
188 197
189 cp = strchr (cp, ' ') + 1; 198 cp = strchr (cp, ' ') + 1;
… …
192 if ((next = strchr (cp, ',')) != NULL) 201 if ((next = strchr (cp, ',')) != NULL)
193 { 202 {
194 *(next++) = '\0'; 203 *(next++) = '\0';
195 numb_ingred++; 204 numb_ingred++;
196 } 205 }
206
197 tmp = new linked_char; 207 tmp = new linked_char;
198 208
199 tmp->name = cp; 209 tmp->name = cp;
200 tmp->next = formula->ingred; 210 tmp->next = formula->ingred;
201 formula->ingred = tmp; 211 formula->ingred = tmp;
… …
204 * quickly for the right recipe. 214 * quickly for the right recipe.
205 */ 215 */
206 formula->index += strtoint (cp); 216 formula->index += strtoint (cp);
207 } 217 }
208 while ((cp = next) != NULL); 218 while ((cp = next) != NULL);
219
209 /* now find the correct (# of ingred ordered) formulalist */ 220 /* now find the correct (# of ingred ordered) formulalist */
210 fl = formulalist; 221 fl = formulalist;
211 while (numb_ingred != 1) 222 while (numb_ingred != 1)
212 { 223 {
213 if (!fl->next) 224 if (!fl->next)
214 fl->next = init_recipelist (); 225 fl->next = init_recipelist ();
226
215 fl = fl->next; 227 fl = fl->next;
216 numb_ingred--; 228 numb_ingred--;
217 } 229 }
230
218 fl->total_chance += formula->chance; 231 fl->total_chance += formula->chance;
219 fl->number++; 232 fl->number++;
220 formula->next = fl->items; 233 formula->next = fl->items;
221 fl->items = formula; 234 fl->items = formula;
222 } 235 }
… …
224 { 237 {
225 build_stringlist (strchr (cp, ' ') + 1, &formula->arch_name, &formula->arch_names); 238 build_stringlist (strchr (cp, ' ') + 1, &formula->arch_name, &formula->arch_names);
226 check_recipe (formula); 239 check_recipe (formula);
227 } 240 }
228 else if (!strncmp (cp, "skill", 5)) 241 else if (!strncmp (cp, "skill", 5))
229 {
230 formula->skill = strchr (cp, ' ') + 1; 242 formula->skill = strchr (cp, ' ') + 1;
231 }
232 else if (!strncmp (cp, "cauldron", 8)) 243 else if (!strncmp (cp, "cauldron", 8))
233 {
234 formula->cauldron = strchr (cp, ' ') + 1; 244 formula->cauldron = strchr (cp, ' ') + 1;
235 }
236 else 245 else
237 LOG (llevError, "Unknown input in file %s: %s\n", filename, buf); 246 LOG (llevError, "Unknown input in file %s: %s\n", filename, buf);
238 } 247 }
248
239 LOG (llevDebug, "done.\n"); 249 LOG (llevDebug, "done.\n");
240 close_and_delete (fp, comp); 250 close_and_delete (fp, comp);
241 /* Lastly, lets check for problems in formula we got */ 251 /* Lastly, lets check for problems in formula we got */
242 check_formulae (); 252 check_formulae ();
243} 253}
… …
256 recipe *check, *formula; 266 recipe *check, *formula;
257 int numb = 1; 267 int numb = 1;
258 268
259 LOG (llevDebug, "Checking formulae lists...\n"); 269 LOG (llevDebug, "Checking formulae lists...\n");
260 270
261 for (fl = formulalist; fl != NULL; fl = fl->next) 271 for (fl = formulalist; fl; fl = fl->next)
262 { 272 {
263 for (formula = fl->items; formula != NULL; formula = formula->next) 273 for (formula = fl->items; formula; formula = formula->next)
264 for (check = formula->next; check != NULL; check = check->next) 274 for (check = formula->next; check; check = check->next)
265 if (check->index == formula->index) 275 if (check->index == formula->index)
266 { 276 {
267 LOG (llevError, " ERROR: On %d ingred list: ", numb); 277 LOG (llevError, " ERROR: On %d ingred list: ", numb);
268 LOG (llevError, "Formulae [%s] of %s and [%s] of %s have matching index id (%d)\n", 278 LOG (llevError, "Formulae [%s] of %s and [%s] of %s have matching index id (%d)\n",
269 formula->arch_name[0], &formula->title, check->arch_name[0], &check->title, formula->index); 279 formula->arch_name[0], &formula->title, check->arch_name[0], &check->title, formula->index);
… …
273 283
274 LOG (llevDebug, "done.\n"); 284 LOG (llevDebug, "done.\n");
275 285
276} 286}
277 287
278/* Borrowed (again) from the artifacts code for this */
279
280void
281dump_alchemy (void)
282{
283 recipelist *fl = formulalist;
284 recipe *formula = NULL;
285 linked_char *next;
286 int num_ingred = 1;
287
288 fprintf (logfile, "\n");
289 while (fl)
290 {
291 fprintf (logfile, "\n Formulae with %d ingredient%s %d Formulae with total_chance=%d\n",
292 num_ingred, num_ingred > 1 ? "s." : ".", fl->number, fl->total_chance);
293 for (formula = fl->items; formula != NULL; formula = formula->next)
294 {
295 artifact *art = NULL;
296 char buf[MAX_BUF];
297 size_t i;
298
299 for (i = 0; i < formula->arch_names; i++)
300 {
301 const char *string = formula->arch_name[i];
302
303 if (archetype::find (string) != NULL)
304 {
305 art = locate_recipe_artifact (formula, i);
306 if (!art && strcmp (formula->title, "NONE"))
307 LOG (llevError, "Formula %s has no artifact\n", &formula->title);
308 else
309 {
310 if (strcmp (formula->title, "NONE"))
311 sprintf (buf, "%s of %s", string, &formula->title);
312 else
313 sprintf (buf, "%s", string);
314 fprintf (logfile, "%-30s(%d) bookchance %3d ", buf, formula->index, formula->chance);
315 fprintf (logfile, "skill %s", &formula->skill);
316 fprintf (logfile, "\n");
317 if (formula->ingred != NULL)
318 {
319 int nval = 0, tval = 0;
320
321 fprintf (logfile, "\tIngred: ");
322 for (next = formula->ingred; next != NULL; next = next->next)
323 {
324 if (nval != 0)
325 fprintf (logfile, ",");
326 fprintf (logfile, "%s(%d)", &next->name, (nval = strtoint (next->name)));
327 tval += nval;
328 }
329 fprintf (logfile, "\n");
330 if (tval != formula->index)
331 fprintf (logfile, "WARNING:ingredient list and formula values not equal.\n");
332 }
333 if (formula->skill != NULL)
334 fprintf (logfile, "\tSkill Required: %s", &formula->skill);
335 if (formula->cauldron != NULL)
336 fprintf (logfile, "\tCauldron: %s\n", &formula->cauldron);
337 fprintf (logfile, "\tDifficulty: %d\t Exp: %d\n", formula->diff, formula->exp);
338 }
339 }
340 else
341 LOG (llevError, "Can't find archetype:%s for formula %s\n", string, &formula->title);
342 }
343 }
344 fprintf (logfile, "\n");
345 fl = fl->next;
346 num_ingred++;
347 }
348}
349
350/* Find a treasure with a matching name. The 'depth' parameter is 288/* Find a treasure with a matching name. The 'depth' parameter is
351 * only there to prevent infinite loops in treasure lists (a list 289 * only there to prevent infinite loops in treasure lists (a list
352 * referencing another list pointing back to the first one). */ 290 * referencing another list pointing back to the first one). */
353archetype * 291archetype *
354find_treasure_by_name (const treasure *t, const char *name, int depth) 292find_treasure_by_name (const treasure *t, const char *name, int depth)
355{ 293{
356 treasurelist *tl;
357 archetype *at;
358
359 if (depth > 10) 294 if (depth > 10)
360 return 0; 295 return 0;
361 296
362 while (t) 297 while (t)
363 { 298 {
364 if (t->name) 299 if (t->name)
365 { 300 {
366 tl = find_treasurelist (t->name); 301 if (treasurelist *tl = treasurelist::find (t->name))
367
368 if (tl) 302 if (tl->items)
369 {
370 at = find_treasure_by_name (tl->items, name, depth + 1); 303 if (archetype *at = find_treasure_by_name (tl->items, name, depth + 1))
371
372 if (at)
373 return at; 304 return at;
374 }
375 } 305 }
376 else 306 else
377 { 307 {
378 if (t->item && !strcasecmp (t->item->clone.name, name)) 308 if (t->item && !strcasecmp (t->item->object::name, name))
379 return t->item; 309 return t->item;
380 } 310 }
381 311
382 if (t->next_yes) 312 if (t->next_yes)
383 {
384 at = find_treasure_by_name (t->next_yes, name, depth); 313 if (archetype *at = find_treasure_by_name (t->next_yes, name, depth))
385 if (at)
386 return at; 314 return at;
387 }
388 315
389 if (t->next_no) 316 if (t->next_no)
390 {
391 at = find_treasure_by_name (t->next_no, name, depth); 317 if (archetype *at = find_treasure_by_name (t->next_no, name, depth))
392 if (at)
393 return at; 318 return at;
394 } 319
395 t = t->next; 320 t = t->next;
396 } 321 }
322
397 return 0; 323 return 0;
398} 324}
399 325
400/* If several archetypes have the same name, the value of the first 326/* If several archetypes have the same name, the value of the first
401 * one with that name will be returned. This happens for the 327 * one with that name will be returned. This happens for the
… …
406 * body parts that we are looking for (e.g. big_dragon and 332 * body parts that we are looking for (e.g. big_dragon and
407 * big_dragon_worthless). */ 333 * big_dragon_worthless). */
408long 334long
409find_ingred_cost (const char *name) 335find_ingred_cost (const char *name)
410{ 336{
411 archetype *at;
412 archetype *at2; 337 archetype *at2;
413 artifactlist *al; 338 artifactlist *al;
414 artifact *art; 339 artifact *art;
415 long mult; 340 long mult;
416 char *cp; 341 char *cp;
… …
429 name++; 354 name++;
430 else 355 else
431 mult = 1; 356 mult = 1;
432 357
433 /* first, try to match the name of an archetype */ 358 /* first, try to match the name of an archetype */
434 for (at = first_archetype; at != NULL; at = at->next) 359 for_all_archetypes (at)
435 { 360 {
436 if (at->clone.title != NULL) 361 if (at->title != NULL)
437 { 362 {
438 /* inefficient, but who cares? */ 363 /* inefficient, but who cares? */
439 sprintf (part1, "%s %s", &at->clone.name, &at->clone.title); 364 sprintf (part1, "%s %s", &at->object::name, &at->title);
440 if (!strcasecmp (part1, name)) 365 if (!strcasecmp (part1, name))
441 return mult * at->clone.value; 366 return mult * at->value;
442 } 367 }
443 if (!strcasecmp (at->clone.name, name)) 368 if (!strcasecmp (at->object::name, name))
444 return mult * at->clone.value; 369 return mult * at->value;
445 } 370 }
446 371
447 /* second, try to match an artifact ("arch of something") */ 372 /* second, try to match an artifact ("arch of something") */
448 cp = strstr (name, " of "); 373 cp = strstr (name, " of ");
449 if (cp != NULL) 374 if (cp != NULL)
450 { 375 {
451 strcpy (part1, name); 376 strcpy (part1, name);
452 part1[cp - name] = '\0'; 377 part1[cp - name] = '\0';
453 strcpy (part2, cp + 4); 378 strcpy (part2, cp + 4);
379
454 /* find the first archetype matching the first part of the name */ 380 /* find the first archetype matching the first part of the name */
455 for (at = first_archetype; at != NULL; at = at->next) 381 for_all_archetypes (at)
456 if (!strcasecmp (at->clone.name, part1) && at->clone.title == NULL) 382 if (at->object::name.eq_nc (part1) && !at->title)
457 break;
458 if (at != NULL)
459 { 383 {
460 /* find the first artifact derived from that archetype (same type) */ 384 /* find the first artifact derived from that archetype (same type) */
461 for (al = first_artifactlist; al != NULL; al = al->next) 385 for (al = first_artifactlist; al; al = al->next)
462 if (al->type == at->clone.type) 386 if (al->type == at->type)
463 { 387 {
464 for (art = al->items; art != NULL; art = art->next) 388 for (art = al->items; art; art = art->next)
465 if (!strcasecmp (art->item->name, part2)) 389 if (!strcasecmp (art->item->name, part2))
466 return mult * at->clone.value * art->item->value; 390 return mult * at->value * art->item->value;
467 } 391 }
468 } 392 }
469 } 393 }
470 394
471 /* third, try to match a body part ("arch's something") */ 395 /* third, try to match a body part ("arch's something") */
472 cp = strstr (name, "'s "); 396 cp = strstr (name, "'s ");
473 if (cp) 397 if (cp)
474 { 398 {
475 strcpy (part1, name); 399 strcpy (part1, name);
476 part1[cp - name] = '\0'; 400 part1[cp - name] = '\0';
477 strcpy (part2, cp + 3); 401 strcpy (part2, cp + 3);
478 /* examine all archetypes matching the first part of the name */ 402 /* examine all archetypes matching the first part of the name */
479 for (at = first_archetype; at != NULL; at = at->next) 403 for_all_archetypes (at)
480 if (!strcasecmp (at->clone.name, part1) && at->clone.title == NULL) 404 if (at->object::name.eq_nc (part1) && !at->title)
481 { 405 {
482 if (at->clone.randomitems != NULL) 406 if (at->randomitems)
483 { 407 {
484 at2 = find_treasure_by_name (at->clone.randomitems->items, part2, 0); 408 at2 = find_treasure_by_name (at->randomitems->items, part2, 0);
485 if (at2) 409 if (at2)
486 return mult * at2->clone.value * isqrt (at->clone.level * 2); 410 return mult * at2->value * isqrt (at->level * 2);
487 } 411 }
488 } 412 }
489 } 413 }
490 414
491 /* failed to find any matching items -- formula should be checked */ 415 /* failed to find any matching items -- formula should be checked */
492 return -1; 416 return -1;
493} 417}
494 418
495/* code copied from dump_alchemy() and modified by Raphael Quinet */
496void
497dump_alchemy_costs (void)
498{
499 recipelist *fl = formulalist;
500 recipe *formula = NULL;
501 linked_char *next;
502 int num_ingred = 1;
503 int num_errors = 0;
504 long cost;
505 long tcost;
506
507 fprintf (logfile, "\n");
508 while (fl)
509 {
510 fprintf (logfile, "\n Formulae with %d ingredient%s %d Formulae with total_chance=%d\n",
511 num_ingred, num_ingred > 1 ? "s." : ".", fl->number, fl->total_chance);
512 for (formula = fl->items; formula != NULL; formula = formula->next)
513 {
514 artifact *art = NULL;
515 archetype *at = NULL;
516 char buf[MAX_BUF];
517 size_t i;
518
519 for (i = 0; i < formula->arch_names; i++)
520 {
521 const char *string = formula->arch_name[i];
522
523 if ((at = archetype::find (string)) != NULL)
524 {
525 art = locate_recipe_artifact (formula, i);
526 if (!art && strcmp (formula->title, "NONE"))
527 LOG (llevError, "Formula %s has no artifact\n", &formula->title);
528 else
529 {
530 if (!strcmp (formula->title, "NONE"))
531 sprintf (buf, "%s", string);
532 else
533 sprintf (buf, "%s of %s", string, &formula->title);
534 fprintf (logfile, "\n%-40s bookchance %3d skill %s\n", buf, formula->chance, &(formula->skill));
535 if (formula->ingred != NULL)
536 {
537 tcost = 0;
538 for (next = formula->ingred; next != NULL; next = next->next)
539 {
540 cost = find_ingred_cost (next->name);
541 if (cost < 0)
542 num_errors++;
543 fprintf (logfile, "\t%-33s%5ld\n", &next->name, cost);
544 if (cost < 0 || tcost < 0)
545 tcost = -1;
546 else
547 tcost += cost;
548 }
549 if (art != NULL && art->item != NULL)
550 cost = at->clone.value * art->item->value;
551 else
552 cost = at->clone.value;
553 fprintf (logfile, "\t\tBuying result costs: %5ld", cost);
554 if (formula->yield > 1)
555 {
556 fprintf (logfile, " to %ld (max %d items)\n", cost * formula->yield, formula->yield);
557 cost = cost * (formula->yield + 1L) / 2L;
558 }
559 else
560 fprintf (logfile, "\n");
561 fprintf (logfile, "\t\tIngredients cost: %5ld\n\t\tComment: ", tcost);
562 if (tcost < 0)
563 fprintf (logfile, "Could not find some ingredients. Check the formula!\n");
564 else if (tcost > cost)
565 fprintf (logfile, "Ingredients are much too expensive. Useless formula.\n");
566 else if (tcost * 2L > cost)
567 fprintf (logfile, "Ingredients are too expensive.\n");
568 else if (tcost * 10L < cost)
569 fprintf (logfile, "Ingredients are too cheap.\n");
570 else
571 fprintf (logfile, "OK.\n");
572 }
573 }
574 }
575 else
576 LOG (llevError, "Can't find archetype:%s for formula %s\n", string, &formula->title);
577 }
578 }
579 fprintf (logfile, "\n");
580 fl = fl->next;
581 num_ingred++;
582 }
583 if (num_errors > 0)
584 fprintf (logfile, "WARNING: %d objects required by the formulae do not exist in the game.\n", num_errors);
585}
586
587const char * 419const char *
588ingred_name (const char *name) 420ingred_name (const char *name)
589{ 421{
590 const char *cp = name; 422 const char *cp = name;
591 423
592 if (atoi (cp)) 424 if (atoi (cp))
593 cp = strchr (cp, ' ') + 1; 425 cp = strchr (cp, ' ') + 1;
426
594 return cp; 427 return cp;
595} 428}
596 429
597/* strtoint() - we use this to convert buf into an integer 430/* strtoint() - we use this to convert buf into an integer
598 * equal to the coadded sum of the (lowercase) character 431 * equal to the coadded sum of the (lowercase) character
… …
615} 448}
616 449
617artifact * 450artifact *
618locate_recipe_artifact (const recipe *rp, size_t idx) 451locate_recipe_artifact (const recipe *rp, size_t idx)
619{ 452{
620 object *item = get_archetype (rp->arch_name[idx]); 453 archetype *at = archetype::find (rp->arch_name [idx]);
621 artifactlist *at = NULL;
622 artifact *art = NULL;
623 454
624 if (!item) 455 if (at)
625 return (artifact *) NULL;
626
627 if ((at = find_artifactlist (item->type))) 456 if (artifactlist *al = find_artifactlist (at->type))
628 for (art = at->items; art; art = art->next) 457 for (artifact *art = al->items; art; art = art->next)
629 if (!strcmp (art->item->name, rp->title)) 458 if (art->item->name == rp->title)
630 break; 459 return art;
631 460
632 item->destroy ();
633
634 return art; 461 return 0;
635} 462}
636 463
637int 464int
638numb_ingred (const char *buf) 465numb_ingred (const char *buf)
639{ 466{

Diff Legend

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