[ViewVC] Diff of: cvs/deliantra/server/random

Comparing deliantra/server/random_maps/style.C (file contents):
Revision 1.14 by root, Sun Dec 31 17:17:23 2006 UTC vs.
Revision 1.15 by root, Sun Dec 31 18:10:41 2006 UTC

                       min_dist = dist;
                       min_index = i;
                     }
                 }
             }
           /* presumably now we've found the "best" match for the
              difficulty. */
           strcat (style_file_path, "/");
           strcat (style_file_path, namelist[min_index]);
           style_map = maptile::load_map_sync (style_file_path);
       for (i = 0; i < n; i++)
         free (namelist[i]);
       free (namelist);
     }
+  if (style_map)
+    style_map->deactivate ();
   return style_map;
 }
  * variables to generate tables.
  */
 object *
 pick_random_object (maptile *style)
 {
-  int x, y, limit = 0;
-  object *new_obj;
   /* while returning a null object will result in a crash, that
    * is actually preferable to an infinite loop.  That is because
    * most servers will automatically restart in case of crash.
    * Change the logic on getting the random space - shouldn't make
    * any difference, but this seems clearer to me.
    */
-  do
+  for (int i = 1000; --i; )
     {
-      if (limit++ >= 1000)
+      object *new_obj = style->at (RANDOM () % style->width, RANDOM () % style->height).bot;
-        return create_singularity ("pick_random_object");
-      x = RANDOM () % style->width;
+      if (new_obj)
-      y = RANDOM () % style->height;
+        return new_obj->head_ ();
-      new_obj = GET_MAP_OB (style, x, y);
     }
-  while (!new_obj);
-  return new_obj->head_ ();
+  return 0;
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines