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

Comparing deliantra/server/random_maps/random_map.C (file contents):
Revision 1.24 by root, Fri Jan 19 21:49:58 2007 UTC vs.
Revision 1.30 by root, Sun Jul 1 05:00:19 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 #include <time.h>
 #include <stdio.h>
 #include <global.h>
 #include <room_gen.h>
 #include <random_map.h>
 #include <rproto.h>
 #include <sproto.h>
-#define CEDE coroapi::cede (); rndm.seed (RP->random_seed + __LINE__);
+#define CEDE coroapi::cede_to_tick (); rndm.seed (RP->random_seed + __LINE__);
 void
 dump_layout (char **layout, random_map_params *RP)
 {
   {
   if (RP->Ysize < MIN_RANDOM_MAP_SIZE)
     RP->Ysize = MIN_RANDOM_MAP_SIZE + rndm (25) + 5;
   if (RP->symmetry == SYMMETRY_RANDOM)
-    RP->symmetry_used = (RANDOM () % (SYMMETRY_XY)) + 1;
+    RP->symmetry_used = rndm (SYMMETRY_XY) + 1;
   else
     RP->symmetry_used = RP->symmetry;
   if (RP->symmetry_used == SYMMETRY_Y || RP->symmetry_used == SYMMETRY_XY)
     RP->Ysize = RP->Ysize / 2 + 1;
   if (strstr (RP->layoutstyle, "squarespiral"))
     RP->map_layout_style = LAYOUT_SQUARE_SPIRAL;
   /* No style found - choose one randomly */
   if (RP->map_layout_style == LAYOUT_NONE)
-    RP->map_layout_style = (RANDOM () % (NROFLAYOUTS - 1)) + 1;
+    RP->map_layout_style = rndm (NROFLAYOUTS - 1) + 1;
   layout = layoutgen (RP);
 #ifdef RMAP_DEBUG
   dump_layout (layout, RP);
   /* allocate the map and set the floor */
   make_map_floor (layout, RP->floorstyle, RP);
   /* set region */
-  region = RP->region;
+  default_region = RP->region;
   CEDE;
   /* create walls unless the wallstyle is "none" */
   if (strcmp (RP->wallstyle, "none"))
   for (ti = 0; ti < tries; ti++)
     {
       int dx, dy;               /* starting location for looking at creating a door */
       int cx, cy;               /* results of checking on creating walls. */
-      dx = RANDOM () % RP->Xsize;
+      dx = rndm (RP->Xsize);
-      dy = RANDOM () % RP->Ysize;
+      dy = rndm (RP->Ysize);
       cx = can_make_wall (maze, dx, dy, 0, RP); /* horizontal */
       cy = can_make_wall (maze, dx, dy, 1, RP); /* vertical */
       if (cx == -1)
         {
           if (cy != -1)
             make_wall (maze, dx, dy, 1);
           continue;
         }
       if (cy == -1)
         {
           make_wall (maze, dx, dy, 0);
           continue;
         }
       if (cx < cy)
         make_wall (maze, dx, dy, 0);
       else
         make_wall (maze, dx, dy, 1);
     }
   while (ndoors > 0 && doorlocs > 0)
     {
       int di;
       int sindex;
-      di = RANDOM () % doorlocs;
+      di = rndm (doorlocs);
       i = doorlist_x[di];
       j = doorlist_y[di];
       sindex = surround_flag (maze, i, j, RP);
       if (sindex == 3 || sindex == 12)  /* these are possible door sindex */
         {
           maze[i][j] = 'D';
           ndoors--;
         }
       /* reduce the size of the list */
       doorlocs--;
       doorlist_x[di] = doorlist_x[doorlocs];
       doorlist_y[di] = doorlist_y[doorlocs];
     }
       strcat (buf, small_buf);
     }
   if (RP->random_seed)
     {
-      sprintf (small_buf, "random_seed %d\n", RP->random_seed);
+      sprintf (small_buf, "random_seed %u\n", RP->random_seed);
       strcat (buf, small_buf);
     }
   if (RP->custom)
     {
 void
 write_parameters_to_string (char *buf,
                             int xsize_n,
                             int ysize_n,
-                            char *wallstyle_n,
+                            const char *wallstyle_n,
-                            char *floorstyle_n,
+                            const char *floorstyle_n,
-                            char *monsterstyle_n,
+                            const char *monsterstyle_n,
-                            char *treasurestyle_n,
+                            const char *treasurestyle_n,
-                            char *layoutstyle_n,
+                            const char *layoutstyle_n,
-                            char *decorstyle_n,
+                            const char *decorstyle_n,
-                            char *doorstyle_n,
+                            const char *doorstyle_n,
-                            char *exitstyle_n,
+                            const char *exitstyle_n,
-                            char *final_map_n,
+                            const char *final_map_n,
-                            char *exit_on_final_map_n,
+                            const char *exit_on_final_map_n,
-                            char *this_map_n,
+                            const char *this_map_n,
                             int layoutoptions1_n,
                             int layoutoptions2_n,
                             int layoutoptions3_n,
                             int symmetry_n,
                             int dungeon_depth_n,
                             int dungeon_level_n,
                             int difficulty_n,
                             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)
+                            int origin_x_n,
+                            int origin_y_n,
+                            uint32_t random_seed_n,
+                            int treasureoptions_n,
+                            float difficulty_increase)
 {
   char small_buf[16384];
   sprintf (buf, "xsize %d\nysize %d\n", xsize_n, ysize_n);
     }
   if (random_seed_n)
     {
       /* Add one so that the next map is a bit different */
-      sprintf (small_buf, "random_seed %d\n", random_seed_n + 1);
+      sprintf (small_buf, "random_seed %u\n", random_seed_n + 1);
       strcat (buf, small_buf);
     }
   if (treasureoptions_n)
     {

Diff Legend

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

Comparing deliantra/server/random_maps/random_map.C (file contents): Revision 1.24 by root, Fri Jan 19 21:49:58 2007 UTC vs. Revision 1.30 by root, Sun Jul 1 05:00:19 2007 UTC

Diff Legend

Comparing deliantra/server/random_maps/random_map.C (file contents):
Revision 1.24 by root, Fri Jan 19 21:49:58 2007 UTC vs.
Revision 1.30 by root, Sun Jul 1 05:00:19 2007 UTC