--- deliantra/server/random_maps/treasure.C	2008/05/08 11:39:24	1.39
+++ deliantra/server/random_maps/treasure.C	2008/09/25 04:35:50	1.42
@@ -54,14 +54,8 @@
 gen_key (const shstr &keycode)
 {
   /* get a key and set its keycode */
-  object *key = archetype::get (shstr_key2);
-
+  object *key = archetype::get (shstr_key_random_map);
   key->slaying = keycode;
-  key->stats.food = 100;
-  key->speed_left = -1.f;
-  key->flag [FLAG_IS_USED_UP] = true;
-  key->set_speed (1.f / 300.f);
-
   return key;
 }
 
@@ -81,6 +75,7 @@
   int i, j;
   int kx = 0, ky = 0;
   object *the_keymaster;        /* the monster that gets the key. */
+  object *the_key = gen_key (keycode);
 
   if (door_flag == PASS_DOORS)
     {
@@ -105,7 +100,7 @@
             {
               kx = rmg_rndm (RP->Xsize - 2) + 1;
               ky = rmg_rndm (RP->Ysize - 2) + 1;
-              freeindex = find_free_spot (gen_key (keycode), map, kx, ky, 1, SIZEOFFREE1 + 1);
+              freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
             }
 
           // can freeindex ever be < 0?
@@ -123,7 +118,10 @@
       if (n_keys == 1)
         {
           if (wall_blocked (map, x, y))
-            return 0;
+            {
+              the_key->destroy ();
+              return 0;
+            }
 
           the_keymaster = find_monster_in_room (map, x, y, RP);
           if (!the_keymaster)    /* if fail, find a spot to drop the key. */
@@ -147,12 +145,11 @@
               keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
             }
 
+          the_key->destroy ();
           return 1;
         }
     }
 
-  object *the_key = gen_key (keycode);
-
   if (the_keymaster)
     the_keymaster->head_ ()->insert (the_key);
   else
@@ -827,7 +824,7 @@
     {
       for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++)
         {
-          object *new_door = get_archetype ("locked_door1");
+          object *new_door = get_archetype (shstr_locked_door1);
 
           door = doorlist[i];
           new_door->face = door->face;