--- deliantra/server/common/arch.C	2007/05/28 21:21:39	1.61
+++ deliantra/server/common/arch.C	2007/06/04 12:19:08	1.62
@@ -52,7 +52,7 @@
   > HT;
 
 static HT ht (5000);
-static std::vector<archetype *> archetypes;
+archvec archetypes;
 
 /**
  * GROS -  This function retrieves an archetype given the name that appears
@@ -379,13 +379,13 @@
 
         if (at->head != head && at->head)
           {
-            LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
+            LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->archname);
             goto fail;
           }
 
         if (at->next && at != head)
           {
-            LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
+            LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->archname);
             goto fail;
           }
       }
@@ -540,8 +540,8 @@
 
   if (!at)
     {
-      archetypes.push_back (at = new archetype);
-      at->name = at->clone.name = at->clone.name_pl = name;
+      archetypes.insert (at = new archetype);
+      at->archname = at->clone.name = at->clone.name_pl = name;
       at->hash_add ();
     }
 
@@ -554,13 +554,13 @@
 void
 archetype::hash_add ()
 {
-  ht.insert (std::make_pair (name, this));
+  ht.insert (std::make_pair (archname, this));
 }
 
 void
 archetype::hash_del ()
 {
-  ht.erase (name);
+  ht.erase (archname);
 }
 
 /*