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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.117 by root, Fri Aug 24 00:26:09 2007 UTC vs.
Revision 1.165 by root, Tue Oct 20 05:57:08 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT 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 <crossfire@schmorp.de>	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 "funcpoint.h"
28
29	#include "loader.h"	28	#include "loader.h"
30
31	#include "path.h"	29	#include "path.h"
		30
		31	sint8 maptile::outdoor_darkness;
32		32
33	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	33	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34	* one function that just returns a P_.. value (see map.h)	34	* one function that just returns a P_.. value (see map.h)
35	* it will also do map translation for tiled maps, returning	35	* it will also do map translation for tiled maps, returning
36	* new values into newmap, nx, and ny. Any and all of those	36	* new values into newmap, nx, and ny. Any and all of those
71	* by the caller.	71	* by the caller.
72	*/	72	*/
73	int	73	int
74	blocked_link (object ob, maptile m, int sx, int sy)	74	blocked_link (object ob, maptile m, int sx, int sy)
75	{	75	{
76	object *tmp;
77	int mflags, blocked;
78
79	/* Make sure the coordinates are valid - they should be, as caller should	76	/* Make sure the coordinates are valid - they should be, as caller should
80	* have already checked this.	77	* have already checked this.
81	*/	78	*/
82	if (OUT_OF_REAL_MAP (m, sx, sy))	79	if (OUT_OF_REAL_MAP (m, sx, sy))
83	{	80	{
…		…
86	}	83	}
87		84
88	/* Save some cycles - instead of calling get_map_flags(), just get the value	85	/* Save some cycles - instead of calling get_map_flags(), just get the value
89	* directly.	86	* directly.
90	*/	87	*/
91	mflags = m->at (sx, sy).flags ();	88	mapspace &ms = m->at (sx, sy);
92		89
93	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	90	int mflags = ms.flags ();
		91	int blocked = ms.move_block;
94		92
95	/* If space is currently not blocked by anything, no need to	93	/* If space is currently not blocked by anything, no need to
96	* go further. Not true for players - all sorts of special	94	* go further. Not true for players - all sorts of special
97	* things we need to do for players.	95	* things we need to do for players.
98	*/	96	*/
99	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	97	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
100	return 0;	98	return 0;
101		99
102	/* if there isn't anytyhing alive on this space, and this space isn't	100	/* if there isn't anything alive on this space, and this space isn't
103	* otherwise blocked, we can return now. Only if there is a living	101	* otherwise blocked, we can return now. Only if there is a living
104	* creature do we need to investigate if it is part of this creature	102	* creature do we need to investigate if it is part of this creature
105	* or another. Likewise, only if something is blocking us do we	103	* or another. Likewise, only if something is blocking us do we
106	* need to investigate if there is a special circumstance that would	104	* need to investigate if there is a special circumstance that would
107	* let the player through (inventory checkers for example)	105	* let the player through (inventory checkers for example)
…		…
114	/* We basically go through the stack of objects, and if there is	112	/* We basically go through the stack of objects, and if there is
115	* some other object that has NO_PASS or FLAG_ALIVE set, return	113	* some other object that has NO_PASS or FLAG_ALIVE set, return
116	* true. If we get through the entire stack, that must mean	114	* true. If we get through the entire stack, that must mean
117	* ob is blocking it, so return 0.	115	* ob is blocking it, so return 0.
118	*/	116	*/
119	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	117	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
120	{	118	{
121		119	if (OB_MOVE_BLOCK (ob, tmp))
122	/* This must be before the checks below. Code for inventory checkers. */
123	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
124	{	120	{
125	/* If last_sp is set, the player/monster needs an object,	121	if (tmp->type == CHECK_INV)
126	* so we check for it. If they don't have it, they can't
127	* pass through this space.
128	*/
129	if (tmp->last_sp)
130	{	122	{
131	if (check_inv_recursive (ob, tmp) == NULL)	123	bool have = check_inv_recursive (ob, tmp);
		124
		125	// last_sp set means we block if we don't have.
		126	if (logical_xor (have, tmp->last_sp))
132	return 1;	127	return 1;
133	else	128	}
134	continue;	129	else if (tmp->type == T_MATCH)
		130	{
		131	// T_MATCH allows "entrance" iff the match is true
		132	// == blocks if the match fails
		133
		134	// we could have used an INVOKE_OBJECT, but decided against it, as we
		135	// assume that T_MATCH is very common.
		136	if (!match (tmp->slaying, ob, tmp, ob))
		137	return 1;
135	}	138	}
136	else	139	else
137	{	140	return 1; // unconditional block
138	/* In this case, the player must not have the object -	141
139	* if they do, they can't pass through.
140	*/
141	if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
142	return 1;
143	else
144	continue;
145	}
146	} /* if check_inv */
147	else	142	} else {
148	{	143	// space does not block the ob, directly, but
149	/* Broke apart a big nasty if into several here to make	144	// anything alive that is not a door still
150	* this more readable. first check - if the space blocks	145	// blocks anything but wizards.
151	* movement, can't move here.
152	* second - if a monster, can't move there, unless it is a
153	* hidden dm
154	*/
155	if (OB_MOVE_BLOCK (ob, tmp))
156	return 1;
157		146
158	if (tmp->flag [FLAG_ALIVE]	147	if (tmp->flag [FLAG_ALIVE]
159	&& tmp->head_ () != ob	148	&& tmp->head_ () != ob
160	&& tmp != ob	149	&& tmp != ob
161	&& tmp->type != DOOR	150	&& tmp->type != DOOR
162	&& !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))	151	&& !tmp->flag [FLAG_WIZPASS])
163	return 1;	152	return 1;
164	}	153	}
165
166	}	154	}
		155
167	return 0;	156	return 0;
168	}	157	}
169		158
170	/*	159	/*
171	* Returns true if the given object can't fit in the given spot.	160	* Returns qthe blocking object if the given object can't fit in the given
172	* This is meant for multi space objects - for single space objecs,	161	* spot. This is meant for multi space objects - for single space objecs,
173	* just calling get_map_blocked and checking that against movement type	162	* just calling get_map_blocked and checking that against movement type
174	* of object. This function goes through all the parts of the	163	* of object. This function goes through all the parts of the multipart
175	* multipart object and makes sure they can be inserted.	164	* object and makes sure they can be inserted.
176	*	165	*
177	* While this doesn't call out of map, the get_map_flags does.	166	* While this doesn't call out of map, the get_map_flags does.
178	*	167	*
179	* This function has been used to deprecate arch_out_of_map -	168	* This function has been used to deprecate arch_out_of_map -
180	* this function also does that check, and since in most cases,	169	* this function also does that check, and since in most cases,
…		…
191	*	180	*
192	* Note this used to be arch_blocked, but with new movement	181	* Note this used to be arch_blocked, but with new movement
193	* code, we need to have actual object to check its move_type	182	* code, we need to have actual object to check its move_type
194	* against the move_block values.	183	* against the move_block values.
195	*/	184	*/
196	int	185	bool
197	ob_blocked (const object ob, maptile m, sint16 x, sint16 y)	186	object::blocked (maptile *m, int x, int y) const
198	{	187	{
199	archetype *tmp;	188	for (archetype tmp = arch; tmp; tmp = (archetype )tmp->more)
200	int flag;
201	maptile *m1;
202	sint16 sx, sy;
203
204	if (!ob)
205	{
206	flag = get_map_flags (m, &m1, x, y, &sx, &sy);
207	if (flag & P_OUT_OF_MAP)
208	return P_OUT_OF_MAP;
209
210	/* don't have object, so don't know what types would block */
211	return m1->at (sx, sy).move_block;
212	}	189	{
		190	mapxy pos (m, x + tmp->x, y + tmp->y);
213		191
214	for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)	192	if (!pos.normalise ())
215	{	193	return 1;
216	flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217		194
218	if (flag & P_OUT_OF_MAP)	195	mapspace &ms = *pos;
219	return P_OUT_OF_MAP;	196
220	if (flag & P_IS_ALIVE)	197	if (ms.flags () & P_IS_ALIVE)
221	return P_IS_ALIVE;	198	return 1;
222		199
223	mapspace &ms = m1->at (sx, sy);	200	/* However, often ob doesn't have any move type
224		201	* (signifying non-moving objects)
225	/* find_first_free_spot() calls this function. However, often
226	* ob doesn't have any move type (when used to place exits)
227	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	202	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228	*/	203	*/
229
230	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	204	if (!move_type && ms.move_block != MOVE_ALL)
231	continue;	205	continue;
232		206
233	/* Note it is intentional that we check ob - the movement type of the	207	/* Note it is intentional that we check ob - the movement type of the
234	* head of the object should correspond for the entire object.	208	* head of the object should correspond for the entire object.
235	*/	209	*/
236	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	210	if (ms.blocks (move_type))
237	return P_NO_PASS;	211	return 1;
238	}	212	}
239		213
240	return 0;	214	return 0;
241	}	215	}
242		216
…		…
260		234
261	insert_ob_in_ob (tmp, container);	235	insert_ob_in_ob (tmp, container);
262	tmp = next;	236	tmp = next;
263	}	237	}
264		238
265	/* sum_weight will go through and calculate what all the containers are	239	// go through and calculate what all the containers are carrying.
266	* carrying.	240	//TODO: remove
267	*/	241	container->update_weight ();
268	sum_weight (container);
269	}	242	}
270		243
271	void	244	void
272	maptile::set_object_flag (int flag, int value)	245	maptile::set_object_flag (int flag, int value)
273	{	246	{
…		…
275	return;	248	return;
276		249
277	for (mapspace *ms = spaces + size (); ms-- > spaces; )	250	for (mapspace *ms = spaces + size (); ms-- > spaces; )
278	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	251	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279	tmp->flag [flag] = value;	252	tmp->flag [flag] = value;
		253	}
		254
		255	void
		256	maptile::post_load_original ()
		257	{
		258	if (!spaces)
		259	return;
		260
		261	set_object_flag (FLAG_OBJ_ORIGINAL);
		262
		263	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		264	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		265	INVOKE_OBJECT (RESET, tmp);
280	}	266	}
281		267
282	/* link_multipart_objects go through all the objects on the map looking	268	/* link_multipart_objects go through all the objects on the map looking
283	* for objects whose arch says they are multipart yet according to the	269	* for objects whose arch says they are multipart yet according to the
284	* info we have, they only have the head (as would be expected when	270	* info we have, they only have the head (as would be expected when
…		…
322	bool	308	bool
323	maptile::_load_objects (object_thawer &f)	309	maptile::_load_objects (object_thawer &f)
324	{	310	{
325	for (;;)	311	for (;;)
326	{	312	{
327	coroapi::cede_to_tick_every (100); // cede once in a while	313	coroapi::cede_to_tick (); // cede once in a while
328		314
329	switch (f.kw)	315	switch (f.kw)
330	{	316	{
331	case KW_arch:	317	case KW_arch:
332	if (object *op = object::read (f, this))	318	if (object *op = object::read (f, this))
333	{	319	{
		320	// TODO: why?
334	if (op->inv)	321	if (op->inv)
335	sum_weight (op);	322	op->update_weight ();
336		323
337	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ON_TOP \| INS_MAP_LOAD);	324	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
		325	{
		326	// we insert manually because
		327	// a) its way faster
		328	// b) we remove manually, too, and there are good reasons for that
		329	// c) it's correct
		330	mapspace &ms = at (op->x, op->y);
		331
		332	op->flag [FLAG_REMOVED] = false;
		333
		334	op->above = 0;
		335	op->below = ms.top;
		336
		337	*(ms.top ? &ms.top->above : &ms.bot) = op;
		338
		339	ms.top = op;
		340	ms.flags_ = 0;
		341	}
		342	else
		343	{
		344	f.parse_warn (format ("object %s out of range", op->debug_desc ()));
		345	op->destroy ();
		346	}
338	}	347	}
339		348
340	continue;	349	continue;
341		350
342	case KW_EOF:	351	case KW_EOF:
…		…
383	if (!spaces)	392	if (!spaces)
384	return false;	393	return false;
385		394
386	for (int i = 0; i < size (); ++i)	395	for (int i = 0; i < size (); ++i)
387	{	396	{
388	int unique = 0;	397	bool unique = 0;
		398
389	for (object *op = spaces [i].bot; op; op = op->above)	399	for (object *op = spaces [i].bot; op; op = op->above)
390	{	400	{
391	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])	401	unique \|= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392	unique = 1;
393		402
394	if (!op->can_map_save ())	403	if (expect_false (!op->can_map_save ()))
395	continue;	404	continue;
396		405
397	if (unique \|\| op->flag [FLAG_UNIQUE])	406	if (expect_false (unique \|\| op->flag [FLAG_UNIQUE]))
398	{	407	{
399	if (flags & IO_UNIQUES)	408	if (flags & IO_UNIQUES)
400	op->write (f);	409	op->write (f);
401	}	410	}
402	else if (flags & IO_OBJECTS)	411	else if (expect_true (flags & IO_OBJECTS))
403	op->write (f);	412	op->write (f);
404	}	413	}
405	}	414	}
406		415
407	coroapi::cede_to_tick ();	416	coroapi::cede_to_tick ();
408		417
409	return true;	418	return true;
410	}
411
412	bool
413	maptile::_load_objects (const char *path, bool skip_header)
414	{
415	object_thawer f (path);
416
417	if (!f)
418	return false;
419
420	f.next ();
421
422	if (skip_header)
423	for (;;)
424	{
425	keyword kw = f.kw;
426	f.skip ();
427	if (kw == KW_end)
428	break;
429	}
430
431	return _load_objects (f);
432	}	419	}
433		420
434	bool	421	bool
435	maptile::_save_objects (const char *path, int flags)	422	maptile::_save_objects (const char *path, int flags)
436	{	423	{
…		…
567	return items;	554	return items;
568	}	555	}
569		556
570	/* opposite of parse string, this puts the string that was originally fed in to	557	/* opposite of parse string, this puts the string that was originally fed in to
571	* the map (or something equivilent) into output_string. */	558	* the map (or something equivilent) into output_string. */
572	static void	559	static const char *
573	print_shop_string (maptile m, char output_string)	560	print_shop_string (maptile *m)
574	{	561	{
575	int i;	562	static dynbuf_text buf; buf.clear ();
576	char tmp[MAX_BUF];
577		563
578	strcpy (output_string, "");
579	for (i = 0; i < m->shopitems[0].index; i++)	564	for (int i = 0; i < m->shopitems[0].index; i++)
580	{	565	{
581	if (m->shopitems[i].typenum)	566	if (m->shopitems[i].typenum)
582	{	567	{
583	if (m->shopitems[i].strength)	568	if (m->shopitems[i].strength)
584	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	569	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
585	else	570	else
586	sprintf (tmp, "%s;", m->shopitems[i].name);	571	buf.printf ("%s;", m->shopitems[i].name);
587	}	572	}
588	else	573	else
589	{	574	{
590	if (m->shopitems[i].strength)	575	if (m->shopitems[i].strength)
591	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	576	buf.printf ("*:%d;", m->shopitems[i].strength);
592	else	577	else
593	sprintf (tmp, "*");	578	buf.printf ("*");
594	}	579	}
595
596	strcat (output_string, tmp);
597	}	580	}
		581
		582	return buf;
598	}	583	}
599		584
600	/* This loads the header information of the map. The header	585	/* This loads the header information of the map. The header
601	* contains things like difficulty, size, timeout, etc.	586	* contains things like difficulty, size, timeout, etc.
602	* this used to be stored in the map object, but with the	587	* this used to be stored in the map object, but with the
…		…
611	bool	596	bool
612	maptile::_load_header (object_thawer &thawer)	597	maptile::_load_header (object_thawer &thawer)
613	{	598	{
614	for (;;)	599	for (;;)
615	{	600	{
616	thawer.next ();
617
618	switch (thawer.kw)	601	switch (thawer.kw)
619	{	602	{
620	case KW_msg:	603	case KW_msg:
621	thawer.get_ml (KW_endmsg, msg);	604	thawer.get_ml (KW_endmsg, msg);
622	break;	605	break;
…		…
656	case KW_sky: thawer.get (sky); break;	639	case KW_sky: thawer.get (sky); break;
657		640
658	case KW_per_player: thawer.get (per_player); break;	641	case KW_per_player: thawer.get (per_player); break;
659	case KW_per_party: thawer.get (per_party); break;	642	case KW_per_party: thawer.get (per_party); break;
660	case KW_no_reset: thawer.get (no_reset); break;	643	case KW_no_reset: thawer.get (no_reset); break;
		644	case KW_no_drop: thawer.get (no_drop); break;
661		645
662	case KW_region: default_region = region::find (thawer.get_str ()); break;	646	case KW_region: default_region = region::find (thawer.get_str ()); break;
663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	647	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
664		648
665	// old names new names	649	// old names new names
…		…
677	case KW_tile_path_2: thawer.get (tile_path [1]); break;	661	case KW_tile_path_2: thawer.get (tile_path [1]); break;
678	case KW_tile_path_3: thawer.get (tile_path [2]); break;	662	case KW_tile_path_3: thawer.get (tile_path [2]); break;
679	case KW_tile_path_4: thawer.get (tile_path [3]); break;	663	case KW_tile_path_4: thawer.get (tile_path [3]); break;
680		664
681	case KW_ERROR:	665	case KW_ERROR:
682	set_key (thawer.kw_str, thawer.value);	666	set_key_text (thawer.kw_str, thawer.value);
683	break;	667	break;
684		668
685	case KW_end:	669	case KW_end:
		670	thawer.next ();
686	return true;	671	return true;
687		672
688	default:	673	default:
689	if (!thawer.parse_error ("map", 0))	674	if (!thawer.parse_error ("map", 0))
690	return false;	675	return false;
691	break;	676	break;
692	}	677	}
		678
		679	thawer.next ();
693	}	680	}
694		681
695	abort ();	682	abort ();
696	}
697
698	bool
699	maptile::_load_header (const char *path)
700	{
701	object_thawer thawer (path);
702
703	if (!thawer)
704	return false;
705
706	return _load_header (thawer);
707	}	683	}
708		684
709	/******************************************************************************	685	/******************************************************************************
710	* This is the start of unique map handling code	686	* This is the start of unique map handling code
711	*****************************************************************************/	687	*****************************************************************************/
…		…
723		699
724	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	700	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
725	unique = 1;	701	unique = 1;
726		702
727	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	703	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))
728	{
729	op->destroy_inv (false);
730	op->destroy ();	704	op->destroy ();
731	}
732		705
733	op = above;	706	op = above;
734	}	707	}
735	}	708	}
736	}	709	}
…		…
747	MAP_OUT (swap_time);	720	MAP_OUT (swap_time);
748	MAP_OUT (reset_time);	721	MAP_OUT (reset_time);
749	MAP_OUT (reset_timeout);	722	MAP_OUT (reset_timeout);
750	MAP_OUT (fixed_resettime);	723	MAP_OUT (fixed_resettime);
751	MAP_OUT (no_reset);	724	MAP_OUT (no_reset);
		725	MAP_OUT (no_drop);
752	MAP_OUT (difficulty);	726	MAP_OUT (difficulty);
753
754	if (default_region) MAP_OUT2 (region, default_region->name);	727	if (default_region) MAP_OUT2 (region, default_region->name);
755		728
756	if (shopitems)	729	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
757	{
758	char shop[MAX_BUF];
759	print_shop_string (this, shop);
760	MAP_OUT2 (shopitems, shop);
761	}
762
763	MAP_OUT (shopgreed);	730	MAP_OUT (shopgreed);
764	MAP_OUT (shopmin);	731	MAP_OUT (shopmin);
765	MAP_OUT (shopmax);	732	MAP_OUT (shopmax);
766	if (shoprace) MAP_OUT (shoprace);	733	if (shoprace) MAP_OUT (shoprace);
		734
767	MAP_OUT (darkness);	735	MAP_OUT (darkness);
768	MAP_OUT (width);	736	MAP_OUT (width);
769	MAP_OUT (height);	737	MAP_OUT (height);
770	MAP_OUT (enter_x);	738	MAP_OUT (enter_x);
771	MAP_OUT (enter_y);	739	MAP_OUT (enter_y);
…		…
810	* Remove and free all objects in the given map.	778	* Remove and free all objects in the given map.
811	*/	779	*/
812	void	780	void
813	maptile::clear ()	781	maptile::clear ()
814	{	782	{
815	sfree (regions, size ()); regions = 0;
816	delete [] regionmap; regionmap = 0;
817
818	if (spaces)	783	if (spaces)
819	{	784	{
820	for (mapspace *ms = spaces + size (); ms-- > spaces; )	785	for (mapspace *ms = spaces + size (); ms-- > spaces; )
821	while (object *op = ms->bot)	786	while (object *op = ms->bot)
822	{	787	{
		788	// manually remove, as to not trigger anything
		789	if (ms->bot = op->above)
		790	ms->bot->below = 0;
		791
		792	op->flag [FLAG_REMOVED] = true;
		793
823	op = op->head_ ();	794	object *head = op->head_ ();
824	op->destroy_inv (false);	795	if (op == head)
825	op->destroy ();	796	op->destroy ();
		797	else if (head->map != op->map)
		798	{
		799	LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
		800	head->destroy ();
		801	}
826	}	802	}
827		803
828	sfree (spaces, size ()), spaces = 0;	804	sfree0 (spaces, size ());
829	}	805	}
830		806
831	if (buttons)	807	if (buttons)
832	free_objectlinkpt (buttons), buttons = 0;	808	free_objectlinkpt (buttons), buttons = 0;
		809
		810	sfree0 (regions, size ());
		811	delete [] regionmap; regionmap = 0;
833	}	812	}
834		813
835	void	814	void
836	maptile::clear_header ()	815	maptile::clear_header ()
837	{	816	{
…		…
889	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	868	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890	break;	869	break;
891		870
892	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	871	if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)	872	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894	\|\| QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895	\|\| QUERY_FLAG (op, FLAG_UNIQUE)	873	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
896	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)	874	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897	\|\| QUERY_FLAG (op, FLAG_UNPAID)	875	\|\| QUERY_FLAG (op, FLAG_UNPAID)
898	\|\| op->is_alive ())	876	\|\| op->is_alive ())
899	; // do not decay	877	; // do not decay
…		…
938	op->destroy ();	916	op->destroy ();
939	}	917	}
940	}	918	}
941		919
942	/*	920	/*
943	* Updates every button on the map (by calling update_button() for them).
944	*/
945	void
946	maptile::update_buttons ()
947	{
948	for (oblinkpt *obp = buttons; obp; obp = obp->next)
949	for (objectlink *ol = obp->link; ol; ol = ol->next)
950	{
951	if (!ol->ob)
952	{
953	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
954	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
955	continue;
956	}
957
958	if (ol->ob->type == BUTTON \|\| ol->ob->type == PEDESTAL)
959	{
960	update_button (ol->ob);
961	break;
962	}
963	}
964	}
965
966	/*
967	* This routine is supposed to find out the difficulty of the map.	921	* This routine is supposed to find out the difficulty of the map.
968	* difficulty does not have a lot to do with character level,	922	* difficulty does not have a lot to do with character level,
969	* but does have a lot to do with treasure on the map.	923	* but does have a lot to do with treasure on the map.
970	*	924	*
971	* Difficulty can now be set by the map creature. If the value stored	925	* Difficulty can now be set by the map creator. If the value stored
972	* in the map is zero, then use this routine. Maps should really	926	* in the map is zero, then use this routine. Maps should really
973	* have a difficulty set than using this function - human calculation	927	* have a difficulty set rather than using this function - human calculation
974	* is much better than this functions guesswork.	928	* is much better than this function's guesswork.
975	*/	929	*/
976	int	930	int
977	maptile::estimate_difficulty () const	931	maptile::estimate_difficulty () const
978	{	932	{
979	long monster_cnt = 0;	933	long monster_cnt = 0;
…		…
991		945
992	if (QUERY_FLAG (op, FLAG_GENERATOR))	946	if (QUERY_FLAG (op, FLAG_GENERATOR))
993	{	947	{
994	total_exp += op->stats.exp;	948	total_exp += op->stats.exp;
995		949
996	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))	950	if (archetype *at = op->other_arch)
		951	{
997	total_exp += at->stats.exp * 8;	952	total_exp += at->stats.exp * 8;
998
999	monster_cnt++;	953	monster_cnt++;
		954	}
		955
		956	for (object *inv = op->inv; inv; inv = inv->below)
		957	{
		958	total_exp += op->stats.exp * 8;
		959	monster_cnt++;
		960	}
1000	}	961	}
1001	}	962	}
1002		963
1003	avgexp = (double) total_exp / monster_cnt;	964	avgexp = (double) total_exp / monster_cnt;
1004		965
…		…
1017	* postive values make it darker, negative make it brighter	978	* postive values make it darker, negative make it brighter
1018	*/	979	*/
1019	int	980	int
1020	maptile::change_map_light (int change)	981	maptile::change_map_light (int change)
1021	{	982	{
1022	int new_level = darkness + change;
1023
1024	/* Nothing to do */	983	/* Nothing to do */
1025	if (!change \|\| (new_level <= 0 && darkness == 0) \|\| (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))	984	if (!change)
1026	return 0;	985	return 0;
1027		986
1028	/* inform all players on the map */	987	/* inform all players on the map */
1029	if (change > 0)	988	if (change > 0)
1030	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");	989	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");
1031	else	990	else
1032	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");	991	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");
1033		992
1034	/* Do extra checking. since darkness is a unsigned value,	993	darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1035	* we need to be extra careful about negative values.
1036	* In general, the checks below are only needed if change
1037	* is not +/-1
1038	*/
1039	if (new_level < 0)
1040	darkness = 0;
1041	else if (new_level >= MAX_DARKNESS)
1042	darkness = MAX_DARKNESS;
1043	else
1044	darkness = new_level;
1045		994
1046	/* All clients need to get re-updated for the change */	995	/* All clients need to get re-updated for the change */
1047	update_all_map_los (this);	996	update_all_map_los (this);
		997
1048	return 1;	998	return 1;
1049	}	999	}
1050		1000
1051	/*	1001	/*
1052	* This function updates various attributes about a specific space	1002	* This function updates various attributes about a specific space
…		…
1055	* through, etc)	1005	* through, etc)
1056	*/	1006	*/
1057	void	1007	void
1058	mapspace::update_ ()	1008	mapspace::update_ ()
1059	{	1009	{
1060	object tmp, last = 0;	1010	object *last = 0;
1061	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;	1011	uint8 flags = P_UPTODATE, anywhere = 0;
		1012	sint8 light = 0;
1062	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1013	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1063		1014
1064	//object *middle = 0;	1015	//object *middle = 0;
1065	//object *top = 0;	1016	//object *top = 0;
1066	//object *floor = 0;	1017	//object *floor = 0;
1067	// this seems to generate better code than using locals, above	1018	// this seems to generate better code than using locals, above
1068	object *&top = faces_obj[0] = 0;	1019	object *&top = faces_obj[0] = 0;
1069	object *&middle = faces_obj[1] = 0;	1020	object *&middle = faces_obj[1] = 0;
1070	object *&floor = faces_obj[2] = 0;	1021	object *&floor = faces_obj[2] = 0;
1071		1022
1072	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)	1023	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1073	{	1024	{
1074	/* This could be made additive I guess (two lights better than	1025	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1075	* one). But if so, it shouldn't be a simple additive - 2
1076	* light bulbs do not illuminate twice as far as once since
1077	* it is a dissapation factor that is cubed.
1078	*/
1079	if (tmp->glow_radius > light)
1080	light = tmp->glow_radius;	1026	light += tmp->glow_radius;
1081		1027
1082	/* This call is needed in order to update objects the player	1028	/* This call is needed in order to update objects the player
1083	* is standing in that have animations (ie, grass, fire, etc).	1029	* is standing in that have animations (ie, grass, fire, etc).
1084	* However, it also causes the look window to be re-drawn	1030	* However, it also causes the look window to be re-drawn
1085	* 3 times each time the player moves, because many of the	1031	* 3 times each time the player moves, because many of the
…		…
1104	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))	1050	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1105	{	1051	{
1106	middle = tmp;	1052	middle = tmp;
1107	anywhere = 1;	1053	anywhere = 1;
1108	}	1054	}
		1055
1109	/* Find the highest visible face around. If equal	1056	/* Find the highest visible face around. If equal
1110	* visibilities, we still want the one nearer to the	1057	* visibilities, we still want the one nearer to the
1111	* top	1058	* top
1112	*/	1059	*/
1113	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))	1060	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
…		…
1132	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1079	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1133	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;	1080	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1134	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;	1081	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1135	}	1082	}
1136		1083
1137	this->light = light;	1084	this->light = min (light, MAX_LIGHT_RADIUS);
1138	this->flags_ = flags;	1085	this->flags_ = flags;
1139	this->move_block = move_block & ~move_allow;	1086	this->move_block = move_block & ~move_allow;
1140	this->move_on = move_on;	1087	this->move_on = move_on;
1141	this->move_off = move_off;	1088	this->move_off = move_off;
1142	this->move_slow = move_slow;	1089	this->move_slow = move_slow;
…		…
1162	* 1) top face is set, need middle to be set.	1109	* 1) top face is set, need middle to be set.
1163	* 2) middle is set, need to set top.	1110	* 2) middle is set, need to set top.
1164	* 3) neither middle or top is set - need to set both.	1111	* 3) neither middle or top is set - need to set both.
1165	*/	1112	*/
1166		1113
1167	for (tmp = last; tmp; tmp = tmp->below)	1114	for (object *tmp = last; tmp; tmp = tmp->below)
1168	{	1115	{
1169	/* Once we get to a floor, stop, since we already have a floor object */	1116	/* Once we get to a floor, stop, since we already have a floor object */
1170	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1117	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1171	break;	1118	break;
1172		1119
…		…
1224	vol += op->volume ();	1171	vol += op->volume ();
1225		1172
1226	return vol;	1173	return vol;
1227	}	1174	}
1228		1175
1229	bool	1176	maptile *
1230	maptile::tile_available (int dir, bool load)	1177	maptile::tile_available (int dir, bool load)
1231	{	1178	{
1232	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_IN_MEMORY))
1233	return 1;
1234
1235	if (!tile_path[dir])	1179	if (tile_path[dir])
1236	return 0;	1180	{
		1181	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))
		1182	return tile_map[dir];
1237		1183
1238	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))	1184	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1239	return 1;	1185	return tile_map[dir];
		1186	}
1240		1187
1241	return 0;	1188	return 0;
1242	}	1189	}
1243		1190
1244	/* this returns TRUE if the coordinates (x,y) are out of	1191	/* this returns TRUE if the coordinates (x,y) are out of
…		…
1259	if (!m)	1206	if (!m)
1260	return 0;	1207	return 0;
1261		1208
1262	if (x < 0)	1209	if (x < 0)
1263	{	1210	{
1264	if (!m->tile_available (3, 0))	1211	if (!m->tile_available (3))
1265	return 1;	1212	return 1;
1266		1213
1267	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1214	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1268	}	1215	}
1269		1216
1270	if (x >= m->width)	1217	if (x >= m->width)
1271	{	1218	{
1272	if (!m->tile_available (1, 0))	1219	if (!m->tile_available (1))
1273	return 1;	1220	return 1;
1274		1221
1275	return out_of_map (m->tile_map[1], x - m->width, y);	1222	return out_of_map (m->tile_map[1], x - m->width, y);
1276	}	1223	}
1277		1224
1278	if (y < 0)	1225	if (y < 0)
1279	{	1226	{
1280	if (!m->tile_available (0, 0))	1227	if (!m->tile_available (0))
1281	return 1;	1228	return 1;
1282		1229
1283	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1230	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1284	}	1231	}
1285		1232
1286	if (y >= m->height)	1233	if (y >= m->height)
1287	{	1234	{
1288	if (!m->tile_available (2, 0))	1235	if (!m->tile_available (2))
1289	return 1;	1236	return 1;
1290		1237
1291	return out_of_map (m->tile_map[2], x, y - m->height);	1238	return out_of_map (m->tile_map[2], x, y - m->height);
1292	}	1239	}
1293		1240
…		…
1308	maptile *	1255	maptile *
1309	maptile::xy_find (sint16 &x, sint16 &y)	1256	maptile::xy_find (sint16 &x, sint16 &y)
1310	{	1257	{
1311	if (x < 0)	1258	if (x < 0)
1312	{	1259	{
1313	if (!tile_available (3, 1))	1260	if (!tile_available (3))
1314	return 0;	1261	return 0;
1315		1262
1316	x += tile_map[3]->width;	1263	x += tile_map[3]->width;
1317	return tile_map[3]->xy_find (x, y);	1264	return tile_map[3]->xy_find (x, y);
1318	}	1265	}
1319		1266
1320	if (x >= width)	1267	if (x >= width)
1321	{	1268	{
1322	if (!tile_available (1, 1))	1269	if (!tile_available (1))
1323	return 0;	1270	return 0;
1324		1271
1325	x -= width;	1272	x -= width;
1326	return tile_map[1]->xy_find (x, y);	1273	return tile_map[1]->xy_find (x, y);
1327	}	1274	}
1328		1275
1329	if (y < 0)	1276	if (y < 0)
1330	{	1277	{
1331	if (!tile_available (0, 1))	1278	if (!tile_available (0))
1332	return 0;	1279	return 0;
1333		1280
1334	y += tile_map[0]->height;	1281	y += tile_map[0]->height;
1335	return tile_map[0]->xy_find (x, y);	1282	return tile_map[0]->xy_find (x, y);
1336	}	1283	}
1337		1284
1338	if (y >= height)	1285	if (y >= height)
1339	{	1286	{
1340	if (!tile_available (2, 1))	1287	if (!tile_available (2))
1341	return 0;	1288	return 0;
1342		1289
1343	y -= height;	1290	y -= height;
1344	return tile_map[2]->xy_find (x, y);	1291	return tile_map[2]->xy_find (x, y);
1345	}	1292	}
…		…
1358	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1305	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)
1359	{	1306	{
1360	if (!map1 \|\| !map2)	1307	if (!map1 \|\| !map2)
1361	return 0;	1308	return 0;
1362		1309
1363	//TODO: this doesn't actually check corretcly when intermediate maps are not loaded	1310	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
1364	//fix: compare paths instead (this is likely faster, too!)	1311	//fix: compare paths instead (this is likely faster, too!)
1365	if (map1 == map2)	1312	if (map1 == map2)
1366	{	1313	{
1367	*dx = 0;	1314	*dx = 0;
1368	*dy = 0;	1315	*dy = 0;
…		…
1550	else	1497	else
1551	{	1498	{
1552	retval->distance_x += op2->x - x;	1499	retval->distance_x += op2->x - x;
1553	retval->distance_y += op2->y - y;	1500	retval->distance_y += op2->y - y;
1554		1501
1555	retval->part = NULL;	1502	retval->part = 0;
1556	retval->distance = idistance (retval->distance_x, retval->distance_y);	1503	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1557	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1504	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1558	}	1505	}
1559	}	1506	}
1560		1507
1561	/* Returns true of op1 and op2 are effectively on the same map	1508	/* Returns true of op1 and op2 are effectively on the same map
…		…
1575	}	1522	}
1576		1523
1577	object *	1524	object *
1578	maptile::insert (object op, int x, int y, object originator, int flags)	1525	maptile::insert (object op, int x, int y, object originator, int flags)
1579	{	1526	{
1580	if (!op->flag [FLAG_REMOVED])
1581	op->remove ();
1582
1583	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1527	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1584	}	1528	}
1585		1529
1586	region *	1530	region *
1587	maptile::region (int x, int y) const	1531	maptile::region (int x, int y) const
…		…
1597		1541
1598	return ::region::default_region ();	1542	return ::region::default_region ();
1599	}	1543	}
1600		1544
1601	/* picks a random object from a style map.	1545	/* picks a random object from a style map.
1602	* Redone by MSW so it should be faster and not use static
1603	* variables to generate tables.
1604	*/	1546	*/
1605	object *	1547	object *
1606	maptile::pick_random_object () const	1548	maptile::pick_random_object (rand_gen &gen) const
1607	{	1549	{
1608	/* while returning a null object will result in a crash, that	1550	/* while returning a null object will result in a crash, that
1609	* is actually preferable to an infinite loop. That is because	1551	* is actually preferable to an infinite loop. That is because
1610	* most servers will automatically restart in case of crash.	1552	* most servers will automatically restart in case of crash.
1611	* Change the logic on getting the random space - shouldn't make	1553	* Change the logic on getting the random space - shouldn't make
1612	* any difference, but this seems clearer to me.	1554	* any difference, but this seems clearer to me.
1613	*/	1555	*/
1614	for (int i = 1000; --i;)	1556	for (int i = 1000; --i;)
1615	{	1557	{
1616	object *pick = at (rndm (width), rndm (height)).bot;	1558	object *pick = at (gen (width), gen (height)).bot;
1617		1559
1618	// do not prefer big monsters just because they are big.	1560	// do not prefer big monsters just because they are big.
1619	if (pick && pick->head_ () == pick)	1561	if (pick && pick->is_head ())
1620	return pick->head_ ();	1562	return pick->head_ ();
1621	}	1563	}
1622		1564
1623	// instead of crashing in the unlikely(?) case, try to return something	1565	// instead of crashing in the unlikely(?) case, try to return something
1624	return get_archetype ("blocked");	1566	return archetype::find ("bug");
1625	}	1567	}
1626		1568
1627	void	1569	void
1628	maptile::play_sound (faceidx sound, int x, int y) const	1570	maptile::play_sound (faceidx sound, int x, int y) const
1629	{	1571	{
1630	if (!sound)	1572	if (!sound)
1631	return;	1573	return;
1632		1574
		1575	for_all_players_on_map (pl, this)
		1576	if (client *ns = pl->ns)
		1577	{
		1578	int dx = x - pl->ob->x;
		1579	int dy = y - pl->ob->y;
		1580
		1581	int distance = idistance (dx, dy);
		1582
		1583	if (distance <= MAX_SOUND_DISTANCE)
		1584	ns->play_sound (sound, dx, dy);
		1585	}
		1586	}
		1587
		1588	void
		1589	maptile::say_msg (const char *msg, int x, int y) const
		1590	{
1633	for_all_players (pl)	1591	for_all_players (pl)
1634	if (pl->ob->map == this)
1635	if (client *ns = pl->ns)	1592	if (client *ns = pl->ns)
1636	{	1593	{
1637	int dx = x - pl->ob->x;	1594	int dx = x - pl->ob->x;
1638	int dy = y - pl->ob->y;	1595	int dy = y - pl->ob->y;
1639		1596
1640	int distance = idistance (dx, dy);	1597	int distance = idistance (dx, dy);
1641		1598
1642	if (distance <= MAX_SOUND_DISTANCE)	1599	if (distance <= MAX_SOUND_DISTANCE)
1643	ns->play_sound (sound, dx, dy);	1600	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1644	}	1601	}
1645	}	1602	}
1646		1603
		1604	static void
		1605	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
		1606	{
		1607	// clip to map to the left
		1608	if (x0 < 0)
		1609	{
		1610	if (maptile *tile = m->tile_available (TILE_LEFT, 1))
		1611	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
		1612
		1613	if (x1 < 0) // entirely to the left
		1614	return;
		1615
		1616	x0 = 0;
		1617	}
		1618
		1619	// clip to map to the right
		1620	if (x1 > m->width)
		1621	{
		1622	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
		1623	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
		1624
		1625	if (x0 > m->width) // entirely to the right
		1626	return;
		1627
		1628	x1 = m->width;
		1629	}
		1630
		1631	// clip to map above
		1632	if (y0 < 0)
		1633	{
		1634	if (maptile *tile = m->tile_available (TILE_UP, 1))
		1635	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
		1636
		1637	if (y1 < 0) // entirely above
		1638	return;
		1639
		1640	y0 = 0;
		1641	}
		1642
		1643	// clip to map below
		1644	if (y1 > m->height)
		1645	{
		1646	if (maptile *tile = m->tile_available (TILE_DOWN, 1))
		1647	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
		1648
		1649	if (y0 > m->height) // entirely below
		1650	return;
		1651
		1652	y1 = m->height;
		1653	}
		1654
		1655	// if we get here, the rect is within the current map
		1656	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1657
		1658	r->m = m;
		1659	r->x0 = x0;
		1660	r->y0 = y0;
		1661	r->x1 = x1;
		1662	r->y1 = y1;
		1663	r->dx = dx;
		1664	r->dy = dy;
		1665	}
		1666
		1667	maprect *
		1668	maptile::split_to_tiles (int x0, int y0, int x1, int y1)
		1669	{
		1670	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
		1671	buf.clear ();
		1672
		1673	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
		1674
		1675	// add end marker
		1676	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1677	r->m = 0;
		1678
		1679	return (maprect *)buf.linearise ();
		1680	}
		1681

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.117 by root, Fri Aug 24 00:26:09 2007 UTC vs. Revision 1.165 by root, Tue Oct 20 05:57:08 2009 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.117 by root, Fri Aug 24 00:26:09 2007 UTC vs.
Revision 1.165 by root, Tue Oct 20 05:57:08 2009 UTC