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

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.60 by root, Sat Apr 23 04:56:54 2011 UTC vs.
Revision 1.67 by root, Sat Nov 17 23:40:02 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by 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
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /*  placing treasure in maps, where appropriate.  */
   object *key = archetype::get (shstr_key_random_map);
   key->slaying = keycode;
   return key;
 }
 /* places keys in the map, preferably in something alive.
         keycode is the key's code,
         door_flag is either PASS_DOORS or NO_PASS_DOORS.
           NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
         if n_keys is 1, it will place 1 key.  if n_keys >1, it will place 2-4 keys:
         it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
             }
           // can freeindex ever be < 0?
           if (freeindex >= 0)
             {
-              kx += freearr_x [freeindex];
+              kx += DIRX (freeindex);
-              ky += freearr_y [freeindex];
+              ky += DIRY (freeindex);
             }
         }
     }
   else
     {                           /* NO_PASS_DOORS --we have to work harder. */
   m->at (x, y).update ();
   return GET_MAP_MOVE_BLOCK (m, x, y) & MOVE_WALK;
 }
 /* place treasures in the map, given the
 map,         (required)
 maze,      (required)
 treasure style    (may be empty or NULL, or "none" to cause no treasure.)
 treasureoptions   (may be 0 for random choices or positive)
 */
     {
       the_chest->destroy ();
       return NULL;
     }
-  int xl = x + freearr_x[i];
+  int xl = x + DIRX (i);
-  int yl = y + freearr_y[i];
+  int yl = y + DIRY (i);
   /* if the placement is blocked, return a fail. */
   if (wall_blocked (map, xl, yl))
     return 0;
   for (i = 0; i < SIZEOFFREE; i++)
     {
       int lx, ly;
-      lx = x + freearr_x[i];
+      lx = x + DIRX (i);
-      ly = y + freearr_y[i];
+      ly = y + DIRY (i);
       /* boundscheck */
       if (lx >= 0 && ly >= 0 && lx < map->width && ly < map->height)
         /* don't bother searching this square unless the map says life exists. */
         if (GET_MAP_FLAGS (map, lx, ly) & P_IS_ALIVE)
           {
     }
   /* now search all the 8 squares around recursively for a monster,in random order */
   for (i = rmg_rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
     {
-      theMonsterToFind = find_monster_in_room_recursive (maze, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1]);
+      theMonsterToFind = find_monster_in_room_recursive (maze, map, x + DIRX (i % 8 + 1), y + DIRY (i % 8 + 1));
       if (theMonsterToFind)
         return theMonsterToFind;
     }
   return theMonsterToFind;
   maze[x][y] = 1;
   spots.push (point (x, y));
   /* now search all the 8 squares around recursively for free spots,in random order */
   for (int i = rmg_rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
-    find_spot_in_room_recursive (maze, spots, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1]);
+    find_spot_in_room_recursive (maze, spots, x + DIRX (i % 8 + 1), y + DIRY (i % 8 + 1));
 }
 /* find a random non-blocked spot in this room to drop a key. */
 static void
   for (i = 0; i <= SIZEOFFREE1; i++)
     {
       int lx, ly, sindex;
-      lx = x + freearr_x[i];
+      lx = x + DIRX (i);
-      ly = y + freearr_y[i];
+      ly = y + DIRY (i);
       sindex = surround_flag3 (map, lx, ly);
       /* if it's blocked on 3 sides, it's enclosed */
       if (sindex == 7 || sindex == 11 || sindex == 13 || sindex == 14)
         {
           *cx = lx;
      spots--try to find someplace which is 2x enclosed.  */
   for (i = 0; i <= SIZEOFFREE1; i++)
     {
       int lx, ly, sindex;
-      lx = x + freearr_x[i];
+      lx = x + DIRX (i);
-      ly = y + freearr_y[i];
+      ly = y + DIRY (i);
       sindex = surround_flag3 (map, lx, ly);
       /* if it's blocked on 3 sides, it's enclosed */
       if (sindex == 3 || sindex == 5 || sindex == 9 || sindex == 6 || sindex == 10 || sindex == 12)
         {
           *cx = lx;
   /* settle for one surround point */
   for (i = 0; i <= SIZEOFFREE1; i++)
     {
       int lx, ly, sindex;
-      lx = x + freearr_x[i];
+      lx = x + DIRX (i);
-      ly = y + freearr_y[i];
+      ly = y + DIRY (i);
       sindex = surround_flag3 (map, lx, ly);
       /* if it's blocked on 3 sides, it's enclosed */
       if (sindex)
         {
           *cx = lx;
   /* give up and return the closest free spot. */
   i = rmg_find_free_spot (archetype::find (shstr_chest), map, x, y, 1, SIZEOFFREE1 + 1);
   if (i != -1)
     {
-      *cx = x + freearr_x[i];
+      *cx = x + DIRX (i);
-      *cy = y + freearr_y[i];
+      *cy = y + DIRY (i);
     }
   else
     {
       /* indicate failure */
       *cx = -1;
     }
   /* place doors in all the 8 adjacent unblocked squares. */
   for (i = 1; i < 9; i++)
     {
-      int x1 = x + freearr_x[i], y1 = y + freearr_y[i];
+      int x1 = x + DIRX (i), y1 = y + DIRY (i);
       if (!wall_blocked (map, x1, y1) && maze[x1][y1] == '>')
         {                       /* place a door */
           remove_monsters (x1, y1, map);
-          object *new_door = get_archetype (freearr_x[i] == 0 ? doors[1] : doors[0]);
+          object *new_door = archetype::get (DIRX (i) == 0 ? doors[1] : doors[0]);
           map->insert (new_door, x1, y1);
           doorlist[ndoors_made] = new_door;
           ndoors_made++;
         }
     }
       maze[x][y] = 1;
       /* now search all the 8 squares around recursively for free spots,in random order */
       for (i = rmg_rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
         find_doors_in_room_recursive (maze, map,
-                                      x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1],
+                                      x + DIRX (i % 8 + 1), y + DIRY (i % 8 + 1),
                                       doorlist, ndoors);
     }
 }
 /* find a random non-blocked spot in this room to drop a key. */
   if (opts & DOORED)
     {
       for (i = 0, door = doorlist[0]; doorlist[i]; i++)
         {
-          object *new_door = get_archetype (shstr_locked_door1);
+          object *new_door = archetype::get (shstr_locked_door1);
           door = doorlist[i];
           new_door->face = door->face;
           new_door->x = door->x;
           new_door->y = door->y;

Diff Legend

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

Comparing deliantra/server/random_maps/treasure.C (file contents): Revision 1.60 by root, Sat Apr 23 04:56:54 2011 UTC vs. Revision 1.67 by root, Sat Nov 17 23:40:02 2018 UTC

Diff Legend

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.60 by root, Sat Apr 23 04:56:54 2011 UTC vs.
Revision 1.67 by root, Sat Nov 17 23:40:02 2018 UTC