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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.76 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.166 by root, Wed Oct 21 00:44:39 2009 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	#include <global.h>
26	#include <funcpoint.h>
27
28	#include <loader.h>
29	#include <unistd.h>	25	#include <unistd.h>
30		26
		27	#include "global.h"
		28	#include "loader.h"
31	#include "path.h"	29	#include "path.h"
32		30
33	/*	31	sint8 maptile::outdoor_darkness;
34	* This makes a path absolute outside the world of Crossfire.
35	* In other words, it prepends LIBDIR/MAPDIR/ to the given path
36	* and returns the pointer to a static array containing the result.
37	* it really should be called create_mapname
38	*/
39	const char *
40	create_pathname (const char *name)
41	{
42	static char buf[8192];
43	snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44	return buf;
45	}
46
47	/*
48	* This function checks if a file with the given path exists.
49	* -1 is returned if it fails, otherwise the mode of the file
50	* is returned.
51	* It tries out all the compression suffixes listed in the uncomp[] array.
52	*
53	* If prepend_dir is set, then we call create_pathname (which prepends
54	* libdir & mapdir). Otherwise, we assume the name given is fully
55	* complete.
56	* Only the editor actually cares about the writablity of this -
57	* the rest of the code only cares that the file is readable.
58	* when the editor goes away, the call to stat should probably be
59	* replaced by an access instead (similar to the windows one, but
60	* that seems to be missing the prepend_dir processing
61	*/
62	int
63	check_path (const char *name, int prepend_dir)
64	{
65	char buf[MAX_BUF];
66
67	char *endbuf;
68	struct stat statbuf;
69	int mode = 0;
70
71	if (prepend_dir)
72	strcpy (buf, create_pathname (name));
73	else
74	strcpy (buf, name);
75
76	/* old method (strchr(buf, '\0')) seemd very odd to me -
77	* this method should be equivalant and is clearer.
78	* Can not use strcat because we need to cycle through
79	* all the names.
80	*/
81	endbuf = buf + strlen (buf);
82
83	if (stat (buf, &statbuf))
84	return -1;
85	if (!S_ISREG (statbuf.st_mode))
86	return (-1);
87
88	if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) \|\|
89	((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) \|\| (statbuf.st_mode & S_IROTH))
90	mode \|= 4;
91
92	if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) \|\|
93	(statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) \|\| (statbuf.st_mode & S_IWOTH))
94	mode \|= 2;
95
96	return (mode);
97	}
98		32
99	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	33	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100	* one function that just returns a P_.. value (see map.h)	34	* one function that just returns a P_.. value (see map.h)
101	* it will also do map translation for tiled maps, returning	35	* it will also do map translation for tiled maps, returning
102	* 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
137	* by the caller.	71	* by the caller.
138	*/	72	*/
139	int	73	int
140	blocked_link (object ob, maptile m, int sx, int sy)	74	blocked_link (object ob, maptile m, int sx, int sy)
141	{	75	{
142	object *tmp;
143	int mflags, blocked;
144
145	/* 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
146	* have already checked this.	77	* have already checked this.
147	*/	78	*/
148	if (OUT_OF_REAL_MAP (m, sx, sy))	79	if (OUT_OF_REAL_MAP (m, sx, sy))
149	{	80	{
150	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	81	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
151	return 1;	82	return 1;
152	}	83	}
153		84
154	/* Save some cycles - instead of calling get_map_flags(), just get the value	85	mapspace &ms = m->at (sx, sy);
155	* directly.
156	*/
157	mflags = m->at (sx, sy).flags ();
158		86
159	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	87	int mflags = ms.flags ();
		88	int blocked = ms.move_block;
160		89
161	/* If space is currently not blocked by anything, no need to	90	/* If space is currently not blocked by anything, no need to
162	* go further. Not true for players - all sorts of special	91	* go further. Not true for players - all sorts of special
163	* things we need to do for players.	92	* things we need to do for players.
164	*/	93	*/
165	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	94	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
166	return 0;	95	return 0;
167		96
168	/* if there isn't anytyhing alive on this space, and this space isn't	97	/* if there isn't anything alive on this space, and this space isn't
169	* otherwise blocked, we can return now. Only if there is a living	98	* otherwise blocked, we can return now. Only if there is a living
170	* creature do we need to investigate if it is part of this creature	99	* creature do we need to investigate if it is part of this creature
171	* or another. Likewise, only if something is blocking us do we	100	* or another. Likewise, only if something is blocking us do we
172	* need to investigate if there is a special circumstance that would	101	* need to investigate if there is a special circumstance that would
173	* let the player through (inventory checkers for example)	102	* let the player through (inventory checkers for example)
174	*/	103	*/
175	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))	104	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176	return 0;	105	return 0;
177		106
178	if (ob->head != NULL)
179	ob = ob->head;	107	ob = ob->head_ ();
180		108
181	/* We basically go through the stack of objects, and if there is	109	/* We basically go through the stack of objects, and if there is
182	* some other object that has NO_PASS or FLAG_ALIVE set, return	110	* some other object that has NO_PASS or FLAG_ALIVE set, return
183	* true. If we get through the entire stack, that must mean	111	* true. If we get through the entire stack, that must mean
184	* ob is blocking it, so return 0.	112	* ob is blocking it, so return 0.
185	*/	113	*/
186	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	114	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
187	{	115	{
188		116	if (OB_MOVE_BLOCK (ob, tmp))
189	/* This must be before the checks below. Code for inventory checkers. */
190	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
191	{	117	{
192	/* If last_sp is set, the player/monster needs an object,	118	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
193	* so we check for it. If they don't have it, they can't	119	if (RESULT_INT (0))
194	* pass through this space.	120	return 1;
195	*/	121	else
196	if (tmp->last_sp)	122	continue;
		123
		124	if (tmp->type == CHECK_INV)
197	{	125	{
198	if (check_inv_recursive (ob, tmp) == NULL)	126	bool have = check_inv_recursive (ob, tmp);
		127
		128	// last_sp set means we block if we don't have.
		129	if (logical_xor (have, tmp->last_sp))
199	return 1;	130	return 1;
200	else	131	}
201	continue;	132	else if (tmp->type == T_MATCH)
		133	{
		134	// T_MATCH allows "entrance" iff the match is true
		135	// == blocks if the match fails
		136
		137	// we could have used an INVOKE_OBJECT, but decided against it, as we
		138	// assume that T_MATCH is relatively common.
		139	if (!match (tmp->slaying, ob, tmp, ob))
		140	return 1;
202	}	141	}
203	else	142	else
204	{	143	return 1; // unconditional block
205	/* In this case, the player must not have the object -	144
206	* if they do, they can't pass through.
207	*/
208	if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
209	return 1;
210	else
211	continue;
212	}
213	} /* if check_inv */
214	else	145	} else {
215	{	146	// space does not block the ob, directly, but
216	/* Broke apart a big nasty if into several here to make	147	// anything alive that is not a door still
217	* this more readable. first check - if the space blocks	148	// blocks anything but wizards.
218	* movement, can't move here.	149
219	* second - if a monster, can't move there, unles it is a	150	if (tmp->flag [FLAG_ALIVE]
220	* hidden dm	151	&& tmp->head_ () != ob
221	*/	152	&& tmp != ob
222	if (OB_MOVE_BLOCK (ob, tmp))	153	&& tmp->type != DOOR
223	return 1;	154	&& !tmp->flag [FLAG_WIZPASS])
224	if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
225	tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
226	return 1;	155	return 1;
227	}	156	}
228
229	}	157	}
		158
230	return 0;	159	return 0;
231	}	160	}
232		161
233
234	/*	162	/*
235	* Returns true if the given object can't fit in the given spot.	163	* Returns qthe blocking object if the given object can't fit in the given
236	* This is meant for multi space objects - for single space objecs,	164	* spot. This is meant for multi space objects - for single space objecs,
237	* just calling get_map_blocked and checking that against movement type	165	* just calling get_map_blocked and checking that against movement type
238	* of object. This function goes through all the parts of the	166	* of object. This function goes through all the parts of the multipart
239	* multipart object and makes sure they can be inserted.	167	* object and makes sure they can be inserted.
240	*	168	*
241	* While this doesn't call out of map, the get_map_flags does.	169	* While this doesn't call out of map, the get_map_flags does.
242	*	170	*
243	* This function has been used to deprecate arch_out_of_map -	171	* This function has been used to deprecate arch_out_of_map -
244	* this function also does that check, and since in most cases,	172	* this function also does that check, and since in most cases,
…		…
255	*	183	*
256	* Note this used to be arch_blocked, but with new movement	184	* Note this used to be arch_blocked, but with new movement
257	* code, we need to have actual object to check its move_type	185	* code, we need to have actual object to check its move_type
258	* against the move_block values.	186	* against the move_block values.
259	*/	187	*/
260	int	188	bool
261	ob_blocked (const object ob, maptile m, sint16 x, sint16 y)	189	object::blocked (maptile *m, int x, int y) const
262	{	190	{
263	archetype *tmp;	191	for (archetype tmp = arch; tmp; tmp = (archetype )tmp->more)
264	int flag;
265	maptile *m1;
266	sint16 sx, sy;
267
268	if (!ob)
269	{
270	flag = get_map_flags (m, &m1, x, y, &sx, &sy);
271	if (flag & P_OUT_OF_MAP)
272	return P_OUT_OF_MAP;
273
274	/* don't have object, so don't know what types would block */
275	return m1->at (sx, sy).move_block;
276	}	192	{
		193	mapxy pos (m, x + tmp->x, y + tmp->y);
277		194
278	for (tmp = ob->arch; tmp; tmp = tmp->more)	195	if (!pos.normalise ())
279	{	196	return 1;
280	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281		197
282	if (flag & P_OUT_OF_MAP)	198	mapspace &ms = *pos;
283	return P_OUT_OF_MAP;	199
284	if (flag & P_IS_ALIVE)	200	if (ms.flags () & P_IS_ALIVE)
285	return P_IS_ALIVE;	201	return 1;
286		202
287	mapspace &ms = m1->at (sx, sy);	203	/* However, often ob doesn't have any move type
288		204	* (signifying non-moving objects)
289	/* find_first_free_spot() calls this function. However, often
290	* ob doesn't have any move type (when used to place exits)
291	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	205	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292	*/	206	*/
293
294	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	207	if (!move_type && ms.move_block != MOVE_ALL)
295	continue;	208	continue;
296		209
297	/* Note it is intentional that we check ob - the movement type of the	210	/* Note it is intentional that we check ob - the movement type of the
298	* head of the object should correspond for the entire object.	211	* head of the object should correspond for the entire object.
299	*/	212	*/
300	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	213	if (ms.blocks (move_type))
301	return P_NO_PASS;	214	return 1;
302	}	215	}
303		216
304	return 0;	217	return 0;
305	}	218	}
306		219
…		…
324		237
325	insert_ob_in_ob (tmp, container);	238	insert_ob_in_ob (tmp, container);
326	tmp = next;	239	tmp = next;
327	}	240	}
328		241
329	/* sum_weight will go through and calculate what all the containers are	242	// go through and calculate what all the containers are carrying.
330	* carrying.	243	//TODO: remove
331	*/	244	container->update_weight ();
332	sum_weight (container);
333	}	245	}
334		246
335	void	247	void
336	maptile::set_object_flag (int flag, int value)	248	maptile::set_object_flag (int flag, int value)
337	{	249	{
…		…
341	for (mapspace *ms = spaces + size (); ms-- > spaces; )	253	for (mapspace *ms = spaces + size (); ms-- > spaces; )
342	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	254	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343	tmp->flag [flag] = value;	255	tmp->flag [flag] = value;
344	}	256	}
345		257
		258	void
		259	maptile::post_load_original ()
		260	{
		261	if (!spaces)
		262	return;
		263
		264	set_object_flag (FLAG_OBJ_ORIGINAL);
		265
		266	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		267	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		268	INVOKE_OBJECT (RESET, tmp);
		269	}
		270
346	/* link_multipart_objects go through all the objects on the map looking	271	/* link_multipart_objects go through all the objects on the map looking
347	* for objects whose arch says they are multipart yet according to the	272	* for objects whose arch says they are multipart yet according to the
348	* info we have, they only have the head (as would be expected when	273	* info we have, they only have the head (as would be expected when
349	* they are saved). We do have to look for the old maps that did save	274	* they are saved).
350	* the more sections and not re-add sections for them.
351	*/	275	*/
352	void	276	void
353	maptile::link_multipart_objects ()	277	maptile::link_multipart_objects ()
354	{	278	{
355	if (!spaces)	279	if (!spaces)
356	return;	280	return;
357		281
358	for (mapspace *ms = spaces + size (); ms-- > spaces; )	282	for (mapspace *ms = spaces + size (); ms-- > spaces; )
359	for (object *tmp = ms->bot; tmp; )	283	{
		284	object *op = ms->bot;
		285	while (op)
360	{	286	{
361	object *above = tmp->above;
362
363	/* already multipart - don't do anything more */	287	/* already multipart - don't do anything more */
364	if (!tmp->head && !tmp->more)	288	if (op->head_ () == op && !op->more && op->arch->more)
365	{
366	/* If there is nothing more to this object, this for loop
367	* won't do anything.
368	*/
369	archetype *at;
370	object last, op;
371	for (at = tmp->arch->more, last = tmp;
372	at;
373	at = at->more, last = op)
374	{	289	{
375	op = arch_to_object (at);	290	op->remove ();
		291	op->expand_tail ();
376		292
377	/* update x,y coordinates */	293	// FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
378	op->x += tmp->x;	294	// multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
379	op->y += tmp->y;	295	// below the pentagrams... hopefully INS_ON_TOP doesn't break anything
380	op->head = tmp;
381	op->map = this;
382	last->more = op;
383	op->name = tmp->name;
384	op->title = tmp->title;
385
386	/* we could link all the parts onto tmp, and then just
387	* call insert_ob_in_map once, but the effect is the same,
388	* as insert_ob_in_map will call itself with each part, and
389	* the coding is simpler to just to it here with each part.
390	*/
391	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE \| INS_ABOVE_FLOOR_ONLY \| INS_NO_WALK_ON);	296	insert (op, op->x, op->y, 0, INS_NO_MERGE \| INS_ON_TOP \| INS_NO_WALK_ON);
		297
		298	op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
		299	// so we have to reset the iteration through the mapspace
392	}	300	}
		301	else
		302	op = op->above;
393	}	303	}
394
395	tmp = above;
396	}	304	}
397	}	305	}
398		306
399	/*	307	/*
400	* Loads (ands parses) the objects into a given map from the specified	308	* Loads (ands parses) the objects into a given map from the specified
401	* file pointer.	309	* file pointer.
402	* mapflags is the same as we get with load_original_map
403	*/	310	*/
404	bool	311	bool
405	maptile::_load_objects (object_thawer &thawer)	312	maptile::_load_objects (object_thawer &f)
406	{	313	{
407	int unique;	314	for (;;)
408	object op, prev = NULL, last_more = NULL, otmp;
409
410	op = object::create ();
411	op->map = this; /* To handle buttons correctly */
412
413	while (int i = load_object (thawer, op, 0))
414	{	315	{
415	/* if the archetype for the object is null, means that we	316	coroapi::cede_to_tick (); // cede once in a while
416	* got an invalid object. Don't do anything with it - the game	317
417	* or editor will not be able to do anything with it either.	318	switch (f.kw)
418	*/
419	if (op->arch == NULL)
420	{	319	{
421	LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");	320	case KW_arch:
		321	if (object *op = object::read (f, this))
		322	{
		323	// TODO: why?
		324	if (op->inv)
		325	op->update_weight ();
		326
		327	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
		328	{
		329	// we insert manually because
		330	// a) its way faster
		331	// b) we remove manually, too, and there are good reasons for that
		332	// c) it's correct
		333	mapspace &ms = at (op->x, op->y);
		334
		335	op->flag [FLAG_REMOVED] = false;
		336
		337	op->above = 0;
		338	op->below = ms.top;
		339
		340	*(ms.top ? &ms.top->above : &ms.bot) = op;
		341
		342	ms.top = op;
		343	ms.flags_ = 0;
		344	}
		345	else
		346	{
		347	f.parse_warn (format ("object %s out of range", op->debug_desc ()));
		348	op->destroy ();
		349	}
		350	}
		351
422	continue;	352	continue;
423	}
424		353
425	switch (i)
426	{
427	case LL_NORMAL:
428	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ON_TOP \| INS_MAP_LOAD);
429
430	if (op->inv)
431	sum_weight (op);
432
433	prev = op, last_more = op;
434	break;
435
436	case LL_MORE:	354	case KW_EOF:
437	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ABOVE_FLOOR_ONLY);	355	return true;
438	op->head = prev, last_more->more = op, last_more = op;	356
		357	default:
		358	if (!f.parse_error ("map file"))
		359	return false;
439	break;	360	break;
440	}	361	}
441		362
442	op = object::create ();	363	f.next ();
443	op->map = this;
444	}
445
446	op->destroy ();
447
448	#if 0
449	for (i = 0; i < width; i++)
450	for (j = 0; j < height; j++)
451	{
452	unique = 0;
453	/* check for unique items, or unique squares */
454	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
455	{
456	if (QUERY_FLAG (otmp, FLAG_UNIQUE) \|\| QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
457	unique = 1;
458
459	if (!(mapflags & (MAP_OVERLAY \| MAP_PLAYER_UNIQUE) \|\| unique))
460	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
461	}
462	}	364	}
463	#endif
464		365
465	return true;	366	return true;
466	}	367	}
467		368
468	void	369	void
469	maptile::activate ()	370	maptile::activate ()
470	{	371	{
471	if (!spaces)	372	if (spaces)
472	return;
473
474	for (mapspace *ms = spaces + size (); ms-- > spaces; )	373	for (mapspace *ms = spaces + size (); ms-- > spaces; )
475	for (object *op = ms->bot; op; op = op->above)	374	for (object *op = ms->bot; op; op = op->above)
476	op->activate_recursive ();	375	op->activate_recursive ();
477	}	376	}
478		377
479	void	378	void
480	maptile::deactivate ()	379	maptile::deactivate ()
481	{	380	{
482	if (!spaces)	381	if (spaces)
483	return;
484
485	for (mapspace *ms = spaces + size (); ms-- > spaces; )	382	for (mapspace *ms = spaces + size (); ms-- > spaces; )
486	for (object *op = ms->bot; op; op = op->above)	383	for (object *op = ms->bot; op; op = op->above)
487	op->deactivate_recursive ();	384	op->deactivate_recursive ();
488	}	385	}
489		386
490	bool	387	bool
491	maptile::_save_objects (object_freezer &freezer, int flags)	388	maptile::_save_objects (object_freezer &f, int flags)
492	{	389	{
493	static int cede_count = 0;	390	coroapi::cede_to_tick ();
494		391
495	if (flags & IO_HEADER)	392	if (flags & IO_HEADER)
496	_save_header (freezer);	393	_save_header (f);
497		394
498	if (!spaces)	395	if (!spaces)
499	return false;	396	return false;
500		397
501	for (int i = 0; i < size (); ++i)	398	for (int i = 0; i < size (); ++i)
502	{	399	{
503	#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
504	if (cede_count >= 500)
505	{
506	cede_count = 0;
507	coroapi::cede ();
508	}
509	#endif
510
511	int unique = 0;	400	bool unique = 0;
		401
512	for (object *op = spaces [i].bot; op; op = op->above)	402	for (object *op = spaces [i].bot; op; op = op->above)
513	{	403	{
514	// count per-object, but cede only when modification-safe
515	cede_count++;
516
517	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])	404	unique \|= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
518	unique = 1;
519		405
520	if (!op->can_map_save ())	406	if (expect_false (!op->can_map_save ()))
521	continue;	407	continue;
522		408
523	if (unique \|\| op->flag [FLAG_UNIQUE])	409	if (expect_false (unique \|\| op->flag [FLAG_UNIQUE]))
524	{	410	{
525	if (flags & IO_UNIQUES)	411	if (flags & IO_UNIQUES)
526	save_object (freezer, op, 1);	412	op->write (f);
527	}	413	}
528	else if (flags & IO_OBJECTS)	414	else if (expect_true (flags & IO_OBJECTS))
529	save_object (freezer, op, 1);	415	op->write (f);
530	}	416	}
531	}	417	}
532		418
		419	coroapi::cede_to_tick ();
		420
533	return true;	421	return true;
534	}
535
536	bool
537	maptile::_load_objects (const char *path, bool skip_header)
538	{
539	object_thawer thawer (path);
540
541	if (!thawer)
542	return false;
543
544	if (skip_header)
545	for (;;)
546	{
547	keyword kw = thawer.get_kv ();
548
549	if (kw == KW_end)
550	break;
551
552	thawer.skip_kv (kw);
553	}
554
555	return _load_objects (thawer);
556	}	422	}
557		423
558	bool	424	bool
559	maptile::_save_objects (const char *path, int flags)	425	maptile::_save_objects (const char *path, int flags)
560	{	426	{
…		…
569	maptile::maptile ()	435	maptile::maptile ()
570	{	436	{
571	in_memory = MAP_SWAPPED;	437	in_memory = MAP_SWAPPED;
572		438
573	/* The maps used to pick up default x and y values from the	439	/* The maps used to pick up default x and y values from the
574	* map archetype. Mimic that behaviour.	440	* map archetype. Mimic that behaviour.
575	*/	441	*/
576	width = 16;	442	width = 16;
577	height = 16;	443	height = 16;
578	reset_timeout = 0;
579	timeout = 300;	444	timeout = 300;
580	enter_x = 0;	445	max_nrof = 1000; // 1000 items of anything
581	enter_y = 0;	446	max_volume = 2000000; // 2m³
582	}	447	}
583		448
584	maptile::maptile (int w, int h)	449	maptile::maptile (int w, int h)
585	{	450	{
586	in_memory = MAP_SWAPPED;	451	in_memory = MAP_SWAPPED;
…		…
692	return items;	557	return items;
693	}	558	}
694		559
695	/* opposite of parse string, this puts the string that was originally fed in to	560	/* opposite of parse string, this puts the string that was originally fed in to
696	* the map (or something equivilent) into output_string. */	561	* the map (or something equivilent) into output_string. */
697	static void	562	static const char *
698	print_shop_string (maptile m, char output_string)	563	print_shop_string (maptile *m)
699	{	564	{
700	int i;	565	static dynbuf_text buf; buf.clear ();
701	char tmp[MAX_BUF];
702		566
703	strcpy (output_string, "");
704	for (i = 0; i < m->shopitems[0].index; i++)	567	for (int i = 0; i < m->shopitems[0].index; i++)
705	{	568	{
706	if (m->shopitems[i].typenum)	569	if (m->shopitems[i].typenum)
707	{	570	{
708	if (m->shopitems[i].strength)	571	if (m->shopitems[i].strength)
709	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	572	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
710	else	573	else
711	sprintf (tmp, "%s;", m->shopitems[i].name);	574	buf.printf ("%s;", m->shopitems[i].name);
712	}	575	}
713	else	576	else
714	{	577	{
715	if (m->shopitems[i].strength)	578	if (m->shopitems[i].strength)
716	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	579	buf.printf ("*:%d;", m->shopitems[i].strength);
717	else	580	else
718	sprintf (tmp, "*");	581	buf.printf ("*");
719	}	582	}
720
721	strcat (output_string, tmp);
722	}	583	}
		584
		585	return buf;
723	}	586	}
724		587
725	/* This loads the header information of the map. The header	588	/* This loads the header information of the map. The header
726	* contains things like difficulty, size, timeout, etc.	589	* contains things like difficulty, size, timeout, etc.
727	* this used to be stored in the map object, but with the	590	* this used to be stored in the map object, but with the
…		…
736	bool	599	bool
737	maptile::_load_header (object_thawer &thawer)	600	maptile::_load_header (object_thawer &thawer)
738	{	601	{
739	for (;;)	602	for (;;)
740	{	603	{
741	keyword kw = thawer.get_kv ();
742
743	switch (kw)	604	switch (thawer.kw)
744	{	605	{
745	case KW_EOF:
746	LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
747	return false;
748
749	case KW_end:
750	return true;
751
752	default:
753	case KW_ERROR:
754	LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
755	break;
756
757	case KW_msg:	606	case KW_msg:
758	thawer.get_ml (KW_endmsg, msg);	607	thawer.get_ml (KW_endmsg, msg);
759	break;	608	break;
760		609
761	case KW_lore: // CF+ extension	610	case KW_lore: // CF+ extension
…		…
792	case KW_winddir: thawer.get (winddir); break;	641	case KW_winddir: thawer.get (winddir); break;
793	case KW_sky: thawer.get (sky); break;	642	case KW_sky: thawer.get (sky); break;
794		643
795	case KW_per_player: thawer.get (per_player); break;	644	case KW_per_player: thawer.get (per_player); break;
796	case KW_per_party: thawer.get (per_party); break;	645	case KW_per_party: thawer.get (per_party); break;
		646	case KW_no_reset: thawer.get (no_reset); break;
		647	case KW_no_drop: thawer.get (no_drop); break;
797		648
798	case KW_region: get_region_by_name (thawer.get_str ()); break;	649	case KW_region: default_region = region::find (thawer.get_str ()); break;
799	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	650	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
800		651
801	// old names new names	652	// old names new names
802	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;	653	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
803	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;	654	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
…		…
811		662
812	case KW_tile_path_1: thawer.get (tile_path [0]); break;	663	case KW_tile_path_1: thawer.get (tile_path [0]); break;
813	case KW_tile_path_2: thawer.get (tile_path [1]); break;	664	case KW_tile_path_2: thawer.get (tile_path [1]); break;
814	case KW_tile_path_3: thawer.get (tile_path [2]); break;	665	case KW_tile_path_3: thawer.get (tile_path [2]); break;
815	case KW_tile_path_4: thawer.get (tile_path [3]); break;	666	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		667
		668	case KW_ERROR:
		669	set_key_text (thawer.kw_str, thawer.value);
		670	break;
		671
		672	case KW_end:
		673	thawer.next ();
		674	return true;
		675
		676	default:
		677	if (!thawer.parse_error ("map", 0))
		678	return false;
		679	break;
816	}	680	}
		681
		682	thawer.next ();
817	}	683	}
818		684
819	abort ();	685	abort ();
820	}
821
822	bool
823	maptile::_load_header (const char *path)
824	{
825	object_thawer thawer (path);
826
827	if (!thawer)
828	return false;
829
830	return _load_header (thawer);
831	}	686	}
832		687
833	/******************************************************************************	688	/******************************************************************************
834	* This is the start of unique map handling code	689	* This is the start of unique map handling code
835	*****************************************************************************/	690	*****************************************************************************/
…		…
846	object *above = op->above;	701	object *above = op->above;
847		702
848	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	703	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
849	unique = 1;	704	unique = 1;
850		705
851	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	706	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))
852	{
853	op->destroy_inv (false);
854	op->destroy ();	707	op->destroy ();
855	}
856		708
857	op = above;	709	op = above;
858	}	710	}
859	}	711	}
860	}	712	}
…		…
870	if (name) MAP_OUT (name);	722	if (name) MAP_OUT (name);
871	MAP_OUT (swap_time);	723	MAP_OUT (swap_time);
872	MAP_OUT (reset_time);	724	MAP_OUT (reset_time);
873	MAP_OUT (reset_timeout);	725	MAP_OUT (reset_timeout);
874	MAP_OUT (fixed_resettime);	726	MAP_OUT (fixed_resettime);
		727	MAP_OUT (no_reset);
		728	MAP_OUT (no_drop);
875	MAP_OUT (difficulty);	729	MAP_OUT (difficulty);
876
877	if (region) MAP_OUT2 (region, region->name);	730	if (default_region) MAP_OUT2 (region, default_region->name);
878		731
879	if (shopitems)	732	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
880	{
881	char shop[MAX_BUF];
882	print_shop_string (this, shop);
883	MAP_OUT2 (shopitems, shop);
884	}
885
886	MAP_OUT (shopgreed);	733	MAP_OUT (shopgreed);
887	MAP_OUT (shopmin);	734	MAP_OUT (shopmin);
888	MAP_OUT (shopmax);	735	MAP_OUT (shopmax);
889	if (shoprace) MAP_OUT (shoprace);	736	if (shoprace) MAP_OUT (shoprace);
		737
890	MAP_OUT (darkness);	738	MAP_OUT (darkness);
891	MAP_OUT (width);	739	MAP_OUT (width);
892	MAP_OUT (height);	740	MAP_OUT (height);
893	MAP_OUT (enter_x);	741	MAP_OUT (enter_x);
894	MAP_OUT (enter_y);	742	MAP_OUT (enter_y);
…		…
933	* Remove and free all objects in the given map.	781	* Remove and free all objects in the given map.
934	*/	782	*/
935	void	783	void
936	maptile::clear ()	784	maptile::clear ()
937	{	785	{
938	if (!spaces)	786	if (spaces)
939	return;	787	{
940
941	for (mapspace *ms = spaces + size (); ms-- > spaces; )	788	for (mapspace *ms = spaces + size (); ms-- > spaces; )
942	while (object *op = ms->bot)	789	while (object *op = ms->bot)
943	{	790	{
		791	// manually remove, as to not trigger anything
		792	if (ms->bot = op->above)
		793	ms->bot->below = 0;
		794
		795	op->flag [FLAG_REMOVED] = true;
		796
		797	object *head = op->head_ ();
944	if (op->head)	798	if (op == head)
945	op = op->head;
946
947	op->destroy_inv (false);
948	op->destroy ();	799	op->destroy ();
		800	else if (head->map != op->map)
		801	{
		802	LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
		803	head->destroy ();
		804	}
		805	}
		806
		807	sfree0 (spaces, size ());
949	}	808	}
950
951	sfree (spaces, size ()), spaces = 0;
952		809
953	if (buttons)	810	if (buttons)
954	free_objectlinkpt (buttons), buttons = 0;	811	free_objectlinkpt (buttons), buttons = 0;
		812
		813	sfree0 (regions, size ());
		814	delete [] regionmap; regionmap = 0;
955	}	815	}
956		816
957	void	817	void
958	maptile::clear_header ()	818	maptile::clear_header ()
959	{	819	{
…		…
991	attachable::do_destroy ();	851	attachable::do_destroy ();
992		852
993	clear ();	853	clear ();
994	}	854	}
995		855
996	/*	856	/* decay and destroy perishable items in a map */
997	* Updates every button on the map (by calling update_button() for them).
998	*/
999	void	857	void
1000	maptile::update_buttons ()	858	maptile::do_decay_objects ()
1001	{	859	{
1002	for (oblinkpt *obp = buttons; obp; obp = obp->next)	860	if (!spaces)
1003	for (objectlink *ol = obp->link; ol; ol = ol->next)	861	return;
		862
		863	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		864	for (object above, op = ms->bot; op; op = above)
1004	{	865	{
1005	if (!ol->ob)	866	above = op->above;
		867
		868	bool destroy = 0;
		869
		870	// do not decay anything above unique floor tiles (yet :)
		871	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
		872	break;
		873
		874	if (QUERY_FLAG (op, FLAG_IS_FLOOR)
		875	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
		876	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
		877	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
		878	\|\| QUERY_FLAG (op, FLAG_UNPAID)
		879	\|\| op->is_alive ())
		880	; // do not decay
		881	else if (op->is_weapon ())
1006	{	882	{
1007	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",	883	op->stats.dam--;
1008	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);	884	if (op->stats.dam < 0)
1009	continue;	885	destroy = 1;
1010	}	886	}
1011		887	else if (op->is_armor ())
1012	if (ol->ob->type == BUTTON \|\| ol->ob->type == PEDESTAL)
1013	{	888	{
1014	update_button (ol->ob);	889	op->stats.ac--;
1015	break;	890	if (op->stats.ac < 0)
		891	destroy = 1;
1016	}	892	}
		893	else if (op->type == FOOD)
		894	{
		895	op->stats.food -= rndm (5, 20);
		896	if (op->stats.food < 0)
		897	destroy = 1;
		898	}
		899	else
		900	{
		901	int mat = op->materials;
		902
		903	if (mat & M_PAPER
		904	\|\| mat & M_LEATHER
		905	\|\| mat & M_WOOD
		906	\|\| mat & M_ORGANIC
		907	\|\| mat & M_CLOTH
		908	\|\| mat & M_LIQUID
		909	\|\| (mat & M_IRON && rndm (1, 5) == 1)
		910	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
		911	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
		912	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
		913	\|\| (mat & M_ICE && temp > 32))
		914	destroy = 1;
		915	}
		916
		917	/* adjust overall chance below */
		918	if (destroy && rndm (0, 1))
		919	op->destroy ();
1017	}	920	}
1018	}	921	}
1019		922
1020	/*	923	/*
1021	* This routine is supposed to find out the difficulty of the map.	924	* This routine is supposed to find out the difficulty of the map.
1022	* difficulty does not have a lot to do with character level,	925	* difficulty does not have a lot to do with character level,
1023	* but does have a lot to do with treasure on the map.	926	* but does have a lot to do with treasure on the map.
1024	*	927	*
1025	* Difficulty can now be set by the map creature. If the value stored	928	* Difficulty can now be set by the map creator. If the value stored
1026	* in the map is zero, then use this routine. Maps should really	929	* in the map is zero, then use this routine. Maps should really
1027	* have a difficulty set than using this function - human calculation	930	* have a difficulty set rather than using this function - human calculation
1028	* is much better than this functions guesswork.	931	* is much better than this function's guesswork.
1029	*/	932	*/
1030	int	933	int
1031	maptile::estimate_difficulty () const	934	maptile::estimate_difficulty () const
1032	{	935	{
1033	long monster_cnt = 0;	936	long monster_cnt = 0;
…		…
1045		948
1046	if (QUERY_FLAG (op, FLAG_GENERATOR))	949	if (QUERY_FLAG (op, FLAG_GENERATOR))
1047	{	950	{
1048	total_exp += op->stats.exp;	951	total_exp += op->stats.exp;
1049		952
1050	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))	953	if (archetype *at = op->other_arch)
		954	{
1051	total_exp += at->clone.stats.exp * 8;	955	total_exp += at->stats.exp * 8;
1052
1053	monster_cnt++;	956	monster_cnt++;
		957	}
		958
		959	for (object *inv = op->inv; inv; inv = inv->below)
		960	{
		961	total_exp += op->stats.exp * 8;
		962	monster_cnt++;
		963	}
1054	}	964	}
1055	}	965	}
1056		966
1057	avgexp = (double) total_exp / monster_cnt;	967	avgexp = (double) total_exp / monster_cnt;
1058		968
…		…
1071	* postive values make it darker, negative make it brighter	981	* postive values make it darker, negative make it brighter
1072	*/	982	*/
1073	int	983	int
1074	maptile::change_map_light (int change)	984	maptile::change_map_light (int change)
1075	{	985	{
1076	int new_level = darkness + change;
1077
1078	/* Nothing to do */	986	/* Nothing to do */
1079	if (!change \|\| (new_level <= 0 && darkness == 0) \|\| (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))	987	if (!change)
1080	return 0;	988	return 0;
1081		989
1082	/* inform all players on the map */	990	/* inform all players on the map */
1083	if (change > 0)	991	if (change > 0)
1084	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");	992	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");
1085	else	993	else
1086	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");	994	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");
1087		995
1088	/* Do extra checking. since darkness is a unsigned value,	996	darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1089	* we need to be extra careful about negative values.
1090	* In general, the checks below are only needed if change
1091	* is not +/-1
1092	*/
1093	if (new_level < 0)
1094	darkness = 0;
1095	else if (new_level >= MAX_DARKNESS)
1096	darkness = MAX_DARKNESS;
1097	else
1098	darkness = new_level;
1099		997
1100	/* All clients need to get re-updated for the change */	998	/* All clients need to get re-updated for the change */
1101	update_all_map_los (this);	999	update_all_map_los (this);
		1000
1102	return 1;	1001	return 1;
1103	}	1002	}
1104		1003
1105	/*	1004	/*
1106	* This function updates various attributes about a specific space	1005	* This function updates various attributes about a specific space
…		…
1109	* through, etc)	1008	* through, etc)
1110	*/	1009	*/
1111	void	1010	void
1112	mapspace::update_ ()	1011	mapspace::update_ ()
1113	{	1012	{
1114	object tmp, last = 0;	1013	object *last = 0;
1115	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;	1014	uint8 flags = P_UPTODATE, anywhere = 0;
1116	New_Face top, floor, *middle;	1015	sint8 light = 0;
1117	object top_obj, floor_obj, *middle_obj;
1118	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1016	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119		1017
1120	middle = blank_face;	1018	//object *middle = 0;
1121	top = blank_face;	1019	//object *top = 0;
1122	floor = blank_face;	1020	//object *floor = 0;
		1021	// this seems to generate better code than using locals, above
		1022	object *&top = faces_obj[0] = 0;
		1023	object *&middle = faces_obj[1] = 0;
		1024	object *&floor = faces_obj[2] = 0;
1123		1025
1124	middle_obj = 0;
1125	top_obj = 0;
1126	floor_obj = 0;
1127
1128	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)	1026	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1129	{	1027	{
1130	/* This could be made additive I guess (two lights better than	1028	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1131	* one). But if so, it shouldn't be a simple additive - 2
1132	* light bulbs do not illuminate twice as far as once since
1133	* it is a dissapation factor that is cubed.
1134	*/
1135	if (tmp->glow_radius > light)
1136	light = tmp->glow_radius;	1029	light += tmp->glow_radius;
1137		1030
1138	/* This call is needed in order to update objects the player	1031	/* This call is needed in order to update objects the player
1139	* is standing in that have animations (ie, grass, fire, etc).	1032	* is standing in that have animations (ie, grass, fire, etc).
1140	* However, it also causes the look window to be re-drawn	1033	* However, it also causes the look window to be re-drawn
1141	* 3 times each time the player moves, because many of the	1034	* 3 times each time the player moves, because many of the
…		…
1144	* Always put the player down for drawing.	1037	* Always put the player down for drawing.
1145	*/	1038	*/
1146	if (!tmp->invisible)	1039	if (!tmp->invisible)
1147	{	1040	{
1148	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1041	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))
1149	{
1150	top = tmp->face;
1151	top_obj = tmp;	1042	top = tmp;
1152	}
1153	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1043	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1154	{	1044	{
1155	/* If we got a floor, that means middle and top were below it,	1045	/* If we got a floor, that means middle and top were below it,
1156	* so should not be visible, so we clear them.	1046	* so should not be visible, so we clear them.
1157	*/	1047	*/
1158	middle = blank_face;	1048	middle = 0;
1159	top = blank_face;	1049	top = 0;
1160	floor = tmp->face;
1161	floor_obj = tmp;	1050	floor = tmp;
1162	}	1051	}
1163	/* Flag anywhere have high priority */	1052	/* Flag anywhere have high priority */
1164	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))	1053	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1165	{	1054	{
1166	middle = tmp->face;
1167
1168	middle_obj = tmp;	1055	middle = tmp;
1169	anywhere = 1;	1056	anywhere = 1;
1170	}	1057	}
		1058
1171	/* Find the highest visible face around. If equal	1059	/* Find the highest visible face around. If equal
1172	* visibilities, we still want the one nearer to the	1060	* visibilities, we still want the one nearer to the
1173	* top	1061	* top
1174	*/	1062	*/
1175	else if (middle == blank_face \|\| (tmp->face->visibility > middle->visibility && !anywhere))	1063	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1176	{
1177	middle = tmp->face;
1178	middle_obj = tmp;	1064	middle = tmp;
1179	}
1180	}	1065	}
1181		1066
1182	if (tmp == tmp->above)	1067	if (tmp == tmp->above)
1183	{	1068	{
1184	LOG (llevError, "Error in structure of map\n");	1069	LOG (llevError, "Error in structure of map\n");
…		…
1197	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1082	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1198	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;	1083	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1199	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;	1084	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1200	}	1085	}
1201		1086
1202	this->light = light;	1087	this->light = min (light, MAX_LIGHT_RADIUS);
1203	this->flags_ = flags;	1088	this->flags_ = flags;
1204	this->move_block = move_block & ~move_allow;	1089	this->move_block = move_block & ~move_allow;
1205	this->move_on = move_on;	1090	this->move_on = move_on;
1206	this->move_off = move_off;	1091	this->move_off = move_off;
1207	this->move_slow = move_slow;	1092	this->move_slow = move_slow;
…		…
1219	* middle face. This should not happen, as we already have the	1104	* middle face. This should not happen, as we already have the
1220	* else statement above so middle should not get set. OTOH, it	1105	* else statement above so middle should not get set. OTOH, it
1221	* may be possible for the faces to match but be different objects.	1106	* may be possible for the faces to match but be different objects.
1222	*/	1107	*/
1223	if (top == middle)	1108	if (top == middle)
1224	middle = blank_face;	1109	middle = 0;
1225		1110
1226	/* There are three posibilities at this point:	1111	/* There are three posibilities at this point:
1227	* 1) top face is set, need middle to be set.	1112	* 1) top face is set, need middle to be set.
1228	* 2) middle is set, need to set top.	1113	* 2) middle is set, need to set top.
1229	* 3) neither middle or top is set - need to set both.	1114	* 3) neither middle or top is set - need to set both.
1230	*/	1115	*/
1231		1116
1232	for (tmp = last; tmp; tmp = tmp->below)	1117	for (object *tmp = last; tmp; tmp = tmp->below)
1233	{	1118	{
1234	/* Once we get to a floor, stop, since we already have a floor object */	1119	/* Once we get to a floor, stop, since we already have a floor object */
1235	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1120	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1236	break;	1121	break;
1237		1122
1238	/* If two top faces are already set, quit processing */	1123	/* If two top faces are already set, quit processing */
1239	if ((top != blank_face) && (middle != blank_face))	1124	if (top && middle)
1240	break;	1125	break;
1241		1126
1242	/* Only show visible faces */	1127	/* Only show visible faces */
1243	if (!tmp->invisible)	1128	if (!tmp->invisible)
1244	{	1129	{
1245	/* Fill in top if needed */	1130	/* Fill in top if needed */
1246	if (top == blank_face)	1131	if (!top)
1247	{	1132	{
1248	top = tmp->face;
1249	top_obj = tmp;	1133	top = tmp;
1250	if (top == middle)	1134	if (top == middle)
1251	middle = blank_face;	1135	middle = 0;
1252	}	1136	}
1253	else	1137	else
1254	{	1138	{
1255	/* top is already set - we should only get here if	1139	/* top is already set - we should only get here if
1256	* middle is not set	1140	* middle is not set
1257	*	1141	*
1258	* Set the middle face and break out, since there is nothing	1142	* Set the middle face and break out, since there is nothing
1259	* more to fill in. We don't check visiblity here, since	1143	* more to fill in. We don't check visiblity here, since
1260	*	1144	*
1261	*/	1145	*/
1262	if (tmp->face != top)	1146	if (tmp != top)
1263	{	1147	{
1264	middle = tmp->face;
1265	middle_obj = tmp;	1148	middle = tmp;
1266	break;	1149	break;
1267	}	1150	}
1268	}	1151	}
1269	}	1152	}
1270	}	1153	}
1271		1154
1272	if (middle == floor)	1155	if (middle == floor)
1273	middle = blank_face;	1156	middle = 0;
1274		1157
1275	if (top == middle)	1158	if (top == middle)
1276	middle = blank_face;	1159	middle = 0;
1277		1160
1278	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;	1161	#if 0
1279	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;	1162	faces_obj [0] = top;
1280	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;	1163	faces_obj [1] = middle;
		1164	faces_obj [2] = floor;
		1165	#endif
1281	}	1166	}
1282		1167
1283	/* this updates the orig_map->tile_map[tile_num] value after finding	1168	uint64
1284	* the map. It also takes care of linking back the freshly found	1169	mapspace::volume () const
1285	* maps tile_map values if it tiles back to this one. It returns
1286	* the value of orig_map->tile_map[tile_num].
1287	*/
1288	static inline maptile *
1289	find_and_link (maptile *orig_map, int tile_num)
1290	{	1170	{
1291	maptile *mp = orig_map->tile_map [tile_num];	1171	uint64 vol = 0;
1292		1172
1293	if (!mp)	1173	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1294	{	1174	vol += op->volume ();
1295	mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1296		1175
1297	if (!mp)	1176	return vol;
1298	{	1177	}
1299	// emergency mode, manufacture a dummy map, this creates a memleak, but thats fine	1178
1300	LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",	1179	maptile *
1301	&orig_map->tile_path[tile_num], &orig_map->path);	1180	maptile::tile_available (int dir, bool load)
1302	mp = new maptile (1, 1);	1181	{
1303	mp->alloc ();	1182	if (tile_path[dir])
1304	mp->in_memory = MAP_IN_MEMORY;
1305	}
1306	}	1183	{
		1184	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))
		1185	return tile_map[dir];
1307		1186
1308	int dest_tile = (tile_num + 2) % 4;	1187	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
		1188	return tile_map[dir];
		1189	}
1309		1190
1310	orig_map->tile_map [tile_num] = mp;
1311
1312	// optimisation: back-link map to origin map if euclidean
1313	//TODO: non-euclidean maps MUST GO
1314	if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1315	orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1316
1317	return mp;	1191	return 0;
1318	}
1319
1320	static inline void
1321	load_and_link (maptile *orig_map, int tile_num)
1322	{
1323	find_and_link (orig_map, tile_num)->load_sync ();
1324	}	1192	}
1325		1193
1326	/* this returns TRUE if the coordinates (x,y) are out of	1194	/* this returns TRUE if the coordinates (x,y) are out of
1327	* map m. This function also takes into account any	1195	* map m. This function also takes into account any
1328	* tiling considerations, loading adjacant maps as needed.	1196	* tiling considerations, loading adjacant maps as needed.
…		…
1341	if (!m)	1209	if (!m)
1342	return 0;	1210	return 0;
1343		1211
1344	if (x < 0)	1212	if (x < 0)
1345	{	1213	{
1346	if (!m->tile_path[3])	1214	if (!m->tile_available (3))
1347	return 1;	1215	return 1;
1348		1216
1349	if (!m->tile_map[3] \|\| m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1350	find_and_link (m, 3);
1351
1352	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1217	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1353	}	1218	}
1354		1219
1355	if (x >= m->width)	1220	if (x >= m->width)
1356	{	1221	{
1357	if (!m->tile_path[1])	1222	if (!m->tile_available (1))
1358	return 1;	1223	return 1;
1359		1224
1360	if (!m->tile_map[1] \|\| m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1361	find_and_link (m, 1);
1362
1363	return out_of_map (m->tile_map[1], x - m->width, y);	1225	return out_of_map (m->tile_map[1], x - m->width, y);
1364	}	1226	}
1365		1227
1366	if (y < 0)	1228	if (y < 0)
1367	{	1229	{
1368	if (!m->tile_path[0])	1230	if (!m->tile_available (0))
1369	return 1;	1231	return 1;
1370		1232
1371	if (!m->tile_map[0] \|\| m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1372	find_and_link (m, 0);
1373
1374	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1233	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1375	}	1234	}
1376		1235
1377	if (y >= m->height)	1236	if (y >= m->height)
1378	{	1237	{
1379	if (!m->tile_path[2])	1238	if (!m->tile_available (2))
1380	return 1;	1239	return 1;
1381
1382	if (!m->tile_map[2] \|\| m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1383	find_and_link (m, 2);
1384		1240
1385	return out_of_map (m->tile_map[2], x, y - m->height);	1241	return out_of_map (m->tile_map[2], x, y - m->height);
1386	}	1242	}
1387		1243
1388	/* Simple case - coordinates are within this local	1244	/* Simple case - coordinates are within this local
…		…
1402	maptile *	1258	maptile *
1403	maptile::xy_find (sint16 &x, sint16 &y)	1259	maptile::xy_find (sint16 &x, sint16 &y)
1404	{	1260	{
1405	if (x < 0)	1261	if (x < 0)
1406	{	1262	{
1407	if (!tile_path[3])	1263	if (!tile_available (3))
1408	return 0;	1264	return 0;
1409		1265
1410	find_and_link (this, 3);
1411	x += tile_map[3]->width;	1266	x += tile_map[3]->width;
1412	return tile_map[3]->xy_find (x, y);	1267	return tile_map[3]->xy_find (x, y);
1413	}	1268	}
1414		1269
1415	if (x >= width)	1270	if (x >= width)
1416	{	1271	{
1417	if (!tile_path[1])	1272	if (!tile_available (1))
1418	return 0;	1273	return 0;
1419		1274
1420	find_and_link (this, 1);
1421	x -= width;	1275	x -= width;
1422	return tile_map[1]->xy_find (x, y);	1276	return tile_map[1]->xy_find (x, y);
1423	}	1277	}
1424		1278
1425	if (y < 0)	1279	if (y < 0)
1426	{	1280	{
1427	if (!tile_path[0])	1281	if (!tile_available (0))
1428	return 0;	1282	return 0;
1429		1283
1430	find_and_link (this, 0);
1431	y += tile_map[0]->height;	1284	y += tile_map[0]->height;
1432	return tile_map[0]->xy_find (x, y);	1285	return tile_map[0]->xy_find (x, y);
1433	}	1286	}
1434		1287
1435	if (y >= height)	1288	if (y >= height)
1436	{	1289	{
1437	if (!tile_path[2])	1290	if (!tile_available (2))
1438	return 0;	1291	return 0;
1439		1292
1440	find_and_link (this, 2);
1441	y -= height;	1293	y -= height;
1442	return tile_map[2]->xy_find (x, y);	1294	return tile_map[2]->xy_find (x, y);
1443	}	1295	}
1444		1296
1445	/* Simple case - coordinates are within this local	1297	/* Simple case - coordinates are within this local
…		…
1450		1302
1451	/**	1303	/**
1452	* Return whether map2 is adjacent to map1. If so, store the distance from	1304	* Return whether map2 is adjacent to map1. If so, store the distance from
1453	* map1 to map2 in dx/dy.	1305	* map1 to map2 in dx/dy.
1454	*/	1306	*/
1455	static int	1307	int
1456	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1308	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)
1457	{	1309	{
1458	if (!map1 \|\| !map2)	1310	if (!map1 \|\| !map2)
1459	return 0;	1311	return 0;
1460		1312
1461	//TODO: this doesn't actually check corretcly when intermediate maps are not loaded	1313	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
1462	//fix: compare paths instead (this is likely faster, too!)	1314	//fix: compare paths instead (this is likely faster, too!)
1463	if (map1 == map2)	1315	if (map1 == map2)
1464	{	1316	{
1465	*dx = 0;	1317	*dx = 0;
1466	*dy = 0;	1318	*dy = 0;
…		…
1551	/* From map.c	1403	/* From map.c
1552	* This is used by get_player to determine where the other	1404	* This is used by get_player to determine where the other
1553	* creature is. get_rangevector takes into account map tiling,	1405	* creature is. get_rangevector takes into account map tiling,
1554	* so you just can not look the the map coordinates and get the	1406	* so you just can not look the the map coordinates and get the
1555	* righte value. distance_x/y are distance away, which	1407	* righte value. distance_x/y are distance away, which
1556	* can be negativbe. direction is the crossfire direction scheme	1408	* can be negative. direction is the crossfire direction scheme
1557	* that the creature should head. part is the part of the	1409	* that the creature should head. part is the part of the
1558	* monster that is closest.	1410	* monster that is closest.
1559	*	1411	*
1560	* get_rangevector looks at op1 and op2, and fills in the	1412	* get_rangevector looks at op1 and op2, and fills in the
1561	* structure for op1 to get to op2.	1413	* structure for op1 to get to op2.
…		…
1572	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1424	get_rangevector (object op1, object op2, rv_vector * retval, int flags)
1573	{	1425	{
1574	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1426	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1575	{	1427	{
1576	/* be conservative and fill in _some_ data */	1428	/* be conservative and fill in _some_ data */
1577	retval->distance = 100000;	1429	retval->distance = 10000;
1578	retval->distance_x = 32767;	1430	retval->distance_x = 10000;
1579	retval->distance_y = 32767;	1431	retval->distance_y = 10000;
1580	retval->direction = 0;	1432	retval->direction = 0;
1581	retval->part = 0;	1433	retval->part = 0;
1582	}	1434	}
1583	else	1435	else
1584	{	1436	{
…		…
1589		1441
1590	best = op1;	1442	best = op1;
1591	/* If this is multipart, find the closest part now */	1443	/* If this is multipart, find the closest part now */
1592	if (!(flags & 0x1) && op1->more)	1444	if (!(flags & 0x1) && op1->more)
1593	{	1445	{
1594	object *tmp;
1595	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1446	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1596		1447
1597	/* we just take the offset of the piece to head to figure	1448	/* we just take the offset of the piece to head to figure
1598	* distance instead of doing all that work above again	1449	* distance instead of doing all that work above again
1599	* since the distance fields we set above are positive in the	1450	* since the distance fields we set above are positive in the
1600	* same axis as is used for multipart objects, the simply arithmetic	1451	* same axis as is used for multipart objects, the simply arithmetic
1601	* below works.	1452	* below works.
1602	*/	1453	*/
1603	for (tmp = op1->more; tmp != NULL; tmp = tmp->more)	1454	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1604	{	1455	{
1605	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1456	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1606	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1457	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1607	if (tmpi < best_distance)	1458	if (tmpi < best_distance)
1608	{	1459	{
…		…
1617	retval->distance_y += op1->y - best->y;	1468	retval->distance_y += op1->y - best->y;
1618	}	1469	}
1619	}	1470	}
1620		1471
1621	retval->part = best;	1472	retval->part = best;
1622	retval->distance = idistance (retval->distance_x, retval->distance_y);	1473	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1623	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1474	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1624	}	1475	}
1625	}	1476	}
1626		1477
1627	/* this is basically the same as get_rangevector above, but instead of	1478	/* this is basically the same as get_rangevector above, but instead of
…		…
1632	* flags has no meaning for this function at this time - I kept it in to	1483	* flags has no meaning for this function at this time - I kept it in to
1633	* be more consistant with the above function and also in case they are needed	1484	* be more consistant with the above function and also in case they are needed
1634	* for something in the future. Also, since no object is pasted, the best	1485	* for something in the future. Also, since no object is pasted, the best
1635	* field of the rv_vector is set to NULL.	1486	* field of the rv_vector is set to NULL.
1636	*/	1487	*/
1637
1638	void	1488	void
1639	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector * retval, int flags)	1489	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1640	{	1490	{
1641	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1491	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1642	{	1492	{
1643	/* be conservative and fill in _some_ data */	1493	/* be conservative and fill in _some_ data */
1644	retval->distance = 100000;	1494	retval->distance = 100000;
…		…
1650	else	1500	else
1651	{	1501	{
1652	retval->distance_x += op2->x - x;	1502	retval->distance_x += op2->x - x;
1653	retval->distance_y += op2->y - y;	1503	retval->distance_y += op2->y - y;
1654		1504
1655	retval->part = NULL;	1505	retval->part = 0;
1656	retval->distance = idistance (retval->distance_x, retval->distance_y);	1506	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1657	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1507	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1658	}	1508	}
1659	}	1509	}
1660		1510
1661	/* Returns true of op1 and op2 are effectively on the same map	1511	/* Returns true of op1 and op2 are effectively on the same map
…		…
1675	}	1525	}
1676		1526
1677	object *	1527	object *
1678	maptile::insert (object op, int x, int y, object originator, int flags)	1528	maptile::insert (object op, int x, int y, object originator, int flags)
1679	{	1529	{
1680	if (!op->flag [FLAG_REMOVED])
1681	op->remove ();
1682
1683	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1530	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1684	}	1531	}
1685		1532
		1533	region *
		1534	maptile::region (int x, int y) const
		1535	{
		1536	if (regions
		1537	&& regionmap
		1538	&& !OUT_OF_REAL_MAP (this, x, y))
		1539	if (struct region reg = regionmap [regions [y width + x]])
		1540	return reg;
		1541
		1542	if (default_region)
		1543	return default_region;
		1544
		1545	return ::region::default_region ();
		1546	}
		1547
		1548	/* picks a random object from a style map.
		1549	*/
		1550	object *
		1551	maptile::pick_random_object (rand_gen &gen) const
		1552	{
		1553	/* while returning a null object will result in a crash, that
		1554	* is actually preferable to an infinite loop. That is because
		1555	* most servers will automatically restart in case of crash.
		1556	* Change the logic on getting the random space - shouldn't make
		1557	* any difference, but this seems clearer to me.
		1558	*/
		1559	for (int i = 1000; --i;)
		1560	{
		1561	object *pick = at (gen (width), gen (height)).bot;
		1562
		1563	// do not prefer big monsters just because they are big.
		1564	if (pick && pick->is_head ())
		1565	return pick->head_ ();
		1566	}
		1567
		1568	// instead of crashing in the unlikely(?) case, try to return something
		1569	return archetype::find ("bug");
		1570	}
		1571
		1572	void
		1573	maptile::play_sound (faceidx sound, int x, int y) const
		1574	{
		1575	if (!sound)
		1576	return;
		1577
		1578	for_all_players_on_map (pl, this)
		1579	if (client *ns = pl->ns)
		1580	{
		1581	int dx = x - pl->ob->x;
		1582	int dy = y - pl->ob->y;
		1583
		1584	int distance = idistance (dx, dy);
		1585
		1586	if (distance <= MAX_SOUND_DISTANCE)
		1587	ns->play_sound (sound, dx, dy);
		1588	}
		1589	}
		1590
		1591	void
		1592	maptile::say_msg (const char *msg, int x, int y) const
		1593	{
		1594	for_all_players (pl)
		1595	if (client *ns = pl->ns)
		1596	{
		1597	int dx = x - pl->ob->x;
		1598	int dy = y - pl->ob->y;
		1599
		1600	int distance = idistance (dx, dy);
		1601
		1602	if (distance <= MAX_SOUND_DISTANCE)
		1603	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
		1604	}
		1605	}
		1606
		1607	static void
		1608	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
		1609	{
		1610	// clip to map to the left
		1611	if (x0 < 0)
		1612	{
		1613	if (maptile *tile = m->tile_available (TILE_LEFT, 1))
		1614	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
		1615
		1616	if (x1 < 0) // entirely to the left
		1617	return;
		1618
		1619	x0 = 0;
		1620	}
		1621
		1622	// clip to map to the right
		1623	if (x1 > m->width)
		1624	{
		1625	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
		1626	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
		1627
		1628	if (x0 > m->width) // entirely to the right
		1629	return;
		1630
		1631	x1 = m->width;
		1632	}
		1633
		1634	// clip to map above
		1635	if (y0 < 0)
		1636	{
		1637	if (maptile *tile = m->tile_available (TILE_UP, 1))
		1638	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
		1639
		1640	if (y1 < 0) // entirely above
		1641	return;
		1642
		1643	y0 = 0;
		1644	}
		1645
		1646	// clip to map below
		1647	if (y1 > m->height)
		1648	{
		1649	if (maptile *tile = m->tile_available (TILE_DOWN, 1))
		1650	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
		1651
		1652	if (y0 > m->height) // entirely below
		1653	return;
		1654
		1655	y1 = m->height;
		1656	}
		1657
		1658	// if we get here, the rect is within the current map
		1659	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1660
		1661	r->m = m;
		1662	r->x0 = x0;
		1663	r->y0 = y0;
		1664	r->x1 = x1;
		1665	r->y1 = y1;
		1666	r->dx = dx;
		1667	r->dy = dy;
		1668	}
		1669
		1670	maprect *
		1671	maptile::split_to_tiles (int x0, int y0, int x1, int y1)
		1672	{
		1673	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
		1674	buf.clear ();
		1675
		1676	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
		1677
		1678	// add end marker
		1679	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1680	r->m = 0;
		1681
		1682	return (maprect *)buf.linearise ();
		1683	}
		1684

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.76 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs. Revision 1.166 by root, Wed Oct 21 00:44:39 2009 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.76 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.166 by root, Wed Oct 21 00:44:39 2009 UTC