--- deliantra/server/common/recipe.C 2006/09/10 16:00:23 1.5 +++ deliantra/server/common/recipe.C 2006/12/12 20:53:02 1.8 @@ -1,5 +1,3 @@ - - /* Basic stuff for use with the alchemy code. Clearly some of this stuff * could go into server/alchemy, but I left it here just in case it proves * more generally useful. @@ -91,7 +89,7 @@ result = 1; for (i = 0; i < rp->arch_names; i++) { - if (find_archetype (rp->arch_name[i]) != NULL) + if (archetype::find (rp->arch_name[i]) != NULL) { artifact *art = locate_recipe_artifact (rp, i); @@ -301,7 +299,7 @@ { const char *string = formula->arch_name[i]; - if (find_archetype (string) != NULL) + if (archetype::find (string) != NULL) { art = locate_recipe_artifact (formula, i); if (!art && strcmp (formula->title, "NONE")) @@ -508,7 +506,7 @@ { const char *string = formula->arch_name[i]; - if ((at = find_archetype (string)) != NULL) + if ((at = archetype::find (string)) != NULL) { art = locate_recipe_artifact (formula, i); if (!art && strcmp (formula->title, "NONE")) @@ -617,7 +615,7 @@ if (!strcmp (art->item->name, rp->title)) break; - free_object (item); + item->destroy (0); return art; }