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

Comparing deliantra/server/random_maps/exit.C (file contents):
Revision 1.32 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.43 by root, Sat Jun 26 22:10:18 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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 GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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>
  */
 #include <global.h>
 #include <sproto.h>
 #include <rproto.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
+static void
 find_in_layout (int mode, char target, int *fx, int *fy, char **layout, random_map_params *RP)
 {
   int M;
   int i, j;
   4 means leftward
   5 means northward
   6 means southward
 */
 void
-place_exits (maptile *map, char **maze, char *exitstyle, int orientation, random_map_params *RP)
+place_exits (maptile *map, char **maze, const char *exitstyle, int orientation, random_map_params *RP)
 {
-  char styledirname[1024];
   maptile *style_map_down = 0;  /* harder maze */
   maptile *style_map_up = 0;    /* easier maze */
   object *the_exit_down;        /* harder maze */
   object *the_exit_up;          /* easier maze */
   int cx = -1, cy = -1;         /* location of a map center */
   switch (orientation)
     {
       case 1:
         {
-          sprintf (styledirname, "/styles/exitstyles/up");
-          style_map_up = find_style (styledirname, exitstyle, -1);
+          style_map_up   = find_style ("/styles/exitstyles/up"  , exitstyle, RP->difficulty);
-          sprintf (styledirname, "/styles/exitstyles/down");
-          style_map_down = find_style (styledirname, exitstyle, -1);
+          style_map_down = find_style ("/styles/exitstyles/down", exitstyle, RP->difficulty);
           break;
         }
       case 2:
         {
-          sprintf (styledirname, "/styles/exitstyles/down");
-          style_map_up = find_style (styledirname, exitstyle, -1);
+          style_map_up   = find_style ("/styles/exitstyles/down", exitstyle, RP->difficulty);
-          sprintf (styledirname, "/styles/exitstyles/up");
-          style_map_down = find_style (styledirname, exitstyle, -1);
+          style_map_down = find_style ("/styles/exitstyles/up"  , exitstyle, RP->difficulty);
           break;
         }
       default:
         {
-          sprintf (styledirname, "/styles/exitstyles/generic");
+          style_map_up   =
-          style_map_up = find_style (styledirname, exitstyle, -1);
+          style_map_down = find_style ("/styles/exitstyles/generic", exitstyle, RP->difficulty);
-          style_map_down = style_map_up;
           break;
         }
     }
   the_exit_up = style_map_up
     if (downx == -1)
       find_in_layout (0, 0, &downx, &downy, maze, RP);
     if (the_exit_down)
       {
-        char buf[16384];
-        int i = find_free_spot (the_exit_down, map, downx, downy, 1, SIZEOFFREE1 + 1);
+        int i = rmg_find_free_spot (the_exit_down, map, downx, downy, 1, SIZEOFFREE1 + 1);
         the_exit_down->x = downx + freearr_x[i];
         the_exit_down->y = downy + freearr_y[i];
         RP->origin_x = the_exit_down->x;
         RP->origin_y = the_exit_down->y;
+        dynbuf_text buf;
         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)
           {
             maptile *new_map;
-            object *the_exit_back = arch_to_object (the_exit_up->arch);
+            object *the_exit_back = the_exit_up->arch->instance ();
             /* load it */
             if (!(new_map = maptile::find_sync (RP->final_map)))
               return;
               /* 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))
+              if (tmp->type == EXIT && EXIT_PATH (tmp).starts_with ("?random/"))
                 {
                   tmp->destroy ();
                   break;
                 }
                 insert_ob_in_map (the_exit_back, new_map, NULL, 0);
               }
           }
         else
-          the_exit_down->slaying = "/!";
+          the_exit_down->slaying = shstr_random_map_exit;
         /* Block the exit so things don't get dumped on top of it. */
         the_exit_down->move_block = MOVE_ALL;
         insert_ob_in_map (the_exit_down, map, NULL, 0);
         maze[the_exit_down->x][the_exit_down->y] = '>';

Diff Legend

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

Comparing deliantra/server/random_maps/exit.C (file contents): Revision 1.32 by root, Mon Sep 29 10:32:50 2008 UTC vs. Revision 1.43 by root, Sat Jun 26 22:10:18 2010 UTC

Diff Legend

Comparing deliantra/server/random_maps/exit.C (file contents):
Revision 1.32 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.43 by root, Sat Jun 26 22:10:18 2010 UTC