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

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.22 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
+ * 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>
  */
 /*  placing treasure in maps, where appropriate.  */
 #include <global.h>
 #define LAST_OPTION 64          /* set this to the last real option, for random */
 #define NO_PASS_DOORS 0
 #define PASS_DOORS 1
+/*  a macro to get a strongly centered random distribution,
+    from 0 to x, centered at x/2 */
+static int
+bc_random (int x)
+{
+  return (rndm (x) + rndm (x) + rndm (x)) / 3;
+}
 /* returns true if square x,y has P_NO_PASS set, which is true for walls
  * and doors but not monsters.
  * This function is not map tile aware.
  */
 wall_blocked (maptile *m, int x, int y)
 {
   if (OUT_OF_REAL_MAP (m, x, y))
     return 1;
+  m->at (x, y).update ();
-  int r = GET_MAP_MOVE_BLOCK (m, x, y) & ~MOVE_BLOCK_DEFAULT;
+  return GET_MAP_MOVE_BLOCK (m, x, y) & MOVE_WALK;
-  return r;
 }
 /* place treasures in the map, given the
 map,         (required)
 layout,      (required)
   if (treasure_style)
     if (!strcmp (treasure_style, "none"))
       return;
   if (treasureoptions <= 0)
-    treasureoptions = RANDOM () % (2 * LAST_OPTION);
+    treasureoptions = rndm (2 * LAST_OPTION);
   /* filter out the mutually exclusive options */
   if ((treasureoptions & RICH) && (treasureoptions & SPARSE))
     {
       if (rndm (2))
         treasureoptions -= 2;
     }
   /* pick the number of treasures */
   if (treasureoptions & SPARSE)
-    num_treasures = BC_RANDOM (RP->total_map_hp / 600 + RP->difficulty / 2 + 1);
+    num_treasures = bc_random (RP->total_map_hp / 600 + RP->difficulty / 2 + 1);
   else if (treasureoptions & RICH)
-    num_treasures = BC_RANDOM (RP->total_map_hp / 150 + 2 * RP->difficulty + 1);
+    num_treasures = bc_random (RP->total_map_hp / 150 + 2 * RP->difficulty + 1);
   else
-    num_treasures = BC_RANDOM (RP->total_map_hp / 300 + RP->difficulty + 1);
+    num_treasures = bc_random (RP->total_map_hp / 300 + RP->difficulty + 1);
   if (num_treasures <= 0)
     return;
   /* get the style map */
   sprintf (styledirname, "%s", "/styles/treasurestyles");
   sprintf (stylefilepath, "%s/%s", styledirname, treasure_style);
   style_map = find_style (styledirname, treasure_style, -1);
+  if (!style_map)
+    {
+      LOG (llevError, "unable to load style map %s %s.\n", styledirname, treasure_style);
+      return;
+    }
   /* all the treasure at one spot in the map. */
   if (treasureoptions & CONCENTRATED)
     {
               i = j = -1;
               tries = 0;
               while (i == -1 && tries < 100)
                 {
-                  i = RANDOM () % (RP->Xsize - 2) + 1;
+                  i = rndm (RP->Xsize - 2) + 1;
-                  j = RANDOM () % (RP->Ysize - 2) + 1;
+                  j = rndm (RP->Ysize - 2) + 1;
                   find_enclosed_spot (map, &i, &j, RP);
                   if (wall_blocked (map, i, j))
                     i = -1;
                   tries++;
                 }
     {                           /* DIFFUSE treasure layout */
       int ti, i, j;
       for (ti = 0; ti < num_treasures; ti++)
         {
-          i = RANDOM () % (RP->Xsize - 2) + 1;
+          i = rndm (RP->Xsize - 2) + 1;
-          j = RANDOM () % (RP->Ysize - 2) + 1;
+          j = rndm (RP->Ysize - 2) + 1;
           place_chest (treasureoptions, i, j, map, style_map, 1, RP);
         }
     }
 }
   treasurelist *tlist = find_treasurelist (RP->treasurestyle);
   if (tlist != NULL)
     for (ti = 0; ti < n_treasures; ti++)
       {                         /* use the treasure list */
-        object *new_treasure = pick_random_object (style_map);
+        object *new_treasure = style_map->pick_random_object ();
         insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest);
       }
   else
     {                           /* use the style map */
       the_chest->randomitems = tlist;
       the_chest->stats.hp = n_treasures;
     }
 #endif
   {                             /* neither style_map no treasure list given */
-    treasurelist *tlist = find_treasurelist ("chest");
+    treasurelist *tlist = treasurelist::find ("chest");
     the_chest->randomitems = tlist;
     the_chest->stats.hp = n_treasures;
   }
       maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1);
       object *the_trap;
       if (trap_map)
         {
-          the_trap = pick_random_object (trap_map);
+          the_trap = trap_map->pick_random_object ();
           the_trap->stats.Cha = 10 + RP->difficulty;
-          the_trap->level = BC_RANDOM ((3 * RP->difficulty) / 2);
+          the_trap->level = bc_random ((3 * RP->difficulty) / 2);
           if (the_trap)
             {
               object *new_trap;
               new_trap = arch_to_object (the_trap->arch);
     }
   /* set the chest lock code, and call the keyplacer routine with
      the lockcode.  It's not worth bothering to lock the chest if
      there's only 1 treasure.... */
   if ((treasureoptions & KEYREQUIRED) && n_treasures > 1)
     {
       char keybuf[1024];
-      sprintf (keybuf, "%d", (int) RANDOM ());
+      sprintf (keybuf, "%d", rndm (1000000000));
       the_chest->slaying = keybuf;
       keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP);
     }
   /* actually place the chest. */
       int tries = 0;
       the_keymaster = 0;
       while (tries < 15 && !the_keymaster)
         {
-          i = (RANDOM () % (RP->Xsize - 2)) + 1;
+          i = rndm (RP->Xsize - 2) + 1;
-          j = (RANDOM () % (RP->Ysize - 2)) + 1;
+          j = rndm (RP->Ysize - 2) + 1;
           tries++;
           the_keymaster = find_closest_monster (map, i, j, RP);
         }
       /* if we don't find a good keymaster, drop the key on the ground. */
           int freeindex;
           freeindex = -1;
           for (tries = 0; tries < 15 && freeindex == -1; tries++)
             {
-              kx = (RANDOM () % (RP->Xsize - 2)) + 1;
+              kx = rndm (RP->Xsize - 2) + 1;
-              ky = (RANDOM () % (RP->Ysize - 2)) + 1;
+              ky = rndm (RP->Ysize - 2) + 1;
               freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
             }
           // can freeindex ever be < 0?
           if (freeindex >= 0)
   /* setup num_free_spots and room_free_spots */
   find_spot_in_room_recursive (layout2, x, y, RP);
   if (number_of_free_spots_in_room > 0)
     {
-      i = RANDOM () % number_of_free_spots_in_room;
+      i = rndm (number_of_free_spots_in_room);
       *kx = room_free_spots_x[i];
       *ky = room_free_spots_y[i];
     }
   /* deallocate the temp. layout */
           *cy = ly;
           return;
         }
     }
   /* give up and return the closest free spot. */
-  i = find_free_spot (&archetype::find ("chest")->clone, map, x, y, 1, SIZEOFFREE1 + 1);
+  i = find_free_spot (archetype::find ("chest"), map, x, y, 1, SIZEOFFREE1 + 1);
   if (i != -1)
     {
       *cx = x + freearr_x[i];
       *cy = y + freearr_y[i];
          it'll remove any monsters it finds.*/
 object **
 surround_by_doors (maptile *map, char **layout, int x, int y, int opts)
 {
   int i;
-  char *doors[2];
+  const char *doors[2];
   object **doorlist;
   int ndoors_made = 0;
   doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */
   /* this is a list we pick from, for horizontal and vertical doors */
         }
     }
   else
     {
       layout[x][y] = 1;
       /* now search all the 8 squares around recursively for free spots,in random order */
-      for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
+      for (i = rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
-        find_doors_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], doorlist, ndoors, RP);
+        find_doors_in_room_recursive (layout, map,
+                                      x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1],
+                                      doorlist, ndoors, RP);
     }
 }
 /* find a random non-blocked spot in this room to drop a key. */
 object **
           new_door->y = door->y;
           door->remove ();
           door->destroy ();
           doorlist[i] = new_door;
           insert_ob_in_map (new_door, map, NULL, 0);
-          sprintf (keybuf, "%d", (int) RANDOM ());
+          sprintf (keybuf, "%d", rndm (1000000000));
           new_door->slaying = keybuf;
           keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP);
         }
     }

Diff Legend

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

Comparing deliantra/server/random_maps/treasure.C (file contents): Revision 1.22 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/treasure.C (file contents):
Revision 1.22 by root, Fri Jan 19 21:49:58 2007 UTC vs.
Revision 1.30 by root, Sun Jul 1 05:00:19 2007 UTC