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

Comparing deliantra/server/random_maps/door.C (file contents):
Revision 1.18 by root, Fri May 2 21:01:53 2008 UTC vs.
Revision 1.20 by root, Mon Oct 12 14:00:58 2009 UTC

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 (©) 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>
33 2 = door or wall to right, 34 2 = door or wall to right,
34 4 = door or wall above 35 4 = door or wall above
35 8 = door or wall below */ 36 8 = door or wall below */
36 int surround_index = 0; 37 int surround_index = 0;
37 38
38 if ((i > 0) && (layout[i - 1][j] == 'D' || layout[i - 1][j] == '#')) 39 if ((i > 0) && (layout[i - 1][j] == 'D' || layout[i - 1][j] == '#')) surround_index |= 1;
39 surround_index += 1;
40 if ((i < Xsize - 1) && (layout[i + 1][j] == 'D' || layout[i + 1][j] == '#')) 40 if ((i < Xsize - 1) && (layout[i + 1][j] == 'D' || layout[i + 1][j] == '#')) surround_index |= 2;
41 surround_index += 2;
42 if ((j > 0) && (layout[i][j - 1] == 'D' || layout[i][j - 1] == '#')) 41 if ((j > 0) && (layout[i][j - 1] == 'D' || layout[i][j - 1] == '#')) surround_index |= 4;
43 surround_index += 4;
44 if ((j < Ysize - 1) && (layout[i][j + 1] == 'D' && layout[i][j + 1] == '#')) 42 if ((j < Ysize - 1) && (layout[i][j + 1] == 'D' || layout[i][j + 1] == '#')) surround_index |= 8;
45 surround_index += 8; 43
46 return surround_index; 44 return surround_index;
47} 45}
48 46
49void 47void
50put_doors (maptile *the_map, char **maze, const char *doorstyle, random_map_params *RP) 48put_doors (maptile *the_map, char **maze, const char *doorstyle, random_map_params *RP)
79 if (maze[i][j] == 'D') 77 if (maze[i][j] == 'D')
80 { 78 {
81 int sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize); 79 int sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize);
82 80
83 object *this_door = (sindex == 3 ? hdoors : vdoors) 81 object *this_door = (sindex == 3 ? hdoors : vdoors)
84 ->pick_random_object (); 82 ->pick_random_object (rmg_rndm);
85 83
86 if (!this_door)//TODO not necessary? 84 the_map->insert (this_door->clone (), i, j, 0, 0);
87 abort ();
88
89 object *new_door = this_door->clone ();
90 new_door->x = i;
91 new_door->y = j;
92 insert_ob_in_map (new_door, the_map, NULL, 0);
93 } 85 }
94 } 86 }
95} 87}
96 88

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines