--- deliantra/server/server/player.C	2007/06/03 17:42:39	1.147
+++ deliantra/server/server/player.C	2007/06/04 12:19:09	1.148
@@ -234,9 +234,9 @@
 
       for (tmp = ob->inv; tmp; tmp = tmp->below)
         if (tmp->type == FORCE)
-          if (tmp->arch->name == dragon_ability_force)
+          if (tmp->arch->archname == dragon_ability_force)
             abil = tmp;
-          else if (tmp->arch->name == dragon_skin_force)
+          else if (tmp->arch->archname == dragon_skin_force)
             skin = tmp;
 
       set_dragon_name (ob, abil, skin);
@@ -916,7 +916,7 @@
       object *tmp;
       char mapname[MAX_BUF];
 
-      snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
+      snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
       tmp = object::create ();
       EXIT_PATH (tmp) = mapname;
       EXIT_X (tmp)    = ob->x;
@@ -1108,7 +1108,7 @@
                          &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
               else
                 sprintf (putstring, "item name: %s    item type: %d    weight/value: %d",
-                         &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
+                         &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
 
               new_draw_info (NDI_UNIQUE, 0, op, putstring);
             }
@@ -1311,8 +1311,8 @@
             {
               if (tmp->type == WEAPON && tmp->name != NULL)
                 {
-                  if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&
-                      strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
+                  if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
+                      strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
                     {
                       pick_up (op, tmp);
                       continue;
@@ -1321,7 +1321,7 @@
 
               if (tmp->type == WEAPON && tmp->name == NULL)
                 {
-                  if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
+                  if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
                     {
                       pick_up (op, tmp);
                       continue;
@@ -1356,7 +1356,7 @@
                       fprintf (stderr, "%s", tmp->name);
                     }
                   else
-                    fprintf (stderr, "%s", tmp->arch->name);
+                    fprintf (stderr, "%s", tmp->arch->archname);
                   fprintf (stderr, ",%d] = ", tmp->type);
                   fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
 #endif
@@ -3428,7 +3428,7 @@
 
       /* first get the dragon skin force */
       shstr_cmp dragon_skin_force ("dragon_skin_force");
-      for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
+      for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
         ;
 
       if (!skin)