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

Comparing deliantra/server/random_maps/random_map.C (file contents):
Revision 1.13 by root, Sun Dec 31 19:02:24 2006 UTC vs.
Revision 1.14 by root, Sun Dec 31 20:46:17 2006 UTC

       }
   }
   printf ("\n");
 }
-extern FILE *logfile;
 maptile *
 generate_random_map (const char *OutFileName, random_map_params *RP)
 {
   char **layout, buf[HUGE_BUF];
   maptile *theMap;
   int i;
   /* pick a random seed, or use the one from the input file */
-  if (RP->random_seed == 0)
+  SRANDOM (RP->random_seed ? RP->random_seed + RP->dungeon_level : time (0));
-    RP->random_seed = time (0);
-  SRANDOM (RP->random_seed);
   write_map_parameters_to_string (buf, RP);
   if (RP->difficulty == 0)
     {
   theMap->path = OutFileName;
   /* set region */
   theMap->region = RP->region;
+  coroapi.cede ();
   /* create walls unless the wallstyle is "none" */
   if (strcmp (RP->wallstyle, "none"))
     {
       make_map_walls (theMap, layout, RP->wallstyle, RP);
       if (strcmp (RP->doorstyle, "none"))
         put_doors (theMap, layout, RP->doorstyle, RP);
     }
+  coroapi.cede ();
   /* create exits unless the exitstyle is "none" */
   if (strcmp (RP->exitstyle, "none"))
     place_exits (theMap, layout, RP->exitstyle, RP->orientation, RP);
+  coroapi.cede ();
   place_specials_in_map (theMap, layout, RP);
+  coroapi.cede ();
   /* create monsters unless the monsterstyle is "none" */
   if (strcmp (RP->monsterstyle, "none"))
     place_monsters (theMap, RP->monsterstyle, RP->difficulty, RP);
+  coroapi.cede ();
   /* treasures needs to have a proper difficulty set for the map. */
   theMap->difficulty = theMap->estimate_difficulty ();
+  coroapi.cede ();
   /* create treasure unless the treasurestyle is "none" */
   if (strcmp (RP->treasurestyle, "none"))
     place_treasure (theMap, layout, RP->treasurestyle, RP->treasureoptions, RP);
+  coroapi.cede ();
   /* create decor unless the decorstyle is "none" */
   if (strcmp (RP->decorstyle, "none"))
     put_decor (theMap, layout, RP->decorstyle, RP->decoroptions, RP);
+  coroapi.cede ();
   /* generate treasures, etc. */
   theMap->fix_auto_apply ();
+  coroapi.cede ();
   unblock_exits (theMap, layout, RP);
   /* free the layout */
   for (i = 0; i < RP->Xsize; i++)
     free (layout[i]);
 }
 void
 write_map_parameters_to_string (char *buf, random_map_params *RP)
 {
-  char small_buf[256];
+  char small_buf[2048];
   sprintf (buf, "xsize %d\nysize %d\n", RP->Xsize, RP->Ysize);
   if (RP->wallstyle[0])
     {
     {
       sprintf (small_buf, "exitstyle %s\n", RP->exitstyle);
       strcat (buf, small_buf);
     }
-  if (RP->final_map[0])
+  if (RP->final_map.length ())
     {
-      sprintf (small_buf, "final_map %s\n", RP->final_map);
+      sprintf (small_buf, "final_map %s\n", &RP->final_map);
       strcat (buf, small_buf);
     }
   if (RP->exit_on_final_map[0])
     {
       sprintf (small_buf, "exit_on_final_map %s\n", RP->exit_on_final_map);
       strcat (buf, small_buf);
     }
-  if (RP->this_map[0])
+  if (RP->this_map.length ())
     {
-      sprintf (small_buf, "origin_map %s\n", RP->this_map);
+      sprintf (small_buf, "origin_map %s\n", &RP->this_map);
       strcat (buf, small_buf);
     }
   if (RP->expand2x)
     {
     {
       sprintf (small_buf, "layoutoptions1 %d\n", RP->layoutoptions1);
       strcat (buf, small_buf);
     }
   if (RP->layoutoptions2)
     {
       sprintf (small_buf, "layoutoptions2 %d\n", RP->layoutoptions2);
       strcat (buf, small_buf);
     }
   if (RP->layoutoptions3)
     {
       sprintf (small_buf, "layoutoptions3 %d\n", RP->layoutoptions3);
       strcat (buf, small_buf);
     }
   if (RP->symmetry)
     {
       sprintf (small_buf, "symmetry %d\n", RP->symmetry);
       strcat (buf, small_buf);
     }
   if (RP->difficulty && RP->difficulty_given)
     {
       sprintf (small_buf, "difficulty %d\n", RP->difficulty);
       strcat (buf, small_buf);
     }
   if (RP->treasureoptions)
     {
       sprintf (small_buf, "treasureoptions %d\n", RP->treasureoptions);
+      strcat (buf, small_buf);
+    }
+  if (RP->random_seed)
+    {
+      sprintf (small_buf, "random_seed %d\n", RP->random_seed);
       strcat (buf, small_buf);
     }
 }
 void
                             int difficulty_given_n,
                             int decoroptions_n,
                             int orientation_n,
                             int origin_x_n, int origin_y_n, int random_seed_n, int treasureoptions_n, float difficulty_increase)
 {
-  char small_buf[256];
+  char small_buf[2048];
   sprintf (buf, "xsize %d\nysize %d\n", xsize_n, ysize_n);
   if (wallstyle_n && wallstyle_n[0])
     {
   if (treasureoptions_n)
     {
       sprintf (small_buf, "treasureoptions %d\n", treasureoptions_n);
       strcat (buf, small_buf);
     }
 }
 /* copy an object with an inventory...  i.e., duplicate the inv too. */
 void
 copy_object_with_inv (object *src_ob, object *dest_ob)
 {
   object *walk, *tmp;
   src_ob->copy_to (dest_ob);
-  for (walk = src_ob->inv; walk != NULL; walk = walk->below)
+  for (walk = src_ob->inv; walk; walk = walk->below)
     {
       tmp = object::create ();
       walk->copy_to (tmp);
       insert_ob_in_ob (tmp, dest_ob);

Diff Legend

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

Comparing deliantra/server/random_maps/random_map.C (file contents): Revision 1.13 by root, Sun Dec 31 19:02:24 2006 UTC vs. Revision 1.14 by root, Sun Dec 31 20:46:17 2006 UTC

Diff Legend

Comparing deliantra/server/random_maps/random_map.C (file contents):
Revision 1.13 by root, Sun Dec 31 19:02:24 2006 UTC vs.
Revision 1.14 by root, Sun Dec 31 20:46:17 2006 UTC