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.33 by root, Sun Oct 8 16:51:50 2006 UTC vs.
Revision 1.54 by root, Wed Dec 27 13:13:46 2006 UTC

…		…
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24
25	#include <global.h>	24	#include <global.h>
26	#include <funcpoint.h>	25	#include <funcpoint.h>
27		26
28	#include <loader.h>	27	#include <loader.h>
29	#ifndef WIN32 /* ---win32 exclude header */
30	# include <unistd.h>	28	#include <unistd.h>
31	#endif /* win32 */
32		29
33	#include "path.h"	30	#include "path.h"
34
35		31
36	/*	32	/*
37	* Returns the maptile which has a name matching the given argument.	33	* Returns the maptile which has a name matching the given argument.
38	* return NULL if no match is found.	34	* return NULL if no match is found.
39	*/	35	*/
40
41	maptile *	36	maptile *
42	has_been_loaded (const char *name)	37	has_been_loaded (const char *name)
43	{	38	{
44	maptile *map;
45
46	if (!name || !*name)	39	if (!name || !*name)
47	return 0;	40	return 0;
48	for (map = first_map; map; map = map->next)	41
		42	for_all_maps (map)
49	if (!strcmp (name, map->path))	43	if (!strcmp (name, map->path))
50	break;
51	return (map);	44	return map;
		45
		46	return 0;
52	}	47	}
53		48
54	/*	49	/*
55	* This makes a path absolute outside the world of Crossfire.	50	* This makes a path absolute outside the world of Crossfire.
56	* In other words, it prepends LIBDIR/MAPDIR/ to the given path	51	* In other words, it prepends LIBDIR/MAPDIR/ to the given path
…		…
157	int	152	int
158	check_path (const char *name, int prepend_dir)	153	check_path (const char *name, int prepend_dir)
159	{	154	{
160	char buf[MAX_BUF];	155	char buf[MAX_BUF];
161		156
162	#ifndef WIN32
163	char *endbuf;	157	char *endbuf;
164	struct stat statbuf;	158	struct stat statbuf;
165	int mode = 0;	159	int mode = 0;
166	#endif
167		160
168	if (prepend_dir)	161	if (prepend_dir)
169	strcpy (buf, create_pathname (name));	162	strcpy (buf, create_pathname (name));
170	else	163	else
171	strcpy (buf, name);	164	strcpy (buf, name);
172	#ifdef WIN32 /* ***win32: check this sucker in windows style. */
173	return (_access (buf, 0));
174	#else
175		165
176	/* old method (strchr(buf, '\0')) seemd very odd to me -	166	/* old method (strchr(buf, '\0')) seemd very odd to me -
177	* this method should be equivalant and is clearer.	167	* this method should be equivalant and is clearer.
178	* Can not use strcat because we need to cycle through	168	* Can not use strcat because we need to cycle through
179	* all the names.	169	* all the names.
…		…
192	if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||	182	if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
193	(statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))	183	(statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
194	mode |= 2;	184	mode |= 2;
195		185
196	return (mode);	186	return (mode);
197	#endif
198	}	187	}
199		188
200	/*	189	/*
201	* Prints out debug-information about a map.	190	* Prints out debug-information about a map.
202	* Dumping these at llevError doesn't seem right, but is	191	* Dumping these at llevError doesn't seem right, but is
…		…
205		194
206	void	195	void
207	dump_map (const maptile *m)	196	dump_map (const maptile *m)
208	{	197	{
209	LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);	198	LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
210	LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m));	199	LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
211		200
212	if (m->msg != NULL)	201	if (m->msg != NULL)
213	LOG (llevError, "Message:\n%s", m->msg);	202	LOG (llevError, "Message:\n%s", m->msg);
214		203
215	if (m->maplore != NULL)	204	if (m->maplore != NULL)
…		…
229	*/	218	*/
230		219
231	void	220	void
232	dump_all_maps (void)	221	dump_all_maps (void)
233	{	222	{
234	maptile *m;	223	for_all_maps (m)
235
236	for (m = first_map; m != NULL; m = m->next)
237	{
238	dump_map (m);	224	dump_map (m);
239	}
240	}	225	}
241		226
242	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	227	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
243	* one function that just returns a P_.. value (see map.h)	228	* one function that just returns a P_.. value (see map.h)
244	* it will also do map translation for tiled maps, returning	229	* it will also do map translation for tiled maps, returning
…		…
248	* is needed. The case of not passing values is if we're just	233	* is needed. The case of not passing values is if we're just
249	* checking for the existence of something on those spaces, but	234	* checking for the existence of something on those spaces, but
250	* don't expect to insert/remove anything from those spaces.	235	* don't expect to insert/remove anything from those spaces.
251	*/	236	*/
252	int	237	int
253	get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny)	238	get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
254	{	239	{
255	sint16 newx, newy;	240	sint16 newx, newy;
256	int retval = 0;	241	int retval = 0;
257	maptile *mp;	242	maptile *mp;
258		243
259	if (out_of_map (oldmap, x, y))
260	return P_OUT_OF_MAP;
261	newx = x;	244	newx = x;
262	newy = y;	245	newy = y;
		246
263	mp = get_map_from_coord (oldmap, &newx, &newy);	247	mp = get_map_from_coord (oldmap, &newx, &newy);
		248
		249	if (!mp)
		250	return P_OUT_OF_MAP;
		251
264	if (mp != oldmap)	252	if (mp != oldmap)
265	retval |= P_NEW_MAP;	253	retval |= P_NEW_MAP;
266	if (newmap)
267	*newmap = mp;
268	if (nx)
269	*nx = newx;
270	if (ny)
271	*ny = newy;
272		254
273	retval |= mp->spaces[newx + mp->width * newy].flags;	255	if (newmap) *newmap = mp;
		256	if (nx) *nx = newx;
		257	if (ny) *ny = newy;
274		258
275	return retval;	259	return retval | mp->at (newx, newy).flags ();
276	}	260	}
277		261
278	/*	262	/*
279	* Returns true if the given coordinate is blocked except by the	263	* Returns true if the given coordinate is blocked except by the
280	* object passed is not blocking. This is used with	264	* object passed is not blocking. This is used with
…		…
303	}	287	}
304		288
305	/* Save some cycles - instead of calling get_map_flags(), just get the value	289	/* Save some cycles - instead of calling get_map_flags(), just get the value
306	* directly.	290	* directly.
307	*/	291	*/
308	mflags = m->spaces[sx + m->width * sy].flags;	292	mflags = m->at (sx, sy).flags ();
309		293
310	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	294	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
311		295
312	/* If space is currently not blocked by anything, no need to	296	/* If space is currently not blocked by anything, no need to
313	* go further. Not true for players - all sorts of special	297	* go further. Not true for players - all sorts of special
…		…
332	/* We basically go through the stack of objects, and if there is	316	/* We basically go through the stack of objects, and if there is
333	* some other object that has NO_PASS or FLAG_ALIVE set, return	317	* some other object that has NO_PASS or FLAG_ALIVE set, return
334	* true. If we get through the entire stack, that must mean	318	* true. If we get through the entire stack, that must mean
335	* ob is blocking it, so return 0.	319	* ob is blocking it, so return 0.
336	*/	320	*/
337	for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above)	321	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
338	{	322	{
339		323
340	/* This must be before the checks below. Code for inventory checkers. */	324	/* This must be before the checks below. Code for inventory checkers. */
341	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))	325	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
342	{	326	{
…		…
406	*	390	*
407	* Note this used to be arch_blocked, but with new movement	391	* Note this used to be arch_blocked, but with new movement
408	* code, we need to have actual object to check its move_type	392	* code, we need to have actual object to check its move_type
409	* against the move_block values.	393	* against the move_block values.
410	*/	394	*/
411
412	int	395	int
413	ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)	396	ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
414	{	397	{
415	archetype *tmp;	398	archetype *tmp;
416	int flag;	399	int flag;
…		…
422	flag = get_map_flags (m, &m1, x, y, &sx, &sy);	405	flag = get_map_flags (m, &m1, x, y, &sx, &sy);
423	if (flag & P_OUT_OF_MAP)	406	if (flag & P_OUT_OF_MAP)
424	return P_OUT_OF_MAP;	407	return P_OUT_OF_MAP;
425		408
426	/* don't have object, so don't know what types would block */	409	/* don't have object, so don't know what types would block */
427	return (GET_MAP_MOVE_BLOCK (m1, sx, sy));	410	return m1->at (sx, sy).move_block;
428	}	411	}
429		412
430	for (tmp = ob->arch; tmp != NULL; tmp = tmp->more)	413	for (tmp = ob->arch; tmp; tmp = tmp->more)
431	{	414	{
432	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);	415	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
433		416
434	if (flag & P_OUT_OF_MAP)	417	if (flag & P_OUT_OF_MAP)
435	return P_OUT_OF_MAP;	418	return P_OUT_OF_MAP;
436	if (flag & P_IS_ALIVE)	419	if (flag & P_IS_ALIVE)
437	return P_IS_ALIVE;	420	return P_IS_ALIVE;
438		421
		422	mapspace &ms = m1->at (sx, sy);
		423
		424
439	/* find_first_free_spot() calls this function. However, often	425	/* find_first_free_spot() calls this function. However, often
440	* ob doesn't have any move type (when used to place exits)	426	* ob doesn't have any move type (when used to place exits)
441	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	427	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
442	*/	428	*/
443		429
444	if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL)	430	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
445	continue;	431	continue;
446		432
447	/* Note it is intentional that we check ob - the movement type of the	433	/* Note it is intentional that we check ob - the movement type of the
448	* head of the object should correspond for the entire object.	434	* head of the object should correspond for the entire object.
449	*/	435	*/
450	if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy)))	436	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
451	return AB_NO_PASS;	437	return P_NO_PASS;
452
453	}	438	}
		439
454	return 0;	440	return 0;
455	}	441	}
456		442
457	/* When the map is loaded, load_object does not actually insert objects	443	/* When the map is loaded, load_object does not actually insert objects
458	* into inventory, but just links them. What this does is go through	444	* into inventory, but just links them. What this does is go through
…		…
485	* for objects whose arch says they are multipart yet according to the	471	* for objects whose arch says they are multipart yet according to the
486	* info we have, they only have the head (as would be expected when	472	* info we have, they only have the head (as would be expected when
487	* they are saved). We do have to look for the old maps that did save	473	* they are saved). We do have to look for the old maps that did save
488	* the more sections and not re-add sections for them.	474	* the more sections and not re-add sections for them.
489	*/	475	*/
490
491	static void	476	static void
492	link_multipart_objects (maptile *m)	477	link_multipart_objects (maptile *m)
493	{	478	{
494	int x, y;	479	int x, y;
495	object *tmp, *op, *last, *above;	480	object *tmp, *op, *last, *above;
496	archetype *at;	481	archetype *at;
497		482
498	for (x = 0; x < MAP_WIDTH (m); x++)	483	for (x = 0; x < m->width; x++)
499	for (y = 0; y < MAP_HEIGHT (m); y++)	484	for (y = 0; y < m->height; y++)
500	for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)	485	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
501	{	486	{
502	above = tmp->above;	487	above = tmp->above;
503		488
504	/* already multipart - don't do anything more */	489	/* already multipart - don't do anything more */
505	if (tmp->head || tmp->more)	490	if (tmp->head || tmp->more)
…		…
540	{	525	{
541	int i, j;	526	int i, j;
542	int unique;	527	int unique;
543	object *op, *prev = NULL, *last_more = NULL, *otmp;	528	object *op, *prev = NULL, *last_more = NULL, *otmp;
544		529
545	op = get_object ();	530	op = object::create ();
546	op->map = m; /* To handle buttons correctly */	531	op->map = m; /* To handle buttons correctly */
547		532
548	while ((i = load_object (fp, op, mapflags)))	533	while ((i = load_object (fp, op, mapflags)))
549	{	534	{
550	/* if the archetype for the object is null, means that we	535	/* if the archetype for the object is null, means that we
…		…
555	{	540	{
556	LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");	541	LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
557	continue;	542	continue;
558	}	543	}
559		544
560
561	switch (i)	545	switch (i)
562	{	546	{
563	case LL_NORMAL:	547	case LL_NORMAL:
564	/* if we are loading an overlay, put the floors on the bottom */	548	/* if we are loading an overlay, put the floors on the bottom */
565	if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)	549	if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
566	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);	550	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
567	else	551	else
568	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);	552	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
569		553
570	if (op->inv)	554	if (op->inv)
571	sum_weight (op);	555	sum_weight (op);
572		556
573	prev = op, last_more = op;	557	prev = op, last_more = op;
574	break;	558	break;
575		559
576	case LL_MORE:	560	case LL_MORE:
577	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);	561	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
578	op->head = prev, last_more->more = op, last_more = op;	562	op->head = prev, last_more->more = op, last_more = op;
579	break;	563	break;
580	}	564	}
581		565
582	if (mapflags & MAP_STYLE)	566	if (mapflags & MAP_STYLE)
583	remove_from_active_list (op);	567	remove_from_active_list (op);
584		568
585	op = get_object ();	569	op = object::create ();
586	op->map = m;	570	op->map = m;
587	}	571	}
588		572
589	for (i = 0; i < m->width; i++)	573	for (i = 0; i < m->width; i++)
590	{	574	{
591	for (j = 0; j < m->height; j++)	575	for (j = 0; j < m->height; j++)
592	{	576	{
593	unique = 0;	577	unique = 0;
594	/* check for unique items, or unique squares */	578	/* check for unique items, or unique squares */
595	for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above)	579	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
596	{	580	{
597	if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))	581	if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
598	unique = 1;	582	unique = 1;
		583
599	if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))	584	if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
600	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);	585	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
601	}	586	}
602	}	587	}
603	}	588	}
604		589
605	free_object (op);	590	op->destroy ();
606	link_multipart_objects (m);	591	link_multipart_objects (m);
607	}	592	}
608		593
609	/* This saves all the objects on the map in a non destructive fashion.	594	/* This saves all the objects on the map in a non destructive fashion.
610	* Modified by MSW 2001-07-01 to do in a single pass - reduces code,	595	* Modified by MSW 2001-07-01 to do in a single pass - reduces code,
611	* and we only save the head of multi part objects - this is needed	596	* and we only save the head of multi part objects - this is needed
612	* in order to do map tiling properly.	597	* in order to do map tiling properly.
613	*/	598	*/
614	void	599	void
615	save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag)	600	save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
616	{	601	{
617	int i, j = 0, unique = 0;	602	int i, j = 0, unique = 0;
618	object *op;	603	object *op;
619		604
620	/* first pass - save one-part objects */	605	/* first pass - save one-part objects */
621	for (i = 0; i < MAP_WIDTH (m); i++)	606	for (i = 0; i < m->width; i++)
622	for (j = 0; j < MAP_HEIGHT (m); j++)	607	for (j = 0; j < m->height; j++)
623	{	608	{
624	unique = 0;	609	unique = 0;
		610
625	for (op = get_map_ob (m, i, j); op; op = op->above)	611	for (op = m->at (i, j).bot; op; op = op->above)
626	{	612	{
627	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	613	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
628	unique = 1;	614	unique = 1;
629		615
630	if (op->type == PLAYER)	616	if (!op->can_map_save ())
631	{
632	LOG (llevDebug, "Player on map that is being saved\n");
633	continue;
634	}
635
636	if (op->head || op->owner)
637	continue;	617	continue;
638		618
639	if (unique || QUERY_FLAG (op, FLAG_UNIQUE))	619	if (unique || op->flag [FLAG_UNIQUE])
640	save_object (fp2, op, 3);	620	save_object (fp2, op, 1);
641	else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID))))	621	else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
642	save_object (fp, op, 3);	622	save_object (fp, op, 1);
		623	}
		624	}
		625	}
643		626
644	} /* for this space */	627	maptile::maptile ()
645	} /* for this j */	628	{
		629	in_memory = MAP_SWAPPED;
		630
		631	/* The maps used to pick up default x and y values from the
		632	* map archetype. Mimic that behaviour.
		633	*/
		634	width = 16;
		635	height = 16;
		636	reset_timeout = 0;
		637	timeout = 300;
		638	enter_x = 0;
		639	enter_y = 0;
		640	/*set part to -1 indicating conversion to weather map not yet done */
		641	worldpartx = -1;
		642	worldparty = -1;
		643	}
		644
		645	void
		646	maptile::link ()
		647	{
		648	next = first_map;
		649	first_map = this;
		650	}
		651
		652	void
		653	maptile::unlink ()
		654	{
		655	if (first_map == this)
		656	first_map = next;
		657	else
		658	for_all_maps (m)
		659	if (m->next = this)
		660	{
		661	m->next = next;
		662	break;
		663	}
646	}	664	}
647		665
648	/*	666	/*
649	* Allocates, initialises, and returns a pointer to a maptile.	667	* Allocates, initialises, and returns a pointer to a maptile.
650	* Modified to no longer take a path option which was not being	668	* Modified to no longer take a path option which was not being
651	* used anyways. MSW 2001-07-01	669	* used anyways. MSW 2001-07-01
652	*/	670	*/
653
654	maptile *	671	maptile *
655	get_linked_map (void)	672	get_linked_map (void)
656	{	673	{
657	maptile *map = new maptile;	674	maptile *map = new maptile;
658	maptile *mp;	675	map->link ();
659
660	for (mp = first_map; mp != NULL && mp->next != NULL; mp = mp->next);
661	if (mp == NULL)
662	first_map = map;
663	else
664	mp->next = map;
665
666	map->in_memory = MAP_SWAPPED;
667	/* The maps used to pick up default x and y values from the
668	* map archetype. Mimic that behaviour.
669	*/
670	MAP_WIDTH (map) = 16;
671	MAP_HEIGHT (map) = 16;
672	MAP_RESET_TIMEOUT (map) = 0;
673	MAP_TIMEOUT (map) = 300;
674	MAP_ENTER_X (map) = 0;
675	MAP_ENTER_Y (map) = 0;
676	/*set part to -1 indicating conversion to weather map not yet done */
677	MAP_WORLDPARTX (map) = -1;
678	MAP_WORLDPARTY (map) = -1;
679	return map;	676	return map;
680	}	677	}
681		678
682	/*	679	/*
683	* Allocates the arrays contained in a maptile.	680	* Allocates the arrays contained in a maptile.
684	* This basically allocates the dynamic array of spaces for the	681	* This basically allocates the dynamic array of spaces for the
685	* map.	682	* map.
686	*/	683	*/
687
688	void	684	void
689	allocate_map (maptile *m)	685	maptile::allocate ()
690	{	686	{
691	m->in_memory = MAP_IN_MEMORY;	687	in_memory = MAP_IN_MEMORY;
		688
692	/* Log this condition and free the storage. We could I suppose	689	/* Log this condition and free the storage. We could I suppose
693	* realloc, but if the caller is presuming the data will be intact,	690	* realloc, but if the caller is presuming the data will be intact,
694	* that is their poor assumption.	691	* that is their poor assumption.
695	*/	692	*/
696	if (m->spaces)	693	if (spaces)
697	{	694	{
698	LOG (llevError, "allocate_map called with already allocated map (%s)\n", m->path);	695	LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
699	free (m->spaces);	696	sfree (spaces, size ());
700	}	697	}
701		698
702	m->spaces = (MapSpace *) calloc (1, MAP_WIDTH (m) * MAP_HEIGHT (m) * sizeof (MapSpace));	699	spaces = salloc0<mapspace> (size ());
703
704	if (m->spaces == NULL)
705	fatal (OUT_OF_MEMORY);
706	}	700	}
707		701
708	/* Create and returns a map of the specific size. Used	702	/* Create and returns a map of the specific size. Used
709	* in random map code and the editor.	703	* in random map code and the editor.
710	*/	704	*/
…		…
714	maptile *m = get_linked_map ();	708	maptile *m = get_linked_map ();
715		709
716	m->width = sizex;	710	m->width = sizex;
717	m->height = sizey;	711	m->height = sizey;
718	m->in_memory = MAP_SWAPPED;	712	m->in_memory = MAP_SWAPPED;
719	allocate_map (m);	713	m->allocate ();
		714
720	return m;	715	return m;
721	}	716	}
722		717
723	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	718	/* Takes a string from a map definition and outputs a pointer to the array of shopitems
724	* corresponding to that string. Memory is allocated for this, it must be freed	719	* corresponding to that string. Memory is allocated for this, it must be freed
…		…
732	char *shop_string, *p, *q, *next_semicolon, *next_colon;	727	char *shop_string, *p, *q, *next_semicolon, *next_colon;
733	shopitems *items = NULL;	728	shopitems *items = NULL;
734	int i = 0, number_of_entries = 0;	729	int i = 0, number_of_entries = 0;
735	const typedata *current_type;	730	const typedata *current_type;
736		731
737	shop_string = strdup_local (input_string);	732	shop_string = strdup (input_string);
738	p = shop_string;	733	p = shop_string;
739	/* first we'll count the entries, we'll need that for allocating the array shortly */	734	/* first we'll count the entries, we'll need that for allocating the array shortly */
740	while (p)	735	while (p)
741	{	736	{
742	p = strchr (p, ';');	737	p = strchr (p, ';');
743	number_of_entries++;	738	number_of_entries++;
744	if (p)	739	if (p)
745	p++;	740	p++;
746	}	741	}
		742
747	p = shop_string;	743	p = shop_string;
748	strip_endline (p);	744	strip_endline (p);
749	items = new shopitems[number_of_entries + 1];	745	items = new shopitems[number_of_entries + 1];
750	for (i = 0; i < number_of_entries; i++)	746	for (i = 0; i < number_of_entries; i++)
751	{	747	{
752	if (!p)	748	if (!p)
753	{	749	{
754	LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");	750	LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
755	break;	751	break;
756	}	752	}
		753
757	next_semicolon = strchr (p, ';');	754	next_semicolon = strchr (p, ';');
758	next_colon = strchr (p, ':');	755	next_colon = strchr (p, ':');
759	/* if there is a stregth specified, figure out what it is, we'll need it soon. */	756	/* if there is a stregth specified, figure out what it is, we'll need it soon. */
760	if (next_colon && (!next_semicolon || next_colon < next_semicolon))	757	if (next_colon && (!next_semicolon || next_colon < next_semicolon))
761	items[i].strength = atoi (strchr (p, ':') + 1);	758	items[i].strength = atoi (strchr (p, ':') + 1);
…		…
788	* the next entry while we're at it, better print a warning	785	* the next entry while we're at it, better print a warning
789	*/	786	*/
790	LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);	787	LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
791	}	788	}
792	}	789	}
		790
793	items[i].index = number_of_entries;	791	items[i].index = number_of_entries;
794	if (next_semicolon)	792	if (next_semicolon)
795	p = ++next_semicolon;	793	p = ++next_semicolon;
796	else	794	else
797	p = NULL;	795	p = NULL;
798	}	796	}
		797
799	free (shop_string);	798	free (shop_string);
800	return items;	799	return items;
801	}	800	}
802		801
803	/* opposite of parse string, this puts the string that was originally fed in to	802	/* opposite of parse string, this puts the string that was originally fed in to
…		…
812	for (i = 0; i < m->shopitems[0].index; i++)	811	for (i = 0; i < m->shopitems[0].index; i++)
813	{	812	{
814	if (m->shopitems[i].typenum)	813	if (m->shopitems[i].typenum)
815	{	814	{
816	if (m->shopitems[i].strength)	815	if (m->shopitems[i].strength)
817	{
818	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	816	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
819	}
820	else	817	else
821	sprintf (tmp, "%s;", m->shopitems[i].name);	818	sprintf (tmp, "%s;", m->shopitems[i].name);
822	}	819	}
823	else	820	else
824	{	821	{
825	if (m->shopitems[i].strength)	822	if (m->shopitems[i].strength)
826	{
827	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	823	sprintf (tmp, "*:%d;", m->shopitems[i].strength);
828	}
829	else	824	else
830	sprintf (tmp, "*");	825	sprintf (tmp, "*");
831	}	826	}
		827
832	strcat (output_string, tmp);	828	strcat (output_string, tmp);
833	}	829	}
834	}	830	}
835		831
836	/* This loads the header information of the map. The header	832	/* This loads the header information of the map. The header
…		…
851	{	847	{
852	char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;	848	char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
853	int msgpos = 0;	849	int msgpos = 0;
854	int maplorepos = 0;	850	int maplorepos = 0;
855		851
856	while (fgets (buf, HUGE_BUF - 1, fp) != NULL)	852	while (fgets (buf, HUGE_BUF, fp) != NULL)
857	{	853	{
858	buf[HUGE_BUF - 1] = 0;	854	buf[HUGE_BUF - 1] = 0;
859	key = buf;	855	key = buf;
		856
860	while (isspace (*key))	857	while (isspace (*key))
861	key++;	858	key++;
		859
862	if (*key == 0)	860	if (*key == 0)
863	continue; /* empty line */	861	continue; /* empty line */
		862
864	value = strchr (key, ' ');	863	value = strchr (key, ' ');
		864
865	if (!value)	865	if (!value)
866	{	866	{
867	end = strchr (key, '\n');	867	if ((end = strchr (key, '\n')))
868	if (end != NULL)
869	{
870	*end = 0;	868	*end = 0;
871	}
872	}	869	}
873	else	870	else
874	{	871	{
875	*value = 0;	872	*value = 0;
876	value++;	873	value++;
877	end = strchr (value, '\n');	874	end = strchr (value, '\n');
		875
878	while (isspace (*value))	876	while (isspace (*value))
879	{	877	{
880	value++;	878	value++;
		879
881	if (*value == '\0' || value == end)	880	if (*value == '\0' || value == end)
882	{	881	{
883	/* Nothing but spaces. */	882	/* Nothing but spaces. */
884	value = NULL;	883	value = NULL;
885	break;	884	break;
…		…
908	* that use the parameter.	907	* that use the parameter.
909	*/	908	*/
910		909
911	if (!strcmp (key, "msg"))	910	if (!strcmp (key, "msg"))
912	{	911	{
913	while (fgets (buf, HUGE_BUF - 1, fp) != NULL)	912	while (fgets (buf, HUGE_BUF, fp) != NULL)
914	{	913	{
915	if (!strcmp (buf, "endmsg\n"))	914	if (!strcmp (buf, "endmsg\n"))
916	break;	915	break;
917	else	916	else
918	{	917	{
…		…
925	* with nothing between). There is no reason in those cases to	924	* with nothing between). There is no reason in those cases to
926	* keep the empty message. Also, msgbuf contains garbage data	925	* keep the empty message. Also, msgbuf contains garbage data
927	* when msgpos is zero, so copying it results in crashes	926	* when msgpos is zero, so copying it results in crashes
928	*/	927	*/
929	if (msgpos != 0)	928	if (msgpos != 0)
930	m->msg = strdup_local (msgbuf);	929	m->msg = strdup (msgbuf);
931	}	930	}
932	else if (!strcmp (key, "maplore"))	931	else if (!strcmp (key, "maplore"))
933	{	932	{
934	while (fgets (buf, HUGE_BUF - 1, fp) != NULL)	933	while (fgets (buf, HUGE_BUF, fp) != NULL)
935	{	934	{
936	if (!strcmp (buf, "endmaplore\n"))	935	if (!strcmp (buf, "endmaplore\n"))
937	break;	936	break;
938	else	937	else
939	{	938	{
…		…
941	strcpy (maplorebuf + maplorepos, buf);	940	strcpy (maplorebuf + maplorepos, buf);
942	maplorepos += strlen (buf);	941	maplorepos += strlen (buf);
943	}	942	}
944	}	943	}
945	if (maplorepos != 0)	944	if (maplorepos != 0)
946	m->maplore = strdup_local (maplorebuf);	945	m->maplore = strdup (maplorebuf);
947	}	946	}
948	else if (!strcmp (key, "end"))	947	else if (!strcmp (key, "end"))
949	{	948	{
950	break;	949	break;
951	}	950	}
…		…
960	LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);	959	LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
961	}	960	}
962	else if (!strcmp (key, "name"))	961	else if (!strcmp (key, "name"))
963	{	962	{
964	*end = 0;	963	*end = 0;
965	m->name = strdup_local (value);	964	m->name = strdup (value);
966	}	965	}
967	/* first strcmp value on these are old names supported	966	/* first strcmp value on these are old names supported
968	* for compatibility reasons. The new values (second) are	967	* for compatibility reasons. The new values (second) are
969	* what really should be used.	968	* what really should be used.
970	*/	969	*/
971	else if (!strcmp (key, "oid"))	970	else if (!strcmp (key, "oid"))
972	{
973	fp.get (m, atoi (value));	971	fp.get (m, atoi (value));
974	}
975	else if (!strcmp (key, "attach"))	972	else if (!strcmp (key, "attach"))
976	{
977	m->attach = value;	973	m->attach = value;
978	}
979	else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))	974	else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
980	{
981	m->enter_x = atoi (value);	975	m->enter_x = atoi (value);
982	}
983	else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))	976	else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
984	{
985	m->enter_y = atoi (value);	977	m->enter_y = atoi (value);
986	}
987	else if (!strcmp (key, "x") || !strcmp (key, "width"))	978	else if (!strcmp (key, "x") || !strcmp (key, "width"))
988	{
989	m->width = atoi (value);	979	m->width = atoi (value);
990	}
991	else if (!strcmp (key, "y") || !strcmp (key, "height"))	980	else if (!strcmp (key, "y") || !strcmp (key, "height"))
992	{
993	m->height = atoi (value);	981	m->height = atoi (value);
994	}
995	else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))	982	else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
996	{
997	m->reset_timeout = atoi (value);	983	m->reset_timeout = atoi (value);
998	}
999	else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))	984	else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1000	{
1001	m->timeout = atoi (value);	985	m->timeout = atoi (value);
1002	}
1003	else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))	986	else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1004	{	987	m->difficulty = clamp (atoi (value), 1, settings.max_level);
1005	m->difficulty = atoi (value);
1006	}
1007	else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))	988	else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1008	{
1009	m->darkness = atoi (value);	989	m->darkness = atoi (value);
1010	}
1011	else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))	990	else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1012	{
1013	m->fixed_resettime = atoi (value);	991	m->fixed_resettime = atoi (value);
1014	}
1015	else if (!strcmp (key, "unique"))	992	else if (!strcmp (key, "unique"))
1016	{
1017	m->unique = atoi (value);	993	m->unique = atoi (value);
1018	}
1019	else if (!strcmp (key, "template"))	994	else if (!strcmp (key, "template"))
1020	{
1021	m->templatemap = atoi (value);	995	m->templatemap = atoi (value);
1022	}
1023	else if (!strcmp (key, "region"))	996	else if (!strcmp (key, "region"))
1024	{
1025	m->region = get_region_by_name (value);	997	m->region = get_region_by_name (value);
1026	}
1027	else if (!strcmp (key, "shopitems"))	998	else if (!strcmp (key, "shopitems"))
1028	{	999	{
1029	*end = 0;	1000	*end = 0;
1030	m->shopitems = parse_shop_string (value);	1001	m->shopitems = parse_shop_string (value);
1031	}	1002	}
1032	else if (!strcmp (key, "shopgreed"))	1003	else if (!strcmp (key, "shopgreed"))
1033	{
1034	m->shopgreed = atof (value);	1004	m->shopgreed = atof (value);
1035	}
1036	else if (!strcmp (key, "shopmin"))	1005	else if (!strcmp (key, "shopmin"))
1037	{
1038	m->shopmin = atol (value);	1006	m->shopmin = atol (value);
1039	}
1040	else if (!strcmp (key, "shopmax"))	1007	else if (!strcmp (key, "shopmax"))
1041	{
1042	m->shopmax = atol (value);	1008	m->shopmax = atol (value);
1043	}
1044	else if (!strcmp (key, "shoprace"))	1009	else if (!strcmp (key, "shoprace"))
1045	{	1010	{
1046	*end = 0;	1011	*end = 0;
1047	m->shoprace = strdup_local (value);	1012	m->shoprace = strdup (value);
1048	}	1013	}
1049	else if (!strcmp (key, "outdoor"))	1014	else if (!strcmp (key, "outdoor"))
1050	{
1051	m->outdoor = atoi (value);	1015	m->outdoor = atoi (value);
1052	}
1053	else if (!strcmp (key, "temp"))	1016	else if (!strcmp (key, "temp"))
1054	{
1055	m->temp = atoi (value);	1017	m->temp = atoi (value);
1056	}
1057	else if (!strcmp (key, "pressure"))	1018	else if (!strcmp (key, "pressure"))
1058	{
1059	m->pressure = atoi (value);	1019	m->pressure = atoi (value);
1060	}
1061	else if (!strcmp (key, "humid"))	1020	else if (!strcmp (key, "humid"))
1062	{
1063	m->humid = atoi (value);	1021	m->humid = atoi (value);
1064	}
1065	else if (!strcmp (key, "windspeed"))	1022	else if (!strcmp (key, "windspeed"))
1066	{
1067	m->windspeed = atoi (value);	1023	m->windspeed = atoi (value);
1068	}
1069	else if (!strcmp (key, "winddir"))	1024	else if (!strcmp (key, "winddir"))
1070	{
1071	m->winddir = atoi (value);	1025	m->winddir = atoi (value);
1072	}
1073	else if (!strcmp (key, "sky"))	1026	else if (!strcmp (key, "sky"))
1074	{
1075	m->sky = atoi (value);	1027	m->sky = atoi (value);
1076	}
1077	else if (!strcmp (key, "nosmooth"))	1028	else if (!strcmp (key, "nosmooth"))
1078	{
1079	m->nosmooth = atoi (value);	1029	m->nosmooth = atoi (value);
1080	}
1081	else if (!strncmp (key, "tile_path_", 10))	1030	else if (!strncmp (key, "tile_path_", 10))
1082	{	1031	{
1083	int tile = atoi (key + 10);	1032	int tile = atoi (key + 10);
1084		1033
1085	if (tile < 1 || tile > 4)	1034	if (tile < 1 || tile > 4)
…		…
1118	}	1067	}
1119		1068
1120	if (editor)	1069	if (editor)
1121	{	1070	{
1122	/* Use the value as in the file. */	1071	/* Use the value as in the file. */
1123	m->tile_path[tile - 1] = strdup_local (value);	1072	m->tile_path[tile - 1] = strdup (value);
1124	}	1073	}
1125	else if (path != NULL)	1074	else if (path != NULL)
1126	{	1075	{
1127	/* Use the normalized value. */	1076	/* Use the normalized value. */
1128	m->tile_path[tile - 1] = strdup_local (path);	1077	m->tile_path[tile - 1] = strdup (path);
1129	}	1078	}
1130	} /* end if tile direction (in)valid */	1079	} /* end if tile direction (in)valid */
1131	}	1080	}
1132	else	1081	else
1133	{
1134	LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);	1082	LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1135	}
1136	}	1083	}
		1084
1137	if (!key || strcmp (key, "end"))	1085	if (!key || strcmp (key, "end"))
1138	{	1086	{
1139	LOG (llevError, "Got premature eof on map header!\n");	1087	LOG (llevError, "Got premature eof on map header!\n");
1140	return 1;	1088	return 1;
1141	}	1089	}
		1090
1142	return 0;	1091	return 0;
1143	}	1092	}
1144		1093
1145	/*	1094	/*
1146	* Opens the file "filename" and reads information about the map	1095	* Opens the file "filename" and reads information about the map
…		…
1151	* MAP_BLOCK, in which case we block on this load. This happens in all	1100	* MAP_BLOCK, in which case we block on this load. This happens in all
1152	* cases, no matter if this flag is set or not.	1101	* cases, no matter if this flag is set or not.
1153	* MAP_STYLE: style map - don't add active objects, don't add to server	1102	* MAP_STYLE: style map - don't add active objects, don't add to server
1154	* managed map list.	1103	* managed map list.
1155	*/	1104	*/
1156
1157	maptile *	1105	maptile *
1158	load_original_map (const char *filename, int flags)	1106	load_original_map (const char *filename, int flags)
1159	{	1107	{
1160	maptile *m;	1108	maptile *m;
1161	char pathname[MAX_BUF];	1109	char pathname[MAX_BUF];
…		…
1179	strcpy (m->path, filename);	1127	strcpy (m->path, filename);
1180	if (load_map_header (thawer, m))	1128	if (load_map_header (thawer, m))
1181	{	1129	{
1182	LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);	1130	LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1183	delete_map (m);	1131	delete_map (m);
1184	return NULL;	1132	return 0;
1185	}	1133	}
1186		1134
1187	allocate_map (m);	1135	m->allocate ();
1188		1136
1189	m->in_memory = MAP_LOADING;	1137	m->in_memory = MAP_LOADING;
1190	load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));	1138	load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1191		1139
1192	m->in_memory = MAP_IN_MEMORY;	1140	m->in_memory = MAP_IN_MEMORY;
1193	if (!MAP_DIFFICULTY (m))	1141	if (!m->difficulty)
1194	MAP_DIFFICULTY (m) = calculate_difficulty (m);	1142	m->difficulty = calculate_difficulty (m);
1195	set_map_reset_time (m);	1143	set_map_reset_time (m);
1196	m->instantiate ();	1144	m->instantiate ();
1197	return (m);	1145	return (m);
1198	}	1146	}
1199		1147
1200	/*	1148	/*
1201	* Loads a map, which has been loaded earlier, from file.	1149	* Loads a map, which has been loaded earlier, from file.
1202	* Return the map object we load into (this can change from the passed	1150	* Return the map object we load into (this can change from the passed
1203	* option if we can't find the original map)	1151	* option if we can't find the original map)
1204	*/	1152	*/
1205
1206	static maptile *	1153	static maptile *
1207	load_temporary_map (maptile *m)	1154	load_temporary_map (maptile *m)
1208	{	1155	{
1209	char buf[MAX_BUF];	1156	char buf[MAX_BUF];
1210		1157
…		…
1238	LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);	1185	LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1239	delete_map (m);	1186	delete_map (m);
1240	m = load_original_map (m->path, 0);	1187	m = load_original_map (m->path, 0);
1241	return NULL;	1188	return NULL;
1242	}	1189	}
		1190
1243	allocate_map (m);	1191	m->allocate ();
1244		1192
1245	m->in_memory = MAP_LOADING;	1193	m->in_memory = MAP_LOADING;
1246	load_objects (m, thawer, 0);	1194	load_objects (m, thawer, 0);
1247		1195
1248	m->in_memory = MAP_IN_MEMORY;	1196	m->in_memory = MAP_IN_MEMORY;
…		…
1253	/*	1201	/*
1254	* Loads a map, which has been loaded earlier, from file.	1202	* Loads a map, which has been loaded earlier, from file.
1255	* Return the map object we load into (this can change from the passed	1203	* Return the map object we load into (this can change from the passed
1256	* option if we can't find the original map)	1204	* option if we can't find the original map)
1257	*/	1205	*/
1258
1259	maptile *	1206	maptile *
1260	load_overlay_map (const char *filename, maptile *m)	1207	load_overlay_map (const char *filename, maptile *m)
1261	{	1208	{
1262	char pathname[MAX_BUF];	1209	char pathname[MAX_BUF];
1263		1210
…		…
1271	if (load_map_header (thawer, m))	1218	if (load_map_header (thawer, m))
1272	{	1219	{
1273	LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);	1220	LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1274	delete_map (m);	1221	delete_map (m);
1275	m = load_original_map (m->path, 0);	1222	m = load_original_map (m->path, 0);
1276	return NULL;	1223	return 0;
1277	}	1224	}
1278	/*allocate_map(m); */	1225	/*m->allocate ();*/
1279		1226
1280	m->in_memory = MAP_LOADING;	1227	m->in_memory = MAP_LOADING;
1281	load_objects (m, thawer, MAP_OVERLAY);	1228	load_objects (m, thawer, MAP_OVERLAY);
1282		1229
1283	m->in_memory = MAP_IN_MEMORY;	1230	m->in_memory = MAP_IN_MEMORY;
…		…
1293	delete_unique_items (maptile *m)	1240	delete_unique_items (maptile *m)
1294	{	1241	{
1295	int i, j, unique;	1242	int i, j, unique;
1296	object *op, *next;	1243	object *op, *next;
1297		1244
1298	for (i = 0; i < MAP_WIDTH (m); i++)	1245	for (i = 0; i < m->width; i++)
1299	for (j = 0; j < MAP_HEIGHT (m); j++)	1246	for (j = 0; j < m->height; j++)
1300	{	1247	{
1301	unique = 0;	1248	unique = 0;
		1249
1302	for (op = get_map_ob (m, i, j); op; op = next)	1250	for (op = GET_MAP_OB (m, i, j); op; op = next)
1303	{	1251	{
1304	next = op->above;	1252	next = op->above;
		1253
1305	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	1254	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1306	unique = 1;	1255	unique = 1;
		1256
1307	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))	1257	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1308	{	1258	{
1309	clean_object (op);	1259	op->destroy_inv (false);
1310	if (QUERY_FLAG (op, FLAG_IS_LINKED))	1260	op->destroy ();
1311	remove_button_link (op);
1312	remove_ob (op);
1313	free_object (op);
1314	}	1261	}
1315	}	1262	}
1316	}	1263	}
1317	}	1264	}
1318		1265
1319
1320	/*	1266	/*
1321	* Loads unique objects from file(s) into the map which is in memory	1267	* Loads unique objects from file(s) into the map which is in memory
1322	* m is the map to load unique items into.	1268	* m is the map to load unique items into.
1323	*/	1269	*/
1324	static void	1270	static void
…		…
1343	return;	1289	return;
1344		1290
1345	m->in_memory = MAP_LOADING;	1291	m->in_memory = MAP_LOADING;
1346	if (m->tmpname == NULL) /* if we have loaded unique items from */	1292	if (m->tmpname == NULL) /* if we have loaded unique items from */
1347	delete_unique_items (m); /* original map before, don't duplicate them */	1293	delete_unique_items (m); /* original map before, don't duplicate them */
		1294
1348	load_objects (m, thawer, 0);	1295	load_objects (m, thawer, 0);
1349		1296
1350	m->in_memory = MAP_IN_MEMORY;	1297	m->in_memory = MAP_IN_MEMORY;
1351	}	1298	}
1352
1353		1299
1354	/*	1300	/*
1355	* Saves a map to file. If flag is set, it is saved into the same	1301	* Saves a map to file. If flag is set, it is saved into the same
1356	* file it was (originally) loaded from. Otherwise a temporary	1302	* file it was (originally) loaded from. Otherwise a temporary
1357	* filename will be genarated, and the file will be stored there.	1303	* filename will be genarated, and the file will be stored there.
1358	* The temporary filename will be stored in the maptileure.	1304	* The temporary filename will be stored in the maptileure.
1359	* If the map is unique, we also save to the filename in the map	1305	* If the map is unique, we also save to the filename in the map
1360	* (this should have been updated when first loaded)	1306	* (this should have been updated when first loaded)
1361	*/	1307	*/
1362
1363	int	1308	int
1364	new_save_map (maptile *m, int flag)	1309	new_save_map (maptile *m, int flag)
1365	{	1310	{
1366	char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];	1311	char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1367	int i;	1312	int i;
…		…
1387	make_path_to_file (filename);	1332	make_path_to_file (filename);
1388	}	1333	}
1389	else	1334	else
1390	{	1335	{
1391	if (!m->tmpname)	1336	if (!m->tmpname)
1392	m->tmpname = tempnam_local (settings.tmpdir, NULL);	1337	m->tmpname = tempnam (settings.tmpdir, NULL);
1393		1338
1394	strcpy (filename, m->tmpname);	1339	strcpy (filename, m->tmpname);
1395	}	1340	}
1396		1341
1397	LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);	1342	LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
…		…
1421	print_shop_string (m, shop);	1366	print_shop_string (m, shop);
1422	fprintf (freezer, "shopitems %s\n", shop);	1367	fprintf (freezer, "shopitems %s\n", shop);
1423	}	1368	}
1424	if (m->shopgreed)	1369	if (m->shopgreed)
1425	fprintf (freezer, "shopgreed %f\n", m->shopgreed);	1370	fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1426	#ifndef WIN32
1427	if (m->shopmin)	1371	if (m->shopmin)
1428	fprintf (freezer, "shopmin %llu\n", m->shopmin);	1372	fprintf (freezer, "shopmin %llu\n", m->shopmin);
1429	if (m->shopmax)	1373	if (m->shopmax)
1430	fprintf (freezer, "shopmax %llu\n", m->shopmax);	1374	fprintf (freezer, "shopmax %llu\n", m->shopmax);
1431	#else
1432	if (m->shopmin)
1433	fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1434	if (m->shopmax)
1435	fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1436	#endif
1437	if (m->shoprace)	1375	if (m->shoprace)
1438	fprintf (freezer, "shoprace %s\n", m->shoprace);	1376	fprintf (freezer, "shoprace %s\n", m->shoprace);
1439	if (m->darkness)	1377	if (m->darkness)
1440	fprintf (freezer, "darkness %d\n", m->darkness);	1378	fprintf (freezer, "darkness %d\n", m->darkness);
1441	if (m->width)	1379	if (m->width)
…		…
1506	freezer.save (filename);	1444	freezer.save (filename);
1507		1445
1508	return 0;	1446	return 0;
1509	}	1447	}
1510		1448
1511
1512	/*
1513	* Remove and free all objects in the inventory of the given object.
1514	* object.c ?
1515	*/
1516
1517	void
1518	clean_object (object *op)
1519	{
1520	object *tmp, *next;
1521
1522	for (tmp = op->inv; tmp; tmp = next)
1523	{
1524	next = tmp->below;
1525	clean_object (tmp);
1526	if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1527	remove_button_link (tmp);
1528	remove_ob (tmp);
1529	free_object (tmp);
1530	}
1531	}
1532
1533	/*	1449	/*
1534	* Remove and free all objects in the given map.	1450	* Remove and free all objects in the given map.
1535	*/	1451	*/
1536
1537	void	1452	void
1538	free_all_objects (maptile *m)	1453	free_all_objects (maptile *m)
1539	{	1454	{
1540	int i, j;	1455	if (!m->spaces)
1541	object *op;	1456	return;
1542		1457
1543	for (i = 0; i < MAP_WIDTH (m); i++)	1458	for (int i = 0; i < m->width; i++)
1544	for (j = 0; j < MAP_HEIGHT (m); j++)	1459	for (int j = 0; j < m->height; j++)
1545	{	1460	{
1546	object *previous_obj = NULL;	1461	mapspace &ms = m->at (i, j);
1547		1462
1548	while ((op = GET_MAP_OB (m, i, j)) != NULL)	1463	while (object *op = ms.bot)
1549	{	1464	{
1550	if (op == previous_obj)
1551	{
1552	LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1553	break;
1554	}
1555	previous_obj = op;
1556	if (op->head != NULL)	1465	if (op->head)
1557	op = op->head;	1466	op = op->head;
1558		1467
1559	/* If the map isn't in memory, free_object will remove and	1468	op->destroy_inv (false);
1560	* free objects in op's inventory. So let it do the job.	1469	op->destroy ();
1561	*/
1562	if (m->in_memory == MAP_IN_MEMORY)
1563	clean_object (op);
1564	remove_ob (op);
1565	free_object (op);
1566	}	1470	}
1567	}	1471	}
1568	}	1472	}
1569		1473
1570	/*	1474	/*
1571	* Frees everything allocated by the given maptileure.	1475	* Frees everything allocated by the given maptileure.
1572	* don't free tmpname - our caller is left to do that	1476	* don't free tmpname - our caller is left to do that
1573	*/	1477	*/
1574
1575	void	1478	void
1576	free_map (maptile *m, int flag)	1479	free_map (maptile *m, int flag)
1577	{	1480	{
1578	int i;	1481	if (!m->in_memory) //TODO: makes no sense to me?
1579
1580	if (!m->in_memory)
1581	{
1582	LOG (llevError, "Trying to free freed map.\n");
1583	return;	1482	return;
1584	}	1483
		1484	m->in_memory = MAP_SAVING;
		1485
		1486	// TODO: use new/delete
		1487
1585	if (flag && m->spaces)	1488	if (flag && m->spaces)
1586	free_all_objects (m);	1489	free_all_objects (m);
1587	if (m->name)	1490
1588	FREE_AND_CLEAR (m->name);	1491	sfree (m->spaces, m->size ()), m->spaces = 0;
1589	if (m->spaces)	1492
1590	FREE_AND_CLEAR (m->spaces);	1493	free (m->name), m->name = 0;
1591	if (m->msg)	1494	free (m->msg), m->msg = 0;
1592	FREE_AND_CLEAR (m->msg);	1495	free (m->maplore), m->maplore = 0;
1593	if (m->maplore)	1496	free (m->shoprace), m->shoprace = 0;
1594	FREE_AND_CLEAR (m->maplore);	1497	delete [] m->shopitems, m->shopitems = 0;
1595	if (m->shopitems)	1498
1596	delete[]m->shopitems;
1597	m->shopitems = 0;
1598	if (m->shoprace)
1599	FREE_AND_CLEAR (m->shoprace);
1600	if (m->buttons)	1499	if (m->buttons)
1601	free_objectlinkpt (m->buttons);	1500	free_objectlinkpt (m->buttons), m->buttons = 0;
1602	m->buttons = NULL;	1501
1603	for (i = 0; i < 4; i++)	1502	for (int i = 0; i < 4; i++)
1604	{	1503	free (m->tile_path[i]), m->tile_path[i] = 0;
1605	if (m->tile_path[i])	1504
1606	FREE_AND_CLEAR (m->tile_path[i]);
1607	m->tile_map[i] = NULL;
1608	}
1609	m->in_memory = MAP_SWAPPED;	1505	m->in_memory = MAP_SWAPPED;
1610	}	1506	}
1611		1507
1612	/*	1508	maptile::~maptile ()
1613	* function: vanish maptile	1509	{
1614	* m : pointer to maptile, if NULL no action	1510	assert (destroyed ());
1615	* this deletes all the data on the map (freeing pointers)	1511	}
1616	* and then removes this map from the global linked list of maps.	1512
		1513	void
		1514	maptile::do_destroy ()
		1515	{
		1516	attachable::do_destroy ();
		1517
		1518	unlink ();
		1519
		1520	free_map (this, 1);
		1521	free (tmpname), tmpname = 0;
		1522
		1523	/* We need to look through all the maps and see if any maps
		1524	* are pointing at this one for tiling information. Since
		1525	* tiling can be asymetric, we just can not look to see which
		1526	* maps this map tiles with and clears those.
1617	*/	1527	*/
		1528	//TODO: non-euclidean-tiling MUST GO
		1529	for_all_maps (m)
		1530	for (int i = 0; i < 4; i++)
		1531	if (m->tile_map[i] == this)
		1532	m->tile_map[i] = 0;
		1533	}
1618		1534
		1535	//TODO: must go
1619	void	1536	void
1620	delete_map (maptile *m)	1537	delete_map (maptile *m)
1621	{	1538	{
1622	maptile *tmp, *last;
1623	int i;
1624
1625	if (!m)	1539	if (m)
1626	return;	1540	m->destroy ();
1627
1628	m->clear ();
1629
1630	if (m->in_memory == MAP_IN_MEMORY)
1631	{
1632	/* change to MAP_SAVING, even though we are not,
1633	* so that remove_ob doesn't do as much work.
1634	*/
1635	m->in_memory = MAP_SAVING;
1636	free_map (m, 1);
1637	}
1638	/* move this out of free_map, since tmpname can still be needed if
1639	* the map is swapped out.
1640	*/
1641	if (m->tmpname)
1642	{
1643	free (m->tmpname);
1644	m->tmpname = NULL;
1645	}
1646	last = NULL;
1647	/* We need to look through all the maps and see if any maps
1648	* are pointing at this one for tiling information. Since
1649	* tiling can be assymetric, we just can not look to see which
1650	* maps this map tiles with and clears those.
1651	*/
1652	for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1653	{
1654	if (tmp->next == m)
1655	last = tmp;
1656
1657	/* This should hopefully get unrolled on a decent compiler */
1658	for (i = 0; i < 4; i++)
1659	if (tmp->tile_map[i] == m)
1660	tmp->tile_map[i] = NULL;
1661	}
1662
1663	/* If last is null, then this should be the first map in the list */
1664	if (!last)
1665	{
1666	if (m == first_map)
1667	first_map = m->next;
1668	else
1669	/* m->path is a static char, so should hopefully still have
1670	* some useful data in it.
1671	*/
1672	LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1673	}
1674	else
1675	last->next = m->next;
1676
1677	delete m;
1678	}	1541	}
1679
1680
1681		1542
1682	/*	1543	/*
1683	* Makes sure the given map is loaded and swapped in.	1544	* Makes sure the given map is loaded and swapped in.
1684	* name is path name of the map.	1545	* name is path name of the map.
1685	* flags meaning:	1546	* flags meaning:
…		…
1688	* 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.	1549	* 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1689	* dont do any more name translation on it.	1550	* dont do any more name translation on it.
1690	*	1551	*
1691	* Returns a pointer to the given map.	1552	* Returns a pointer to the given map.
1692	*/	1553	*/
1693
1694	maptile *	1554	maptile *
1695	ready_map_name (const char *name, int flags)	1555	ready_map_name (const char *name, int flags)
1696	{	1556	{
1697	maptile *m;
1698
1699	if (!name)	1557	if (!name)
1700	return (NULL);	1558	return 0;
1701		1559
1702	/* Have we been at this level before? */	1560	/* Have we been at this level before? */
1703	m = has_been_loaded (name);	1561	maptile *m = has_been_loaded (name);
1704		1562
1705	/* Map is good to go, so just return it */	1563	/* Map is good to go, so just return it */
1706	if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))	1564	if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1707	{
1708	return m;	1565	return m;
1709	}
1710		1566
1711	/* unique maps always get loaded from their original location, and never	1567	/* unique maps always get loaded from their original location, and never
1712	* a temp location. Likewise, if map_flush is set, or we have never loaded	1568	* a temp location. Likewise, if map_flush is set, or we have never loaded
1713	* this map, load it now. I removed the reset checking from here -	1569	* this map, load it now. I removed the reset checking from here -
1714	* it seems the probability of a player trying to enter a map that should	1570	* it seems the probability of a player trying to enter a map that should
…		…
1716	* a bit cleaner (and players probably shouldn't rely on exact timing for	1572	* a bit cleaner (and players probably shouldn't rely on exact timing for
1717	* resets in any case - if they really care, they should use the 'maps command.	1573	* resets in any case - if they really care, they should use the 'maps command.
1718	*/	1574	*/
1719	if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)	1575	if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1720	{	1576	{
1721
1722	/* first visit or time to reset */	1577	/* first visit or time to reset */
1723	if (m)	1578	if (m)
1724	{	1579	{
1725	clean_tmp_map (m); /* Doesn't make much difference */	1580	clean_tmp_map (m); /* Doesn't make much difference */
1726	delete_map (m);	1581	delete_map (m);
…		…
1730	if (flags & MAP_PLAYER_UNIQUE)	1585	if (flags & MAP_PLAYER_UNIQUE)
1731	LOG (llevDebug, "Trying to load map %s.\n", name);	1586	LOG (llevDebug, "Trying to load map %s.\n", name);
1732	else	1587	else
1733	LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));	1588	LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1734		1589
1735	//eval_pv ("$x = Event::time", 1);//D
1736	if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))	1590	if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1737	return (NULL);	1591	return (NULL);
1738	//eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1739		1592
1740	fix_auto_apply (m); /* Chests which open as default */	1593	fix_auto_apply (m); /* Chests which open as default */
1741		1594
1742	/* If a player unique map, no extra unique object file to load.	1595	/* If a player unique map, no extra unique object file to load.
1743	* if from the editor, likewise.	1596	* if from the editor, likewise.
…		…
1813	int x, y, i;	1666	int x, y, i;
1814	long monster_cnt = 0;	1667	long monster_cnt = 0;
1815	double avgexp = 0;	1668	double avgexp = 0;
1816	sint64 total_exp = 0;	1669	sint64 total_exp = 0;
1817		1670
1818	if (MAP_DIFFICULTY (m))	1671	if (m->difficulty)
1819	{	1672	{
1820	LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));	1673	LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1821	return MAP_DIFFICULTY (m);	1674	return m->difficulty;
1822	}	1675	}
1823		1676
1824	for (x = 0; x < MAP_WIDTH (m); x++)	1677	for (x = 0; x < m->width; x++)
1825	for (y = 0; y < MAP_HEIGHT (m); y++)	1678	for (y = 0; y < m->height; y++)
1826	for (op = get_map_ob (m, x, y); op != NULL; op = op->above)	1679	for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1827	{	1680	{
1828	if (QUERY_FLAG (op, FLAG_MONSTER))	1681	if (QUERY_FLAG (op, FLAG_MONSTER))
1829	{	1682	{
1830	total_exp += op->stats.exp;	1683	total_exp += op->stats.exp;
1831	monster_cnt++;	1684	monster_cnt++;
…		…
1879	if (first_map->in_memory == MAP_SAVING)	1732	if (first_map->in_memory == MAP_SAVING)
1880	first_map->in_memory = MAP_IN_MEMORY;	1733	first_map->in_memory = MAP_IN_MEMORY;
1881	delete_map (first_map);	1734	delete_map (first_map);
1882	real_maps++;	1735	real_maps++;
1883	}	1736	}
		1737
1884	LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);	1738	LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1885	}	1739	}
1886		1740
1887	/* change_map_light() - used to change map light level (darkness)	1741	/* change_map_light() - used to change map light level (darkness)
1888	* up or down. Returns true if successful. It should now be	1742	* up or down. Returns true if successful. It should now be
…		…
1924	/* All clients need to get re-updated for the change */	1778	/* All clients need to get re-updated for the change */
1925	update_all_map_los (m);	1779	update_all_map_los (m);
1926	return 1;	1780	return 1;
1927	}	1781	}
1928		1782
1929
1930	/*	1783	/*
1931	* This function updates various attributes about a specific space	1784	* This function updates various attributes about a specific space
1932	* on the map (what it looks like, whether it blocks magic,	1785	* on the map (what it looks like, whether it blocks magic,
1933	* has a living creatures, prevents people from passing	1786	* has a living creatures, prevents people from passing
1934	* through, etc)	1787	* through, etc)
1935	*/	1788	*/
1936	void	1789	void
1937	update_position (maptile *m, int x, int y)	1790	mapspace::update_ ()
1938	{	1791	{
1939	object *tmp, *last = NULL;	1792	object *tmp, *last = 0;
1940	uint8 flags = 0, oldflags, light = 0, anywhere = 0;	1793	uint8 flags = 0, light = 0, anywhere = 0;
1941	New_Face *top, *floor, *middle;	1794	New_Face *top, *floor, *middle;
1942	object *top_obj, *floor_obj, *middle_obj;	1795	object *top_obj, *floor_obj, *middle_obj;
1943	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1796	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1944		1797
1945	oldflags = GET_MAP_FLAGS (m, x, y);
1946	if (!(oldflags & P_NEED_UPDATE))
1947	{
1948	LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1949	return;
1950	}
1951
1952	middle = blank_face;	1798	middle = blank_face;
1953	top = blank_face;	1799	top = blank_face;
1954	floor = blank_face;	1800	floor = blank_face;
1955		1801
1956	middle_obj = NULL;	1802	middle_obj = 0;
1957	top_obj = NULL;	1803	top_obj = 0;
1958	floor_obj = NULL;	1804	floor_obj = 0;
1959		1805
1960	for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above)	1806	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1961	{	1807	{
1962
1963	/* This could be made additive I guess (two lights better than	1808	/* This could be made additive I guess (two lights better than
1964	* one). But if so, it shouldn't be a simple additive - 2	1809	* one). But if so, it shouldn't be a simple additive - 2
1965	* light bulbs do not illuminate twice as far as once since	1810	* light bulbs do not illuminate twice as far as once since
1966	* it is a disapation factor that is squared (or is it cubed?)	1811	* it is a dissapation factor that is cubed.
1967	*/	1812	*/
1968	if (tmp->glow_radius > light)	1813	if (tmp->glow_radius > light)
1969	light = tmp->glow_radius;	1814	light = tmp->glow_radius;
1970		1815
1971	/* This call is needed in order to update objects the player	1816	/* This call is needed in order to update objects the player
…		…
2009	{	1854	{
2010	middle = tmp->face;	1855	middle = tmp->face;
2011	middle_obj = tmp;	1856	middle_obj = tmp;
2012	}	1857	}
2013	}	1858	}
		1859
2014	if (tmp == tmp->above)	1860	if (tmp == tmp->above)
2015	{	1861	{
2016	LOG (llevError, "Error in structure of map\n");	1862	LOG (llevError, "Error in structure of map\n");
2017	exit (-1);	1863	exit (-1);
2018	}	1864	}
2019		1865
2020	move_slow |= tmp->move_slow;	1866	move_slow |= tmp->move_slow;
2021	move_block |= tmp->move_block;	1867	move_block |= tmp->move_block;
2022	move_on |= tmp->move_on;	1868	move_on |= tmp->move_on;
2023	move_off |= tmp->move_off;	1869	move_off |= tmp->move_off;
2024	move_allow |= tmp->move_allow;	1870	move_allow |= tmp->move_allow;
2025		1871
2026	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2027	flags |= P_IS_ALIVE;
2028	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2029	flags |= P_NO_MAGIC;
2030	if (QUERY_FLAG (tmp, FLAG_DAMNED))
2031	flags |= P_NO_CLERIC;
2032	if (tmp->type == SAFE_GROUND)
2033	flags |= P_SAFE;
2034
2035	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW))	1872	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2036	flags |= P_BLOCKSVIEW;	1873	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2037	} /* for stack of objects */	1874	if (tmp->type == PLAYER) flags |= P_PLAYER;
2038		1875	if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2039	/* we don't want to rely on this function to have accurate flags, but	1876	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2040	* since we're already doing the work, we calculate them here.	1877	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2041	* if they don't match, logic is broken someplace.
2042	*/
2043	if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2044	{	1878	}
2045	LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",	1879
2046	m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags);	1880	this->light = light;
2047	}	1881	this->flags_ = flags;
2048	SET_MAP_FLAGS (m, x, y, flags);	1882	this->move_block = move_block & ~move_allow;
2049	SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow);	1883	this->move_on = move_on;
2050	SET_MAP_MOVE_ON (m, x, y, move_on);	1884	this->move_off = move_off;
2051	SET_MAP_MOVE_OFF (m, x, y, move_off);	1885	this->move_slow = move_slow;
2052	SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2053		1886
2054	/* At this point, we have a floor face (if there is a floor),	1887	/* At this point, we have a floor face (if there is a floor),
2055	* and the floor is set - we are not going to touch it at	1888	* and the floor is set - we are not going to touch it at
2056	* this point.	1889	* this point.
2057	* middle contains the highest visibility face.	1890	* middle contains the highest visibility face.
…		…
2111	break;	1944	break;
2112	}	1945	}
2113	}	1946	}
2114	}	1947	}
2115	}	1948	}
		1949
2116	if (middle == floor)	1950	if (middle == floor)
2117	middle = blank_face;	1951	middle = blank_face;
		1952
2118	if (top == middle)	1953	if (top == middle)
2119	middle = blank_face;	1954	middle = blank_face;
2120	SET_MAP_FACE (m, x, y, top, 0);
2121	if (top != blank_face)
2122	SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2123	else
2124	SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2125	SET_MAP_FACE (m, x, y, middle, 1);
2126	if (middle != blank_face)
2127	SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2128	else
2129	SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2130	SET_MAP_FACE (m, x, y, floor, 2);
2131	if (floor != blank_face)
2132	SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2133	else
2134	SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2135	SET_MAP_LIGHT (m, x, y, light);
2136	}
2137		1955
		1956	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
		1957	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
		1958	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
		1959	}
2138		1960
2139	void	1961	void
2140	set_map_reset_time (maptile *map)	1962	set_map_reset_time (maptile *map)
2141	{	1963	{
2142	int timeout;	1964	int timeout;
2143		1965
2144	timeout = MAP_RESET_TIMEOUT (map);	1966	timeout = map->reset_timeout;
2145	if (timeout <= 0)	1967	if (timeout <= 0)
2146	timeout = MAP_DEFAULTRESET;	1968	timeout = MAP_DEFAULTRESET;
2147	if (timeout >= MAP_MAXRESET)	1969	if (timeout >= MAP_MAXRESET)
2148	timeout = MAP_MAXRESET;	1970	timeout = MAP_MAXRESET;
2149	MAP_WHEN_RESET (map) = seconds () + timeout;	1971	map->reset_time = time (0) + timeout;
2150	}	1972	}
2151		1973
2152	/* this updates the orig_map->tile_map[tile_num] value after loading	1974	/* this updates the orig_map->tile_map[tile_num] value after loading
2153	* the map. It also takes care of linking back the freshly loaded	1975	* the map. It also takes care of linking back the freshly loaded
2154	* maps tile_map values if it tiles back to this one. It returns	1976	* maps tile_map values if it tiles back to this one. It returns
…		…
2182	*	2004	*
2183	*/	2005	*/
2184	int	2006	int
2185	out_of_map (maptile *m, int x, int y)	2007	out_of_map (maptile *m, int x, int y)
2186	{	2008	{
2187
2188	/* If we get passed a null map, this is obviously the	2009	/* If we get passed a null map, this is obviously the
2189	* case. This generally shouldn't happen, but if the	2010	* case. This generally shouldn't happen, but if the
2190	* map loads fail below, it could happen.	2011	* map loads fail below, it could happen.
2191	*/	2012	*/
2192	if (!m)	2013	if (!m)
…		…
2194		2015
2195	if (x < 0)	2016	if (x < 0)
2196	{	2017	{
2197	if (!m->tile_path[3])	2018	if (!m->tile_path[3])
2198	return 1;	2019	return 1;
		2020
2199	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)	2021	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2200	{
2201	load_and_link_tiled_map (m, 3);	2022	load_and_link_tiled_map (m, 3);
2202	}	2023
2203	return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y));	2024	return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2204	}	2025	}
2205	if (x >= MAP_WIDTH (m))	2026
		2027	if (x >= m->width)
2206	{	2028	{
2207	if (!m->tile_path[1])	2029	if (!m->tile_path[1])
2208	return 1;	2030	return 1;
		2031
2209	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)	2032	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2210	{
2211	load_and_link_tiled_map (m, 1);	2033	load_and_link_tiled_map (m, 1);
2212	}	2034
2213	return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y));	2035	return (out_of_map (m->tile_map[1], x - m->width, y));
2214	}	2036	}
		2037
2215	if (y < 0)	2038	if (y < 0)
2216	{	2039	{
2217	if (!m->tile_path[0])	2040	if (!m->tile_path[0])
2218	return 1;	2041	return 1;
		2042
2219	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)	2043	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2220	{
2221	load_and_link_tiled_map (m, 0);	2044	load_and_link_tiled_map (m, 0);
2222	}	2045
2223	return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0])));	2046	return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2224	}	2047	}
2225	if (y >= MAP_HEIGHT (m))	2048
		2049	if (y >= m->height)
2226	{	2050	{
2227	if (!m->tile_path[2])	2051	if (!m->tile_path[2])
2228	return 1;	2052	return 1;
		2053
2229	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)	2054	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2230	{
2231	load_and_link_tiled_map (m, 2);	2055	load_and_link_tiled_map (m, 2);
2232	}	2056
2233	return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m)));	2057	return (out_of_map (m->tile_map[2], x, y - m->height));
2234	}	2058	}
2235		2059
2236	/* Simple case - coordinates are within this local	2060	/* Simple case - coordinates are within this local
2237	* map.	2061	* map.
2238	*/	2062	*/
…		…
2252	{	2076	{
2253		2077
2254	if (*x < 0)	2078	if (*x < 0)
2255	{	2079	{
2256	if (!m->tile_path[3])	2080	if (!m->tile_path[3])
2257	return NULL;	2081	return 0;
2258	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)	2082	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2259	load_and_link_tiled_map (m, 3);	2083	load_and_link_tiled_map (m, 3);
2260		2084
2261	*x += MAP_WIDTH (m->tile_map[3]);	2085	*x += m->tile_map[3]->width;
2262	return (get_map_from_coord (m->tile_map[3], x, y));	2086	return (get_map_from_coord (m->tile_map[3], x, y));
2263	}	2087	}
2264	if (*x >= MAP_WIDTH (m))	2088
		2089	if (*x >= m->width)
2265	{	2090	{
2266	if (!m->tile_path[1])	2091	if (!m->tile_path[1])
2267	return NULL;	2092	return 0;
		2093
2268	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)	2094	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2269	load_and_link_tiled_map (m, 1);	2095	load_and_link_tiled_map (m, 1);
2270		2096
2271	*x -= MAP_WIDTH (m);	2097	*x -= m->width;
2272	return (get_map_from_coord (m->tile_map[1], x, y));	2098	return (get_map_from_coord (m->tile_map[1], x, y));
2273	}	2099	}
		2100
2274	if (*y < 0)	2101	if (*y < 0)
2275	{	2102	{
2276	if (!m->tile_path[0])	2103	if (!m->tile_path[0])
2277	return NULL;	2104	return 0;
		2105
2278	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)	2106	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2279	load_and_link_tiled_map (m, 0);	2107	load_and_link_tiled_map (m, 0);
2280		2108
2281	*y += MAP_HEIGHT (m->tile_map[0]);	2109	*y += m->tile_map[0]->height;
2282	return (get_map_from_coord (m->tile_map[0], x, y));	2110	return (get_map_from_coord (m->tile_map[0], x, y));
2283	}	2111	}
2284	if (*y >= MAP_HEIGHT (m))	2112
		2113	if (*y >= m->height)
2285	{	2114	{
2286	if (!m->tile_path[2])	2115	if (!m->tile_path[2])
2287	return NULL;	2116	return 0;
		2117
2288	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)	2118	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2289	load_and_link_tiled_map (m, 2);	2119	load_and_link_tiled_map (m, 2);
2290		2120
2291	*y -= MAP_HEIGHT (m);	2121	*y -= m->height;
2292	return (get_map_from_coord (m->tile_map[2], x, y));	2122	return (get_map_from_coord (m->tile_map[2], x, y));
2293	}	2123	}
2294		2124
2295	/* Simple case - coordinates are within this local	2125	/* Simple case - coordinates are within this local
2296	* map.	2126	* map.
…		…
2316		2146
2317	}	2147	}
2318	else if (map1->tile_map[0] == map2)	2148	else if (map1->tile_map[0] == map2)
2319	{ /* up */	2149	{ /* up */
2320	*dx = 0;	2150	*dx = 0;
2321	*dy = -MAP_HEIGHT (map2);	2151	*dy = -map2->height;
2322	}	2152	}
2323	else if (map1->tile_map[1] == map2)	2153	else if (map1->tile_map[1] == map2)
2324	{ /* right */	2154	{ /* right */
2325	*dx = MAP_WIDTH (map1);	2155	*dx = map1->width;
2326	*dy = 0;	2156	*dy = 0;
2327	}	2157	}
2328	else if (map1->tile_map[2] == map2)	2158	else if (map1->tile_map[2] == map2)
2329	{ /* down */	2159	{ /* down */
2330	*dx = 0;	2160	*dx = 0;
2331	*dy = MAP_HEIGHT (map1);	2161	*dy = map1->height;
2332	}	2162	}
2333	else if (map1->tile_map[3] == map2)	2163	else if (map1->tile_map[3] == map2)
2334	{ /* left */	2164	{ /* left */
2335	*dx = -MAP_WIDTH (map2);	2165	*dx = -map2->width;
2336	*dy = 0;	2166	*dy = 0;
2337		2167
2338	}	2168	}
2339	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	2169	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2340	{ /* up right */	2170	{ /* up right */
2341	*dx = MAP_WIDTH (map1->tile_map[0]);	2171	*dx = map1->tile_map[0]->width;
2342	*dy = -MAP_HEIGHT (map1->tile_map[0]);	2172	*dy = -map1->tile_map[0]->height;
2343	}	2173	}
2344	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	2174	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2345	{ /* up left */	2175	{ /* up left */
2346	*dx = -MAP_WIDTH (map2);	2176	*dx = -map2->width;
2347	*dy = -MAP_HEIGHT (map1->tile_map[0]);	2177	*dy = -map1->tile_map[0]->height;
2348	}	2178	}
2349	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	2179	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2350	{ /* right up */	2180	{ /* right up */
2351	*dx = MAP_WIDTH (map1);	2181	*dx = map1->width;
2352	*dy = -MAP_HEIGHT (map2);	2182	*dy = -map2->height;
2353	}	2183	}
2354	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	2184	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2355	{ /* right down */	2185	{ /* right down */
2356	*dx = MAP_WIDTH (map1);	2186	*dx = map1->width;
2357	*dy = MAP_HEIGHT (map1->tile_map[1]);	2187	*dy = map1->tile_map[1]->height;
2358	}	2188	}
2359	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	2189	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2360	{ /* down right */	2190	{ /* down right */
2361	*dx = MAP_WIDTH (map1->tile_map[2]);	2191	*dx = map1->tile_map[2]->width;
2362	*dy = MAP_HEIGHT (map1);	2192	*dy = map1->height;
2363	}	2193	}
2364	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	2194	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2365	{ /* down left */	2195	{ /* down left */
2366	*dx = -MAP_WIDTH (map2);	2196	*dx = -map2->width;
2367	*dy = MAP_HEIGHT (map1);	2197	*dy = map1->height;
2368	}	2198	}
2369	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	2199	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2370	{ /* left up */	2200	{ /* left up */
2371	*dx = -MAP_WIDTH (map1->tile_map[3]);	2201	*dx = -map1->tile_map[3]->width;
2372	*dy = -MAP_HEIGHT (map2);	2202	*dy = -map2->height;
2373	}	2203	}
2374	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	2204	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2375	{ /* left down */	2205	{ /* left down */
2376	*dx = -MAP_WIDTH (map1->tile_map[3]);	2206	*dx = -map1->tile_map[3]->width;
2377	*dy = MAP_HEIGHT (map1->tile_map[3]);	2207	*dy = map1->tile_map[3]->height;
2378		2208
2379	}	2209	}
2380	else	2210	else
2381	{ /* not "adjacent" enough */	2211	{ /* not "adjacent" enough */
2382	return 0;	2212	return 0;
…		…
2507	{	2337	{
2508	int dx, dy;	2338	int dx, dy;
2509		2339
2510	return adjacent_map (op1->map, op2->map, &dx, &dy);	2340	return adjacent_map (op1->map, op2->map, &dx, &dy);
2511	}	2341	}
		2342
		2343	object *
		2344	maptile::insert (object *op, int x, int y, object *originator, int flags)
		2345	{
		2346	if (!op->flag [FLAG_REMOVED])
		2347	op->remove ();
		2348
		2349	return insert_ob_in_map_at (op, this, originator, flags, x, y);
		2350	}
		2351

Diff Legend

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