--- deliantra/server/common/loader.C	2006/09/13 02:05:19	1.15
+++ deliantra/server/common/loader.C	2006/09/14 22:33:59	1.17
@@ -1,4 +1,3 @@
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -19,7 +18,7 @@
     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-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
@@ -566,7 +565,7 @@
                    * must be part of the inventory.  So process
                    * appropriately.
                    */
-                  archetype *arch = find_archetype (str);
+                  archetype *arch = archetype::find (str);
 
                   object *tmp;
 
@@ -617,7 +616,7 @@
               else
                 {
                   /* This is the actual archetype definition then */
-                  op->arch = find_archetype (str);
+                  op->arch = archetype::find (str);
 
                   if (op->arch != NULL)
                     copy_object (&op->arch->clone, op);
@@ -629,7 +628,7 @@
             break;
 
           case KW_other_arch:
-            op->other_arch = find_archetype (thawer.get_str ());
+            op->other_arch = archetype::find (thawer.get_str ());
             break;
 
           case KW_animation:
@@ -887,7 +886,7 @@
             }
             break;
 
-            //TODO: remove these after convertign archetypes
+            //TODO: remove these after converting archetypes
           case KW_can_use_wand:
             GET_FLAG (op, FLAG_USE_RANGE);
             break;