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

Comparing deliantra/server/random_maps/room_gen_spiral.C (file contents):
Revision 1.13 by root, Mon Apr 14 22:41:17 2008 UTC vs.
Revision 1.16 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 (©) 1994,2007 Mark Wedel 5 * Copyright (©) 1994,2007 Mark Wedel
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/* The onion room generator: 25/* The onion room generator:
25Onion rooms are like this: 26Onion rooms are like this:
26 27
27char **map_gen_spiral(int xsize, int ysize, int option); 28char **map_gen_spiral(int xsize, int ysize, int option);
28
29
30*/ 29*/
30
31#include <global.h> 31#include <global.h>
32#include <random_map.h> 32#include <random_map.h>
33 33
34#define RANDOM_OPTIONS 0 /* Pick random options below */ 34#define RANDOM_OPTIONS 0 /* Pick random options below */
35#define REGULAR_SPIRAL 1 /* Regular spiral--distance increases constantly */ 35#define REGULAR_SPIRAL 1 /* Regular spiral--distance increases constantly */
… …
50#define MAX_FINE .454545 50#define MAX_FINE .454545
51 51
52extern int surround_check (char **maze, int i, int j, int xsize, int ysize); 52extern int surround_check (char **maze, int i, int j, int xsize, int ysize);
53 53
54void 54void
55map_gen_spiral (Maze maze, int option) 55map_gen_spiral (Layout maze, int option)
56{ 56{
57 int i, j; 57 int i, j;
58 float parm = 0; 58 float parm = 0;
59 float x = 0, y = 0; 59 float x = 0, y = 0;
60 int ic, jc; 60 int ic, jc;
… …
72 SizeX = xsize / 2 - 2; 72 SizeX = xsize / 2 - 2;
73 SizeY = ysize / 2 - 2; 73 SizeY = ysize / 2 - 2;
74 74
75 /* select random options if necessary */ 75 /* select random options if necessary */
76 if (option == 0) 76 if (option == 0)
77 option = rndm (MAX_SPIRAL_OPT); 77 option = rmg_rndm (MAX_SPIRAL_OPT);
78 78
79 /* the order in which these are evaluated matters */ 79 /* the order in which these are evaluated matters */
80 80
81 /* the following two are mutually exclusive. 81 /* the following two are mutually exclusive.
82 pick one if they're both set. */ 82 pick one if they're both set. */
83 if ((option & REGULAR_SPIRAL) && (option & FIT_SPIRAL)) 83 if ((option & REGULAR_SPIRAL) && (option & FIT_SPIRAL))
84 { 84 {
85 /* unset REGULAR_SPIRAL half the time */ 85 /* unset REGULAR_SPIRAL half the time */
86 if (rndm (2) && (option & REGULAR_SPIRAL)) 86 if (rmg_rndm (2) && (option & REGULAR_SPIRAL))
87 option -= REGULAR_SPIRAL; 87 option -= REGULAR_SPIRAL;
88 else 88 else
89 option -= FIT_SPIRAL; 89 option -= FIT_SPIRAL;
90 } 90 }
91 91
92 xscale = yscale = MAX_FINE; /* fine spiral */ 92 xscale = yscale = MAX_FINE; /* fine spiral */
93 93
94 /* choose the spiral pitch */ 94 /* choose the spiral pitch */
95 if (!(option & FINE_SPIRAL)) 95 if (!(option & FINE_SPIRAL))
96 { 96 {
97 float pitch = (rndm (5)) / 10. + 10. / 22.; 97 float pitch = (rmg_rndm (5)) / 10. + 10. / 22.;
98 98
99 xscale = yscale = pitch; 99 xscale = yscale = pitch;
100 } 100 }
101 101
102 if ((option & FIT_SPIRAL) && (xsize != ysize)) 102 if ((option & FIT_SPIRAL) && (xsize != ysize))
… …
133/* the following function connects disjoint spirals which may 133/* the following function connects disjoint spirals which may
134 result from the symmetrization process. */ 134 result from the symmetrization process. */
135void 135void
136connect_spirals (int xsize, int ysize, int sym, char **layout) 136connect_spirals (int xsize, int ysize, int sym, char **layout)
137{ 137{
138
139 int i, j, ic = xsize / 2, jc = ysize / 2; 138 int i, j, ic = xsize / 2, jc = ysize / 2;
140 139
141 if (sym == SYMMETRY_X) 140 if (sym == SYMMETRY_X)
142 { 141 {
143 layout[ic][jc] = 0; 142 layout[ic][jc] = 0;
143
144 /* go left from map center */ 144 /* go left from map center */
145 for (i = ic - 1, j = jc; i > 0 && layout[i][j] == '#'; i--) 145 for (i = ic - 1, j = jc; i > 0 && layout[i][j] == '#'; i--)
146 layout[i][j] = 0; 146 layout[i][j] = 0;
147
147 /* go right */ 148 /* go right */
148 for (i = ic + 1, j = jc; i < xsize - 1 && layout[i][j] == '#'; i++) 149 for (i = ic + 1, j = jc; i < xsize - 1 && layout[i][j] == '#'; i++)
149 layout[i][j] = 0; 150 layout[i][j] = 0;
150 } 151 }
151 152
152 if (sym == SYMMETRY_Y) 153 if (sym == SYMMETRY_Y)
153 { 154 {
154
155 layout[ic][jc] = 0; 155 layout[ic][jc] = 0;
156
156 /* go up */ 157 /* go up */
157 for (i = ic, j = jc - 1; j > 0 && layout[i][j] == '#'; j--) 158 for (i = ic, j = jc - 1; j > 0 && layout[i][j] == '#'; j--)
158 layout[i][j] = 0; 159 layout[i][j] = 0;
160
159 /* go down */ 161 /* go down */
160 for (i = ic, j = jc + 1; j < ysize - 1 && layout[i][j] == '#'; j++) 162 for (i = ic, j = jc + 1; j < ysize - 1 && layout[i][j] == '#'; j++)
161 layout[i][j] = 0; 163 layout[i][j] = 0;
162 } 164 }
163 165
… …
166 /* go left from map center */ 168 /* go left from map center */
167 layout[ic][jc / 2] = 0; 169 layout[ic][jc / 2] = 0;
168 layout[ic / 2][jc] = 0; 170 layout[ic / 2][jc] = 0;
169 layout[ic][jc / 2 + jc] = 0; 171 layout[ic][jc / 2 + jc] = 0;
170 layout[ic / 2 + ic][jc] = 0; 172 layout[ic / 2 + ic][jc] = 0;
173
171 for (i = ic - 1, j = jc / 2; i > 0 && layout[i][j] == '#'; i--) 174 for (i = ic - 1, j = jc / 2; i > 0 && layout[i][j] == '#'; i--)
172 { 175 {
173 layout[i][j + jc] = 0; 176 layout[i][j + jc] = 0;
174 layout[i][j] = 0; 177 layout[i][j] = 0;
175 } 178 }
179
176 /* go right */ 180 /* go right */
177 for (i = ic + 1, j = jc / 2; i < xsize - 1 && layout[i][j] == '#'; i++) 181 for (i = ic + 1, j = jc / 2; i < xsize - 1 && layout[i][j] == '#'; i++)
178 { 182 {
179 layout[i][j + jc] = 0; 183 layout[i][j + jc] = 0;
180 layout[i][j] = 0; 184 layout[i][j] = 0;
181 } 185 }
186
182 /* go up */ 187 /* go up */
183 for (i = ic / 2, j = jc - 1; j > 0 && layout[i][j] == '#'; j--) 188 for (i = ic / 2, j = jc - 1; j > 0 && layout[i][j] == '#'; j--)
184 { 189 {
185 layout[i][j] = 0; 190 layout[i][j] = 0;
186 layout[i + ic][j] = 0; 191 layout[i + ic][j] = 0;
187 } 192 }
193
188 /* go down */ 194 /* go down */
189 for (i = ic / 2, j = jc + 1; j < ysize - 1 && layout[i][j] == '#'; j++) 195 for (i = ic / 2, j = jc + 1; j < ysize - 1 && layout[i][j] == '#'; j++)
190 { 196 {
191 layout[i][j] = 0; 197 layout[i][j] = 0;
192 layout[i + ic][j] = 0; 198 layout[i + ic][j] = 0;
… …
210 j = 0; 216 j = 0;
211 } 217 }
212 } 218 }
213 } 219 }
214} 220}
221

Diff Legend

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