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.22 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.46 by root, Wed Nov 16 23:41:59 2016 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* 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
26 * 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
27 * more generally useful. 27 * more generally useful.
… …
50static void build_stringlist (const char *str, char ***result_list, size_t * result_size); 50static void build_stringlist (const char *str, char ***result_list, size_t * result_size);
51 51
52static recipelist *formulalist; 52static recipelist *formulalist;
53 53
54static recipelist * 54static recipelist *
55init_recipelist (void) 55init_recipelist ()
56{ 56{
57 recipelist *tl = new recipelist; 57 recipelist *tl = new recipelist;
58 58
59 tl->total_chance = 0; 59 tl->total_chance = 0;
60 tl->number = 0; 60 tl->number = 0;
… …
63 63
64 return tl; 64 return tl;
65} 65}
66 66
67static recipe * 67static recipe *
68get_empty_formula (void) 68get_empty_formula ()
69{ 69{
70 recipe *t = new recipe; 70 recipe *t = new recipe;
71 71
72 t->chance = 0; 72 t->chance = 0;
73 t->index = 0; 73 t->index = 0;
74 t->transmute = 0; 74 t->transmute = 0;
75 t->yield = 0; 75 t->yield = 0;
76 t->diff = 0; 76 t->diff = 0;
77 t->exp = 0; 77 t->exp = 0;
78 t->keycode = 0; 78 t->keycode = 0;
79 t->title = NULL; 79 t->title = 0;
80 t->arch_names = 0; 80 t->arch_names = 0;
81 t->arch_name = NULL; 81 t->arch_name = 0;
82 t->skill = NULL; 82 t->skill = 0;
83 t->cauldron = NULL; 83 t->cauldron = 0;
84 t->ingred = NULL; 84 t->ingred = 0;
85 t->next = NULL; 85 t->next = 0;
86
86 return t; 87 return t;
87} 88}
88 89
89/* get_formulalist() - returns pointer to the formula list */ 90/* get_formulalist() - returns pointer to the formula list */
90recipelist * 91recipelist *
… …
111 size_t i; 112 size_t i;
112 int result = 1; 113 int result = 1;
113 114
114 for (i = 0; i < rp->arch_names; i++) 115 for (i = 0; i < rp->arch_names; i++)
115 { 116 {
116 if (archetype::find (rp->arch_name[i]) != NULL) 117 if (archetype::find (rp->arch_name[i]))
117 { 118 {
118 artifact *art = locate_recipe_artifact (rp, i); 119 artifact *art = locate_recipe_artifact (rp, i);
119 120
120 if (!art && strcmp (rp->title, "NONE") != 0) 121 if (!art && rp->title != shstr_NONE)
121 { 122 {
122 LOG (llevError, "WARNING: Formula %s of %s has no artifact.\n", rp->arch_name[i], &rp->title); 123 LOG (llevError, "WARNING: Formula %s of %s has no artifact.\n", rp->arch_name[i], &rp->title);
123 result = 0; 124 result = 0;
124 } 125 }
125 } 126 }
… …
129 result = 0; 130 result = 0;
130 } 131 }
131 } 132 }
132 133
133 return result; 134 return result;
134}
135
136/*
137 * init_formulae() - Builds up the lists of formula from the file in
138 * the libdir. -b.t.
139 */
140void
141init_formulae (void)
142{
143 static int has_been_done = 0;
144 FILE *fp;
145 char filename[MAX_BUF], buf[MAX_BUF], *cp, *next;
146 recipe *formula = NULL;
147 recipelist *fl = init_recipelist ();
148 linked_char *tmp;
149 int value, comp;
150
151 if (!formulalist)
152 formulalist = fl;
153
154 if (has_been_done)
155 return;
156 else
157 has_been_done = 1;
158
159 sprintf (filename, "%s/formulae", settings.datadir);
160 LOG (llevDebug, "Reading alchemical formulae from %s...\n", filename);
161 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
162 {
163 LOG (llevError, "Can't open %s.\n", filename);
164 return;
165 }
166
167 while (fgets (buf, MAX_BUF, fp) != NULL)
168 {
169 if (*buf == '#')
170 continue;
171 if ((cp = strchr (buf, '\n')) != NULL)
172 *cp = '\0';
173 cp = buf;
174 while (*cp == ' ') /* Skip blanks */
175 cp++;
176
177 if (!strncmp (cp, "object", 6))
178 {
179 formula = get_empty_formula ();
180 formula->title = strchr (cp, ' ') + 1;
181 }
182 else if (!strncmp (cp, "keycode", 7))
183 formula->keycode = strchr (cp, ' ') + 1;
184 else if (sscanf (cp, "trans %d", &value))
185 formula->transmute = (uint16) value;
186 else if (sscanf (cp, "yield %d", &value))
187 formula->yield = (uint16) value;
188 else if (sscanf (cp, "chance %d", &value))
189 formula->chance = (uint16) value;
190 else if (sscanf (cp, "exp %d", &value))
191 formula->exp = (uint16) value;
192 else if (sscanf (cp, "diff %d", &value))
193 formula->diff = (uint16) value;
194 else if (!strncmp (cp, "ingred", 6))
195 {
196 int numb_ingred = 1;
197
198 cp = strchr (cp, ' ') + 1;
199 do
200 {
201 if ((next = strchr (cp, ',')) != NULL)
202 {
203 *(next++) = '\0';
204 numb_ingred++;
205 }
206
207 tmp = new linked_char;
208
209 tmp->name = cp;
210 tmp->next = formula->ingred;
211 formula->ingred = tmp;
212 /* each ingredient's ASCII value is coadded. Later on this
213 * value will be used allow us to search the formula lists
214 * quickly for the right recipe.
215 */
216 formula->index += strtoint (cp);
217 }
218 while ((cp = next) != NULL);
219
220 /* now find the correct (# of ingred ordered) formulalist */
221 fl = formulalist;
222 while (numb_ingred != 1)
223 {
224 if (!fl->next)
225 fl->next = init_recipelist ();
226
227 fl = fl->next;
228 numb_ingred--;
229 }
230
231 fl->total_chance += formula->chance;
232 fl->number++;
233 formula->next = fl->items;
234 fl->items = formula;
235 }
236 else if (!strncmp (cp, "arch", 4))
237 {
238 build_stringlist (strchr (cp, ' ') + 1, &formula->arch_name, &formula->arch_names);
239 check_recipe (formula);
240 }
241 else if (!strncmp (cp, "skill", 5))
242 formula->skill = strchr (cp, ' ') + 1;
243 else if (!strncmp (cp, "cauldron", 8))
244 formula->cauldron = strchr (cp, ' ') + 1;
245 else
246 LOG (llevError, "Unknown input in file %s: %s\n", filename, buf);
247 }
248
249 LOG (llevDebug, "done.\n");
250 close_and_delete (fp, comp);
251 /* Lastly, lets check for problems in formula we got */
252 check_formulae ();
253} 135}
254 136
255/* check_formulae()- since we are doing a squential search on the 137/* check_formulae()- since we are doing a squential search on the
256 * formulae lists now, we have to be carefull that we dont have 2 138 * formulae lists now, we have to be carefull that we dont have 2
257 * formula with the exact same index value. Under the new nbatches 139 * formula with the exact same index value. Under the new nbatches
258 * code, it is possible to have multiples of ingredients in a cauldron 140 * code, it is possible to have multiples of ingredients in a cauldron
259 * which could result in an index formula mismatch. We *don't* check for 141 * which could result in an index formula mismatch. We *don't* check for
260 * that possibility here. -b.t. 142 * that possibility here. -b.t.
261 */ 143 */
262void 144static void
263check_formulae (void) 145check_formulae ()
264{ 146{
265 recipelist *fl; 147 recipelist *fl;
266 recipe *check, *formula; 148 recipe *check, *formula;
267 int numb = 1; 149 int numb = 1;
268 150
… …
283 165
284 LOG (llevDebug, "done.\n"); 166 LOG (llevDebug, "done.\n");
285 167
286} 168}
287 169
288/* Borrowed (again) from the artifacts code for this */ 170/*
289 171 * init_formulae() - Builds up the lists of formula from the file in
172 * the libdir. -b.t.
173 */
290void 174void
291dump_alchemy (void) 175init_formulae ()
292{ 176{
293 recipelist *fl = formulalist; 177 static int has_been_done = 0;
294 recipe *formula = NULL; 178 char *next;
179 recipelist *fl = init_recipelist ();
295 linked_char *next; 180 linked_char *tmp;
296 int num_ingred = 1;
297 181
298 fprintf (logfile, "\n"); 182 if (!formulalist)
299 while (fl) 183 formulalist = fl;
184
185 if (has_been_done)
186 return;
187 else
188 has_been_done = 1;
189
190 object_thawer thawer (settings.datadir, "formulae");
191
192 if (!thawer)
193 {
194 LOG (llevError, "Can't open %s.\n", thawer.name);
195 return;
300 { 196 }
301 fprintf (logfile, "\n Formulae with %d ingredient%s %d Formulae with total_chance=%d\n",
302 num_ingred, num_ingred > 1 ? "s." : ".", fl->number, fl->total_chance);
303 for (formula = fl->items; formula; formula = formula->next)
304 {
305 artifact *art = NULL;
306 char buf[MAX_BUF];
307 size_t i;
308 197
309 for (i = 0; i < formula->arch_names; i++) 198 while (thawer.kw)
199 {
200 if (thawer.kw != KW_object)
201 if (!thawer.parse_error ("formulae file"))
202 break;
203
204 recipe *formula = get_empty_formula ();
205 thawer.get (formula->title);
206
207 for (;;)
208 {
209 thawer.next ();
210
211 switch (thawer.kw)
310 { 212 {
311 const char *string = formula->arch_name[i]; 213 case KW_keycode: thawer.get (formula->keycode ); break;
214 case KW_trans: thawer.get (formula->transmute); break;
215 case KW_yield: thawer.get (formula->yield ); break;
216 case KW_chance: thawer.get (formula->chance ); break;
217 case KW_exp: thawer.get (formula->exp ); break;
218 case KW_diff: thawer.get (formula->diff ); break;
219 case KW_skill: thawer.get (formula->skill ); break;
220 case KW_cauldron: thawer.get (formula->cauldron ); break;
312 221
313 if (archetype::find (string) != NULL) 222 case KW_arch:
314 { 223 {
224 build_stringlist (thawer.value_nn, &formula->arch_name, &formula->arch_names);
315 art = locate_recipe_artifact (formula, i); 225 check_recipe (formula);
316 if (!art && strcmp (formula->title, "NONE"))
317 LOG (llevError, "Formula %s has no artifact!\n", &formula->title);
318 else
319 {
320 if (strcmp (formula->title, "NONE"))
321 sprintf (buf, "%s of %s", string, &formula->title);
322 else
323 sprintf (buf, "%s", string);
324 fprintf (logfile, "%-30s(%d) bookchance %3d ", buf, formula->index, formula->chance);
325 fprintf (logfile, "skill %s", &formula->skill);
326 fprintf (logfile, "\n");
327 if (formula->ingred != NULL)
328 {
329 int nval = 0, tval = 0;
330
331 fprintf (logfile, "\tIngred: ");
332 for (next = formula->ingred; next != NULL; next = next->next)
333 {
334 if (nval != 0)
335 fprintf (logfile, ",");
336 fprintf (logfile, "%s(%d)", &next->name, (nval = strtoint (next->name)));
337 tval += nval;
338 }
339 fprintf (logfile, "\n");
340 if (tval != formula->index)
341 fprintf (logfile, "WARNING:ingredient list and formula values not equal.\n");
342 }
343 if (formula->skill != NULL)
344 fprintf (logfile, "\tSkill Required: %s", &formula->skill);
345 if (formula->cauldron != NULL)
346 fprintf (logfile, "\tCauldron: %s\n", &formula->cauldron);
347 fprintf (logfile, "\tDifficulty: %d\t Exp: %d\n", formula->diff, formula->exp);
348 }
349 } 226 }
227 break;
228
229 case KW_ingred:
230 if (thawer.value)
231 {
232 int numb_ingred = 1;
233 char *cp = thawer.value;
234
235 do
236 {
237 if ((next = strchr (cp, ',')))
238 {
239 *next++ = '\0';
240 ++numb_ingred;
241 }
242
243 tmp = new linked_char;
244
245 tmp->name = cp;
246 tmp->next = formula->ingred;
247 formula->ingred = tmp;
248 /* each ingredient's ASCII value is coadded. Later on this
249 * value will be used allow us to search the formula lists
250 * quickly for the right recipe.
251 */
252 formula->index += strtoint (cp);
253 }
254 while ((cp = next));
255
256 /* now find the correct (# of ingred ordered) formulalist */
257 fl = formulalist;
258 while (numb_ingred != 1)
259 {
260 if (!fl->next)
261 fl->next = init_recipelist ();
262
263 fl = fl->next;
264 numb_ingred--;
265 }
266
267 fl->total_chance += formula->chance;
268 fl->number++;
269 formula->next = fl->items;
270 fl->items = formula;
271 }
272 break;
273
350 else 274 default:
351 LOG (llevError, "Can't find archetype:%s for formula %s\n", string, &formula->title); 275 delete formula;
276 case KW_EOF:
277 case KW_object:
278 goto next_object;
352 } 279 }
353 } 280 }
354 fprintf (logfile, "\n"); 281
355 fl = fl->next; 282next_object: ;
356 num_ingred++;
357 } 283 }
284
285 /* Lastly, lets check for problems in formula we got */
286 check_formulae ();
358} 287}
359 288
360/* Find a treasure with a matching name. The 'depth' parameter is 289/* Find a treasure with a matching name. The 'depth' parameter is
361 * only there to prevent infinite loops in treasure lists (a list 290 * only there to prevent infinite loops in treasure lists (a list
362 * referencing another list pointing back to the first one). */ 291 * referencing another list pointing back to the first one). */
363archetype * 292static archetype *
364find_treasure_by_name (const treasure *t, const char *name, int depth) 293find_treasure_by_name (const treasure *t, const char *name, int depth)
365{ 294{
366 if (depth > 10) 295 if (depth > 10)
367 return 0; 296 return 0;
368 297
… …
393 } 322 }
394 323
395 return 0; 324 return 0;
396} 325}
397 326
398/* If several archetypes have the same name, the value of the first
399 * one with that name will be returned. This happens for the
400 * mushrooms (mushroom_1, mushroom_2 and mushroom_3). For the
401 * monsters' body parts, there may be several monsters with the same
402 * name. This is not a problem if these monsters have the same level
403 * (e.g. sage & c_sage) or if only one of the monsters generates the
404 * body parts that we are looking for (e.g. big_dragon and
405 * big_dragon_worthless). */
406long
407find_ingred_cost (const char *name)
408{
409 archetype *at2;
410 artifactlist *al;
411 artifact *art;
412 long mult;
413 char *cp;
414 char part1[100];
415 char part2[100];
416
417 /* same as atoi(), but skip number */
418 mult = 0;
419 while (isdigit (*name))
420 {
421 mult = 10 * mult + (*name - '0');
422 name++;
423 }
424
425 if (mult > 0)
426 name++;
427 else
428 mult = 1;
429
430 /* first, try to match the name of an archetype */
431 for_all_archetypes (at)
432 {
433 if (at->title != NULL)
434 {
435 /* inefficient, but who cares? */
436 sprintf (part1, "%s %s", &at->object::name, &at->title);
437 if (!strcasecmp (part1, name))
438 return mult * at->value;
439 }
440 if (!strcasecmp (at->object::name, name))
441 return mult * at->value;
442 }
443
444 /* second, try to match an artifact ("arch of something") */
445 cp = strstr (name, " of ");
446 if (cp != NULL)
447 {
448 strcpy (part1, name);
449 part1[cp - name] = '\0';
450 strcpy (part2, cp + 4);
451
452 /* find the first archetype matching the first part of the name */
453 for_all_archetypes (at)
454 if (!strcasecmp (at->object::name, part1) && at->title == NULL)
455 {
456 /* find the first artifact derived from that archetype (same type) */
457 for (al = first_artifactlist; al; al = al->next)
458 if (al->type == at->type)
459 {
460 for (art = al->items; art; art = art->next)
461 if (!strcasecmp (art->item->name, part2))
462 return mult * at->value * art->item->value;
463 }
464 }
465 }
466
467 /* third, try to match a body part ("arch's something") */
468 cp = strstr (name, "'s ");
469 if (cp)
470 {
471 strcpy (part1, name);
472 part1[cp - name] = '\0';
473 strcpy (part2, cp + 3);
474 /* examine all archetypes matching the first part of the name */
475 for_all_archetypes (at)
476 if (!strcasecmp (at->object::name, part1) && at->title == NULL)
477 {
478 if (at->randomitems)
479 {
480 at2 = find_treasure_by_name (at->randomitems->items, part2, 0);
481 if (at2)
482 return mult * at2->value * isqrt (at->level * 2);
483 }
484 }
485 }
486
487 /* failed to find any matching items -- formula should be checked */
488 return -1;
489}
490
491/* code copied from dump_alchemy() and modified by Raphael Quinet */
492void
493dump_alchemy_costs (void)
494{
495 recipelist *fl = formulalist;
496 recipe *formula = NULL;
497 linked_char *next;
498 int num_ingred = 1;
499 int num_errors = 0;
500 long cost;
501 long tcost;
502
503 fprintf (logfile, "\n");
504 while (fl)
505 {
506 fprintf (logfile, "\n Formulae with %d ingredient%s %d Formulae with total_chance=%d\n",
507 num_ingred, num_ingred > 1 ? "s." : ".", fl->number, fl->total_chance);
508 for (formula = fl->items; formula; formula = formula->next)
509 {
510 artifact *art = NULL;
511 archetype *at = NULL;
512 char buf[MAX_BUF];
513 size_t i;
514
515 for (i = 0; i < formula->arch_names; i++)
516 {
517 const char *string = formula->arch_name[i];
518
519 if ((at = archetype::find (string)) != NULL)
520 {
521 art = locate_recipe_artifact (formula, i);
522 if (!art && strcmp (formula->title, "NONE"))
523 LOG (llevError, "Formula %s has no artifact\n", &formula->title);
524 else
525 {
526 if (!strcmp (formula->title, "NONE"))
527 sprintf (buf, "%s", string);
528 else
529 sprintf (buf, "%s of %s", string, &formula->title);
530 fprintf (logfile, "\n%-40s bookchance %3d skill %s\n", buf, formula->chance, &(formula->skill));
531 if (formula->ingred != NULL)
532 {
533 tcost = 0;
534 for (next = formula->ingred; next != NULL; next = next->next)
535 {
536 cost = find_ingred_cost (next->name);
537 if (cost < 0)
538 num_errors++;
539 fprintf (logfile, "\t%-33s%5ld\n", &next->name, cost);
540 if (cost < 0 || tcost < 0)
541 tcost = -1;
542 else
543 tcost += cost;
544 }
545 if (art != NULL && art->item != NULL)
546 cost = at->value * art->item->value;
547 else
548 cost = at->value;
549 fprintf (logfile, "\t\tBuying result costs: %5ld", cost);
550 if (formula->yield > 1)
551 {
552 fprintf (logfile, " to %ld (max %d items)\n", cost * formula->yield, formula->yield);
553 cost = cost * (formula->yield + 1L) / 2L;
554 }
555 else
556 fprintf (logfile, "\n");
557 fprintf (logfile, "\t\tIngredients cost: %5ld\n\t\tComment: ", tcost);
558 if (tcost < 0)
559 fprintf (logfile, "Could not find some ingredients. Check the formula!\n");
560 else if (tcost > cost)
561 fprintf (logfile, "Ingredients are much too expensive. Useless formula.\n");
562 else if (tcost * 2L > cost)
563 fprintf (logfile, "Ingredients are too expensive.\n");
564 else if (tcost * 10L < cost)
565 fprintf (logfile, "Ingredients are too cheap.\n");
566 else
567 fprintf (logfile, "OK.\n");
568 }
569 }
570 }
571 else
572 LOG (llevError, "Can't find archetype:%s for formula %s\n", string, &formula->title);
573 }
574 }
575 fprintf (logfile, "\n");
576 fl = fl->next;
577 num_ingred++;
578 }
579 if (num_errors > 0)
580 fprintf (logfile, "WARNING: %d objects required by the formulae do not exist in the game.\n", num_errors);
581}
582
583const char * 327static const char *
584ingred_name (const char *name) 328ingred_name (const char *name)
585{ 329{
586 const char *cp = name; 330 const char *cp = name;
587 331
588 if (atoi (cp)) 332 if (atoi (cp))
589 cp = strchr (cp, ' ') + 1; 333 cp = strchr (cp, ' ') + 1;
334
590 return cp; 335 return cp;
336}
337
338static int
339numb_ingred (const char *buf)
340{
341 int numb;
342
343 if ((numb = atoi (buf)))
344 return numb;
345 else
346 return 1;
591} 347}
592 348
593/* strtoint() - we use this to convert buf into an integer 349/* strtoint() - we use this to convert buf into an integer
594 * equal to the coadded sum of the (lowercase) character 350 * equal to the coadded sum of the (lowercase) character
595 * ASCII values in buf (times prepended integers). 351 * ASCII values in buf (times prepended integers).
352 * Some kind of hashing.
596 */ 353 */
597
598int 354int
599strtoint (const char *buf) 355strtoint (const char *buf)
600{ 356{
601 const char *cp = ingred_name (buf); 357 const char *cp = ingred_name (buf);
602 int val = 0, len = strlen (cp), mult = numb_ingred (buf); 358 int val = 0, len = strlen (cp), mult = numb_ingred (buf);
… …
605 { 361 {
606 val += tolower (*cp); 362 val += tolower (*cp);
607 cp++; 363 cp++;
608 len--; 364 len--;
609 } 365 }
366
610 return val * mult; 367 return val * mult;
611} 368}
612 369
613artifact * 370artifact *
614locate_recipe_artifact (const recipe *rp, size_t idx) 371locate_recipe_artifact (const recipe *rp, size_t idx)
… …
622 return art; 379 return art;
623 380
624 return 0; 381 return 0;
625} 382}
626 383
627int
628numb_ingred (const char *buf)
629{
630 int numb;
631
632 if ((numb = atoi (buf)))
633 return numb;
634 else
635 return 1;
636}
637
638recipelist * 384static recipelist *
639get_random_recipelist (void) 385get_random_recipelist ()
640{ 386{
641 recipelist *fl = NULL; 387 recipelist *fl = NULL;
642 int number = 0, roll = 0; 388 int number = 0, roll = 0;
643 389
644 /* first, determine # of recipelist we have */ 390 /* first, determine # of recipelist we have */
… …
689 } 435 }
690 } 436 }
691 return rp; 437 return rp;
692} 438}
693 439
694void
695free_all_recipes (void)
696{
697 recipelist *fl = formulalist, *flnext;
698 recipe *formula = NULL, *next;
699 linked_char *lchar, *charnext;
700
701 LOG (llevDebug, "Freeing all the recipes\n");
702 for (fl = formulalist; fl != NULL; fl = flnext)
703 {
704 flnext = fl->next;
705
706 for (formula = fl->items; formula != NULL; formula = next)
707 {
708 next = formula->next;
709
710 free (formula->arch_name[0]);
711 free (formula->arch_name);
712
713 for (lchar = formula->ingred; lchar; lchar = charnext)
714 {
715 charnext = lchar->next;
716 delete lchar;
717 }
718 delete formula;
719 }
720
721 delete fl;
722 }
723}
724
725/** 440/**
726 * Split a comma separated string list into words. 441 * Split a comma separated string list into words.
727 * 442 *
728 * @param str the string to split 443 * @param str the string to split
729 * 444 *
… …
740 char *p; 455 char *p;
741 size_t size; 456 size_t size;
742 size_t i; 457 size_t i;
743 458
744 dup = strdup (str); 459 dup = strdup (str);
745 if (dup == NULL)
746 fatal (OUT_OF_MEMORY);
747 460
748 size = 0; 461 size = 0;
749 for (p = strtok (dup, ","); p != NULL; p = strtok (NULL, ",")) 462 for (p = strtok (dup, ","); p != NULL; p = strtok (NULL, ","))
750 size++; 463 size++;
751 464
752 *result_list = (char **) malloc (size * sizeof (*result_list)); 465 *result_list = (char **)malloc (size * sizeof (*result_list));
753 466
754 *result_size = size; 467 *result_size = size;
755 468
756 for (i = 0; i < size; i++) 469 for (i = 0; i < size; i++)
757 { 470 {

Diff Legend

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