--- deliantra/server/common/recipe.C	2007/05/17 21:32:08	1.20
+++ deliantra/server/common/recipe.C	2007/07/01 05:00:18	1.23
@@ -1,25 +1,24 @@
 /*
- * CrossFire, A Multiplayer game
- *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) Mark Wedel & Crossfire Development Team
- * Copyright (C) Frank Tore Johansen
- *
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Crossfire TRT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /* Basic stuff for use with the alchemy code. Clearly some of this stuff
@@ -377,7 +376,7 @@
         }
       else
         {
-          if (t->item && !strcasecmp (t->item->clone.name, name))
+          if (t->item && !strcasecmp (t->item->object::name, name))
             return t->item;
         }
 
@@ -406,7 +405,6 @@
 long
 find_ingred_cost (const char *name)
 {
-  archetype *at;
   archetype *at2;
   artifactlist *al;
   artifact *art;
@@ -429,17 +427,17 @@
     mult = 1;
 
   /* first, try to match the name of an archetype */
-  for (at = first_archetype; at != NULL; at = at->next)
+  for_all_archetypes (at)
     {
-      if (at->clone.title != NULL)
+      if (at->title != NULL)
         {
           /* inefficient, but who cares? */
-          sprintf (part1, "%s %s", &at->clone.name, &at->clone.title);
+          sprintf (part1, "%s %s", &at->object::name, &at->title);
           if (!strcasecmp (part1, name))
-            return mult * at->clone.value;
+            return mult * at->value;
         }
-      if (!strcasecmp (at->clone.name, name))
-        return mult * at->clone.value;
+      if (!strcasecmp (at->object::name, name))
+        return mult * at->value;
     }
 
   /* second, try to match an artifact ("arch of something") */
@@ -449,21 +447,20 @@
       strcpy (part1, name);
       part1[cp - name] = '\0';
       strcpy (part2, cp + 4);
+
       /* find the first archetype matching the first part of the name */
-      for (at = first_archetype; at; at = at->next)
-        if (!strcasecmp (at->clone.name, part1) && at->clone.title == NULL)
-          break;
-      if (at != NULL)
-        {
-          /* find the first artifact derived from that archetype (same type) */
-          for (al = first_artifactlist; al; al = al->next)
-            if (al->type == at->clone.type)
-              {
-                for (art = al->items; art; art = art->next)
-                  if (!strcasecmp (art->item->name, part2))
-                    return mult * at->clone.value * art->item->value;
-              }
-        }
+      for_all_archetypes (at)
+        if (!strcasecmp (at->object::name, part1) && at->title == NULL)
+          {
+            /* find the first artifact derived from that archetype (same type) */
+            for (al = first_artifactlist; al; al = al->next)
+              if (al->type == at->type)
+                {
+                  for (art = al->items; art; art = art->next)
+                    if (!strcasecmp (art->item->name, part2))
+                      return mult * at->value * art->item->value;
+                }
+          }
     }
 
   /* third, try to match a body part ("arch's something") */
@@ -474,14 +471,14 @@
       part1[cp - name] = '\0';
       strcpy (part2, cp + 3);
       /* examine all archetypes matching the first part of the name */
-      for (at = first_archetype; at; at = at->next)
-        if (!strcasecmp (at->clone.name, part1) && at->clone.title == NULL)
+      for_all_archetypes (at)
+        if (!strcasecmp (at->object::name, part1) && at->title == NULL)
           {
-            if (at->clone.randomitems)
+            if (at->randomitems)
               {
-                at2 = find_treasure_by_name (at->clone.randomitems->items, part2, 0);
+                at2 = find_treasure_by_name (at->randomitems->items, part2, 0);
                 if (at2)
-                  return mult * at2->clone.value * isqrt (at->clone.level * 2);
+                  return mult * at2->value * isqrt (at->level * 2);
               }
           }
     }
@@ -545,9 +542,9 @@
                                 tcost += cost;
                             }
                           if (art != NULL && art->item != NULL)
-                            cost = at->clone.value * art->item->value;
+                            cost = at->value * art->item->value;
                           else
-                            cost = at->clone.value;
+                            cost = at->value;
                           fprintf (logfile, "\t\tBuying result costs: %5ld", cost);
                           if (formula->yield > 1)
                             {
@@ -618,7 +615,7 @@
   archetype *at = archetype::find (rp->arch_name [idx]);
 
   if (at)
-    if (artifactlist *al = find_artifactlist (at->clone.type))
+    if (artifactlist *al = find_artifactlist (at->type))
       for (artifact *art = al->items; art; art = art->next)
         if (art->item->name == rp->title)
           return art;