[ViewVC] Diff of: cvs/deliantra/server/random_maps/room_gen

Comparing deliantra/server/random_maps/room_gen_onion.C (file contents):
Revision 1.6 by root, Sun Dec 31 19:02:24 2006 UTC vs.
Revision 1.22 by root, Fri Mar 26 01:04:44 2010 UTC

…		…
1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
4		3	*
		4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7		7	*
8	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
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 2 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, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21		21	*
22	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>
23	*/	23	*/
24
25		24
26	/* The onion room generator:	25	/* The onion room generator:
27	Onion rooms are like this:	26	Onion rooms are like this:
28		27
29	char **map_gen_onion(int xsize, int ysize, int option, int layers);	28	char **map_gen_onion(int xsize, int ysize, int option, int layers);
51	*/	50	*/
52		51
53		52
54	#include <global.h>	53	#include <global.h>
55	#include <random_map.h>	54	#include <random_map.h>
		55	#include <rproto.h>
56		56
57	#ifndef MIN
58	# define MIN(x,y) (((x)<(y))? (x):(y))
59	#endif
60	void centered_onion (char **maze, int xsize, int ysize, int option, int layers);	57	static void centered_onion (char **maze, int xsize, int ysize, int option, int layers);
61	void bottom_centered_onion (char **maze, int xsize, int ysize, int option, int layers);	58	static void bottom_centered_onion (char **maze, int xsize, int ysize, int option, int layers);
62	void bottom_right_centered_onion (char **maze, int xsize, int ysize, int option, int layers);	59	static void bottom_right_centered_onion (char **maze, int xsize, int ysize, int option, int layers);
63		60
64
65	void draw_onion (char *maze, float xlocations, float *ylocations, int layers);	61	static void draw_onion (char *maze, float xlocations, float *ylocations, int layers);
66	void make_doors (char *maze, float xlocations, float *ylocations, int layers, int options);	62	static void make_doors (char *maze, float xlocations, float *ylocations, int layers, int options);
67		63
68	char **	64	void
69	map_gen_onion (int xsize, int ysize, int option, int layers)	65	map_gen_onion (Layout maze, int option, int layers)
70	{	66	{
71	int i, j;	67	int i, j;
72		68
73	/* allocate that array, set it up */	69	int xsize = maze->w;
74	char maze = (char ) calloc (sizeof (char *), xsize);	70	int ysize = maze->h;
75		71
76	for (i = 0; i < xsize; i++)	72	maze->clear ();
77	{
78	maze[i] = (char *) calloc (sizeof (char), ysize);
79	}
80		73
81	/* pick some random options if option = 0 */	74	/* pick some random options if option = 0 */
82	if (option == 0)	75	if (option == 0)
83	{	76	{
84	switch (RANDOM () % 3)	77	switch (rmg_rndm (3))
85	{	78	{
86	case 0:	79	case 0:
87	option \|= RMOPT_CENTERED;	80	option \|= RMOPT_CENTERED;
88	break;	81	break;
89	case 1:	82	case 1:
…		…
91	break;	84	break;
92	case 2:	85	case 2:
93	option \|= RMOPT_BOTTOM_R;	86	option \|= RMOPT_BOTTOM_R;
94	break;	87	break;
95	}	88	}
96	if (RANDOM () % 2)	89
97	option \|= RMOPT_LINEAR;	90	if (rmg_rndm (2)) option \|= RMOPT_LINEAR;
98	if (RANDOM () % 2)
99	option \|= RMOPT_IRR_SPACE;	91	if (rmg_rndm (2)) option \|= RMOPT_IRR_SPACE;
100	}	92	}
101		93
102	/* write the outer walls, if appropriate. */	94	/* write the outer walls, if appropriate. */
103	if (!(option & RMOPT_WALL_OFF))	95	if (!(option & RMOPT_WALL_OFF))
104	{	96	maze->border ();
105	for (i = 0; i < xsize; i++)
106	maze[i][0] = maze[i][ysize - 1] = '#';
107	for (j = 0; j < ysize; j++)
108	maze[0][j] = maze[xsize - 1][j] = '#';
109	};
110		97
111	if (option & RMOPT_WALLS_ONLY)	98	if (option & RMOPT_WALLS_ONLY)
112	return maze;	99	return;
113		100
114	/* pick off the mutually exclusive options */	101	/* pick off the mutually exclusive options */
115	if (option & RMOPT_BOTTOM_R)	102	if (option & RMOPT_BOTTOM_R)
116	bottom_right_centered_onion (maze, xsize, ysize, option, layers);	103	bottom_right_centered_onion (maze, xsize, ysize, option, layers);
117	else if (option & RMOPT_BOTTOM_C)	104	else if (option & RMOPT_BOTTOM_C)
118	bottom_centered_onion (maze, xsize, ysize, option, layers);	105	bottom_centered_onion (maze, xsize, ysize, option, layers);
119	else if (option & RMOPT_CENTERED)	106	else if (option & RMOPT_CENTERED)
120	centered_onion (maze, xsize, ysize, option, layers);	107	centered_onion (maze, xsize, ysize, option, layers);
121
122	return maze;
123	}	108	}
124		109
125	void	110	static void
126	centered_onion (char **maze, int xsize, int ysize, int option, int layers)	111	centered_onion (char **maze, int xsize, int ysize, int option, int layers)
127	{	112	{
128	int i, maxlayers;	113	int i, maxlayers;
129	float *xlocations;
130	float *ylocations;
131		114
132	maxlayers = (MIN (xsize, ysize) - 2) / 5;	115	maxlayers = (min (xsize, ysize) - 2) / 5;
		116
133	if (!maxlayers)	117	if (!maxlayers)
134	return; /* map too small to onionize */	118	return; /* map too small to onionize */
		119
135	if (layers > maxlayers)	120	if (layers > maxlayers)
136	layers = maxlayers;	121	layers = maxlayers;
		122
137	if (layers == 0)	123	if (layers == 0)
138	layers = (RANDOM () % maxlayers) + 1;	124	layers = rmg_rndm (maxlayers) + 1;
139	xlocations = (float ) calloc (sizeof (float), 2 layers);
140	ylocations = (float ) calloc (sizeof (float), 2 layers);
141		125
		126	float xlocations = salloc0<float> (2 layers);
		127	float ylocations = salloc0<float> (2 layers);
142		128
143	/* place all the walls */	129	/* place all the walls */
144	if (option & RMOPT_IRR_SPACE) /* randomly spaced */	130	if (option & RMOPT_IRR_SPACE) /* randomly spaced */
145	{	131	{
146	int x_spaces_available, y_spaces_available;	132	int x_spaces_available, y_spaces_available;
147		133
148	/* the "extra" spaces available for spacing between layers */	134	/* the "extra" spaces available for spacing between layers */
149	x_spaces_available = (xsize - 2) - 6 * layers + 1;	135	x_spaces_available = (xsize - 2) - 6 * layers + 1;
150	y_spaces_available = (ysize - 2) - 6 * layers + 1;	136	y_spaces_available = (ysize - 2) - 6 * layers + 1;
151		137
152
153	/* pick an initial random pitch */	138	/* pick an initial random pitch */
154	for (i = 0; i < 2 * layers; i++)	139	for (i = 0; i < 2 * layers; i++)
155	{	140	{
156	float xpitch = 2, ypitch = 2;	141	float xpitch = 2, ypitch = 2;
157		142
158	if (x_spaces_available > 0)	143	if (x_spaces_available > 0)
159	xpitch = 2 + (RANDOM () % x_spaces_available + RANDOM () % x_spaces_available + RANDOM () % x_spaces_available) / 3;	144	xpitch = 2 + (rmg_rndm (x_spaces_available) + rmg_rndm (x_spaces_available) + rmg_rndm (x_spaces_available)) / 3;
160		145
161	if (y_spaces_available > 0)	146	if (y_spaces_available > 0)
162	ypitch = 2 + (RANDOM () % y_spaces_available + RANDOM () % y_spaces_available + RANDOM () % y_spaces_available) / 3;	147	ypitch = 2 + (rmg_rndm (y_spaces_available) + rmg_rndm (y_spaces_available) + rmg_rndm (y_spaces_available)) / 3;
		148
163	xlocations[i] = ((i > 0) ? xlocations[i - 1] : 0) + xpitch;	149	xlocations[i] = ((i > 0) ? xlocations[i - 1] : 0) + xpitch;
164	ylocations[i] = ((i > 0) ? ylocations[i - 1] : 0) + ypitch;	150	ylocations[i] = ((i > 0) ? ylocations[i - 1] : 0) + ypitch;
165	x_spaces_available -= (int) (xpitch - 2);	151	x_spaces_available -= (int) (xpitch - 2);
166	y_spaces_available -= (int) (ypitch - 2);	152	y_spaces_available -= (int) (ypitch - 2);
167	}	153	}
168		154
169	}	155	}
		156
170	if (!(option & RMOPT_IRR_SPACE))	157	if (!(option & RMOPT_IRR_SPACE))
171	{ /* evenly spaced */	158	{ /* evenly spaced */
172	float xpitch, ypitch; /* pitch of the onion layers */	159	float xpitch, ypitch; /* pitch of the onion layers */
173		160
174	xpitch = (xsize - 2.0) / (2.0 * layers + 1);	161	xpitch = (xsize - 2.0) / (2.0 * layers + 1);
175	ypitch = (ysize - 2.0) / (2.0 * layers + 1);	162	ypitch = (ysize - 2.0) / (2.0 * layers + 1);
		163
176	xlocations[0] = xpitch;	164	xlocations[0] = xpitch;
177	ylocations[0] = ypitch;	165	ylocations[0] = ypitch;
		166
178	for (i = 1; i < 2 * layers; i++)	167	for (i = 1; i < 2 * layers; i++)
179	{	168	{
180	xlocations[i] = xlocations[i - 1] + xpitch;	169	xlocations[i] = xlocations[i - 1] + xpitch;
181	ylocations[i] = ylocations[i - 1] + ypitch;	170	ylocations[i] = ylocations[i - 1] + ypitch;
182	}	171	}
183	}	172	}
184		173
185	/* draw all the onion boxes. */	174	/* draw all the onion boxes. */
186
187	draw_onion (maze, xlocations, ylocations, layers);	175	draw_onion (maze, xlocations, ylocations, layers);
188	make_doors (maze, xlocations, ylocations, layers, option);	176	make_doors (maze, xlocations, ylocations, layers, option);
189		177
		178	sfree (xlocations, 2 * layers);
		179	sfree (ylocations, 2 * layers);
190	}	180	}
191		181
192	void	182	static void
193	bottom_centered_onion (char **maze, int xsize, int ysize, int option, int layers)	183	bottom_centered_onion (char **maze, int xsize, int ysize, int option, int layers)
194	{	184	{
195	int i, maxlayers;	185	int i, maxlayers;
196	float *xlocations;
197	float *ylocations;
198		186
199	maxlayers = (MIN (xsize, ysize) - 2) / 5;	187	maxlayers = (min (xsize, ysize) - 2) / 5;
		188
200	if (!maxlayers)	189	if (!maxlayers)
201	return; /* map too small to onionize */	190	return; /* map too small to onionize */
		191
202	if (layers > maxlayers)	192	if (layers > maxlayers)
203	layers = maxlayers;	193	layers = maxlayers;
		194
204	if (layers == 0)	195	if (layers == 0)
205	layers = (RANDOM () % maxlayers) + 1;	196	layers = rmg_rndm (maxlayers) + 1;
206	xlocations = (float ) calloc (sizeof (float), 2 layers);
207	ylocations = (float ) calloc (sizeof (float), 2 layers);
208		197
		198	float xlocations = salloc0<float> (2 layers);
		199	float ylocations = salloc0<float> (2 layers);
209		200
210	/* place all the walls */	201	/* place all the walls */
211	if (option & RMOPT_IRR_SPACE) /* randomly spaced */	202	if (option & RMOPT_IRR_SPACE) /* randomly spaced */
212	{	203	{
213	int x_spaces_available, y_spaces_available;	204	int x_spaces_available, y_spaces_available;
214		205
215	/* the "extra" spaces available for spacing between layers */	206	/* the "extra" spaces available for spacing between layers */
216	x_spaces_available = (xsize - 2) - 6 * layers + 1;	207	x_spaces_available = (xsize - 2) - 6 * layers + 1;
217	y_spaces_available = (ysize - 2) - 3 * layers + 1;	208	y_spaces_available = (ysize - 2) - 3 * layers + 1;
218		209
219
220	/* pick an initial random pitch */	210	/* pick an initial random pitch */
221	for (i = 0; i < 2 * layers; i++)	211	for (i = 0; i < 2 * layers; i++)
222	{	212	{
223	float xpitch = 2, ypitch = 2;	213	float xpitch = 2, ypitch = 2;
224		214
225	if (x_spaces_available > 0)	215	if (x_spaces_available > 0)
226	xpitch = 2 + (RANDOM () % x_spaces_available + RANDOM () % x_spaces_available + RANDOM () % x_spaces_available) / 3;	216	xpitch = 2 + (rmg_rndm (x_spaces_available) + rmg_rndm (x_spaces_available) + rmg_rndm (x_spaces_available)) / 3;
227		217
228	if (y_spaces_available > 0)	218	if (y_spaces_available > 0)
229	ypitch = 2 + (RANDOM () % y_spaces_available + RANDOM () % y_spaces_available + RANDOM () % y_spaces_available) / 3;	219	ypitch = 2 + (rmg_rndm (y_spaces_available) + rmg_rndm (y_spaces_available) + rmg_rndm (y_spaces_available)) / 3;
		220
230	xlocations[i] = ((i > 0) ? xlocations[i - 1] : 0) + xpitch;	221	xlocations[i] = ((i > 0) ? xlocations[i - 1] : 0) + xpitch;
		222
231	if (i < layers)	223	if (i < layers)
232	ylocations[i] = ((i > 0) ? ylocations[i - 1] : 0) + ypitch;	224	ylocations[i] = ((i > 0) ? ylocations[i - 1] : 0) + ypitch;
233	else	225	else
234	ylocations[i] = ysize - 1;	226	ylocations[i] = ysize - 1;
		227
235	x_spaces_available -= (int) (xpitch - 2);	228	x_spaces_available -= (int) (xpitch - 2);
236	y_spaces_available -= (int) (ypitch - 2);	229	y_spaces_available -= (int) (ypitch - 2);
237	}	230	}
238
239	}	231	}
		232
240	if (!(option & RMOPT_IRR_SPACE))	233	if (!(option & RMOPT_IRR_SPACE))
241	{ /* evenly spaced */	234	{ /* evenly spaced */
242	float xpitch, ypitch; /* pitch of the onion layers */	235	float xpitch, ypitch; /* pitch of the onion layers */
243		236
244	xpitch = (xsize - 2.0) / (2.0 * layers + 1);	237	xpitch = (xsize - 2.0) / (2.0 * layers + 1);
245	ypitch = (ysize - 2.0) / (layers + 1);	238	ypitch = (ysize - 2.0) / (layers + 1);
		239
246	xlocations[0] = xpitch;	240	xlocations[0] = xpitch;
247	ylocations[0] = ypitch;	241	ylocations[0] = ypitch;
		242
248	for (i = 1; i < 2 * layers; i++)	243	for (i = 1; i < 2 * layers; i++)
249	{	244	{
250	xlocations[i] = xlocations[i - 1] + xpitch;	245	xlocations[i] = xlocations[i - 1] + xpitch;
		246
251	if (i < layers)	247	if (i < layers)
252	ylocations[i] = ylocations[i - 1] + ypitch;	248	ylocations[i] = ylocations[i - 1] + ypitch;
253	else	249	else
254	ylocations[i] = ysize - 1;	250	ylocations[i] = ysize - 1;
255	}	251	}
…		…
258	/* draw all the onion boxes. */	254	/* draw all the onion boxes. */
259		255
260	draw_onion (maze, xlocations, ylocations, layers);	256	draw_onion (maze, xlocations, ylocations, layers);
261	make_doors (maze, xlocations, ylocations, layers, option);	257	make_doors (maze, xlocations, ylocations, layers, option);
262		258
		259	sfree (xlocations, 2 * layers);
		260	sfree (ylocations, 2 * layers);
263	}	261	}
264		262
265
266	/* draw_boxes: draws the lines in the maze defining the onion layers */	263	/* draw_boxes: draws the lines in the maze defining the onion layers */
267		264	static void
268	void
269	draw_onion (char *maze, float xlocations, float *ylocations, int layers)	265	draw_onion (char *maze, float xlocations, float *ylocations, int layers)
270	{	266	{
271	int i, j, l;	267	int i, j, l;
272		268
273	for (l = 0; l < layers; l++)	269	for (l = 0; l < layers; l++)
…		…
293	}	289	}
294		290
295	}	291	}
296	}	292	}
297		293
298	void	294	static void
299	make_doors (char *maze, float xlocations, float *ylocations, int layers, int options)	295	make_doors (char *maze, float xlocations, float *ylocations, int layers, int options)
300	{	296	{
301	int freedoms; /* number of different walls on which we could place a door */	297	int freedoms; /* number of different walls on which we could place a door */
302	int which_wall; /* left, 1, top, 2, right, 3, bottom 4 */	298	int which_wall; /* left, 1, top, 2, right, 3, bottom 4 */
303	int l, x1 = 0, x2, y1 = 0, y2;	299	int l, x1 = 0, x2, y1 = 0, y2;
304		300
305	freedoms = 4; /* centered */	301	freedoms = 4; /* centered */
		302
306	if (options & RMOPT_BOTTOM_C)	303	if (options & RMOPT_BOTTOM_C)
307	freedoms = 3;	304	freedoms = 3;
		305
308	if (options & RMOPT_BOTTOM_R)	306	if (options & RMOPT_BOTTOM_R)
309	freedoms = 2;	307	freedoms = 2;
		308
310	if (layers <= 0)	309	if (layers <= 0)
311	return;	310	return;
		311
312	/* pick which wall will have a door. */	312	/* pick which wall will have a door. */
313	which_wall = RANDOM () % freedoms + 1;	313	which_wall = rmg_rndm (freedoms) + 1;
314	for (l = 0; l < layers; l++)	314	for (l = 0; l < layers; l++)
315	{	315	{
316	if (options & RMOPT_LINEAR)	316	if (options & RMOPT_LINEAR)
317	{ /* linear door placement. */	317	{ /* linear door placement. */
318	switch (which_wall)	318	switch (which_wall)
…		…
343	}	343	}
344	}	344	}
345	}	345	}
346	else	346	else
347	{ /* random door placement. */	347	{ /* random door placement. */
348	which_wall = RANDOM () % freedoms + 1;	348	which_wall = rmg_rndm (freedoms) + 1;
349	switch (which_wall)	349	switch (which_wall)
350	{	350	{
351	case 1:	351	case 1:
352	{ /* left hand wall */	352	{ /* left hand wall */
353	x1 = (int) xlocations[l];	353	x1 = (int) xlocations[l];
354	y2 = (int) (ylocations[2 * layers - l - 1] - ylocations[l] - 1);	354	y2 = (int) (ylocations[2 * layers - l - 1] - ylocations[l] - 1);
355	if (y2 > 0)	355	if (y2 > 0)
356	y1 = (int) (ylocations[l] + RANDOM () % y2 + 1);	356	y1 = (int) (ylocations[l] + rmg_rndm (y2) + 1);
357	else	357	else
358	y1 = (int) (ylocations[l] + 1);	358	y1 = (int) (ylocations[l] + 1);
359	break;	359	break;
360	}	360	}
361	case 2:	361	case 2:
362	{ /* top wall placement */	362	{ /* top wall placement */
363	x2 = (int) ((-xlocations[l] + xlocations[2 * layers - l - 1])) - 1;	363	x2 = (int) ((-xlocations[l] + xlocations[2 * layers - l - 1])) - 1;
364	if (x2 > 0)	364	if (x2 > 0)
365	x1 = (int) (xlocations[l] + RANDOM () % x2 + 1);	365	x1 = (int) (xlocations[l] + rmg_rndm (x2) + 1);
366	else	366	else
367	x1 = (int) (xlocations[l] + 1);	367	x1 = (int) (xlocations[l] + 1);
368	y1 = (int) ylocations[l];	368	y1 = (int) ylocations[l];
369	break;	369	break;
370	}	370	}
371	case 3:	371	case 3:
372	{ /* right wall placement */	372	{ /* right wall placement */
373	x1 = (int) xlocations[2 * layers - l - 1];	373	x1 = (int) xlocations[2 * layers - l - 1];
374	y2 = (int) ((-ylocations[l] + ylocations[2 * layers - l - 1])) - 1;	374	y2 = (int) ((-ylocations[l] + ylocations[2 * layers - l - 1])) - 1;
375	if (y2 > 0)	375	if (y2 > 0)
376	y1 = (int) (ylocations[l] + RANDOM () % y2 + 1);	376	y1 = (int) (ylocations[l] + rmg_rndm (y2) + 1);
377	else	377	else
378	y1 = (int) (ylocations[l] + 1);	378	y1 = (int) (ylocations[l] + 1);
379		379
380	break;	380	break;
381	}	381	}
382	case 4:	382	case 4:
383	{ /* bottom wall placement */	383	{ /* bottom wall placement */
384	x2 = (int) ((-xlocations[l] + xlocations[2 * layers - l - 1])) - 1;	384	x2 = (int) ((-xlocations[l] + xlocations[2 * layers - l - 1])) - 1;
385	if (x2 > 0)	385	if (x2 > 0)
386	x1 = (int) (xlocations[l] + RANDOM () % x2 + 1);	386	x1 = (int) (xlocations[l] + rmg_rndm (x2) + 1);
387	else	387	else
388	x1 = (int) (xlocations[l] + 1);	388	x1 = (int) (xlocations[l] + 1);
389	y1 = (int) ylocations[2 * layers - l - 1];	389	y1 = (int) ylocations[2 * layers - l - 1];
390	break;	390	break;
391	}	391	}
392		392
393	}	393	}
394	}	394	}
		395
395	if (options & RMOPT_NO_DOORS)	396	if (options & RMOPT_NO_DOORS)
396	maze[x1][y1] = '#'; /* no door. */	397	maze[x1][y1] = '#'; /* no door. */
397	else	398	else
398	maze[x1][y1] = 'D'; /* write the door */	399	maze[x1][y1] = 'D'; /* write the door */
399		400
400	}	401	}
401	/* mark the center of the maze with a C */	402	/* mark the center of the maze with a C */
402	l = layers - 1;	403	l = layers - 1;
403	x1 = (int) (xlocations[l] + xlocations[2 * layers - l - 1]) / 2;	404	x1 = (int) (xlocations[l] + xlocations[2 * layers - l - 1]) / 2;
404	y1 = (int) (ylocations[l] + ylocations[2 * layers - l - 1]) / 2;	405	y1 = (int) (ylocations[l] + ylocations[2 * layers - l - 1]) / 2;
		406
405	maze[x1][y1] = 'C';	407	maze[x1][y1] = 'C';
406
407	/* not needed anymore */
408	free (xlocations);
409	free (ylocations);
410
411	}	408	}
412		409
413	void	410	static void
414	bottom_right_centered_onion (char **maze, int xsize, int ysize, int option, int layers)	411	bottom_right_centered_onion (char **maze, int xsize, int ysize, int option, int layers)
415	{	412	{
416	int i, maxlayers;	413	int i, maxlayers;
417	float *xlocations;
418	float *ylocations;
419		414
420	maxlayers = (MIN (xsize, ysize) - 2) / 5;	415	maxlayers = (min (xsize, ysize) - 2) / 5;
		416
421	if (!maxlayers)	417	if (!maxlayers)
422	return; /* map too small to onionize */	418	return; /* map too small to onionize */
		419
423	if (layers > maxlayers)	420	if (layers > maxlayers)
424	layers = maxlayers;	421	layers = maxlayers;
		422
425	if (layers == 0)	423	if (layers == 0)
426	layers = (RANDOM () % maxlayers) + 1;	424	layers = rmg_rndm (maxlayers) + 1;
427	xlocations = (float ) calloc (sizeof (float), 2 layers);
428	ylocations = (float ) calloc (sizeof (float), 2 layers);
429		425
		426	float xlocations = salloc0<float> (2 layers);
		427	float ylocations = salloc0<float> (2 layers);
430		428
431	/* place all the walls */	429	/* place all the walls */
432	if (option & RMOPT_IRR_SPACE) /* randomly spaced */	430	if (option & RMOPT_IRR_SPACE) /* randomly spaced */
433	{	431	{
434	int x_spaces_available, y_spaces_available;	432	int x_spaces_available, y_spaces_available;
…		…
442	for (i = 0; i < 2 * layers; i++)	440	for (i = 0; i < 2 * layers; i++)
443	{	441	{
444	float xpitch = 2, ypitch = 2;	442	float xpitch = 2, ypitch = 2;
445		443
446	if (x_spaces_available > 0)	444	if (x_spaces_available > 0)
447	xpitch = 2 + (RANDOM () % x_spaces_available + RANDOM () % x_spaces_available + RANDOM () % x_spaces_available) / 3;	445	xpitch = 2 + (rmg_rndm (x_spaces_available) + rmg_rndm (x_spaces_available) + rmg_rndm (x_spaces_available)) / 3;
448		446
449	if (y_spaces_available > 0)	447	if (y_spaces_available > 0)
450	ypitch = 2 + (RANDOM () % y_spaces_available + RANDOM () % y_spaces_available + RANDOM () % y_spaces_available) / 3;	448	ypitch = 2 + (rmg_rndm (y_spaces_available) + rmg_rndm (y_spaces_available) + rmg_rndm (y_spaces_available)) / 3;
		449
451	if (i < layers)	450	if (i < layers)
452	xlocations[i] = ((i > 0) ? xlocations[i - 1] : 0) + xpitch;	451	xlocations[i] = ((i > 0) ? xlocations[i - 1] : 0) + xpitch;
453	else	452	else
454	xlocations[i] = xsize - 1;	453	xlocations[i] = xsize - 1;
455		454
456	if (i < layers)	455	if (i < layers)
457	ylocations[i] = ((i > 0) ? ylocations[i - 1] : 0) + ypitch;	456	ylocations[i] = ((i > 0) ? ylocations[i - 1] : 0) + ypitch;
458	else	457	else
459	ylocations[i] = ysize - 1;	458	ylocations[i] = ysize - 1;
		459
460	x_spaces_available -= (int) (xpitch - 2);	460	x_spaces_available -= (int) (xpitch - 2);
461	y_spaces_available -= (int) (ypitch - 2);	461	y_spaces_available -= (int) (ypitch - 2);
462	}	462	}
463
464	}	463	}
		464
465	if (!(option & RMOPT_IRR_SPACE))	465	if (!(option & RMOPT_IRR_SPACE))
466	{ /* evenly spaced */	466	{ /* evenly spaced */
467	float xpitch, ypitch; /* pitch of the onion layers */	467	float xpitch, ypitch; /* pitch of the onion layers */
468		468
469	xpitch = (xsize - 2.0) / (2.0 * layers + 1);	469	xpitch = (xsize - 2.0) / (2.0 * layers + 1);
470	ypitch = (ysize - 2.0) / (layers + 1);	470	ypitch = (ysize - 2.0) / (layers + 1);
		471
471	xlocations[0] = xpitch;	472	xlocations[0] = xpitch;
472	ylocations[0] = ypitch;	473	ylocations[0] = ypitch;
		474
473	for (i = 1; i < 2 * layers; i++)	475	for (i = 1; i < 2 * layers; i++)
474	{	476	{
475	if (i < layers)	477	if (i < layers)
476	xlocations[i] = xlocations[i - 1] + xpitch;	478	xlocations[i] = xlocations[i - 1] + xpitch;
477	else	479	else
478	xlocations[i] = xsize - 1;	480	xlocations[i] = xsize - 1;
		481
479	if (i < layers)	482	if (i < layers)
480	ylocations[i] = ylocations[i - 1] + ypitch;	483	ylocations[i] = ylocations[i - 1] + ypitch;
481	else	484	else
482	ylocations[i] = ysize - 1;	485	ylocations[i] = ysize - 1;
483	}	486	}
…		…
486	/* draw all the onion boxes. */	489	/* draw all the onion boxes. */
487		490
488	draw_onion (maze, xlocations, ylocations, layers);	491	draw_onion (maze, xlocations, ylocations, layers);
489	make_doors (maze, xlocations, ylocations, layers, option);	492	make_doors (maze, xlocations, ylocations, layers, option);
490		493
		494	sfree (xlocations, 2 * layers);
		495	sfree (ylocations, 2 * layers);
491	}	496	}
		497

Diff Legend

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

Comparing deliantra/server/random_maps/room_gen_onion.C (file contents): Revision 1.6 by root, Sun Dec 31 19:02:24 2006 UTC vs. Revision 1.22 by root, Fri Mar 26 01:04:44 2010 UTC

Diff Legend

Comparing deliantra/server/random_maps/room_gen_onion.C (file contents):
Revision 1.6 by root, Sun Dec 31 19:02:24 2006 UTC vs.
Revision 1.22 by root, Fri Mar 26 01:04:44 2010 UTC