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

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.4 by root, Sun Sep 10 16:06:37 2006 UTC vs.
Revision 1.7 by root, Sat Sep 16 22:24:13 2006 UTC

-/*
- * static char *rcsid_treasure_c =
- *   "$Id: treasure.C,v 1.4 2006/09/10 16:06:37 root Exp $";
- */
 /*
     CrossFire, A Multiplayer game for X-windows
     Copyright (C) 2001 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     You should have received a copy of the GNU General Public License
     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-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 /*  placing treasure in maps, where appropriate.  */
  * and doors but not monsters.
  * This function is not map tile aware.
  */
 int
-wall_blocked (mapstruct *m, int x, int y)
+wall_blocked (maptile *m, int x, int y)
 {
   int r;
   if (OUT_OF_REAL_MAP (m, x, y))
     return 1;
 treasure style    (may be empty or NULL, or "none" to cause no treasure.)
 treasureoptions   (may be 0 for random choices or positive)
 */
 void
-place_treasure (mapstruct *map, char **layout, char *treasure_style, int treasureoptions, RMParms * RP)
+place_treasure (maptile *map, char **layout, char *treasure_style, int treasureoptions, RMParms * RP)
 {
   char styledirname[256];
   char stylefilepath[256];
-  mapstruct *style_map = 0;
+  maptile *style_map = 0;
   int num_treasures;
   /* bail out if treasure isn't wanted. */
   if (treasure_style)
     if (!strcmp (treasure_style, "none"))
 /* put a chest into the map, near x and y, with the treasure style
         determined (may be null, or may be a treasure list from lib/treasures,
         if the global variable "treasurestyle" is set to that treasure list's name */
 object *
-place_chest (int treasureoptions, int x, int y, mapstruct *map, mapstruct *style_map, int n_treasures, RMParms * RP)
+place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, RMParms * RP)
 {
   object *the_chest;
   int i, xl, yl;
   the_chest = get_archetype ("chest");  /* was "chest_2" */
   }
   /* stick a trap in the chest if required  */
   if (treasureoptions & TRAPPED)
     {
-      mapstruct *trap_map = find_style ("/styles/trapstyles", "traps", -1);
+      maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1);
       object *the_trap;
       if (trap_map)
         {
           the_trap = pick_random_object (trap_map);
 /* finds the closest monster and returns him, regardless of doors
         or walls */
 object *
-find_closest_monster (mapstruct *map, int x, int y, RMParms * RP)
+find_closest_monster (maptile *map, int x, int y, RMParms * RP)
 {
   int i;
   for (i = 0; i < SIZEOFFREE; i++)
     {
         The idea is that you call keyplace on x,y where a door is, and it'll make
         sure a key is placed on both sides of the door.
 */
 int
-keyplace (mapstruct *map, int x, int y, char *keycode, int door_flag, int n_keys, RMParms * RP)
+keyplace (maptile *map, int x, int y, char *keycode, int door_flag, int n_keys, RMParms * RP)
 {
   int i, j;
   int kx, ky;
   object *the_keymaster;        /* the monster that gets the key. */
   object *the_key;
 /* a recursive routine which will return a monster, eventually,if there is one.
    it does a check-off on the layout, converting 0's to 1's */
 object *
-find_monster_in_room_recursive (char **layout, mapstruct *map, int x, int y, RMParms * RP)
+find_monster_in_room_recursive (char **layout, maptile *map, int x, int y, RMParms * RP)
 {
   int i, j;
   /* if we've found a monster already, leave */
   if (theMonsterToFind != NULL)
 /* sets up some data structures:  the _recursive form does the
    real work.  */
 object *
-find_monster_in_room (mapstruct *map, int x, int y, RMParms * RP)
+find_monster_in_room (maptile *map, int x, int y, RMParms * RP)
 {
   char **layout2;
   int i, j;
   theMonsterToFind = 0;
 }
 /* find a random non-blocked spot in this room to drop a key. */
 void
-find_spot_in_room (mapstruct *map, int x, int y, int *kx, int *ky, RMParms * RP)
+find_spot_in_room (maptile *map, int x, int y, int *kx, int *ky, RMParms * RP)
 {
   char **layout2;
   int i, j;
   number_of_free_spots_in_room = 0;
 /* searches the map for a spot with walls around it.  The more
         walls the better, but it'll settle for 1 wall, or even 0, but
         it'll return 0 if no FREE spots are found.*/
 void
-find_enclosed_spot (mapstruct *map, int *cx, int *cy, RMParms * RP)
+find_enclosed_spot (maptile *map, int *cx, int *cy, RMParms * RP)
 {
   int x, y;
   int i;
   x = *cx;
           *cy = ly;
           return;
         }
     }
   /* give up and return the closest free spot. */
-  i = find_first_free_spot (&find_archetype ("chest")->clone, map, x, y);
+  i = find_first_free_spot (&archetype::find ("chest")->clone, map, x, y);
   if (i != -1 && i <= SIZEOFFREE1)
     {
       *cx = x + freearr_x[i];
       *cy = y + freearr_y[i];
       return;
   *cx = *cy = -1;
 }
 void
-remove_monsters (int x, int y, mapstruct *map)
+remove_monsters (int x, int y, maptile *map)
 {
   object *tmp;
   for (tmp = get_map_ob (map, x, y); tmp != NULL; tmp = tmp->above)
     if (QUERY_FLAG (tmp, FLAG_ALIVE))
 /*  surrounds the point x,y by doors, so as to enclose something, like
          a chest.  It only goes as far as the 8 squares surrounding, and
          it'll remove any monsters it finds.*/
 object **
-surround_by_doors (mapstruct *map, char **layout, int x, int y, int opts)
+surround_by_doors (maptile *map, char **layout, int x, int y, int opts)
 {
   int i;
   char *doors[2];
   object **doorlist;
   int ndoors_made = 0;
 }
 /* returns the first door in this square, or NULL if there isn't a door. */
 object *
-door_in_square (mapstruct *map, int x, int y)
+door_in_square (maptile *map, int x, int y)
 {
   object *tmp;
   for (tmp = get_map_ob (map, x, y); tmp != NULL; tmp = tmp->above)
     if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
 }
 /* the workhorse routine, which finds the doors in a room */
 void
-find_doors_in_room_recursive (char **layout, mapstruct *map, int x, int y, object **doorlist, int *ndoors, RMParms * RP)
+find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, RMParms * RP)
 {
   int i, j;
   object *door;
   /* bounds check x and y */
     }
 }
 /* find a random non-blocked spot in this room to drop a key. */
 object **
-find_doors_in_room (mapstruct *map, int x, int y, RMParms * RP)
+find_doors_in_room (maptile *map, int x, int y, RMParms * RP)
 {
   char **layout2;
   object **doorlist;
   int i, j;
   int ndoors = 0;
 /* locks and/or hides all the doors in doorlist, or does nothing if
         opts doesn't say to lock/hide doors. */
 void
-lock_and_hide_doors (object **doorlist, mapstruct *map, int opts, RMParms * RP)
+lock_and_hide_doors (object **doorlist, maptile *map, int opts, RMParms * RP)
 {
   object *door;
   int i;
   /* lock the doors and hide the keys. */

Diff Legend

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

Comparing deliantra/server/random_maps/treasure.C (file contents): Revision 1.4 by root, Sun Sep 10 16:06:37 2006 UTC vs. Revision 1.7 by root, Sat Sep 16 22:24:13 2006 UTC

Diff Legend

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.4 by root, Sun Sep 10 16:06:37 2006 UTC vs.
Revision 1.7 by root, Sat Sep 16 22:24:13 2006 UTC