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