--- deliantra/server/random_maps/exit.C 2008/04/11 21:09:53 1.29
+++ deliantra/server/random_maps/exit.C 2009/10/12 14:00:58 1.34
@@ -5,18 +5,19 @@
* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Deliantra 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 3 of the License, or
- * (at your option) any later version.
+ * 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 GNU General Public License
- * along with this program. If not, see .
+ * 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
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -39,7 +40,7 @@
/* if a starting point isn't given, pick one */
if (mode < 1 || mode > 4)
- M = rndm (4) + 1;
+ M = rmg_rndm (4) + 1;
else
M = mode;
@@ -49,61 +50,61 @@
switch (M)
{
case 1:
- { /* search from top left down/right */
- for (i = 1; i < RP->Xsize; i++)
- for (j = 1; j < RP->Ysize; j++)
- {
- if (layout[i][j] == target)
- {
- *fx = i;
- *fy = j;
- return;
- }
- }
- break;
- }
+ /* search from top left down/right */
+ for (i = 1; i < RP->Xsize; i++)
+ for (j = 1; j < RP->Ysize; j++)
+ {
+ if (layout[i][j] == target)
+ {
+ *fx = i;
+ *fy = j;
+ return;
+ }
+ }
+ break;
+
case 2:
- { /* Search from top right down/left */
- for (i = RP->Xsize - 2; i > 0; i--)
- for (j = 1; j < RP->Ysize - 1; j++)
- {
- if (layout[i][j] == target)
- {
- *fx = i;
- *fy = j;
- return;
- }
- }
- break;
- }
+ /* Search from top right down/left */
+ for (i = RP->Xsize - 2; i > 0; i--)
+ for (j = 1; j < RP->Ysize - 1; j++)
+ {
+ if (layout[i][j] == target)
+ {
+ *fx = i;
+ *fy = j;
+ return;
+ }
+ }
+ break;
+
case 3:
- { /* search from bottom-left up-right */
- for (i = 1; i < RP->Xsize - 1; i++)
- for (j = RP->Ysize - 2; j > 0; j--)
- {
- if (layout[i][j] == target)
- {
- *fx = i;
- *fy = j;
- return;
- }
- }
- break;
- }
+ /* search from bottom-left up-right */
+ for (i = 1; i < RP->Xsize - 1; i++)
+ for (j = RP->Ysize - 2; j > 0; j--)
+ {
+ if (layout[i][j] == target)
+ {
+ *fx = i;
+ *fy = j;
+ return;
+ }
+ }
+ break;
+
case 4:
- { /* search from bottom-right up-left */
- for (i = RP->Xsize - 2; i > 0; i--)
- for (j = RP->Ysize - 2; j > 0; j--)
- {
- if (layout[i][j] == target)
- {
- *fx = i;
- *fy = j;
- return;
- }
- }
- break;
- }
+ /* search from bottom-right up-left */
+ for (i = RP->Xsize - 2; i > 0; i--)
+ for (j = RP->Ysize - 2; j > 0; j--)
+ {
+ if (layout[i][j] == target)
+ {
+ *fx = i;
+ *fy = j;
+ return;
+ }
+ }
+ break;
+
}
}
@@ -123,7 +124,6 @@
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. */
int cx = -1, cy = -1; /* location of a map center */
int upx = -1, upy = -1; /* location of up exit */
int downx = -1, downy = -1;
@@ -134,7 +134,7 @@
final_map_exit = 0;
if (!orientation)
- orientation = rndm (6) + 1;
+ orientation = rmg_rndm (6) + 1;
switch (orientation)
{
@@ -165,29 +165,15 @@
}
}
- if (style_map_up == 0)
- the_exit_up = arch_to_object (archetype::find ("exit"));
-
- else
- {
- object *tmp;
-
- tmp = style_map_up->pick_random_object ();
- the_exit_up = arch_to_object (tmp->arch);
- }
+ the_exit_up = style_map_up
+ ? style_map_up->pick_random_object (rmg_rndm)->clone ()
+ : archetype::get (shstr_exit);
/* 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 (archetype::find ("exit"));
-
- else
- {
- object *tmp;
-
- tmp = style_map_down->pick_random_object ();
- the_exit_down = arch_to_object (tmp->arch);
- }
+ if (RP->dungeon_level < RP->dungeon_depth || *RP->final_map)
+ the_exit_down = style_map_down
+ ? style_map_down->pick_random_object (rmg_rndm)->clone ()
+ : archetype::get (shstr_exit);
else
the_exit_down = 0;
@@ -241,15 +227,9 @@
{
if (!wall_blocked (map, the_exit_up->x + freearr_x[j], the_exit_up->y + freearr_y[j]))
{
- random_sign = get_archetype ("sign");
- random_sign->x = the_exit_up->x + freearr_x[j];
- random_sign->y = the_exit_up->y + freearr_y[j];
-
- char buf[8192];
- sprintf (buf, "This is a random map.\nLevel: %d\n", (RP->dungeon_level) - 1);
-
- random_sign->msg = buf;
- insert_ob_in_map (random_sign, map, NULL, 0);
+ object *random_sign = archetype::get (shstr_sign);
+ random_sign->msg = format ("This is a random map.\nLevel: %d\n", RP->dungeon_level - 1);
+ map->insert (random_sign, the_exit_up->x + freearr_x[j], the_exit_up->y + freearr_y[j], 0, 0);
}
}
@@ -265,6 +245,7 @@
/* first, look for a '>' character */
find_in_layout (0, '>', &downx, &downy, maze, RP);
+
/* if no > is found use C */
if (downx == -1)
{
@@ -333,7 +314,7 @@
* 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;