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.6 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.29 by root, Tue Jan 3 11:25:33 2012 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 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 <rmg.h>
26#include <rproto.h> 27#include <rproto.h>
27 28
28/* where are there adjacent doors or walls? */ 29/* where are there adjacent doors or walls? */
29int 30static int
30surround_check2 (char **layout, int i, int j, int Xsize, int Ysize) 31surround_check2 (layout &maze, int i, int j)
31{ 32{
32 /* 1 = door or wall to left, 33 /* 1 = door or wall to left,
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) && (maze[i - 1][j] == 'D' || maze[i - 1][j] == '#')) surround_index |= 1;
39 surround_index += 1; 40 if ((i < maze.w - 1) && (maze[i + 1][j] == 'D' || maze[i + 1][j] == '#')) surround_index |= 2;
40 if ((i < Xsize - 1) && (layout[i + 1][j] == 'D' || layout[i + 1][j] == '#')) 41 if ((j > 0) && (maze[i][j - 1] == 'D' || maze[i][j - 1] == '#')) surround_index |= 4;
41 surround_index += 2; 42 if ((j < maze.h - 1) && (maze[i][j + 1] == 'D' || maze[i][j + 1] == '#')) surround_index |= 8;
42 if ((j > 0) && (layout[i][j - 1] == 'D' || layout[i][j - 1] == '#')) 43
43 surround_index += 4;
44 if ((j < Ysize - 1) && (layout[i][j + 1] == 'D' && layout[i][j + 1] == '#'))
45 surround_index += 8;
46 return surround_index; 44 return surround_index;
47} 45}
48 46
49void 47void
50put_doors (maptile *the_map, char **maze, const char *doorstyle, RMParms * RP) 48put_doors (maptile *the_map, layout &maze, const char *doorstyle, random_map_params *RP)
51{ 49{
52 int i, j; 50 int i, j;
53 maptile *vdoors; 51 maptile *vdoors;
54 maptile *hdoors; 52 maptile *hdoors;
55 char doorpath[128]; 53 char doorpath[1024];
56 54
57 if (!strcmp (doorstyle, "none")) 55 if (!strcmp (doorstyle, "none"))
58 return; 56 return;
57
59 vdoors = find_style ("/styles/doorstyles", doorstyle, -1); 58 vdoors = find_style ("/styles/doorstyles", doorstyle, RP->difficulty);
59
60 if (vdoors) 60 if (vdoors)
61 hdoors = vdoors; 61 hdoors = vdoors;
62 else 62 else
63 { 63 {
64 vdoors = find_style ("/styles/doorstyles/vdoors", doorstyle, -1); 64 vdoors = find_style ("/styles/doorstyles/vdoors", doorstyle, RP->difficulty);
65 if (!vdoors) 65 if (!vdoors)
66 return; 66 return;
67
67 sprintf (doorpath, "/styles/doorstyles/hdoors%s", strrchr (vdoors->path, '/')); 68 sprintf (doorpath, "/styles/doorstyles/hdoors%s", strrchr (vdoors->path, '/'));
68 hdoors = find_style (doorpath, 0, -1); 69 hdoors = find_style (doorpath, 0, RP->difficulty);
70 if (!hdoors)
71 return;
69 } 72 }
73
70 for (i = 0; i < RP->Xsize; i++) 74 for (i = 0; i < RP->Xsize; i++)
71 for (j = 0; j < RP->Ysize; j++) 75 for (j = 0; j < RP->Ysize; j++)
72 { 76 {
73 if (maze[i][j] == 'D') 77 if (maze[i][j] == 'D')
74 { 78 {
75 int sindex; 79 int sindex = surround_check2 (maze, i, j);
76 object *this_door, *new_door;
77 80
78 sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize); 81 object *this_door = (sindex == 3 ? hdoors : vdoors)
79 if (sindex == 3) 82 ->pick_random_object (rmg_rndm);
80 this_door = pick_random_object (hdoors); 83
81 else 84 the_map->insert (this_door->clone (), i, j, 0, 0);
82 this_door = pick_random_object (vdoors);
83 new_door = arch_to_object (this_door->arch);
84 this_door->copy_to (new_door);
85 new_door->x = i;
86 new_door->y = j;
87 insert_ob_in_map (new_door, the_map, NULL, 0);
88 } 85 }
89 } 86 }
90} 87}
88

Diff Legend

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