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.53 by root, Wed Dec 27 09:28:01 2006 UTC

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

Diff Legend

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