[ViewVC] Diff of: cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.152 by root, Tue Dec 23 01:51:27 2008 UTC vs.
Revision 1.188 by root, Fri Apr 16 02:32:25 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 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 <unistd.h>	25	#include <unistd.h>
25		26
26	#include "global.h"	27	#include "global.h"
27	#include "loader.h"
28	#include "path.h"	28	#include "path.h"
		29
		30	//+GPL
29		31
30	sint8 maptile::outdoor_darkness;	32	sint8 maptile::outdoor_darkness;
31		33
32	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	34	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
33	* one function that just returns a P_.. value (see map.h)	35	* one function that just returns a P_.. value (see map.h)
70	* by the caller.	72	* by the caller.
71	*/	73	*/
72	int	74	int
73	blocked_link (object ob, maptile m, int sx, int sy)	75	blocked_link (object ob, maptile m, int sx, int sy)
74	{	76	{
75	object *tmp;
76	int mflags, blocked;
77
78	/* Make sure the coordinates are valid - they should be, as caller should	77	/* Make sure the coordinates are valid - they should be, as caller should
79	* have already checked this.	78	* have already checked this.
80	*/	79	*/
81	if (OUT_OF_REAL_MAP (m, sx, sy))	80	if (OUT_OF_REAL_MAP (m, sx, sy))
82	{	81	{
83	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	82	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
84	return 1;	83	return 1;
85	}	84	}
86		85
87	/* Save some cycles - instead of calling get_map_flags(), just get the value	86	mapspace &ms = m->at (sx, sy);
88	* directly.
89	*/
90	mflags = m->at (sx, sy).flags ();
91		87
92	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	88	int mflags = ms.flags ();
		89	int blocked = ms.move_block;
93		90
94	/* If space is currently not blocked by anything, no need to	91	/* If space is currently not blocked by anything, no need to
95	* go further. Not true for players - all sorts of special	92	* go further. Not true for players - all sorts of special
96	* things we need to do for players.	93	* things we need to do for players.
97	*/	94	*/
98	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	95	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
99	return 0;	96	return 0;
100		97
101	/* if there isn't anytyhing alive on this space, and this space isn't	98	/* if there isn't anything alive on this space, and this space isn't
102	* otherwise blocked, we can return now. Only if there is a living	99	* otherwise blocked, we can return now. Only if there is a living
103	* creature do we need to investigate if it is part of this creature	100	* creature do we need to investigate if it is part of this creature
104	* or another. Likewise, only if something is blocking us do we	101	* or another. Likewise, only if something is blocking us do we
105	* need to investigate if there is a special circumstance that would	102	* need to investigate if there is a special circumstance that would
106	* let the player through (inventory checkers for example)	103	* let the player through (inventory checkers for example)
…		…
113	/* We basically go through the stack of objects, and if there is	110	/* We basically go through the stack of objects, and if there is
114	* some other object that has NO_PASS or FLAG_ALIVE set, return	111	* some other object that has NO_PASS or FLAG_ALIVE set, return
115	* true. If we get through the entire stack, that must mean	112	* true. If we get through the entire stack, that must mean
116	* ob is blocking it, so return 0.	113	* ob is blocking it, so return 0.
117	*/	114	*/
118	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	115	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
119	{	116	{
120		117	if (OB_MOVE_BLOCK (ob, tmp))
121	/* This must be before the checks below. Code for inventory checkers. */
122	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
123	{	118	{
124	/* If last_sp is set, the player/monster needs an object,	119	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125	* so we check for it. If they don't have it, they can't	120	if (RESULT_INT (0))
126	* pass through this space.	121	return 1;
127	*/	122	else
128	if (tmp->last_sp)	123	continue;
		124
		125	if (tmp->type == CHECK_INV)
129	{	126	{
130	if (check_inv_recursive (ob, tmp) == NULL)	127	bool have = check_inv_recursive (ob, tmp);
		128
		129	// last_sp set means we block if we don't have.
		130	if (logical_xor (have, tmp->last_sp))
131	return 1;	131	return 1;
132	else	132	}
133	continue;	133	else if (tmp->type == T_MATCH)
		134	{
		135	// T_MATCH allows "entrance" iff the match is true
		136	// == blocks if the match fails
		137
		138	// we could have used an INVOKE_OBJECT, but decided against it, as we
		139	// assume that T_MATCH is relatively common.
		140	if (!match (tmp->slaying, ob, tmp, ob))
		141	return 1;
134	}	142	}
135	else	143	else
136	{	144	return 1; // unconditional block
137	/* In this case, the player must not have the object -	145
138	* if they do, they can't pass through.
139	*/
140	if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
141	return 1;
142	else
143	continue;
144	}
145	} /* if check_inv */
146	else	146	} else {
147	{	147	// space does not block the ob, directly, but
148	/* Broke apart a big nasty if into several here to make	148	// anything alive that is not a door still
149	* this more readable. first check - if the space blocks	149	// blocks anything but wizards.
150	* movement, can't move here.
151	* second - if a monster, can't move there, unless it is a
152	* hidden dm
153	*/
154	if (OB_MOVE_BLOCK (ob, tmp))
155	return 1;
156		150
157	if (tmp->flag [FLAG_ALIVE]	151	if (tmp->flag [FLAG_ALIVE]
158	&& tmp->head_ () != ob	152	&& tmp->head_ () != ob
159	&& tmp != ob	153	&& tmp != ob
160	&& tmp->type != DOOR	154	&& tmp->type != DOOR)
161	&& !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
162	return 1;	155	return 1;
163	}	156	}
164
165	}	157	}
		158
166	return 0;	159	return 0;
167	}	160	}
168		161
169	/*	162	/*
170	* Returns qthe blocking object if the given object can't fit in the given	163	* Returns qthe blocking object if the given object can't fit in the given
…		…
222	}	215	}
223		216
224	return 0;	217	return 0;
225	}	218	}
226		219
227	/* When the map is loaded, load_object does not actually insert objects	220	//-GPL
228	* into inventory, but just links them. What this does is go through
229	* and insert them properly.
230	* The object 'container' is the object that contains the inventory.
231	* This is needed so that we can update the containers weight.
232	*/
233	void
234	fix_container (object *container)
235	{
236	object tmp = container->inv, next;
237
238	container->inv = 0;
239	while (tmp)
240	{
241	next = tmp->below;
242	if (tmp->inv)
243	fix_container (tmp);
244
245	insert_ob_in_ob (tmp, container);
246	tmp = next;
247	}
248
249	// go through and calculate what all the containers are carrying.
250	//TODO: remove
251	container->update_weight ();
252	}
253		221
254	void	222	void
255	maptile::set_object_flag (int flag, int value)	223	maptile::set_object_flag (int flag, int value)
256	{	224	{
257	if (!spaces)	225	if (!spaces)
…		…
272		240
273	for (mapspace *ms = spaces + size (); ms-- > spaces; )	241	for (mapspace *ms = spaces + size (); ms-- > spaces; )
274	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	242	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
275	INVOKE_OBJECT (RESET, tmp);	243	INVOKE_OBJECT (RESET, tmp);
276	}	244	}
		245
		246	void
		247	maptile::post_load ()
		248	{
		249	#if 0
		250	if (!spaces)
		251	return;
		252
		253	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		254	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		255	; // nop
		256	#endif
		257	}
		258
		259	//+GPL
277		260
278	/* link_multipart_objects go through all the objects on the map looking	261	/* link_multipart_objects go through all the objects on the map looking
279	* for objects whose arch says they are multipart yet according to the	262	* for objects whose arch says they are multipart yet according to the
280	* info we have, they only have the head (as would be expected when	263	* info we have, they only have the head (as would be expected when
281	* they are saved).	264	* they are saved).
…		…
309	op = op->above;	292	op = op->above;
310	}	293	}
311	}	294	}
312	}	295	}
313		296
		297	//-GPL
		298
314	/*	299	/*
315	* Loads (ands parses) the objects into a given map from the specified	300	* Loads (ands parses) the objects into a given map from the specified
316	* file pointer.	301	* file pointer.
317	*/	302	*/
318	bool	303	bool
…		…
334	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))	319	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
335	{	320	{
336	// we insert manually because	321	// we insert manually because
337	// a) its way faster	322	// a) its way faster
338	// b) we remove manually, too, and there are good reasons for that	323	// b) we remove manually, too, and there are good reasons for that
339	// c) its correct	324	// c) it's correct
340	mapspace &ms = at (op->x, op->y);	325	mapspace &ms = at (op->x, op->y);
341		326
342	op->flag [FLAG_REMOVED] = false;	327	op->flag [FLAG_REMOVED] = false;
343		328
344	op->above = 0;	329	op->above = 0;
345	op->below = ms.top;	330	op->below = ms.top;
346		331
347	if (ms.top)
348	ms.top->above = op;	332	*(ms.top ? &ms.top->above : &ms.bot) = op;
349	else
350	ms.bot = op;
351		333
352	ms.top = op;	334	ms.top = op;
353	ms.flags_ = 0;	335	ms.flags_ = 0;
354	}	336	}
355	else	337	else
…		…
440	return false;	422	return false;
441		423
442	return freezer.save (path);	424	return freezer.save (path);
443	}	425	}
444		426
445	maptile::maptile ()	427	void
		428	maptile::init ()
446	{	429	{
447	in_memory = MAP_SWAPPED;	430	in_memory = MAP_SWAPPED;
448		431
449	/* The maps used to pick up default x and y values from the	432	/* The maps used to pick up default x and y values from the
450	* map archetype. Mimic that behaviour.	433	* map archetype. Mimic that behaviour.
451	*/	434	*/
452	width = 16;	435	width = 16;
453	height = 16;	436	height = 16;
454	timeout = 300;	437	timeout = 300;
455	max_nrof = 1000; // 1000 items of anything	438	max_items = MAX_ITEM_PER_ACTION;
456	max_volume = 2000000; // 2m³	439	max_volume = 2000000; // 2m³
457	}
458
459	maptile::maptile (int w, int h)
460	{
461	in_memory = MAP_SWAPPED;
462
463	width = w;
464	height = h;
465	reset_timeout = 0;	440	reset_timeout = 0;
466	timeout = 300;
467	enter_x = 0;	441	enter_x = 0;
468	enter_y = 0;	442	enter_y = 0;
		443	}
		444
		445	maptile::maptile ()
		446	{
		447	init ();
		448	}
		449
		450	maptile::maptile (int w, int h)
		451	{
		452	init ();
		453
		454	width = w;
		455	height = h;
469		456
470	alloc ();	457	alloc ();
471	}	458	}
472		459
473	/*	460	/*
…		…
481	if (spaces)	468	if (spaces)
482	return;	469	return;
483		470
484	spaces = salloc0<mapspace> (size ());	471	spaces = salloc0<mapspace> (size ());
485	}	472	}
		473
		474	//+GPL
486		475
487	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	476	/* Takes a string from a map definition and outputs a pointer to the array of shopitems
488	* corresponding to that string. Memory is allocated for this, it must be freed	477	* corresponding to that string. Memory is allocated for this, it must be freed
489	* at a later date.	478	* at a later date.
490	* Called by parse_map_headers below.	479	* Called by parse_map_headers below.
…		…
567	return items;	556	return items;
568	}	557	}
569		558
570	/* opposite of parse string, this puts the string that was originally fed in to	559	/* opposite of parse string, this puts the string that was originally fed in to
571	* the map (or something equivilent) into output_string. */	560	* the map (or something equivilent) into output_string. */
572	static void	561	static const char *
573	print_shop_string (maptile m, char output_string)	562	print_shop_string (maptile *m)
574	{	563	{
575	int i;	564	static dynbuf_text buf; buf.clear ();
576	char tmp[MAX_BUF];
577		565
578	strcpy (output_string, "");
579	for (i = 0; i < m->shopitems[0].index; i++)	566	for (int i = 0; i < m->shopitems[0].index; i++)
580	{	567	{
581	if (m->shopitems[i].typenum)	568	if (m->shopitems[i].typenum)
582	{	569	{
583	if (m->shopitems[i].strength)	570	if (m->shopitems[i].strength)
584	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	571	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
585	else	572	else
586	sprintf (tmp, "%s;", m->shopitems[i].name);	573	buf.printf ("%s;", m->shopitems[i].name);
587	}	574	}
588	else	575	else
589	{	576	{
590	if (m->shopitems[i].strength)	577	if (m->shopitems[i].strength)
591	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	578	buf.printf ("*:%d;", m->shopitems[i].strength);
592	else	579	else
593	sprintf (tmp, "*");	580	buf.printf ("*");
594	}	581	}
595
596	strcat (output_string, tmp);
597	}	582	}
		583
		584	return buf;
598	}	585	}
		586
		587	//-GPL
599		588
600	/* This loads the header information of the map. The header	589	/* This loads the header information of the map. The header
601	* contains things like difficulty, size, timeout, etc.	590	* contains things like difficulty, size, timeout, etc.
602	* this used to be stored in the map object, but with the	591	* this used to be stored in the map object, but with the
603	* addition of tiling, fields beyond that easily named in an	592	* addition of tiling, fields beyond that easily named in an
…		…
644	case KW_shopgreed: thawer.get (shopgreed); break;	633	case KW_shopgreed: thawer.get (shopgreed); break;
645	case KW_shopmin: thawer.get (shopmin); break;	634	case KW_shopmin: thawer.get (shopmin); break;
646	case KW_shopmax: thawer.get (shopmax); break;	635	case KW_shopmax: thawer.get (shopmax); break;
647	case KW_shoprace: thawer.get (shoprace); break;	636	case KW_shoprace: thawer.get (shoprace); break;
648	case KW_outdoor: thawer.get (outdoor); break;	637	case KW_outdoor: thawer.get (outdoor); break;
649	case KW_temp: thawer.get (temp); break;
650	case KW_pressure: thawer.get (pressure); break;
651	case KW_humid: thawer.get (humid); break;
652	case KW_windspeed: thawer.get (windspeed); break;
653	case KW_winddir: thawer.get (winddir); break;
654	case KW_sky: thawer.get (sky); break;
655		638
656	case KW_per_player: thawer.get (per_player); break;	639	case KW_per_player: thawer.get (per_player); break;
657	case KW_per_party: thawer.get (per_party); break;	640	case KW_per_party: thawer.get (per_party); break;
658	case KW_no_reset: thawer.get (no_reset); break;	641	case KW_no_reset: thawer.get (no_reset); break;
659	case KW_no_drop: thawer.get (no_drop); break;	642	case KW_no_drop: thawer.get (no_drop); break;
…		…
684	case KW_end:	667	case KW_end:
685	thawer.next ();	668	thawer.next ();
686	return true;	669	return true;
687		670
688	default:	671	default:
689	if (!thawer.parse_error ("map", 0))	672	if (!thawer.parse_error ("map"))
690	return false;	673	return false;
691	break;	674	break;
692	}	675	}
693		676
694	thawer.next ();	677	thawer.next ();
695	}	678	}
696		679
697	abort ();	680	abort ();
698	}	681	}
		682
		683	//+GPL
699		684
700	/******************************************************************************	685	/******************************************************************************
701	* This is the start of unique map handling code	686	* This is the start of unique map handling code
702	*****************************************************************************/	687	*****************************************************************************/
703		688
…		…
710	int unique = 0;	695	int unique = 0;
711	for (object *op = spaces [i].bot; op; )	696	for (object *op = spaces [i].bot; op; )
712	{	697	{
713	object *above = op->above;	698	object *above = op->above;
714		699
715	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	700	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
716	unique = 1;	701	unique = 1;
717		702
718	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	703	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
719	op->destroy ();	704	op->destroy ();
720		705
721	op = above;	706	op = above;
722	}	707	}
723	}	708	}
724	}	709	}
725		710
		711	//-GPL
		712
726	bool	713	bool
727	maptile::_save_header (object_freezer &freezer)	714	maptile::_save_header (object_freezer &freezer)
728	{	715	{
729	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	716	#define MAP_OUT(k) freezer.put (KW(k), k)
730	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	717	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
731		718
732	MAP_OUT2 (arch, "map");	719	MAP_OUT2 (arch, CS(map));
733		720
734	if (name) MAP_OUT (name);	721	if (name) MAP_OUT (name);
735	MAP_OUT (swap_time);	722	MAP_OUT (swap_time);
736	MAP_OUT (reset_time);	723	MAP_OUT (reset_time);
737	MAP_OUT (reset_timeout);	724	MAP_OUT (reset_timeout);
738	MAP_OUT (fixed_resettime);	725	MAP_OUT (fixed_resettime);
739	MAP_OUT (no_reset);	726	MAP_OUT (no_reset);
740	MAP_OUT (no_drop);	727	MAP_OUT (no_drop);
741	MAP_OUT (difficulty);	728	MAP_OUT (difficulty);
742
743	if (default_region) MAP_OUT2 (region, default_region->name);	729	if (default_region) MAP_OUT2 (region, default_region->name);
744		730
745	if (shopitems)	731	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
746	{
747	char shop[MAX_BUF];
748	print_shop_string (this, shop);
749	MAP_OUT2 (shopitems, shop);
750	}
751
752	MAP_OUT (shopgreed);	732	MAP_OUT (shopgreed);
753	MAP_OUT (shopmin);	733	MAP_OUT (shopmin);
754	MAP_OUT (shopmax);	734	MAP_OUT (shopmax);
755	if (shoprace) MAP_OUT (shoprace);	735	if (shoprace) MAP_OUT (shoprace);
756	MAP_OUT (darkness);	736
757	MAP_OUT (width);	737	MAP_OUT (width);
758	MAP_OUT (height);	738	MAP_OUT (height);
759	MAP_OUT (enter_x);	739	MAP_OUT (enter_x);
760	MAP_OUT (enter_y);	740	MAP_OUT (enter_y);
761		741	MAP_OUT (darkness);
762	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
763	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
764
765	MAP_OUT (outdoor);	742	MAP_OUT (outdoor);
766	MAP_OUT (temp);	743
767	MAP_OUT (pressure);	744	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
768	MAP_OUT (humid);	745	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
769	MAP_OUT (windspeed);
770	MAP_OUT (winddir);
771	MAP_OUT (sky);
772		746
773	MAP_OUT (per_player);	747	MAP_OUT (per_player);
774	MAP_OUT (per_party);	748	MAP_OUT (per_party);
775		749
776	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	750	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
777	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	751	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
778	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	752	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
779	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	753	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
780		754
781	freezer.put (this);	755	freezer.put (this);
782	freezer.put (KW_end);	756	freezer.put (KW(end));
783		757
784	return true;	758	return true;
785	}	759	}
786		760
787	bool	761	bool
…		…
792	if (!_save_header (freezer))	766	if (!_save_header (freezer))
793	return false;	767	return false;
794		768
795	return freezer.save (path);	769	return freezer.save (path);
796	}	770	}
		771
		772	//+GPL
797		773
798	/*	774	/*
799	* Remove and free all objects in the given map.	775	* Remove and free all objects in the given map.
800	*/	776	*/
801	void	777	void
…		…
870		846
871	clear ();	847	clear ();
872	}	848	}
873		849
874	/* decay and destroy perishable items in a map */	850	/* decay and destroy perishable items in a map */
		851	// TODO: should be done regularly, not on map load?
875	void	852	void
876	maptile::do_decay_objects ()	853	maptile::do_decay_objects ()
877	{	854	{
878	if (!spaces)	855	if (!spaces)
879	return;	856	return;
…		…
881	for (mapspace *ms = spaces + size (); ms-- > spaces; )	858	for (mapspace *ms = spaces + size (); ms-- > spaces; )
882	for (object above, op = ms->bot; op; op = above)	859	for (object above, op = ms->bot; op; op = above)
883	{	860	{
884	above = op->above;	861	above = op->above;
885		862
		863	// do not decay anything above unique floor tiles (yet :)
		864	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
		865	break;
		866
886	bool destroy = 0;	867	bool destroy = 0;
887		868
888	// do not decay anything above unique floor tiles (yet :)	869	if (op->flag [FLAG_IS_FLOOR]
889	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	870	\|\| op->flag [FLAG_OBJ_ORIGINAL]
890	break;	871	\|\| op->flag [FLAG_UNIQUE]
891		872	\|\| op->flag [FLAG_OVERLAY_FLOOR]
892	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	873	\|\| op->flag [FLAG_UNPAID]
893	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
895	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
896	\|\| QUERY_FLAG (op, FLAG_UNPAID)
897	\|\| op->is_alive ())	874	\|\| op->is_alive ())
898	; // do not decay	875	; // do not decay
899	else if (op->is_weapon ())	876	else if (op->is_weapon ())
900	{	877	{
901	op->stats.dam--;	878	op->stats.dam--;
…		…
926	\|\| mat & M_LIQUID	903	\|\| mat & M_LIQUID
927	\|\| (mat & M_IRON && rndm (1, 5) == 1)	904	\|\| (mat & M_IRON && rndm (1, 5) == 1)
928	\|\| (mat & M_GLASS && rndm (1, 2) == 1)	905	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
929	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)	906	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
930	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)	907	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
931	\|\| (mat & M_ICE && temp > 32))	908	//\|\| (mat & M_ICE && temp > 32)
		909	)
932	destroy = 1;	910	destroy = 1;
933	}	911	}
934		912
935	/* adjust overall chance below */	913	/* adjust overall chance below */
936	if (destroy && rndm (0, 1))	914	if (destroy && rndm (0, 1))
937	op->destroy ();	915	op->destroy ();
938	}
939	}
940
941	/*
942	* Updates every button on the map (by calling update_button() for them).
943	*/
944	void
945	maptile::update_buttons ()
946	{
947	for (oblinkpt *obp = buttons; obp; obp = obp->next)
948	for (objectlink *ol = obp->link; ol; ol = ol->next)
949	{
950	if (!ol->ob)
951	{
952	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
953	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
954	continue;
955	}
956
957	if (ol->ob->type == BUTTON \|\| ol->ob->type == PEDESTAL)
958	{
959	update_button (ol->ob);
960	break;
961	}
962	}	916	}
963	}	917	}
964		918
965	/*	919	/*
966	* This routine is supposed to find out the difficulty of the map.	920	* This routine is supposed to find out the difficulty of the map.
967	* difficulty does not have a lot to do with character level,	921	* difficulty does not have a lot to do with character level,
968	* but does have a lot to do with treasure on the map.	922	* but does have a lot to do with treasure on the map.
969	*	923	*
970	* Difficulty can now be set by the map creature. If the value stored	924	* Difficulty can now be set by the map creator. If the value stored
971	* in the map is zero, then use this routine. Maps should really	925	* in the map is zero, then use this routine. Maps should really
972	* have a difficulty set than using this function - human calculation	926	* have a difficulty set rather than using this function - human calculation
973	* is much better than this functions guesswork.	927	* is much better than this function's guesswork.
974	*/	928	*/
975	int	929	int
976	maptile::estimate_difficulty () const	930	maptile::estimate_difficulty () const
977	{	931	{
978	long monster_cnt = 0;	932	long monster_cnt = 0;
…		…
980	sint64 total_exp = 0;	934	sint64 total_exp = 0;
981		935
982	for (mapspace *ms = spaces + size (); ms-- > spaces; )	936	for (mapspace *ms = spaces + size (); ms-- > spaces; )
983	for (object *op = ms->bot; op; op = op->above)	937	for (object *op = ms->bot; op; op = op->above)
984	{	938	{
985	if (QUERY_FLAG (op, FLAG_MONSTER))	939	if (op->flag [FLAG_MONSTER])
986	{	940	{
987	total_exp += op->stats.exp;	941	total_exp += op->stats.exp;
988	monster_cnt++;	942	monster_cnt++;
989	}	943	}
990		944
991	if (QUERY_FLAG (op, FLAG_GENERATOR))	945	if (op->flag [FLAG_GENERATOR])
992	{	946	{
993	total_exp += op->stats.exp;	947	total_exp += op->stats.exp;
994		948
995	if (archetype *at = op->other_arch)	949	if (archetype *at = op->other_arch)
996	{	950	{
…		…
1023	* postive values make it darker, negative make it brighter	977	* postive values make it darker, negative make it brighter
1024	*/	978	*/
1025	int	979	int
1026	maptile::change_map_light (int change)	980	maptile::change_map_light (int change)
1027	{	981	{
1028	int new_level = darkness + change;
1029
1030	/* Nothing to do */	982	/* Nothing to do */
1031	if (!change \|\| (new_level <= 0 && darkness == 0) \|\| (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))	983	if (!change)
1032	return 0;	984	return 0;
1033		985
1034	/* inform all players on the map */	986	/* inform all players on the map */
1035	if (change > 0)	987	if (change > 0)
1036	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");	988	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");
1037	else	989	else
1038	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");	990	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");
1039		991
1040	/* Do extra checking. since darkness is a unsigned value,	992	darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1041	* we need to be extra careful about negative values.
1042	* In general, the checks below are only needed if change
1043	* is not +/-1
1044	*/
1045	if (new_level < 0)
1046	darkness = 0;
1047	else if (new_level >= MAX_DARKNESS)
1048	darkness = MAX_DARKNESS;
1049	else
1050	darkness = new_level;
1051		993
1052	/* All clients need to get re-updated for the change */	994	/* All clients need to get re-updated for the change */
1053	update_all_map_los (this);	995	update_all_map_los (this);
1054		996
1055	return 1;	997	return 1;
…		…
1063	*/	1005	*/
1064	void	1006	void
1065	mapspace::update_ ()	1007	mapspace::update_ ()
1066	{	1008	{
1067	object *last = 0;	1009	object *last = 0;
1068	uint8 flags = P_UPTODATE, anywhere = 0;	1010	uint8 flags = P_UPTODATE;
1069	sint8 light = 0;	1011	sint8 light = 0;
1070	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1012	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
		1013	uint64_t volume = 0;
		1014	uint32_t items = 0;
		1015	object *anywhere = 0;
		1016	uint8_t middle_visibility = 0;
1071		1017
1072	//object *middle = 0;	1018	//object *middle = 0;
1073	//object *top = 0;	1019	//object *top = 0;
1074	//object *floor = 0;	1020	//object *floor = 0;
1075	// this seems to generate better code than using locals, above	1021	// this seems to generate better code than using locals, above
1076	object *&top = faces_obj[0] = 0;	1022	object *&top = faces_obj[0] = 0;
1077	object *&middle = faces_obj[1] = 0;	1023	object *&middle = faces_obj[1] = 0;
1078	object *&floor = faces_obj[2] = 0;	1024	object *&floor = faces_obj[2] = 0;
		1025
		1026	object::flags_t allflags; // all flags of all objects or'ed together
1079		1027
1080	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)	1028	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1081	{	1029	{
1082	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)	1030	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1083	light += tmp->glow_radius;	1031	light += tmp->glow_radius;
…		…
1088	* 3 times each time the player moves, because many of the	1036	* 3 times each time the player moves, because many of the
1089	* functions the move_player calls eventualy call this.	1037	* functions the move_player calls eventualy call this.
1090	*	1038	*
1091	* Always put the player down for drawing.	1039	* Always put the player down for drawing.
1092	*/	1040	*/
1093	if (!tmp->invisible)	1041	if (expect_true (!tmp->invisible))
1094	{	1042	{
1095	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1043	if (expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))
1096	top = tmp;	1044	top = tmp;
1097	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1045	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1098	{	1046	{
1099	/* If we got a floor, that means middle and top were below it,	1047	/* If we got a floor, that means middle and top were below it,
1100	* so should not be visible, so we clear them.	1048	* so should not be visible, so we clear them.
1101	*/	1049	*/
1102	middle = 0;	1050	middle = 0;
1103	top = 0;	1051	top = 0;
1104	floor = tmp;	1052	floor = tmp;
		1053	volume = 0;
		1054	items = 0;
1105	}	1055	}
1106	/* Flag anywhere have high priority */	1056	else
1107	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1108	{	1057	{
		1058	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
		1059	{
		1060	++items;
		1061	volume += tmp->volume ();
		1062	}
		1063
		1064	/* Flag anywhere have high priority */
		1065	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
		1066	anywhere = tmp;
		1067
		1068	/* Find the highest visible face around. If equal
		1069	* visibilities, we still want the one nearer to the
		1070	* top
		1071	*/
		1072	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
		1073	{
		1074	middle_visibility = ::faces [tmp->face].visibility;
1109	middle = tmp;	1075	middle = tmp;
1110	anywhere = 1;	1076	}
1111	}	1077	}
1112
1113	/* Find the highest visible face around. If equal
1114	* visibilities, we still want the one nearer to the
1115	* top
1116	*/
1117	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1118	middle = tmp;
1119	}
1120
1121	if (tmp == tmp->above)
1122	{
1123	LOG (llevError, "Error in structure of map\n");
1124	exit (-1);
1125	}	1078	}
1126		1079
1127	move_slow \|= tmp->move_slow;	1080	move_slow \|= tmp->move_slow;
1128	move_block \|= tmp->move_block;	1081	move_block \|= tmp->move_block;
1129	move_on \|= tmp->move_on;	1082	move_on \|= tmp->move_on;
1130	move_off \|= tmp->move_off;	1083	move_off \|= tmp->move_off;
1131	move_allow \|= tmp->move_allow;	1084	move_allow \|= tmp->move_allow;
1132		1085
1133	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags \|= P_BLOCKSVIEW;	1086	allflags \|= tmp->flag;
1134	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags \|= P_NO_MAGIC;	1087
1135	if (tmp->type == PLAYER) flags \|= P_PLAYER;	1088	if (tmp->type == PLAYER) flags \|= P_PLAYER;
1136	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1089	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1137	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1138	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1139	}	1090	}
		1091
		1092	// FLAG_SEE_ANYWHERE takes precedence
		1093	if (anywhere)
		1094	middle = anywhere;
		1095
		1096	// ORing all flags together and checking them here is much faster
		1097	if (allflags [FLAG_BLOCKSVIEW]) flags \|= P_BLOCKSVIEW;
		1098	if (allflags [FLAG_NO_MAGIC] ) flags \|= P_NO_MAGIC;
		1099	if (allflags [FLAG_ALIVE] ) flags \|= P_IS_ALIVE;
		1100	if (allflags [FLAG_DAMNED] ) flags \|= P_NO_CLERIC;
1140		1101
1141	this->light = min (light, MAX_LIGHT_RADIUS);	1102	this->light = min (light, MAX_LIGHT_RADIUS);
1142	this->flags_ = flags;	1103	this->flags_ = flags;
1143	this->move_block = move_block & ~move_allow;	1104	this->move_block = move_block & ~move_allow;
1144	this->move_on = move_on;	1105	this->move_on = move_on;
1145	this->move_off = move_off;	1106	this->move_off = move_off;
1146	this->move_slow = move_slow;	1107	this->move_slow = move_slow;
		1108	this->volume_ = (volume + 1023) / 1024;
		1109	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1147		1110
1148	/* At this point, we have a floor face (if there is a floor),	1111	/* At this point, we have a floor face (if there is a floor),
1149	* and the floor is set - we are not going to touch it at	1112	* and the floor is set - we are not going to touch it at
1150	* this point.	1113	* this point.
1151	* middle contains the highest visibility face.	1114	* middle contains the highest visibility face.
…		…
1169	*/	1132	*/
1170		1133
1171	for (object *tmp = last; tmp; tmp = tmp->below)	1134	for (object *tmp = last; tmp; tmp = tmp->below)
1172	{	1135	{
1173	/* Once we get to a floor, stop, since we already have a floor object */	1136	/* Once we get to a floor, stop, since we already have a floor object */
1174	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1137	if (tmp->flag [FLAG_IS_FLOOR])
1175	break;	1138	break;
1176		1139
1177	/* If two top faces are already set, quit processing */	1140	/* If two top faces are already set, quit processing */
1178	if (top && middle)	1141	if (top && middle)
1179	break;	1142	break;
…		…
1217	faces_obj [1] = middle;	1180	faces_obj [1] = middle;
1218	faces_obj [2] = floor;	1181	faces_obj [2] = floor;
1219	#endif	1182	#endif
1220	}	1183	}
1221		1184
1222	uint64	1185	maptile *
1223	mapspace::volume () const
1224	{
1225	uint64 vol = 0;
1226
1227	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1228	vol += op->volume ();
1229
1230	return vol;
1231	}
1232
1233	bool
1234	maptile::tile_available (int dir, bool load)	1186	maptile::tile_available (int dir, bool load)
1235	{	1187	{
1236	if (!tile_path[dir])	1188	if (tile_path[dir])
1237	return 0;	1189	{
1238
1239	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1190	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))
1240	return 1;	1191	return tile_map[dir];
1241		1192
1242	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))	1193	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1243	return 1;	1194	return tile_map[dir];
		1195	}
1244		1196
1245	return 0;	1197	return 0;
1246	}	1198	}
1247		1199
1248	/* this returns TRUE if the coordinates (x,y) are out of	1200	/* this returns TRUE if the coordinates (x,y) are out of
…		…
1473	*	1425	*
1474	* currently, the only flag supported (0x1) is don't translate for	1426	* currently, the only flag supported (0x1) is don't translate for
1475	* closest body part of 'op1'	1427	* closest body part of 'op1'
1476	*/	1428	*/
1477	void	1429	void
1478	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1430	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1479	{	1431	{
1480	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1432	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1481	{	1433	{
1482	/* be conservative and fill in _some_ data */	1434	/* be conservative and fill in _some_ data */
1483	retval->distance = 10000;	1435	retval->distance = 10000;
…		…
1486	retval->direction = 0;	1438	retval->direction = 0;
1487	retval->part = 0;	1439	retval->part = 0;
1488	}	1440	}
1489	else	1441	else
1490	{	1442	{
1491	object *best;
1492
1493	retval->distance_x += op2->x - op1->x;	1443	retval->distance_x += op2->x - op1->x;
1494	retval->distance_y += op2->y - op1->y;	1444	retval->distance_y += op2->y - op1->y;
1495		1445
1496	best = op1;	1446	object *best = op1;
		1447
1497	/* If this is multipart, find the closest part now */	1448	/* If this is multipart, find the closest part now */
1498	if (!(flags & 0x1) && op1->more)	1449	if (!(flags & 1) && op1->more)
1499	{	1450	{
1500	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1451	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1501		1452
1502	/* we just take the offset of the piece to head to figure	1453	/* we just take the offset of the piece to head to figure
1503	* distance instead of doing all that work above again	1454	* distance instead of doing all that work above again
…		…
1554	else	1505	else
1555	{	1506	{
1556	retval->distance_x += op2->x - x;	1507	retval->distance_x += op2->x - x;
1557	retval->distance_y += op2->y - y;	1508	retval->distance_y += op2->y - y;
1558		1509
1559	retval->part = NULL;	1510	retval->part = 0;
1560	retval->distance = idistance (retval->distance_x, retval->distance_y);	1511	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1561	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1512	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1562	}	1513	}
1563	}	1514	}
1564		1515
1565	/* Returns true of op1 and op2 are effectively on the same map	1516	/* Returns true of op1 and op2 are effectively on the same map
…		…
1576	int dx, dy;	1527	int dx, dy;
1577		1528
1578	return adjacent_map (op1->map, op2->map, &dx, &dy);	1529	return adjacent_map (op1->map, op2->map, &dx, &dy);
1579	}	1530	}
1580		1531
		1532	//-GPL
		1533
1581	object *	1534	object *
1582	maptile::insert (object op, int x, int y, object originator, int flags)	1535	maptile::insert (object op, int x, int y, object originator, int flags)
1583	{	1536	{
1584	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1537	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1585	}	1538	}
…		…
1596	if (default_region)	1549	if (default_region)
1597	return default_region;	1550	return default_region;
1598		1551
1599	return ::region::default_region ();	1552	return ::region::default_region ();
1600	}	1553	}
		1554
		1555	//+GPL
1601		1556
1602	/* picks a random object from a style map.	1557	/* picks a random object from a style map.
1603	*/	1558	*/
1604	object *	1559	object *
1605	maptile::pick_random_object (rand_gen &gen) const	1560	maptile::pick_random_object (rand_gen &gen) const
…		…
1612	*/	1567	*/
1613	for (int i = 1000; --i;)	1568	for (int i = 1000; --i;)
1614	{	1569	{
1615	object *pick = at (gen (width), gen (height)).bot;	1570	object *pick = at (gen (width), gen (height)).bot;
1616		1571
1617	// do not prefer big monsters just because they are big.	1572	// must be head: do not prefer big monsters just because they are big.
1618	if (pick && pick->is_head ())	1573	if (pick && pick->is_head ())
1619	return pick->head_ ();	1574	return pick;
1620	}	1575	}
1621		1576
1622	// instead of crashing in the unlikely(?) case, try to return something	1577	// instead of crashing in the unlikely(?) case, try to return something
1623	return archetype::find ("bug");	1578	return archetype::find (shstr_bug);
1624	}	1579	}
		1580
		1581	//-GPL
1625		1582
1626	void	1583	void
1627	maptile::play_sound (faceidx sound, int x, int y) const	1584	maptile::play_sound (faceidx sound, int x, int y) const
1628	{	1585	{
1629	if (!sound)	1586	if (!sound)
…		…
1640	if (distance <= MAX_SOUND_DISTANCE)	1597	if (distance <= MAX_SOUND_DISTANCE)
1641	ns->play_sound (sound, dx, dy);	1598	ns->play_sound (sound, dx, dy);
1642	}	1599	}
1643	}	1600	}
1644		1601
		1602	void
		1603	maptile::say_msg (const char *msg, int x, int y) const
		1604	{
		1605	for_all_players (pl)
		1606	if (client *ns = pl->ns)
		1607	{
		1608	int dx = x - pl->ob->x;
		1609	int dy = y - pl->ob->y;
		1610
		1611	int distance = idistance (dx, dy);
		1612
		1613	if (distance <= MAX_SOUND_DISTANCE)
		1614	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
		1615	}
		1616	}
		1617
		1618	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1619
		1620	static void
		1621	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
		1622	{
		1623	// clip to map to the left
		1624	if (x0 < 0)
		1625	{
		1626	if (maptile *tile = m->tile_available (TILE_LEFT, 1))
		1627	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
		1628
		1629	if (x1 < 0) // entirely to the left
		1630	return;
		1631
		1632	x0 = 0;
		1633	}
		1634
		1635	// clip to map to the right
		1636	if (x1 > m->width)
		1637	{
		1638	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
		1639	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
		1640
		1641	if (x0 > m->width) // entirely to the right
		1642	return;
		1643
		1644	x1 = m->width;
		1645	}
		1646
		1647	// clip to map above
		1648	if (y0 < 0)
		1649	{
		1650	if (maptile *tile = m->tile_available (TILE_UP, 1))
		1651	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
		1652
		1653	if (y1 < 0) // entirely above
		1654	return;
		1655
		1656	y0 = 0;
		1657	}
		1658
		1659	// clip to map below
		1660	if (y1 > m->height)
		1661	{
		1662	if (maptile *tile = m->tile_available (TILE_DOWN, 1))
		1663	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
		1664
		1665	if (y0 > m->height) // entirely below
		1666	return;
		1667
		1668	y1 = m->height;
		1669	}
		1670
		1671	// if we get here, the rect is within the current map
		1672	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1673
		1674	r->m = m;
		1675	r->x0 = x0;
		1676	r->y0 = y0;
		1677	r->x1 = x1;
		1678	r->y1 = y1;
		1679	r->dx = dx;
		1680	r->dy = dy;
		1681	}
		1682
		1683	maprect *
		1684	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
		1685	{
		1686	buf.clear ();
		1687
		1688	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
		1689
		1690	// add end marker
		1691	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1692	r->m = 0;
		1693
		1694	return (maprect *)buf.linearise ();
		1695	}
		1696

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.152 by root, Tue Dec 23 01:51:27 2008 UTC vs. Revision 1.188 by root, Fri Apr 16 02:32:25 2010 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.152 by root, Tue Dec 23 01:51:27 2008 UTC vs.
Revision 1.188 by root, Fri Apr 16 02:32:25 2010 UTC