ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/random_maps/exit.C
(Generate patch)

Comparing deliantra/server/random_maps/exit.C (file contents):
Revision 1.30 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.38 by root, Fri Mar 26 00:59:21 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
26#include <sproto.h> 27#include <sproto.h>
27#include <rproto.h> 28#include <rproto.h>
28 29
29/* find a character in the layout. fx and fy are pointers to 30/* find a character in the layout. fx and fy are pointers to
30 where to find the char. fx,fy = -1 if not found. */ 31 where to find the char. fx,fy = -1 if not found. */
31void 32static void
32find_in_layout (int mode, char target, int *fx, int *fy, char **layout, random_map_params *RP) 33find_in_layout (int mode, char target, int *fx, int *fy, char **layout, random_map_params *RP)
33{ 34{
34 int M; 35 int M;
35 int i, j; 36 int i, j;
36 37
295 296
296 /* the identifier for making a random map. */ 297 /* the identifier for making a random map. */
297 if (RP->dungeon_level >= RP->dungeon_depth && *RP->final_map) 298 if (RP->dungeon_level >= RP->dungeon_depth && *RP->final_map)
298 { 299 {
299 maptile *new_map; 300 maptile *new_map;
300 object *the_exit_back = arch_to_object (the_exit_up->arch); 301 object *the_exit_back = the_exit_up->arch->instance ();
301 302
302 /* load it */ 303 /* load it */
303 if (!(new_map = maptile::find_sync (RP->final_map))) 304 if (!(new_map = maptile::find_sync (RP->final_map)))
304 return; 305 return;
305 306
311 /* Remove exit back to previous random map. There should only be one 312 /* Remove exit back to previous random map. There should only be one
312 * which is why we break out. To try to process more than one 313 * which is why we break out. To try to process more than one
313 * would require keeping a 'next' pointer, ad free_object kills tmp, which 314 * would require keeping a 'next' pointer, ad free_object kills tmp, which
314 * breaks the for loop. 315 * breaks the for loop.
315 */ 316 */
316 if (tmp->type == EXIT && EXIT_PATH (tmp) && !strncmp (EXIT_PATH (tmp), "?random/", 8)) 317 if (tmp->type == EXIT && EXIT_PATH (tmp).starts_with ("?random/"))
317 { 318 {
318 tmp->destroy (); 319 tmp->destroy ();
319 break; 320 break;
320 } 321 }
321 322
330 331
331 insert_ob_in_map (the_exit_back, new_map, NULL, 0); 332 insert_ob_in_map (the_exit_back, new_map, NULL, 0);
332 } 333 }
333 } 334 }
334 else 335 else
335 the_exit_down->slaying = "/!"; 336 the_exit_down->slaying = shstr_random_map_exit;
336 337
337 /* Block the exit so things don't get dumped on top of it. */ 338 /* Block the exit so things don't get dumped on top of it. */
338 the_exit_down->move_block = MOVE_ALL; 339 the_exit_down->move_block = MOVE_ALL;
339 insert_ob_in_map (the_exit_down, map, NULL, 0); 340 insert_ob_in_map (the_exit_down, map, NULL, 0);
340 maze[the_exit_down->x][the_exit_down->y] = '>'; 341 maze[the_exit_down->x][the_exit_down->y] = '>';

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines