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

Comparing deliantra/server/random_maps/exit.C (file contents):
Revision 1.4 by root, Sun Sep 10 16:06:37 2006 UTC vs.
Revision 1.14 by root, Sun Dec 31 10:28:36 2006 UTC

-/*
- * static char *rcsid_exit_c =
- *   "$Id: exit.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>
 */
 #include <global.h>
 #include <random_map.h>
 #include <sproto.h>
 /*  find a character in the layout.  fx and fy are pointers to
     where to find the char.  fx,fy = -1 if not found. */
 void
-find_in_layout (int mode, char target, int *fx, int *fy, char **layout, RMParms * RP)
+find_in_layout (int mode, char target, int *fx, int *fy, char **layout, random_map_params * RP)
 {
   int M;
   int i, j;
   *fx = -1;
             break;
           }
     }
 }
 /* orientation:  0 means random,
   1 means descending dungeon
   2 means ascending dungeon
   3 means rightward
   4 means leftward
   5 means northward
   6 means southward
 */
 void
-place_exits (mapstruct *map, char **maze, char *exitstyle, int orientation, RMParms * RP)
+place_exits (maptile *map, char **maze, char *exitstyle, int orientation, random_map_params *RP)
 {
   char styledirname[256];
-  mapstruct *style_map_down = 0;        /* harder maze */
+  maptile *style_map_down = 0;        /* harder maze */
-  mapstruct *style_map_up = 0;  /* easier maze */
+  maptile *style_map_up = 0;  /* easier maze */
   object *the_exit_down;        /* harder maze */
   object *the_exit_up;          /* easier maze */
   object *random_sign;          /* magic mouth saying this is a random map. */
   char buf[512];
   int cx = -1, cy = -1;         /* location of a map center */
             style_map_down = style_map_up;
             break;
           }
     }
   if (style_map_up == 0)
-    the_exit_up = arch_to_object (find_archetype ("exit"));
+    the_exit_up = arch_to_object (archetype::find ("exit"));
   else
     {
       object *tmp;
       tmp = pick_random_object (style_map_up);
     }
   /* we need a down exit only if we're recursing. */
   if (RP->dungeon_level < RP->dungeon_depth || RP->final_map[0] != 0)
     if (style_map_down == 0)
-      the_exit_down = arch_to_object (find_archetype ("exit"));
+      the_exit_down = arch_to_object (archetype::find ("exit"));
     else
       {
         object *tmp;
         tmp = pick_random_object (style_map_down);
     insert_ob_in_map (the_exit_up, map, NULL, 0);
     maze[the_exit_up->x][the_exit_up->y] = '<';
     /* set the starting x,y for this map */
-    MAP_ENTER_X (map) = the_exit_up->x;
+    map->enter_x = the_exit_up->x;
-    MAP_ENTER_Y (map) = the_exit_up->y;
+    map->enter_y = the_exit_up->y;
     /* first, look for a '>' character */
     find_in_layout (0, '>', &downx, &downy, maze, RP);
     /* if no > is found use C */
     if (downx == -1)
         write_map_parameters_to_string (buf, RP);
         the_exit_down->msg = buf;
         /* the identifier for making a random map. */
         if (RP->dungeon_level >= RP->dungeon_depth && RP->final_map[0] != 0)
           {
-            mapstruct *new_map;
+            maptile *new_map;
             object *the_exit_back = arch_to_object (the_exit_up->arch), *tmp;
 #if 0
             /* I'm not sure if there was any reason to change the path to the
              * map other than to maybe make it more descriptive in the 'maps'
             /* give the final map a name */
             sprintf (new_map_name, "%sfinal_map", RP->final_map);
             /* set the exit down. */
 #endif
             /* load it */
-            if ((new_map = ready_map_name (RP->final_map, 0)) == NULL)
+            if (!(new_map = maptile::load_map_sync (RP->final_map)))
               return;
             the_exit_down->slaying = RP->final_map;
-            strcpy (new_map->path, RP->final_map);
-            for (tmp = GET_MAP_OB (new_map, MAP_ENTER_X (new_map), MAP_ENTER_Y (new_map)); tmp; tmp = tmp->above)
+            for (tmp = new_map->at (new_map->enter_x, new_map->enter_y).bot; tmp; tmp = tmp->above)
               /* Remove exit back to previous random map.  There should only be one
                * which is why we break out.  To try to process more than one
                * would require keeping a 'next' pointer, ad free_object kills tmp, which
                * breaks the for loop.
                */
               if (tmp->type == EXIT && EXIT_PATH (tmp) && !strncmp (EXIT_PATH (tmp), "/random/", 8))
                 {
-                  remove_ob (tmp);
+                  tmp->destroy ();
-                  free_object (tmp);
                   break;
                 }
             if (final_map_exit == 1)
               {
                 /* setup the exit back */
                 the_exit_back->slaying = map->path;
                 the_exit_back->stats.hp = the_exit_down->x;
                 the_exit_back->stats.sp = the_exit_down->y;
-                the_exit_back->x = MAP_ENTER_X (new_map);
+                the_exit_back->x = new_map->enter_x;
-                the_exit_back->y = MAP_ENTER_Y (new_map);
+                the_exit_back->y = new_map->enter_y;
                 insert_ob_in_map (the_exit_back, new_map, NULL, 0);
               }
-            set_map_timeout (new_map);  /* So it gets swapped out */
           }
         else
           the_exit_down->slaying = "/!";
         /* Block the exit so things don't get dumped on top of it. */
       }
   }
 }
 /* this function unblocks the exits.  We blocked them to
    keep things from being dumped on them during the other
    phases of random map generation. */
 void
-unblock_exits (mapstruct *map, char **maze, RMParms * RP)
+unblock_exits (maptile *map, char **maze, random_map_params * RP)
 {
   int i = 0, j = 0;
   object *walk;
   for (i = 0; i < RP->Xsize; i++)
     for (j = 0; j < RP->Ysize; j++)
       if (maze[i][j] == '>' || maze[i][j] == '<')
         {
-          for (walk = get_map_ob (map, i, j); walk != NULL; walk = walk->above)
+          for (walk = GET_MAP_OB (map, i, j); walk != NULL; walk = walk->above)
             {
               if (walk->move_block == MOVE_ALL && walk->type != LOCKED_DOOR)
                 {
                   walk->move_block = MOVE_BLOCK_DEFAULT;
                   update_object (walk, UP_OBJ_CHANGE);

Diff Legend

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

Comparing deliantra/server/random_maps/exit.C (file contents): Revision 1.4 by root, Sun Sep 10 16:06:37 2006 UTC vs. Revision 1.14 by root, Sun Dec 31 10:28:36 2006 UTC

Diff Legend

Comparing deliantra/server/random_maps/exit.C (file contents):
Revision 1.4 by root, Sun Sep 10 16:06:37 2006 UTC vs.
Revision 1.14 by root, Sun Dec 31 10:28:36 2006 UTC