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.29 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.51 by root, Mon Dec 25 17:11:16 2006 UTC

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

Diff Legend

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