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

Comparing deliantra/server/random_maps/wall.C (file contents):
Revision 1.24 by root, Thu Nov 8 19:43:25 2007 UTC vs.
Revision 1.29 by root, Mon Oct 12 14:00:58 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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>
25#include <random_map.h> 26#include <random_map.h>
26#include <rproto.h> 27#include <rproto.h>
27 28
28/* Put in the walls and autojoin them. */ 29/* Put in the walls and autojoin them. */
29 30
30
31/* given a layout and a coordinate, tell me which squares up/down/right/left 31/* given a layout and a coordinate, tell me which squares up/down/right/left
32 are occupied. */ 32 are occupied. */
33
34int 33int
35surround_flag (char **layout, int i, int j, random_map_params *RP) 34surround_flag (char **layout, int i, int j, random_map_params *RP)
36{ 35{
37 /* 1 = wall to left, 36 /* 1 = wall to left,
38 2 = wall to right, 37 2 = wall to right,
153 style_map = find_style (styledirname, w_style, -1); 152 style_map = find_style (styledirname, w_style, -1);
154 if (!style_map) 153 if (!style_map)
155 return; 154 return;
156 155
157 /* fill up the map with the given floor style */ 156 /* fill up the map with the given floor style */
158 if ((the_wall = style_map->pick_random_object ())) 157 if ((the_wall = style_map->pick_random_object (rmg_rndm)))
159 { 158 {
160 int i, j; 159 int i, j;
161 char *cp; 160 char *cp;
162 int joinedwalls = 0; 161 int joinedwalls = 0;
163 object *thiswall; 162 object *thiswall;
396 new_wall = arch_to_object (wall_arch); 395 new_wall = arch_to_object (wall_arch);
397 new_wall->x = i; 396 new_wall->x = i;
398 new_wall->y = j; 397 new_wall->y = j;
399 398
400 if (the_wall && the_wall->map) 399 if (the_wall && the_wall->map)
401 {
402 the_wall->remove ();
403 the_wall->destroy (); 400 the_wall->destroy ();
404 }
405 401
406 the_wall->move_block = MOVE_ALL; 402 the_wall->move_block = MOVE_ALL;
407 insert_ob_in_map (new_wall, the_map, new_wall, INS_NO_MERGE | INS_NO_WALK_ON); 403 insert_ob_in_map (new_wall, the_map, new_wall, INS_NO_MERGE | INS_NO_WALK_ON);
408 } 404 }
409 405

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines