[ViewVC] Diff of: cvs/deliantra/server/random

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.44 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.46 by root, Fri Nov 6 12:49:19 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 (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,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	/* placing treasure in maps, where appropriate. */	25	/* placing treasure in maps, where appropriate. */
…		…
39	#define FILLED 128 /* Fill/tile the entire map with treasure */	40	#define FILLED 128 /* Fill/tile the entire map with treasure */
40	#define LAST_OPTION 64 /* set this to the last real option, for random */	41	#define LAST_OPTION 64 /* set this to the last real option, for random */
41		42
42	#define NO_PASS_DOORS 0	43	#define NO_PASS_DOORS 0
43	#define PASS_DOORS 1	44	#define PASS_DOORS 1
		45
		46	static object find_closest_monster (maptile map, int x, int y, random_map_params *RP);
		47	static object find_monster_in_room (maptile map, int x, int y, random_map_params *RP);
		48	static void find_spot_in_room_recursive (char *layout, int x, int y, random_map_params RP);
		49	static void find_spot_in_room (maptile map, int x, int y, int kx, int ky, random_map_params RP);
		50	static object place_chest (int treasureoptions, int x, int y, maptile map, maptile style_map, int n_treasures, random_map_params RP);
		51	static object *find_doors_in_room (maptile map, int x, int y, random_map_params *RP);
		52	static void lock_and_hide_doors (object *doorlist, maptile map, int opts, random_map_params *RP);
		53	static void find_enclosed_spot (maptile map, int cx, int cy, random_map_params RP);
		54	static object *surround_by_doors (maptile map, char **layout, int x, int y, int opts);
44		55
45	/* a macro to get a strongly centered random distribution,	56	/* a macro to get a strongly centered random distribution,
46	from 0 to x, centered at x/2 */	57	from 0 to x, centered at x/2 */
47	static int	58	static int
48	bc_random (int x)	59	bc_random (int x)
…		…
409	the_chest->y = yl;	420	the_chest->y = yl;
410	insert_ob_in_map (the_chest, map, NULL, 0);	421	insert_ob_in_map (the_chest, map, NULL, 0);
411	return the_chest;	422	return the_chest;
412	}	423	}
413		424
414
415	/* finds the closest monster and returns him, regardless of doors	425	/* finds the closest monster and returns him, regardless of doors or walls */
416	or walls */	426	static object *
417	object *
418	find_closest_monster (maptile map, int x, int y, random_map_params RP)	427	find_closest_monster (maptile map, int x, int y, random_map_params RP)
419	{	428	{
420	int i;	429	int i;
421		430
422	for (i = 0; i < SIZEOFFREE; i++)	431	for (i = 0; i < SIZEOFFREE; i++)
…		…
440	return NULL;	449	return NULL;
441	}	450	}
442		451
443	/* both find_monster_in_room routines need to have access to this. */	452	/* both find_monster_in_room routines need to have access to this. */
444		453
445	object *theMonsterToFind;	454	static object *theMonsterToFind;
446		455
447	/* a recursive routine which will return a monster, eventually,if there is one.	456	/* a recursive routine which will return a monster, eventually,if there is one.
448	it does a check-off on the layout, converting 0's to 1's */	457	it does a check-off on the layout, converting 0's to 1's */
449		458	static object *
450	object *
451	find_monster_in_room_recursive (char *layout, maptile map, int x, int y, random_map_params *RP)	459	find_monster_in_room_recursive (char *layout, maptile map, int x, int y, random_map_params *RP)
452	{	460	{
453	int i, j;	461	int i, j;
454		462
455	/* if we've found a monster already, leave */	463	/* if we've found a monster already, leave */
…		…
513		521
514	return theMonsterToFind;	522	return theMonsterToFind;
515	}	523	}
516		524
517	/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */	525	/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
518	int *room_free_spots_x;	526	static int *room_free_spots_x;
519	int *room_free_spots_y;	527	static int *room_free_spots_y;
520	int number_of_free_spots_in_room;	528	static int number_of_free_spots_in_room;
521		529
522	/* the workhorse routine, which finds the free spots in a room:	530	/* the workhorse routine, which finds the free spots in a room:
523	a datastructure of free points is set up, and a position chosen from	531	a datastructure of free points is set up, and a position chosen from
524	that datastructure. */	532	that datastructure. */
525	void	533	static void
526	find_spot_in_room_recursive (char *layout, int x, int y, random_map_params RP)	534	find_spot_in_room_recursive (char *layout, int x, int y, random_map_params RP)
527	{	535	{
528	int i, j;	536	int i, j;
529		537
530	/* bounds check x and y */	538	/* bounds check x and y */
…		…
548	find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);	556	find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
549		557
550	}	558	}
551		559
552	/* find a random non-blocked spot in this room to drop a key. */	560	/* find a random non-blocked spot in this room to drop a key. */
553	void	561	static void
554	find_spot_in_room (maptile map, int x, int y, int kx, int ky, random_map_params RP)	562	find_spot_in_room (maptile map, int x, int y, int kx, int ky, random_map_params RP)
555	{	563	{
556	char **layout2;	564	char **layout2;
557	int i, j;	565	int i, j;
558		566
…		…
591		599
592		600
593	/* searches the map for a spot with walls around it. The more	601	/* searches the map for a spot with walls around it. The more
594	walls the better, but it'll settle for 1 wall, or even 0, but	602	walls the better, but it'll settle for 1 wall, or even 0, but
595	it'll return 0 if no FREE spots are found.*/	603	it'll return 0 if no FREE spots are found.*/
596	void	604	static void
597	find_enclosed_spot (maptile map, int cx, int cy, random_map_params RP)	605	find_enclosed_spot (maptile map, int cx, int cy, random_map_params RP)
598	{	606	{
599	int x, y;	607	int x, y;
600	int i;	608	int i;
601		609
…		…
683	}	691	}
684		692
685	/* surrounds the point x,y by doors, so as to enclose something, like	693	/* surrounds the point x,y by doors, so as to enclose something, like
686	a chest. It only goes as far as the 8 squares surrounding, and	694	a chest. It only goes as far as the 8 squares surrounding, and
687	it'll remove any monsters it finds.*/	695	it'll remove any monsters it finds.*/
688	object **	696	static object **
689	surround_by_doors (maptile map, char *layout, int x, int y, int opts)	697	surround_by_doors (maptile map, char *layout, int x, int y, int opts)
690	{	698	{
691	int i;	699	int i;
692	const char *doors[2];	700	const char *doors[2];
693	object **doorlist;	701	object **doorlist;
…		…
723	}	731	}
724		732
725	return doorlist;	733	return doorlist;
726	}	734	}
727		735
728
729	/* returns the first door in this square, or NULL if there isn't a door. */	736	/* returns the first door in this square, or NULL if there isn't a door. */
730	object *	737	static object *
731	door_in_square (maptile *map, int x, int y)	738	door_in_square (maptile *map, int x, int y)
732	{	739	{
733	object *tmp;
734
735	for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above)	740	for (object *tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
736	if (tmp->type == DOOR \|\| tmp->type == LOCKED_DOOR)	741	if (tmp->type == DOOR \|\| tmp->type == LOCKED_DOOR)
737	return tmp;	742	return tmp;
		743
738	return NULL;	744	return NULL;
739	}	745	}
740		746
741	/* the workhorse routine, which finds the doors in a room */	747	/* the workhorse routine, which finds the doors in a room */
742	void	748	static void
743	find_doors_in_room_recursive (char *layout, maptile map, int x, int y, object *doorlist, int ndoors, random_map_params *RP)	749	find_doors_in_room_recursive (char *layout, maptile map, int x, int y, object *doorlist, int ndoors, random_map_params *RP)
744	{	750	{
745	int i, j;	751	int i, j;
746	object *door;	752	object *door;
747		753
…		…
782	doorlist, ndoors, RP);	788	doorlist, ndoors, RP);
783	}	789	}
784	}	790	}
785		791
786	/* find a random non-blocked spot in this room to drop a key. */	792	/* find a random non-blocked spot in this room to drop a key. */
787	object **	793	static object **
788	find_doors_in_room (maptile map, int x, int y, random_map_params RP)	794	find_doors_in_room (maptile map, int x, int y, random_map_params RP)
789	{	795	{
790	int i, j;	796	int i, j;
791	int ndoors = 0;	797	int ndoors = 0;
792		798
…		…
806	return doorlist;	812	return doorlist;
807	}	813	}
808		814
809	/* locks and/or hides all the doors in doorlist, or does nothing if	815	/* locks and/or hides all the doors in doorlist, or does nothing if
810	opts doesn't say to lock/hide doors. */	816	opts doesn't say to lock/hide doors. */
811	void	817	static void
812	lock_and_hide_doors (object *doorlist, maptile map, int opts, random_map_params *RP)	818	lock_and_hide_doors (object *doorlist, maptile map, int opts, random_map_params *RP)
813	{	819	{
814	object *door;	820	object *door;
815	int i;	821	int i;
816		822

Diff Legend

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

Comparing deliantra/server/random_maps/treasure.C (file contents): Revision 1.44 by root, Mon Sep 29 10:32:50 2008 UTC vs. Revision 1.46 by root, Fri Nov 6 12:49:19 2009 UTC

Diff Legend

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.44 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.46 by root, Fri Nov 6 12:49:19 2009 UTC