--- deliantra/server/random_maps/standalone.C	2006/12/12 21:39:56	1.7
+++ deliantra/server/random_maps/standalone.C	2006/12/18 03:00:02	1.8
@@ -91,7 +91,7 @@
   switch (op->type)
     {
         case SHOP_FLOOR:
-          if (!HAS_RANDOM_ITEMS (op))
+          if (!op->has_random_items ())
             return 0;
           do
             {
@@ -115,7 +115,7 @@
           break;
 
         case TREASURE:
-          if (HAS_RANDOM_ITEMS (op))
+          if (op->has_random_items ())
             while ((op->stats.hp--) > 0)
               create_treasure (op->randomitems, op, GT_ENVIRONMENT,
                                op->stats.exp ? op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
@@ -149,7 +149,7 @@
             auto_apply (tmp);
           else if (tmp->type == TREASURE)
             {
-              if (HAS_RANDOM_ITEMS (tmp))
+              if (tmp->has_random_items ())
                 while ((tmp->stats.hp--) > 0)
                   create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
             }
@@ -157,11 +157,11 @@
             {
               if (tmp->type == CONTAINER)
                 {
-                  if (HAS_RANDOM_ITEMS (tmp))
+                  if (tmp->has_random_items ())
                     while ((tmp->stats.hp--) > 0)
                       create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
                 }
-              else if (HAS_RANDOM_ITEMS (tmp))
+              else if (tmp->has_random_items ())
                 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0);
             }
         }