ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.123 by root, Thu Aug 30 07:28:24 2007 UTC vs.
Revision 1.203 by root, Sat Apr 23 04:56:46 2011 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,2010,2011 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	* 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"
30
31	#include "path.h"	28	#include "path.h"
		29
		30	//+GPL
		31
		32	sint8 maptile::outdoor_darkness;
32		33
33	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	34	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34	* one function that just returns a P_.. value (see map.h)	35	* one function that just returns a P_.. value (see map.h)
35	* it will also do map translation for tiled maps, returning	36	* it will also do map translation for tiled maps, returning
36	* new values into newmap, nx, and ny. Any and all of those	37	* new values into newmap, nx, and ny. Any and all of those
…		…
71	* by the caller.	72	* by the caller.
72	*/	73	*/
73	int	74	int
74	blocked_link (object *ob, maptile *m, int sx, int sy)	75	blocked_link (object *ob, maptile *m, int sx, int sy)
75	{	76	{
76	object *tmp;
77	int mflags, blocked;
78
79	/* 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
80	* have already checked this.	78	* have already checked this.
81	*/	79	*/
82	if (OUT_OF_REAL_MAP (m, sx, sy))	80	if (OUT_OF_REAL_MAP (m, sx, sy))
83	{	81	{
84	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	82	LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
85	return 1;	83	return 1;
86	}	84	}
87		85
88	/* Save some cycles - instead of calling get_map_flags(), just get the value	86	mapspace &ms = m->at (sx, sy);
89	* directly.
90	*/
91	mflags = m->at (sx, sy).flags ();
92		87
93	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	88	int mflags = ms.flags ();
		89	int blocked = ms.move_block;
94		90
95	/* If space is currently not blocked by anything, no need to	91	/* If space is currently not blocked by anything, no need to
96	* go further. Not true for players - all sorts of special	92	* go further. Not true for players - all sorts of special
97	* things we need to do for players.	93	* things we need to do for players.
98	*/	94	*/
99	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	95	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
100	return 0;	96	return 0;
101		97
102	/* 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
103	* 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
104	* 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
105	* or another. Likewise, only if something is blocking us do we	101	* or another. Likewise, only if something is blocking us do we
106	* need to investigate if there is a special circumstance that would	102	* need to investigate if there is a special circumstance that would
107	* let the player through (inventory checkers for example)	103	* let the player through (inventory checkers for example)
…		…
114	/* 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
115	* 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
116	* true. If we get through the entire stack, that must mean	112	* true. If we get through the entire stack, that must mean
117	* ob is blocking it, so return 0.	113	* ob is blocking it, so return 0.
118	*/	114	*/
119	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	115	for (object *tmp = ms.top; tmp; tmp = tmp->below)
120	{	116	{
121		117	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	{	118	{
125	/* If last_sp is set, the player/monster needs an object,	119	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
126	* so we check for it. If they don't have it, they can't	120	if (RESULT_INT (0))
127	* pass through this space.	121	return 1;
128	*/	122	else
129	if (tmp->last_sp)	123	continue;
		124
		125	if (tmp->type == CHECK_INV)
130	{	126	{
131	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))
132	return 1;	131	return 1;
133	else	132	}
134	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;
135	}	142	}
136	else	143	else
137	{	144	return 1; // unconditional block
138	/* In this case, the player must not have the object -	145
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	146	} else {
148	{	147	// space does not block the ob, directly, but
149	/* Broke apart a big nasty if into several here to make	148	// anything alive that is not a door still
150	* this more readable. first check - if the space blocks	149	// blocks anything
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		150
158	if (tmp->flag [FLAG_ALIVE]	151	if (tmp->flag [FLAG_ALIVE]
159	&& tmp->head_ () != ob
160	&& tmp != ob
161	&& tmp->type != DOOR	152	&& tmp->type != DOOR
162	&& !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))	153	&& tmp->head_ () != ob) //TODO: maybe move these check up?
163	return 1;	154	return 1;
164	}	155	}
165
166	}	156	}
		157
167	return 0;	158	return 0;
168	}	159	}
169		160
170	/*	161	/*
171	* Returns true if the given object can't fit in the given spot.	162	* Returns the blocking object if the given object can't fit in the given
172	* This is meant for multi space objects - for single space objecs,	163	* spot. This is meant for multi space objects - for single space objecs,
173	* just calling get_map_blocked and checking that against movement type	164	* just calling get_map_blocked and checking that against movement type
174	* of object. This function goes through all the parts of the	165	* of object. This function goes through all the parts of the multipart
175	* multipart object and makes sure they can be inserted.	166	* object and makes sure they can be inserted.
176	*	167	*
177	* While this doesn't call out of map, the get_map_flags does.	168	* While this doesn't call out of map, the get_map_flags does.
178	*	169	*
179	* This function has been used to deprecate arch_out_of_map -	170	* This function has been used to deprecate arch_out_of_map -
180	* this function also does that check, and since in most cases,	171	* this function also does that check, and since in most cases,
…		…
191	*	182	*
192	* Note this used to be arch_blocked, but with new movement	183	* Note this used to be arch_blocked, but with new movement
193	* code, we need to have actual object to check its move_type	184	* code, we need to have actual object to check its move_type
194	* against the move_block values.	185	* against the move_block values.
195	*/	186	*/
196	int	187	bool
197	ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)	188	object::blocked (maptile *m, int x, int y) const
198	{	189	{
199	archetype *tmp;	190	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	}	191	{
		192	mapxy pos (m, x + tmp->x, y + tmp->y);
213		193
214	for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)	194	if (!pos.normalise ())
215	{	195	return 1;
216	flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217		196
218	if (flag & P_OUT_OF_MAP)	197	mapspace &ms = *pos;
219	return P_OUT_OF_MAP;	198
220	if (flag & P_IS_ALIVE)	199	if (ms.flags () & P_IS_ALIVE)
221	return P_IS_ALIVE;	200	return 1;
222		201
223	mapspace &ms = m1->at (sx, sy);	202	/* However, often ob doesn't have any move type
224		203	* (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.	204	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228	*/	205	*/
229
230	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	206	if (!move_type && ms.move_block != MOVE_ALL)
231	continue;	207	continue;
232		208
233	/* Note it is intentional that we check ob - the movement type of the	209	/* Note it is intentional that we check ob - the movement type of the
234	* head of the object should correspond for the entire object.	210	* head of the object should correspond for the entire object.
235	*/	211	*/
236	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	212	if (ms.blocks (move_type))
237	return P_NO_PASS;	213	return 1;
238	}	214	}
239		215
240	return 0;	216	return 0;
241	}	217	}
242		218
243	/* When the map is loaded, load_object does not actually insert objects	219	//-GPL
244	* into inventory, but just links them. What this does is go through
245	* and insert them properly.
246	* The object 'container' is the object that contains the inventory.
247	* This is needed so that we can update the containers weight.
248	*/
249	void
250	fix_container (object *container)
251	{
252	object *tmp = container->inv, *next;
253
254	container->inv = 0;
255	while (tmp)
256	{
257	next = tmp->below;
258	if (tmp->inv)
259	fix_container (tmp);
260
261	insert_ob_in_ob (tmp, container);
262	tmp = next;
263	}
264
265	/* sum_weight will go through and calculate what all the containers are
266	* carrying.
267	*/
268	sum_weight (container);
269	}
270		220
271	void	221	void
272	maptile::set_object_flag (int flag, int value)	222	maptile::set_object_flag (int flag, int value)
273	{	223	{
274	if (!spaces)	224	if (!spaces)
…		…
276		226
277	for (mapspace *ms = spaces + size (); ms-- > spaces; )	227	for (mapspace *ms = spaces + size (); ms-- > spaces; )
278	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	228	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279	tmp->flag [flag] = value;	229	tmp->flag [flag] = value;
280	}	230	}
		231
		232	void
		233	maptile::post_load_original ()
		234	{
		235	if (!spaces)
		236	return;
		237
		238	set_object_flag (FLAG_OBJ_ORIGINAL);
		239
		240	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		241	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		242	INVOKE_OBJECT (RESET, tmp);
		243	}
		244
		245	void
		246	maptile::post_load ()
		247	{
		248	#if 0
		249	if (!spaces)
		250	return;
		251
		252	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		253	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		254	; // nop
		255	#endif
		256	}
		257
		258	//+GPL
281		259
282	/* link_multipart_objects go through all the objects on the map looking	260	/* 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	261	* 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	262	* info we have, they only have the head (as would be expected when
285	* they are saved).	263	* they are saved).
…		…
313	op = op->above;	291	op = op->above;
314	}	292	}
315	}	293	}
316	}	294	}
317		295
		296	//-GPL
		297
318	/*	298	/*
319	* Loads (ands parses) the objects into a given map from the specified	299	* Loads (ands parses) the objects into a given map from the specified
320	* file pointer.	300	* file pointer.
321	*/	301	*/
322	bool	302	bool
323	maptile::_load_objects (object_thawer &f)	303	maptile::_load_objects (object_thawer &f)
324	{	304	{
325	for (;;)	305	for (;;)
326	{	306	{
327	coroapi::cede_to_tick_every (100); // cede once in a while	307	coroapi::cede_to_tick (); // cede once in a while
328		308
329	switch (f.kw)	309	switch (f.kw)
330	{	310	{
331	case KW_arch:	311	case KW_arch:
332	if (object *op = object::read (f, this))	312	if (object *op = object::read (f, this))
333	{	313	{
		314	// TODO: why?
334	if (op->inv)	315	if (op->inv)
		316	{
		317	op->carrying = 0;
335	sum_weight (op);	318	op->update_weight ();
		319	}
336		320
337	insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);	321	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
		322	{
		323	// we insert manually because
		324	// a) its way faster
		325	// b) we remove manually, too, and there are good reasons for that
		326	// c) it's correct
		327	mapspace &ms = at (op->x, op->y);
		328
		329	op->flag [FLAG_REMOVED] = false;
		330
		331	op->above = 0;
		332	op->below = ms.top;
		333
		334	*(ms.top ? &ms.top->above : &ms.bot) = op;
		335
		336	ms.top = op;
		337	ms.flags_ = 0;
		338	}
		339	else
		340	{
		341	f.parse_warn (format ("object %s out of range", op->debug_desc ()));
		342	op->destroy ();
		343	}
338	}	344	}
339		345
340	continue;	346	continue;
341		347
342	case KW_EOF:	348	case KW_EOF:
…		…
408		414
409	return true;	415	return true;
410	}	416	}
411		417
412	bool	418	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	}
433
434	bool
435	maptile::_save_objects (const char *path, int flags)	419	maptile::_save_objects (const char *path, int flags)
436	{	420	{
437	object_freezer freezer;	421	object_freezer freezer;
438		422
439	if (!_save_objects (freezer, flags))	423	if (!_save_objects (freezer, flags))
440	return false;	424	return false;
441		425
442	return freezer.save (path);	426	return freezer.save (path);
443	}	427	}
444		428
445	maptile::maptile ()	429	void
		430	maptile::init ()
446	{	431	{
447	in_memory = MAP_SWAPPED;	432	in_memory = MAP_SWAPPED;
448		433
449	/* The maps used to pick up default x and y values from the	434	/* The maps used to pick up default x and y values from the
450	* map archetype. Mimic that behaviour.	435	* map archetype. Mimic that behaviour.
451	*/	436	*/
452	width = 16;	437	width = 16;
453	height = 16;	438	height = 16;
454	timeout = 300;	439	timeout = 300;
455	max_nrof = 1000; // 1000 items of anything	440	max_items = MAX_ITEM_PER_ACTION;
456	max_volume = 2000000; // 2m³	441	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;	442	reset_timeout = 0;
466	timeout = 300;
467	enter_x = 0;	443	enter_x = 0;
468	enter_y = 0;	444	enter_y = 0;
		445	}
		446
		447	maptile::maptile ()
		448	{
		449	init ();
		450	}
		451
		452	maptile::maptile (int w, int h)
		453	{
		454	init ();
		455
		456	width = w;
		457	height = h;
469		458
470	alloc ();	459	alloc ();
471	}	460	}
472		461
473	/*	462	/*
…		…
481	if (spaces)	470	if (spaces)
482	return;	471	return;
483		472
484	spaces = salloc0<mapspace> (size ());	473	spaces = salloc0<mapspace> (size ());
485	}	474	}
		475
		476	//+GPL
486		477
487	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	478	/* 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	479	* corresponding to that string. Memory is allocated for this, it must be freed
489	* at a later date.	480	* at a later date.
490	* Called by parse_map_headers below.	481	* Called by parse_map_headers below.
…		…
567	return items;	558	return items;
568	}	559	}
569		560
570	/* opposite of parse string, this puts the string that was originally fed in to	561	/* opposite of parse string, this puts the string that was originally fed in to
571	* the map (or something equivilent) into output_string. */	562	* the map (or something equivilent) into output_string. */
572	static void	563	static const char *
573	print_shop_string (maptile *m, char *output_string)	564	print_shop_string (maptile *m)
574	{	565	{
575	int i;	566	static dynbuf_text buf; buf.clear ();
576	char tmp[MAX_BUF];	567	bool first = true;
577		568
578	strcpy (output_string, "");
579	for (i = 0; i < m->shopitems[0].index; i++)	569	for (int i = 0; i < m->shopitems[0].index; i++)
580	{	570	{
		571	if (!first)
		572	buf << ';';
		573
		574	first = false;
		575
581	if (m->shopitems[i].typenum)	576	if (m->shopitems[i].typenum)
582	{	577	{
583	if (m->shopitems[i].strength)	578	if (m->shopitems[i].strength)
584	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	579	buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
585	else	580	else
586	sprintf (tmp, "%s;", m->shopitems[i].name);	581	buf.printf ("%s", m->shopitems[i].name);
587	}	582	}
588	else	583	else
589	{	584	{
590	if (m->shopitems[i].strength)	585	if (m->shopitems[i].strength)
591	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	586	buf.printf ("*:%d", m->shopitems[i].strength);
592	else	587	else
593	sprintf (tmp, "*");	588	buf.printf ("*");
594	}	589	}
595
596	strcat (output_string, tmp);
597	}	590	}
		591
		592	return buf;
598	}	593	}
		594
		595	//-GPL
599		596
600	/* This loads the header information of the map. The header	597	/* This loads the header information of the map. The header
601	* contains things like difficulty, size, timeout, etc.	598	* contains things like difficulty, size, timeout, etc.
602	* this used to be stored in the map object, but with the	599	* this used to be stored in the map object, but with the
603	* addition of tiling, fields beyond that easily named in an	600	* addition of tiling, fields beyond that easily named in an
…		…
611	bool	608	bool
612	maptile::_load_header (object_thawer &thawer)	609	maptile::_load_header (object_thawer &thawer)
613	{	610	{
614	for (;;)	611	for (;;)
615	{	612	{
616	thawer.next ();
617
618	switch (thawer.kw)	613	switch (thawer.kw)
619	{	614	{
620	case KW_msg:	615	case KW_msg:
621	thawer.get_ml (KW_endmsg, msg);	616	thawer.get_ml (KW_endmsg, msg);
622	break;	617	break;
623		618
624	case KW_lore: // CF+ extension	619	case KW_lore: // deliantra extension
625	thawer.get_ml (KW_endlore, maplore);	620	thawer.get_ml (KW_endlore, maplore);
626	break;	621	break;
627		622
628	case KW_maplore:	623	case KW_maplore:
629	thawer.get_ml (KW_endmaplore, maplore);	624	thawer.get_ml (KW_endmaplore, maplore);
…		…
646	case KW_shopgreed: thawer.get (shopgreed); break;	641	case KW_shopgreed: thawer.get (shopgreed); break;
647	case KW_shopmin: thawer.get (shopmin); break;	642	case KW_shopmin: thawer.get (shopmin); break;
648	case KW_shopmax: thawer.get (shopmax); break;	643	case KW_shopmax: thawer.get (shopmax); break;
649	case KW_shoprace: thawer.get (shoprace); break;	644	case KW_shoprace: thawer.get (shoprace); break;
650	case KW_outdoor: thawer.get (outdoor); break;	645	case KW_outdoor: thawer.get (outdoor); break;
651	case KW_temp: thawer.get (temp); break;
652	case KW_pressure: thawer.get (pressure); break;
653	case KW_humid: thawer.get (humid); break;
654	case KW_windspeed: thawer.get (windspeed); break;
655	case KW_winddir: thawer.get (winddir); break;
656	case KW_sky: thawer.get (sky); break;
657		646
658	case KW_per_player: thawer.get (per_player); break;	647	case KW_per_player: thawer.get (per_player); break;
659	case KW_per_party: thawer.get (per_party); break;	648	case KW_per_party: thawer.get (per_party); break;
660	case KW_no_reset: thawer.get (no_reset); break;	649	case KW_no_reset: thawer.get (no_reset); break;
		650	case KW_no_drop: thawer.get (no_drop); break;
661		651
662	case KW_region: default_region = region::find (thawer.get_str ()); break;	652	case KW_region: thawer.get (default_region); break;
663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	653	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
664		654
665	// old names new names	655	// old names new names
666	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;	656	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
667	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;	657	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
…		…
675		665
676	case KW_tile_path_1: thawer.get (tile_path [0]); break;	666	case KW_tile_path_1: thawer.get (tile_path [0]); break;
677	case KW_tile_path_2: thawer.get (tile_path [1]); break;	667	case KW_tile_path_2: thawer.get (tile_path [1]); break;
678	case KW_tile_path_3: thawer.get (tile_path [2]); break;	668	case KW_tile_path_3: thawer.get (tile_path [2]); break;
679	case KW_tile_path_4: thawer.get (tile_path [3]); break;	669	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		670	case KW_tile_path_5: thawer.get (tile_path [4]); break;
		671	case KW_tile_path_6: thawer.get (tile_path [5]); break;
680		672
681	case KW_ERROR:	673	case KW_ERROR:
682	set_key_text (thawer.kw_str, thawer.value);	674	set_key_text (thawer.kw_str, thawer.value);
683	break;	675	break;
684		676
685	case KW_end:	677	case KW_end:
		678	thawer.next ();
686	return true;	679	return true;
687		680
688	default:	681	default:
689	if (!thawer.parse_error ("map", 0))	682	if (!thawer.parse_error ("map"))
690	return false;	683	return false;
691	break;	684	break;
692	}	685	}
		686
		687	thawer.next ();
693	}	688	}
694		689
695	abort ();	690	abort ();
696	}	691	}
697		692
698	bool	693	//+GPL
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	}
708		694
709	/******************************************************************************	695	/******************************************************************************
710	* This is the start of unique map handling code	696	* This is the start of unique map handling code
711	*****************************************************************************/	697	*****************************************************************************/
712		698
…		…
719	int unique = 0;	705	int unique = 0;
720	for (object *op = spaces [i].bot; op; )	706	for (object *op = spaces [i].bot; op; )
721	{	707	{
722	object *above = op->above;	708	object *above = op->above;
723		709
724	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	710	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
725	unique = 1;	711	unique = 1;
726		712
727	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))	713	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
728	{
729	op->destroy_inv (false);
730	op->destroy ();	714	op->destroy ();
731	}
732		715
733	op = above;	716	op = above;
734	}	717	}
735	}	718	}
736	}	719	}
737		720
		721	//-GPL
		722
738	bool	723	bool
739	maptile::_save_header (object_freezer &freezer)	724	maptile::_save_header (object_freezer &freezer)
740	{	725	{
741	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	726	#define MAP_OUT(k) freezer.put (KW(k), k)
742	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	727	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
743		728
744	MAP_OUT2 (arch, "map");	729	MAP_OUT2 (arch, CS(map));
745		730
746	if (name) MAP_OUT (name);	731	if (name) MAP_OUT (name);
747	MAP_OUT (swap_time);	732	MAP_OUT (swap_time);
748	MAP_OUT (reset_time);	733	MAP_OUT (reset_time);
749	MAP_OUT (reset_timeout);	734	MAP_OUT (reset_timeout);
750	MAP_OUT (fixed_resettime);	735	MAP_OUT (fixed_resettime);
751	MAP_OUT (no_reset);	736	MAP_OUT (no_reset);
		737	MAP_OUT (no_drop);
752	MAP_OUT (difficulty);	738	MAP_OUT (difficulty);
753
754	if (default_region) MAP_OUT2 (region, default_region->name);	739	if (default_region) MAP_OUT2 (region, default_region->name);
755		740
756	if (shopitems)	741	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);	742	MAP_OUT (shopgreed);
764	MAP_OUT (shopmin);	743	MAP_OUT (shopmin);
765	MAP_OUT (shopmax);	744	MAP_OUT (shopmax);
766	if (shoprace) MAP_OUT (shoprace);	745	if (shoprace) MAP_OUT (shoprace);
767	MAP_OUT (darkness);	746
768	MAP_OUT (width);	747	MAP_OUT (width);
769	MAP_OUT (height);	748	MAP_OUT (height);
770	MAP_OUT (enter_x);	749	MAP_OUT (enter_x);
771	MAP_OUT (enter_y);	750	MAP_OUT (enter_y);
772		751	MAP_OUT (darkness);
773	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
774	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
775
776	MAP_OUT (outdoor);	752	MAP_OUT (outdoor);
777	MAP_OUT (temp);	753
778	MAP_OUT (pressure);	754	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
779	MAP_OUT (humid);	755	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
780	MAP_OUT (windspeed);
781	MAP_OUT (winddir);
782	MAP_OUT (sky);
783		756
784	MAP_OUT (per_player);	757	MAP_OUT (per_player);
785	MAP_OUT (per_party);	758	MAP_OUT (per_party);
786		759
787	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	760	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
788	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	761	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
789	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	762	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
790	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	763	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
		764	if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
		765	if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
791		766
792	freezer.put (this);	767	freezer.put (this);
793	freezer.put (KW_end);	768	freezer.put (KW(end));
794		769
795	return true;	770	return true;
796	}	771	}
797		772
798	bool	773	bool
…		…
804	return false;	779	return false;
805		780
806	return freezer.save (path);	781	return freezer.save (path);
807	}	782	}
808		783
		784	//+GPL
		785
809	/*	786	/*
810	* Remove and free all objects in the given map.	787	* Remove and free all objects in the given map.
811	*/	788	*/
812	void	789	void
813	maptile::clear ()	790	maptile::clear ()
814	{	791	{
815	sfree (regions, size ()); regions = 0;
816	delete [] regionmap; regionmap = 0;
817
818	if (spaces)	792	if (spaces)
819	{	793	{
820	for (mapspace *ms = spaces + size (); ms-- > spaces; )	794	for (mapspace *ms = spaces + size (); ms-- > spaces; )
821	while (object *op = ms->bot)	795	while (object *op = ms->bot)
822	{	796	{
		797	// manually remove, as to not trigger anything
		798	if (ms->bot = op->above)
		799	ms->bot->below = 0;
		800
		801	op->flag [FLAG_REMOVED] = true;
		802
823	op = op->head_ ();	803	object *head = op->head_ ();
824	op->destroy_inv (false);	804	if (op == head)
825	op->destroy ();	805	op->destroy ();
		806	else if (head->map != op->map)
		807	{
		808	LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
		809	head->destroy ();
		810	}
826	}	811	}
827		812
828	sfree (spaces, size ()), spaces = 0;	813	sfree0 (spaces, size ());
829	}	814	}
830		815
831	if (buttons)	816	if (buttons)
832	free_objectlinkpt (buttons), buttons = 0;	817	free_objectlinkpt (buttons), buttons = 0;
		818
		819	sfree0 (regions, size ());
		820	delete [] regionmap; regionmap = 0;
833	}	821	}
834		822
835	void	823	void
836	maptile::clear_header ()	824	maptile::clear_header ()
837	{	825	{
…		…
839	msg = 0;	827	msg = 0;
840	maplore = 0;	828	maplore = 0;
841	shoprace = 0;	829	shoprace = 0;
842	delete [] shopitems, shopitems = 0;	830	delete [] shopitems, shopitems = 0;
843		831
844	for (int i = 0; i < 4; i++)	832	for (int i = 0; i < TILE_NUM; i++)
845	tile_path [i] = 0;	833	tile_path [i] = 0;
846	}	834	}
847		835
848	maptile::~maptile ()	836	maptile::~maptile ()
849	{	837	{
…		…
870		858
871	clear ();	859	clear ();
872	}	860	}
873		861
874	/* decay and destroy perishable items in a map */	862	/* decay and destroy perishable items in a map */
		863	// TODO: should be done regularly, not on map load?
875	void	864	void
876	maptile::do_decay_objects ()	865	maptile::do_decay_objects ()
877	{	866	{
878	if (!spaces)	867	if (!spaces)
879	return;	868	return;
…		…
881	for (mapspace *ms = spaces + size (); ms-- > spaces; )	870	for (mapspace *ms = spaces + size (); ms-- > spaces; )
882	for (object *above, *op = ms->bot; op; op = above)	871	for (object *above, *op = ms->bot; op; op = above)
883	{	872	{
884	above = op->above;	873	above = op->above;
885		874
		875	// do not decay anything above unique floor tiles (yet :)
		876	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
		877	break;
		878
886	bool destroy = 0;	879	bool destroy = 0;
887		880
888	// do not decay anything above unique floor tiles (yet :)	881	if (op->flag [FLAG_IS_FLOOR]
889	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	882	|| op->flag [FLAG_OBJ_ORIGINAL]
890	break;	883	|| op->flag [FLAG_UNIQUE]
891		884	|| op->flag [FLAG_OVERLAY_FLOOR]
892	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	885	|| 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 ())	886	|| op->is_alive ())
898	; // do not decay	887	; // do not decay
899	else if (op->is_weapon ())	888	else if (op->is_weapon ())
900	{	889	{
901	op->stats.dam--;	890	op->stats.dam--;
…		…
926	|| mat & M_LIQUID	915	|| mat & M_LIQUID
927	|| (mat & M_IRON && rndm (1, 5) == 1)	916	|| (mat & M_IRON && rndm (1, 5) == 1)
928	|| (mat & M_GLASS && rndm (1, 2) == 1)	917	|| (mat & M_GLASS && rndm (1, 2) == 1)
929	|| ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)	918	|| ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
930	|| ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)	919	|| ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
931	|| (mat & M_ICE && temp > 32))	920	//|| (mat & M_ICE && temp > 32)
		921	)
932	destroy = 1;	922	destroy = 1;
933	}	923	}
934		924
935	/* adjust overall chance below */	925	/* adjust overall chance below */
936	if (destroy && rndm (0, 1))	926	if (destroy && rndm (0, 1))
937	op->destroy ();	927	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	}	928	}
963	}	929	}
964		930
965	/*	931	/*
966	* This routine is supposed to find out the difficulty of the map.	932	* This routine is supposed to find out the difficulty of the map.
967	* difficulty does not have a lot to do with character level,	933	* difficulty does not have a lot to do with character level,
968	* but does have a lot to do with treasure on the map.	934	* but does have a lot to do with treasure on the map.
969	*	935	*
970	* Difficulty can now be set by the map creature. If the value stored	936	* 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	937	* in the map is zero, then use this routine. Maps should really
972	* have a difficulty set than using this function - human calculation	938	* have a difficulty set rather than using this function - human calculation
973	* is much better than this functions guesswork.	939	* is much better than this function's guesswork.
974	*/	940	*/
975	int	941	int
976	maptile::estimate_difficulty () const	942	maptile::estimate_difficulty () const
977	{	943	{
978	long monster_cnt = 0;	944	long monster_cnt = 0;
…		…
980	sint64 total_exp = 0;	946	sint64 total_exp = 0;
981		947
982	for (mapspace *ms = spaces + size (); ms-- > spaces; )	948	for (mapspace *ms = spaces + size (); ms-- > spaces; )
983	for (object *op = ms->bot; op; op = op->above)	949	for (object *op = ms->bot; op; op = op->above)
984	{	950	{
985	if (QUERY_FLAG (op, FLAG_MONSTER))	951	if (op->flag [FLAG_MONSTER])
986	{	952	{
987	total_exp += op->stats.exp;	953	total_exp += op->stats.exp;
988	monster_cnt++;	954	monster_cnt++;
989	}	955	}
990		956
991	if (QUERY_FLAG (op, FLAG_GENERATOR))	957	if (op->flag [FLAG_GENERATOR])
992	{	958	{
993	total_exp += op->stats.exp;	959	total_exp += op->stats.exp;
994		960
995	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))	961	if (archetype *at = op->other_arch)
		962	{
996	total_exp += at->stats.exp * 8;	963	total_exp += at->stats.exp * 8;
997
998	monster_cnt++;	964	monster_cnt++;
		965	}
		966
		967	for (object *inv = op->inv; inv; inv = inv->below)
		968	{
		969	total_exp += op->stats.exp * 8;
		970	monster_cnt++;
		971	}
999	}	972	}
1000	}	973	}
1001		974
1002	avgexp = (double) total_exp / monster_cnt;	975	avgexp = (double) total_exp / monster_cnt;
1003		976
…		…
1016	* postive values make it darker, negative make it brighter	989	* postive values make it darker, negative make it brighter
1017	*/	990	*/
1018	int	991	int
1019	maptile::change_map_light (int change)	992	maptile::change_map_light (int change)
1020	{	993	{
1021	int new_level = darkness + change;
1022
1023	/* Nothing to do */	994	/* Nothing to do */
1024	if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))	995	if (!change)
1025	return 0;	996	return 0;
1026		997
1027	/* inform all players on the map */	998	/* inform all players on the map */
1028	if (change > 0)	999	if (change > 0)
1029	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");	1000	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1030	else	1001	else
1031	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");	1002	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1032		1003
1033	/* Do extra checking. since darkness is a unsigned value,	1004	darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1034	* we need to be extra careful about negative values.
1035	* In general, the checks below are only needed if change
1036	* is not +/-1
1037	*/
1038	if (new_level < 0)
1039	darkness = 0;
1040	else if (new_level >= MAX_DARKNESS)
1041	darkness = MAX_DARKNESS;
1042	else
1043	darkness = new_level;
1044		1005
1045	/* All clients need to get re-updated for the change */	1006	/* All clients need to get re-updated for the change */
1046	update_all_map_los (this);	1007	update_all_map_los (this);
		1008
1047	return 1;	1009	return 1;
1048	}	1010	}
1049		1011
1050	/*	1012	/*
1051	* This function updates various attributes about a specific space	1013	* This function updates various attributes about a specific space
…		…
1054	* through, etc)	1016	* through, etc)
1055	*/	1017	*/
1056	void	1018	void
1057	mapspace::update_ ()	1019	mapspace::update_ ()
1058	{	1020	{
1059	object *tmp, *last = 0;	1021	object *last = 0;
1060	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;	1022	uint8 flags = P_UPTODATE;
		1023	sint8 light = 0;
1061	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1024	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
		1025	uint64_t volume = 0;
		1026	uint32_t items = 0;
		1027	object *anywhere = 0;
		1028	uint8_t middle_visibility = 0;
1062		1029
1063	//object *middle = 0;	1030	//object *middle = 0;
1064	//object *top = 0;	1031	//object *top = 0;
1065	//object *floor = 0;	1032	//object *floor = 0;
1066	// this seems to generate better code than using locals, above	1033	// this seems to generate better code than using locals, above
1067	object *&top = faces_obj[0] = 0;	1034	object *&top = faces_obj[0] = 0;
1068	object *&middle = faces_obj[1] = 0;	1035	object *&middle = faces_obj[1] = 0;
1069	object *&floor = faces_obj[2] = 0;	1036	object *&floor = faces_obj[2] = 0;
1070		1037
		1038	object::flags_t allflags; // all flags of all objects or'ed together
		1039
1071	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)	1040	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1072	{	1041	{
1073	/* This could be made additive I guess (two lights better than	1042	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1074	* one). But if so, it shouldn't be a simple additive - 2
1075	* light bulbs do not illuminate twice as far as once since
1076	* it is a dissapation factor that is cubed.
1077	*/
1078	if (tmp->glow_radius > light)
1079	light = tmp->glow_radius;	1043	light += tmp->glow_radius;
1080		1044
1081	/* This call is needed in order to update objects the player	1045	/* This call is needed in order to update objects the player
1082	* is standing in that have animations (ie, grass, fire, etc).	1046	* is standing in that have animations (ie, grass, fire, etc).
1083	* However, it also causes the look window to be re-drawn	1047	* However, it also causes the look window to be re-drawn
1084	* 3 times each time the player moves, because many of the	1048	* 3 times each time the player moves, because many of the
1085	* functions the move_player calls eventualy call this.	1049	* functions the move_player calls eventualy call this.
1086	*	1050	*
1087	* Always put the player down for drawing.	1051	* Always put the player down for drawing.
1088	*/	1052	*/
1089	if (!tmp->invisible)	1053	if (expect_true (!tmp->invisible))
1090	{	1054	{
1091	if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))	1055	if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1092	top = tmp;	1056	top = tmp;
1093	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1057	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1094	{	1058	{
1095	/* If we got a floor, that means middle and top were below it,	1059	/* If we got a floor, that means middle and top were below it,
1096	* so should not be visible, so we clear them.	1060	* so should not be visible, so we clear them.
1097	*/	1061	*/
1098	middle = 0;	1062	middle = 0;
1099	top = 0;	1063	top = 0;
1100	floor = tmp;	1064	floor = tmp;
		1065	volume = 0;
		1066	items = 0;
1101	}	1067	}
1102	/* Flag anywhere have high priority */	1068	else
1103	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1104	{	1069	{
		1070	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
		1071	{
		1072	++items;
		1073	volume += tmp->volume ();
		1074	}
		1075
		1076	/* Flag anywhere have high priority */
		1077	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
		1078	anywhere = tmp;
		1079
		1080	/* Find the highest visible face around. If equal
		1081	* visibilities, we still want the one nearer to the
		1082	* top
		1083	*/
		1084	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
		1085	{
		1086	middle_visibility = ::faces [tmp->face].visibility;
1105	middle = tmp;	1087	middle = tmp;
1106	anywhere = 1;	1088	}
1107	}	1089	}
1108	/* Find the highest visible face around. If equal
1109	* visibilities, we still want the one nearer to the
1110	* top
1111	*/
1112	else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1113	middle = tmp;
1114	}
1115
1116	if (tmp == tmp->above)
1117	{
1118	LOG (llevError, "Error in structure of map\n");
1119	exit (-1);
1120	}	1090	}
1121		1091
1122	move_slow |= tmp->move_slow;	1092	move_slow |= tmp->move_slow;
1123	move_block |= tmp->move_block;	1093	move_block |= tmp->move_block;
1124	move_on |= tmp->move_on;	1094	move_on |= tmp->move_on;
1125	move_off |= tmp->move_off;	1095	move_off |= tmp->move_off;
1126	move_allow |= tmp->move_allow;	1096	move_allow |= tmp->move_allow;
1127		1097
1128	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;	1098	allflags |= tmp->flag;
1129	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;	1099
1130	if (tmp->type == PLAYER) flags |= P_PLAYER;	1100	if (tmp->type == PLAYER) flags |= P_PLAYER;
1131	if (tmp->type == SAFE_GROUND) flags |= P_SAFE;	1101	if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1132	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1133	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1134	}	1102	}
1135		1103
1136	this->light = light;	1104	// FLAG_SEE_ANYWHERE takes precedence
		1105	if (anywhere)
		1106	middle = anywhere;
		1107
		1108	// ORing all flags together and checking them here is much faster
		1109	if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
		1110	if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
		1111	if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
		1112	if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
		1113
		1114	this->light = min (light, MAX_LIGHT_RADIUS);
1137	this->flags_ = flags;	1115	this->flags_ = flags;
1138	this->move_block = move_block & ~move_allow;	1116	this->move_block = move_block & ~move_allow;
1139	this->move_on = move_on;	1117	this->move_on = move_on;
1140	this->move_off = move_off;	1118	this->move_off = move_off;
1141	this->move_slow = move_slow;	1119	this->move_slow = move_slow;
		1120	this->volume_ = (volume + 1023) / 1024;
		1121	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1142		1122
1143	/* At this point, we have a floor face (if there is a floor),	1123	/* At this point, we have a floor face (if there is a floor),
1144	* and the floor is set - we are not going to touch it at	1124	* and the floor is set - we are not going to touch it at
1145	* this point.	1125	* this point.
1146	* middle contains the highest visibility face.	1126	* middle contains the highest visibility face.
…		…
1161	* 1) top face is set, need middle to be set.	1141	* 1) top face is set, need middle to be set.
1162	* 2) middle is set, need to set top.	1142	* 2) middle is set, need to set top.
1163	* 3) neither middle or top is set - need to set both.	1143	* 3) neither middle or top is set - need to set both.
1164	*/	1144	*/
1165		1145
1166	for (tmp = last; tmp; tmp = tmp->below)	1146	for (object *tmp = last; tmp; tmp = tmp->below)
1167	{	1147	{
1168	/* Once we get to a floor, stop, since we already have a floor object */	1148	/* Once we get to a floor, stop, since we already have a floor object */
1169	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1149	if (tmp->flag [FLAG_IS_FLOOR])
1170	break;	1150	break;
1171		1151
1172	/* If two top faces are already set, quit processing */	1152	/* If two top faces are already set, quit processing */
1173	if (top && middle)	1153	if (top && middle)
1174	break;	1154	break;
…		…
1212	faces_obj [1] = middle;	1192	faces_obj [1] = middle;
1213	faces_obj [2] = floor;	1193	faces_obj [2] = floor;
1214	#endif	1194	#endif
1215	}	1195	}
1216		1196
1217	uint64	1197	maptile *
1218	mapspace::volume () const
1219	{
1220	uint64 vol = 0;
1221
1222	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1223	vol += op->volume ();
1224
1225	return vol;
1226	}
1227
1228	bool
1229	maptile::tile_available (int dir, bool load)	1198	maptile::tile_available (int dir, bool load)
1230	{	1199	{
1231	if (!tile_path[dir])	1200	if (tile_path[dir])
1232	return 0;	1201	{
1233		1202	// map is there and we don't need to load it OR it's loaded => return what we have
1234	if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))	1203	if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1235	return 1;	1204	return tile_map[dir];
1236		1205
		1206	// well, try to locate it then, if possible - maybe it's there already
1237	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))	1207	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1238	return 1;	1208	return tile_map[dir];
		1209	}
1239		1210
1240	return 0;	1211	return 0;
1241	}	1212	}
1242		1213
1243	/* this returns TRUE if the coordinates (x,y) are out of	1214	/* this returns TRUE if the coordinates (x,y) are out of
…		…
1352	/**	1323	/**
1353	* Return whether map2 is adjacent to map1. If so, store the distance from	1324	* Return whether map2 is adjacent to map1. If so, store the distance from
1354	* map1 to map2 in dx/dy.	1325	* map1 to map2 in dx/dy.
1355	*/	1326	*/
1356	int	1327	int
1357	adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)	1328	adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1358	{	1329	{
1359	if (!map1 || !map2)	1330	if (!map1 || !map2)
1360	return 0;	1331	return 0;
1361		1332
1362	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1333	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1364	if (map1 == map2)	1335	if (map1 == map2)
1365	{	1336	{
1366	*dx = 0;	1337	*dx = 0;
1367	*dy = 0;	1338	*dy = 0;
1368	}	1339	}
1369	else if (map1->tile_map[0] == map2)	1340	else if (map1->tile_available (TILE_NORTH, false) == map2)
1370	{ /* up */	1341	{
1371	*dx = 0;	1342	*dx = 0;
1372	*dy = -map2->height;	1343	*dy = -map2->height;
1373	}	1344	}
1374	else if (map1->tile_map[1] == map2)	1345	else if (map1->tile_available (TILE_EAST , false) == map2)
1375	{ /* right */	1346	{
1376	*dx = map1->width;	1347	*dx = map1->width;
1377	*dy = 0;	1348	*dy = 0;
1378	}	1349	}
1379	else if (map1->tile_map[2] == map2)	1350	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1380	{ /* down */	1351	{
1381	*dx = 0;	1352	*dx = 0;
1382	*dy = map1->height;	1353	*dy = map1->height;
1383	}	1354	}
1384	else if (map1->tile_map[3] == map2)	1355	else if (map1->tile_available (TILE_WEST , false) == map2)
1385	{ /* left */	1356	{
1386	*dx = -map2->width;	1357	*dx = -map2->width;
1387	*dy = 0;	1358	*dy = 0;
1388	}	1359	}
1389	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1360	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1390	{ /* up right */	1361	{ /* up right */
1391	*dx = map1->tile_map[0]->width;	1362	*dx = +map1->tile_map[TILE_NORTH]->width;
1392	*dy = -map1->tile_map[0]->height;	1363	*dy = -map1->tile_map[TILE_NORTH]->height;
1393	}	1364	}
1394	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1365	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1395	{ /* up left */	1366	{ /* up left */
1396	*dx = -map2->width;	1367	*dx = -map2->width;
1397	*dy = -map1->tile_map[0]->height;	1368	*dy = -map1->tile_map[TILE_NORTH]->height;
1398	}	1369	}
1399	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1370	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1400	{ /* right up */	1371	{ /* right up */
1401	*dx = map1->width;	1372	*dx = +map1->width;
1402	*dy = -map2->height;	1373	*dy = -map2->height;
1403	}	1374	}
1404	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1375	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1405	{ /* right down */	1376	{ /* right down */
1406	*dx = map1->width;	1377	*dx = +map1->width;
1407	*dy = map1->tile_map[1]->height;	1378	*dy = +map1->tile_map[TILE_EAST]->height;
1408	}	1379	}
1409	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1380	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1410	{ /* down right */	1381	{ /* down right */
1411	*dx = map1->tile_map[2]->width;	1382	*dx = +map1->tile_map[TILE_SOUTH]->width;
1412	*dy = map1->height;	1383	*dy = +map1->height;
1413	}	1384	}
1414	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1385	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1415	{ /* down left */	1386	{ /* down left */
1416	*dx = -map2->width;	1387	*dx = -map2->width;
1417	*dy = map1->height;	1388	*dy = +map1->height;
1418	}	1389	}
1419	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1390	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1420	{ /* left up */	1391	{ /* left up */
1421	*dx = -map1->tile_map[3]->width;	1392	*dx = -map1->tile_map[TILE_WEST]->width;
1422	*dy = -map2->height;	1393	*dy = -map2->height;
1423	}	1394	}
1424	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1395	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1425	{ /* left down */	1396	{ /* left down */
1426	*dx = -map1->tile_map[3]->width;	1397	*dx = -map1->tile_map[TILE_WEST]->width;
1427	*dy = map1->tile_map[3]->height;	1398	*dy = +map1->tile_map[TILE_WEST]->height;
1428	}	1399	}
1429	else	1400	else
1430	return 0;	1401	return 0;
1431		1402
1432	return 1;	1403	return 1;
…		…
1468	*	1439	*
1469	* currently, the only flag supported (0x1) is don't translate for	1440	* currently, the only flag supported (0x1) is don't translate for
1470	* closest body part of 'op1'	1441	* closest body part of 'op1'
1471	*/	1442	*/
1472	void	1443	void
1473	get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)	1444	get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1474	{	1445	{
1475	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1446	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1476	{	1447	{
1477	/* be conservative and fill in _some_ data */	1448	/* be conservative and fill in _some_ data */
1478	retval->distance = 10000;	1449	retval->distance = 10000;
1479	retval->distance_x = 10000;	1450	retval->distance_x = 10000;
1480	retval->distance_y = 10000;	1451	retval->distance_y = 10000;
1481	retval->direction = 0;	1452	retval->direction = 0;
1482	retval->part = 0;	1453	retval->part = 0;
1483	}	1454	}
1484	else	1455	else
1485	{	1456	{
1486	object *best;
1487
1488	retval->distance_x += op2->x - op1->x;	1457	retval->distance_x += op2->x - op1->x;
1489	retval->distance_y += op2->y - op1->y;	1458	retval->distance_y += op2->y - op1->y;
1490		1459
1491	best = op1;	1460	object *best = op1;
		1461
1492	/* If this is multipart, find the closest part now */	1462	/* If this is multipart, find the closest part now */
1493	if (!(flags & 0x1) && op1->more)	1463	if (!(flags & 1) && op1->more)
1494	{	1464	{
1495	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1465	int best_distance = idistance (retval->distance_x, retval->distance_y);
1496		1466
1497	/* we just take the offset of the piece to head to figure	1467	/* we just take the offset of the piece to head to figure
1498	* distance instead of doing all that work above again	1468	* distance instead of doing all that work above again
1499	* since the distance fields we set above are positive in the	1469	* since the distance fields we set above are positive in the
1500	* same axis as is used for multipart objects, the simply arithmetic	1470	* same axis as is used for multipart objects, the simply arithmetic
1501	* below works.	1471	* below works.
1502	*/	1472	*/
1503	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1473	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1504	{	1474	{
1505	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1475	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1506	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1476
1507	if (tmpi < best_distance)	1477	if (tmpi < best_distance)
1508	{	1478	{
1509	best_distance = tmpi;	1479	best_distance = tmpi;
1510	best = tmp;	1480	best = tmp;
1511	}	1481	}
1512	}	1482	}
1513		1483
1514	if (best != op1)	1484	if (best != op1)
1515	{	1485	{
1516	retval->distance_x += op1->x - best->x;	1486	retval->distance_x += op1->x - best->x;
1517	retval->distance_y += op1->y - best->y;	1487	retval->distance_y += op1->y - best->y;
1518	}	1488	}
1519	}	1489	}
1520		1490
1521	retval->part = best;	1491	retval->part = best;
1522	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1492	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1523	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1493	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1524	}	1494	}
1525	}	1495	}
1526		1496
1527	/* this is basically the same as get_rangevector above, but instead of	1497	/* this is basically the same as get_rangevector above, but instead of
1528	* the first parameter being an object, it instead is the map	1498	* the first parameter being an object, it instead is the map
…		…
1533	* be more consistant with the above function and also in case they are needed	1503	* be more consistant with the above function and also in case they are needed
1534	* for something in the future. Also, since no object is pasted, the best	1504	* for something in the future. Also, since no object is pasted, the best
1535	* field of the rv_vector is set to NULL.	1505	* field of the rv_vector is set to NULL.
1536	*/	1506	*/
1537	void	1507	void
1538	get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)	1508	get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1539	{	1509	{
1540	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1510	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1541	{	1511	{
1542	/* be conservative and fill in _some_ data */	1512	/* be conservative and fill in _some_ data */
1543	retval->distance = 100000;	1513	retval->distance = 100000;
1544	retval->distance_x = 32767;	1514	retval->distance_x = 32767;
1545	retval->distance_y = 32767;	1515	retval->distance_y = 32767;
1546	retval->direction = 0;	1516	retval->direction = 0;
1547	retval->part = 0;	1517	retval->part = 0;
1548	}	1518	}
1549	else	1519	else
1550	{	1520	{
1551	retval->distance_x += op2->x - x;	1521	retval->distance_x += op2->x - x;
1552	retval->distance_y += op2->y - y;	1522	retval->distance_y += op2->y - y;
1553		1523
1554	retval->part = NULL;	1524	retval->part = 0;
1555	retval->distance = idistance (retval->distance_x, retval->distance_y);	1525	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1556	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1526	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1557	}	1527	}
1558	}	1528	}
1559		1529
1560	/* Returns true of op1 and op2 are effectively on the same map	1530	/* Returns true of op1 and op2 are effectively on the same map
1561	* (as related to map tiling). Note that this looks for a path from	1531	* (as related to map tiling). Note that this looks for a path from
…		…
1571	int dx, dy;	1541	int dx, dy;
1572		1542
1573	return adjacent_map (op1->map, op2->map, &dx, &dy);	1543	return adjacent_map (op1->map, op2->map, &dx, &dy);
1574	}	1544	}
1575		1545
		1546	//-GPL
		1547
1576	object *	1548	object *
1577	maptile::insert (object *op, int x, int y, object *originator, int flags)	1549	maptile::insert (object *op, int x, int y, object *originator, int flags)
1578	{	1550	{
1579	if (!op->flag [FLAG_REMOVED])
1580	op->remove ();
1581
1582	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1551	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1583	}	1552	}
1584		1553
1585	region *	1554	region *
1586	maptile::region (int x, int y) const	1555	maptile::region (int x, int y) const
…		…
1595	return default_region;	1564	return default_region;
1596		1565
1597	return ::region::default_region ();	1566	return ::region::default_region ();
1598	}	1567	}
1599		1568
		1569	//+GPL
		1570
1600	/* picks a random object from a style map.	1571	/* picks a random object from a style map.
1601	* Redone by MSW so it should be faster and not use static
1602	* variables to generate tables.
1603	*/	1572	*/
1604	object *	1573	object *
1605	maptile::pick_random_object () const	1574	maptile::pick_random_object (rand_gen &gen) const
1606	{	1575	{
1607	/* while returning a null object will result in a crash, that	1576	/* while returning a null object will result in a crash, that
1608	* is actually preferable to an infinite loop. That is because	1577	* is actually preferable to an infinite loop. That is because
1609	* most servers will automatically restart in case of crash.	1578	* most servers will automatically restart in case of crash.
1610	* Change the logic on getting the random space - shouldn't make	1579	* Change the logic on getting the random space - shouldn't make
1611	* any difference, but this seems clearer to me.	1580	* any difference, but this seems clearer to me.
1612	*/	1581	*/
1613	for (int i = 1000; --i;)	1582	for (int i = 1000; --i;)
1614	{	1583	{
1615	object *pick = at (rndm (width), rndm (height)).bot;	1584	object *pick = at (gen (width), gen (height)).bot;
1616		1585
1617	// do not prefer big monsters just because they are big.	1586	// must be head: do not prefer big monsters just because they are big.
1618	if (pick && pick->head_ () == pick)	1587	if (pick && pick->is_head ())
1619	return pick->head_ ();	1588	return pick;
1620	}	1589	}
1621		1590
1622	// instead of crashing in the unlikely(?) case, try to return *something*	1591	// instead of crashing in the unlikely(?) case, try to return *something*
1623	return get_archetype ("blocked");	1592	return archetype::find (shstr_bug);
1624	}	1593	}
		1594
		1595	//-GPL
1625		1596
1626	void	1597	void
1627	maptile::play_sound (faceidx sound, int x, int y) const	1598	maptile::play_sound (faceidx sound, int x, int y) const
1628	{	1599	{
1629	if (!sound)	1600	if (!sound)
1630	return;	1601	return;
1631		1602
		1603	for_all_players_on_map (pl, this)
		1604	if (client *ns = pl->ns)
		1605	{
		1606	int dx = x - pl->ob->x;
		1607	int dy = y - pl->ob->y;
		1608
		1609	int distance = idistance (dx, dy);
		1610
		1611	if (distance <= MAX_SOUND_DISTANCE)
		1612	ns->play_sound (sound, dx, dy);
		1613	}
		1614	}
		1615
		1616	void
		1617	maptile::say_msg (const char *msg, int x, int y) const
		1618	{
1632	for_all_players (pl)	1619	for_all_players (pl)
1633	if (pl->ob->map == this)
1634	if (client *ns = pl->ns)	1620	if (client *ns = pl->ns)
1635	{	1621	{
1636	int dx = x - pl->ob->x;	1622	int dx = x - pl->ob->x;
1637	int dy = y - pl->ob->y;	1623	int dy = y - pl->ob->y;
1638		1624
1639	int distance = idistance (dx, dy);	1625	int distance = idistance (dx, dy);
1640		1626
1641	if (distance <= MAX_SOUND_DISTANCE)	1627	if (distance <= MAX_SOUND_DISTANCE)
1642	ns->play_sound (sound, dx, dy);	1628	ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1643	}	1629	}
1644	}	1630	}
1645		1631
		1632	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1633
		1634	static void
		1635	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
		1636	{
		1637	// clip to map to the left
		1638	if (x0 < 0)
		1639	{
		1640	if (maptile *tile = m->tile_available (TILE_WEST, 1))
		1641	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
		1642
		1643	if (x1 < 0) // entirely to the left
		1644	return;
		1645
		1646	x0 = 0;
		1647	}
		1648
		1649	// clip to map to the right
		1650	if (x1 > m->width)
		1651	{
		1652	if (maptile *tile = m->tile_available (TILE_EAST, 1))
		1653	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
		1654
		1655	if (x0 > m->width) // entirely to the right
		1656	return;
		1657
		1658	x1 = m->width;
		1659	}
		1660
		1661	// clip to map above
		1662	if (y0 < 0)
		1663	{
		1664	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
		1665	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
		1666
		1667	if (y1 < 0) // entirely above
		1668	return;
		1669
		1670	y0 = 0;
		1671	}
		1672
		1673	// clip to map below
		1674	if (y1 > m->height)
		1675	{
		1676	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
		1677	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
		1678
		1679	if (y0 > m->height) // entirely below
		1680	return;
		1681
		1682	y1 = m->height;
		1683	}
		1684
		1685	// if we get here, the rect is within the current map
		1686	maprect *r = (maprect *)buf.alloc (sizeof (maprect));
		1687
		1688	r->m = m;
		1689	r->x0 = x0;
		1690	r->y0 = y0;
		1691	r->x1 = x1;
		1692	r->y1 = y1;
		1693	r->dx = dx;
		1694	r->dy = dy;
		1695	}
		1696
		1697	maprect *
		1698	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
		1699	{
		1700	buf.clear ();
		1701
		1702	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
		1703
		1704	// add end marker
		1705	maprect *r = (maprect *)buf.alloc (sizeof (maprect));
		1706	r->m = 0;
		1707
		1708	return (maprect *)buf.linearise ();
		1709	}
		1710

Diff Legend

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