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

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

     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 #include <global.h>
 #include <random_map.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include "../include/autoconf.h"
 static int
 pointer_strcmp (const void *p1, const void *p2)
 {
   const char *s1 = *(const char **) p1;
   else                          /* otherwise, just use the dirname.  We'll pick a random stylefile. */
     sprintf (style_file_path, "%s", dirname);
   /* is what we were given a directory, or a file? */
   sprintf (style_file_full_path, "%s/maps%s", settings.datadir, style_file_path);
   if (stat (style_file_full_path, &file_stat) == 0 && !S_ISDIR (file_stat.st_mode))
     style_map = maptile::load_map_sync (style_file_path);
   if (!style_map)        /* maybe we were given a directory! */
     {
    * Change the logic on getting the random space - shouldn't make
    * any difference, but this seems clearer to me.
    */
   do
     {
-      limit++;
+      if (limit++ >= 1000)
+        return create_singularity ("pick_random_object");
       x = RANDOM () % style->width;
       y = RANDOM () % style->height;
       new_obj = GET_MAP_OB (style, x, y);
     }
-  while (new_obj == NULL && limit < 1000);
+  while (!new_obj);
-  if (new_obj->head)
-    return new_obj->head;
+  return new_obj->head_ ();
-  else
-    return new_obj;
 }

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