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

Diff Legend

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