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.46 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.63 by root, Mon Jan 1 00:41:02 2007 UTC

…		…
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24
25	#include <global.h>	24	#include <global.h>
26	#include <funcpoint.h>	25	#include <funcpoint.h>
27		26
28	#include <loader.h>	27	#include <loader.h>
29	#include <unistd.h>	28	#include <unistd.h>
30		29
31	#include "path.h"	30	#include "path.h"
32
33	/*
34	* Returns the maptile which has a name matching the given argument.
35	* return NULL if no match is found.
36	*/
37
38	maptile *
39	has_been_loaded (const char *name)
40	{
41	maptile *map;
42
43	if (!name || !*name)
44	return 0;
45	for (map = first_map; map; map = map->next)
46	if (!strcmp (name, map->path))
47	break;
48	return (map);
49	}
50		31
51	/*	32	/*
52	* This makes a path absolute outside the world of Crossfire.	33	* This makes a path absolute outside the world of Crossfire.
53	* In other words, it prepends LIBDIR/MAPDIR/ to the given path	34	* In other words, it prepends LIBDIR/MAPDIR/ to the given path
54	* and returns the pointer to a static array containing the result.	35	* and returns the pointer to a static array containing the result.
55	* it really should be called create_mapname	36	* it really should be called create_mapname
56	*/	37	*/
57
58	const char *	38	const char *
59	create_pathname (const char *name)	39	create_pathname (const char *name)
60	{	40	{
61	static char buf[MAX_BUF];	41	static char buf[8192];
62
63	/* Why? having extra / doesn't confuse unix anyplace? Dependancies
64	* someplace else in the code? msw 2-17-97
65	*/
66	if (*name == '/')
67	sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
68	else
69	sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name);	42	snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
70	return (buf);	43	return buf;
71	}	44	}
72
73	/*
74	* same as create_pathname, but for the overlay maps.
75	*/
76
77	const char *
78	create_overlay_pathname (const char *name)
79	{
80	static char buf[MAX_BUF];
81
82	/* Why? having extra / doesn't confuse unix anyplace? Dependancies
83	* someplace else in the code? msw 2-17-97
84	*/
85	if (*name == '/')
86	sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
87	else
88	sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
89	return (buf);
90	}
91
92	/*
93	* same as create_pathname, but for the template maps.
94	*/
95
96	const char *
97	create_template_pathname (const char *name)
98	{
99	static char buf[MAX_BUF];
100
101	/* Why? having extra / doesn't confuse unix anyplace? Dependancies
102	* someplace else in the code? msw 2-17-97
103	*/
104	if (*name == '/')
105	sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
106	else
107	sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
108	return (buf);
109	}
110
111	/*
112	* This makes absolute path to the itemfile where unique objects
113	* will be saved. Converts '/' to '@'. I think it's essier maintain
114	* files than full directory structure, but if this is problem it can
115	* be changed.
116	*/
117	static const char *
118	create_items_path (const char *s)
119	{
120	static char buf[MAX_BUF];
121	char *t;
122
123	if (*s == '/')
124	s++;
125
126	sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
127
128	for (t = buf + strlen (buf); *s; s++, t++)
129	if (*s == '/')
130	*t = '@';
131	else
132	*t = *s;
133	*t = 0;
134	return (buf);
135	}
136
137		45
138	/*	46	/*
139	* This function checks if a file with the given path exists.	47	* This function checks if a file with the given path exists.
140	* -1 is returned if it fails, otherwise the mode of the file	48	* -1 is returned if it fails, otherwise the mode of the file
141	* is returned.	49	* is returned.
…		…
148	* the rest of the code only cares that the file is readable.	56	* the rest of the code only cares that the file is readable.
149	* when the editor goes away, the call to stat should probably be	57	* when the editor goes away, the call to stat should probably be
150	* replaced by an access instead (similar to the windows one, but	58	* replaced by an access instead (similar to the windows one, but
151	* that seems to be missing the prepend_dir processing	59	* that seems to be missing the prepend_dir processing
152	*/	60	*/
153
154	int	61	int
155	check_path (const char *name, int prepend_dir)	62	check_path (const char *name, int prepend_dir)
156	{	63	{
157	char buf[MAX_BUF];	64	char buf[MAX_BUF];
158		65
…		…
184	if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||	91	if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
185	(statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))	92	(statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
186	mode |= 2;	93	mode |= 2;
187		94
188	return (mode);	95	return (mode);
189	}
190
191	/*
192	* Prints out debug-information about a map.
193	* Dumping these at llevError doesn't seem right, but is
194	* necessary to make sure the information is in fact logged.
195	*/
196
197	void
198	dump_map (const maptile *m)
199	{
200	LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
201	LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m));
202
203	if (m->msg != NULL)
204	LOG (llevError, "Message:\n%s", m->msg);
205
206	if (m->maplore != NULL)
207	LOG (llevError, "Lore:\n%s", m->maplore);
208
209	if (m->tmpname != NULL)
210	LOG (llevError, "Tmpname: %s\n", m->tmpname);
211
212	LOG (llevError, "Difficulty: %d\n", m->difficulty);
213	LOG (llevError, "Darkness: %d\n", m->darkness);
214	}
215
216	/*
217	* Prints out debug-information about all maps.
218	* This basically just goes through all the maps and calls
219	* dump_map on each one.
220	*/
221
222	void
223	dump_all_maps (void)
224	{
225	maptile *m;
226
227	for (m = first_map; m; m = m->next)
228	dump_map (m);
229	}	96	}
230		97
231	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	98	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
232	* one function that just returns a P_.. value (see map.h)	99	* one function that just returns a P_.. value (see map.h)
233	* it will also do map translation for tiled maps, returning	100	* it will also do map translation for tiled maps, returning
…		…
239	* don't expect to insert/remove anything from those spaces.	106	* don't expect to insert/remove anything from those spaces.
240	*/	107	*/
241	int	108	int
242	get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)	109	get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
243	{	110	{
244	sint16 newx, newy;
245	int retval = 0;
246	maptile *mp;
247
248	newx = x;	111	sint16 newx = x;
249	newy = y;	112	sint16 newy = y;
250		113
251	mp = get_map_from_coord (oldmap, &newx, &newy);	114	maptile *mp = get_map_from_coord (oldmap, &newx, &newy);
252		115
253	if (!mp)	116	if (!mp)
254	return P_OUT_OF_MAP;	117	return P_OUT_OF_MAP;
255
256	if (mp != oldmap)
257	retval |= P_NEW_MAP;
258		118
259	if (newmap) *newmap = mp;	119	if (newmap) *newmap = mp;
260	if (nx) *nx = newx;	120	if (nx) *nx = newx;
261	if (ny) *ny = newy;	121	if (ny) *ny = newy;
262		122
263	return retval | mp->at (newx, newy).flags ();	123	return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
264	}	124	}
265		125
266	/*	126	/*
267	* Returns true if the given coordinate is blocked except by the	127	* Returns true if the given coordinate is blocked except by the
268	* object passed is not blocking. This is used with	128	* object passed is not blocking. This is used with
…		…
402	archetype *tmp;	262	archetype *tmp;
403	int flag;	263	int flag;
404	maptile *m1;	264	maptile *m1;
405	sint16 sx, sy;	265	sint16 sx, sy;
406		266
407	if (ob == NULL)	267	if (!ob)
408	{	268	{
409	flag = get_map_flags (m, &m1, x, y, &sx, &sy);	269	flag = get_map_flags (m, &m1, x, y, &sx, &sy);
410	if (flag & P_OUT_OF_MAP)	270	if (flag & P_OUT_OF_MAP)
411	return P_OUT_OF_MAP;	271	return P_OUT_OF_MAP;
412		272
413	/* don't have object, so don't know what types would block */	273	/* don't have object, so don't know what types would block */
414	return (GET_MAP_MOVE_BLOCK (m1, sx, sy));	274	return m1->at (sx, sy).move_block;
415	}	275	}
416		276
417	for (tmp = ob->arch; tmp != NULL; tmp = tmp->more)	277	for (tmp = ob->arch; tmp; tmp = tmp->more)
418	{	278	{
419	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);	279	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
420		280
421	if (flag & P_OUT_OF_MAP)	281	if (flag & P_OUT_OF_MAP)
422	return P_OUT_OF_MAP;	282	return P_OUT_OF_MAP;
423	if (flag & P_IS_ALIVE)	283	if (flag & P_IS_ALIVE)
424	return P_IS_ALIVE;	284	return P_IS_ALIVE;
425		285
		286	mapspace &ms = m1->at (sx, sy);
		287
426	/* find_first_free_spot() calls this function. However, often	288	/* find_first_free_spot() calls this function. However, often
427	* ob doesn't have any move type (when used to place exits)	289	* ob doesn't have any move type (when used to place exits)
428	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	290	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
429	*/	291	*/
430		292
431	if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL)	293	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
432	continue;	294	continue;
433		295
434	/* Note it is intentional that we check ob - the movement type of the	296	/* Note it is intentional that we check ob - the movement type of the
435	* head of the object should correspond for the entire object.	297	* head of the object should correspond for the entire object.
436	*/	298	*/
437	if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy)))	299	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
438	return P_NO_PASS;	300	return P_NO_PASS;
439	}	301	}
440		302
441	return 0;	303	return 0;
442	}	304	}
…		…
445	* into inventory, but just links them. What this does is go through	307	* into inventory, but just links them. What this does is go through
446	* and insert them properly.	308	* and insert them properly.
447	* The object 'container' is the object that contains the inventory.	309	* The object 'container' is the object that contains the inventory.
448	* This is needed so that we can update the containers weight.	310	* This is needed so that we can update the containers weight.
449	*/	311	*/
450
451	void	312	void
452	fix_container (object *container)	313	fix_container (object *container)
453	{	314	{
454	object *tmp = container->inv, *next;	315	object *tmp = container->inv, *next;
455		316
456	container->inv = NULL;	317	container->inv = 0;
457	while (tmp != NULL)	318	while (tmp)
458	{	319	{
459	next = tmp->below;	320	next = tmp->below;
460	if (tmp->inv)	321	if (tmp->inv)
461	fix_container (tmp);	322	fix_container (tmp);
		323
462	(void) insert_ob_in_ob (tmp, container);	324	insert_ob_in_ob (tmp, container);
463	tmp = next;	325	tmp = next;
464	}	326	}
		327
465	/* sum_weight will go through and calculate what all the containers are	328	/* sum_weight will go through and calculate what all the containers are
466	* carrying.	329	* carrying.
467	*/	330	*/
468	sum_weight (container);	331	sum_weight (container);
469	}	332	}
…		…
472	* for objects whose arch says they are multipart yet according to the	335	* for objects whose arch says they are multipart yet according to the
473	* info we have, they only have the head (as would be expected when	336	* info we have, they only have the head (as would be expected when
474	* they are saved). We do have to look for the old maps that did save	337	* they are saved). We do have to look for the old maps that did save
475	* the more sections and not re-add sections for them.	338	* the more sections and not re-add sections for them.
476	*/	339	*/
477		340	void
478	static void	341	maptile::link_multipart_objects ()
479	link_multipart_objects (maptile *m)
480	{	342	{
481	int x, y;	343	if (!spaces)
482	object *tmp, *op, *last, *above;	344	return;
483	archetype *at;
484		345
485	for (x = 0; x < MAP_WIDTH (m); x++)	346	for (mapspace *ms = spaces + size (); ms-- > spaces; )
486	for (y = 0; y < MAP_HEIGHT (m); y++)	347	for (object *tmp = ms->bot; tmp; )
487	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
488	{	348	{
489	above = tmp->above;	349	object *above = tmp->above;
490		350
491	/* already multipart - don't do anything more */	351	/* already multipart - don't do anything more */
492	if (tmp->head || tmp->more)	352	if (!tmp->head && !tmp->more)
493	continue;	353	{
494
495	/* If there is nothing more to this object, this for loop	354	/* If there is nothing more to this object, this for loop
496	* won't do anything.	355	* won't do anything.
497	*/	356	*/
498	for (at = tmp->arch->more, last = tmp; at != NULL; at = at->more, last = op)	357	archetype *at;
		358	object *last, *op;
		359	for (at = tmp->arch->more, last = tmp;
		360	at;
		361	at = at->more, last = op)
499	{	362	{
500	op = arch_to_object (at);	363	op = arch_to_object (at);
501		364
502	/* update x,y coordinates */	365	/* update x,y coordinates */
503	op->x += tmp->x;	366	op->x += tmp->x;
504	op->y += tmp->y;	367	op->y += tmp->y;
505	op->head = tmp;	368	op->head = tmp;
506	op->map = m;	369	op->map = this;
507	last->more = op;	370	last->more = op;
508	op->name = tmp->name;	371	op->name = tmp->name;
509	op->title = tmp->title;	372	op->title = tmp->title;
		373
510	/* we could link all the parts onto tmp, and then just	374	/* we could link all the parts onto tmp, and then just
511	* call insert_ob_in_map once, but the effect is the same,	375	* call insert_ob_in_map once, but the effect is the same,
512	* as insert_ob_in_map will call itself with each part, and	376	* as insert_ob_in_map will call itself with each part, and
513	* the coding is simpler to just to it here with each part.	377	* the coding is simpler to just to it here with each part.
514	*/	378	*/
515	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);	379	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
516	} /* for at = tmp->arch->more */	380	}
517	} /* for objects on this space */	381	}
		382
		383	tmp = above;
		384	}
518	}	385	}
519		386
520	/*	387	/*
521	* Loads (ands parses) the objects into a given map from the specified	388	* Loads (ands parses) the objects into a given map from the specified
522	* file pointer.	389	* file pointer.
523	* mapflags is the same as we get with load_original_map	390	* mapflags is the same as we get with load_original_map
524	*/	391	*/
525	void	392	bool
526	load_objects (maptile *m, object_thawer & fp, int mapflags)	393	maptile::load_objects (object_thawer &thawer)
527	{	394	{
528	int i, j;
529	int unique;	395	int unique;
530	object *op, *prev = NULL, *last_more = NULL, *otmp;	396	object *op, *prev = NULL, *last_more = NULL, *otmp;
531		397
532	op = object::create ();	398	op = object::create ();
533	op->map = m; /* To handle buttons correctly */	399	op->map = this; /* To handle buttons correctly */
534		400
535	while ((i = load_object (fp, op, mapflags)))	401	while (int i = load_object (thawer, op, 0))
536	{	402	{
537	/* if the archetype for the object is null, means that we	403	/* if the archetype for the object is null, means that we
538	* got an invalid object. Don't do anything with it - the game	404	* got an invalid object. Don't do anything with it - the game
539	* or editor will not be able to do anything with it either.	405	* or editor will not be able to do anything with it either.
540	*/	406	*/
…		…
542	{	408	{
543	LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");	409	LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
544	continue;	410	continue;
545	}	411	}
546		412
547
548	switch (i)	413	switch (i)
549	{	414	{
550	case LL_NORMAL:	415	case LL_NORMAL:
551	/* if we are loading an overlay, put the floors on the bottom */
552	if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
553	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
554	else
555	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);	416	insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
556		417
557	if (op->inv)	418	if (op->inv)
558	sum_weight (op);	419	sum_weight (op);
559		420
560	prev = op, last_more = op;	421	prev = op, last_more = op;
561	break;	422	break;
562		423
563	case LL_MORE:	424	case LL_MORE:
564	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);	425	insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
565	op->head = prev, last_more->more = op, last_more = op;	426	op->head = prev, last_more->more = op, last_more = op;
566	break;	427	break;
567	}	428	}
568		429
569	if (mapflags & MAP_STYLE)
570	remove_from_active_list (op);
571
572	op = object::create ();	430	op = object::create ();
573	op->map = m;	431	op->map = this;
574	}
575
576	for (i = 0; i < m->width; i++)
577	{
578	for (j = 0; j < m->height; j++)
579	{
580	unique = 0;
581	/* check for unique items, or unique squares */
582	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
583	{
584	if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
585	unique = 1;
586
587	if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
588	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
589	}
590	}
591	}	432	}
592		433
593	op->destroy ();	434	op->destroy ();
594	link_multipart_objects (m);
595	}
596		435
597	/* This saves all the objects on the map in a non destructive fashion.	436	#if 0
598	* Modified by MSW 2001-07-01 to do in a single pass - reduces code,	437	for (i = 0; i < width; i++)
599	* and we only save the head of multi part objects - this is needed	438	for (j = 0; j < height; j++)
600	* in order to do map tiling properly.
601	*/
602	void
603	save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag)
604	{
605	int i, j = 0, unique = 0;
606	object *op;
607
608	/* first pass - save one-part objects */
609	for (i = 0; i < MAP_WIDTH (m); i++)
610	for (j = 0; j < MAP_HEIGHT (m); j++)
611	{	439	{
612	unique = 0;	440	unique = 0;
		441	/* check for unique items, or unique squares */
613	for (op = GET_MAP_OB (m, i, j); op; op = op->above)	442	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
614	{	443	{
615	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	444	if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
616	unique = 1;	445	unique = 1;
617		446
618	if (op->type == PLAYER)	447	if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
619	continue;	448	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
620
621	if (op->head || op->owner)
622	continue;
623
624	if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
625	save_object (fp2, op, 3);
626	else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID))))
627	save_object (fp, op, 3);
628	}	449	}
629	}	450	}
		451	#endif
		452
		453	return true;
		454	}
		455
		456	void
		457	maptile::activate ()
		458	{
		459	if (!spaces)
		460	return;
		461
		462	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		463	for (object *op = ms->bot; op; op = op->above)
		464	op->activate_recursive ();
		465	}
		466
		467	void
		468	maptile::deactivate ()
		469	{
		470	if (!spaces)
		471	return;
		472
		473	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		474	for (object *op = ms->bot; op; op = op->above)
		475	op->deactivate_recursive ();
		476	}
		477
		478	bool
		479	maptile::save_objects (object_freezer &freezer, int flags)
		480	{
		481	if (flags & IO_HEADER)
		482	save_header (freezer);
		483
		484	if (!spaces)
		485	return false;
		486
		487	for (int i = 0; i < size (); ++i)
		488	{
		489	int unique = 0;
		490	for (object *op = spaces [i].bot; op; op = op->above)
		491	{
		492	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
		493	unique = 1;
		494
		495	if (!op->can_map_save ())
		496	continue;
		497
		498	if (unique || op->flag [FLAG_UNIQUE])
		499	{
		500	if (flags & IO_UNIQUES)
		501	save_object (freezer, op, 1);
		502	}
		503	else if (flags & IO_OBJECTS)
		504	save_object (freezer, op, 1);
		505	}
		506	}
		507
		508	return true;
		509	}
		510
		511	bool
		512	maptile::load_objects (const char *path, bool skip_header)
		513	{
		514	object_thawer thawer (path);
		515
		516	if (!thawer)
		517	return false;
		518
		519	if (skip_header)
		520	for (;;)
		521	{
		522	keyword kw = thawer.get_kv ();
		523
		524	if (kw == KW_end)
		525	break;
		526
		527	thawer.skip_kv (kw);
		528	}
		529
		530	return load_objects (thawer);
		531	}
		532
		533	bool
		534	maptile::save_objects (const char *path, int flags)
		535	{
		536	object_freezer freezer;
		537
		538	if (!save_objects (freezer, flags))
		539	return false;
		540
		541	return freezer.save (path);
630	}	542	}
631		543
632	maptile::maptile ()	544	maptile::maptile ()
633	{	545	{
634	in_memory = MAP_SWAPPED;	546	in_memory = MAP_SWAPPED;
		547
635	/* The maps used to pick up default x and y values from the	548	/* The maps used to pick up default x and y values from the
636	* map archetype. Mimic that behaviour.	549	* map archetype. Mimic that behaviour.
637	*/	550	*/
638	MAP_WIDTH (this) = 16;	551	width = 16;
639	MAP_HEIGHT (this) = 16;	552	height = 16;
640	MAP_RESET_TIMEOUT (this) = 0;	553	reset_timeout = 0;
641	MAP_TIMEOUT (this) = 300;	554	timeout = 300;
642	MAP_ENTER_X (this) = 0;	555	enter_x = 0;
643	MAP_ENTER_Y (this) = 0;	556	enter_y = 0;
644	/*set part to -1 indicating conversion to weather map not yet done */
645	MAP_WORLDPARTX (this) = -1;
646	MAP_WORLDPARTY (this) = -1;
647	}	557	}
648		558
649	/*	559	maptile::maptile (int w, int h)
650	* Allocates, initialises, and returns a pointer to a maptile.
651	* Modified to no longer take a path option which was not being
652	* used anyways. MSW 2001-07-01
653	*/
654	maptile *
655	get_linked_map (void)
656	{	560	{
657	maptile *mp, *map = new maptile;	561	in_memory = MAP_SWAPPED;
658		562
659	for (mp = first_map; mp && mp->next; mp = mp->next);	563	width = w;
		564	height = h;
		565	reset_timeout = 0;
		566	timeout = 300;
		567	enter_x = 0;
		568	enter_y = 0;
660		569
661	if (mp == NULL)	570	alloc ();
662	first_map = map;
663	else
664	mp->next = map;
665
666	return map;
667	}	571	}
668		572
669	/*	573	/*
670	* Allocates the arrays contained in a maptile.	574	* Allocates the arrays contained in a maptile.
671	* This basically allocates the dynamic array of spaces for the	575	* This basically allocates the dynamic array of spaces for the
672	* map.	576	* map.
673	*/	577	*/
674	void	578	void
675	maptile::allocate ()	579	maptile::alloc ()
676	{	580	{
677	in_memory = MAP_IN_MEMORY;
678
679	/* Log this condition and free the storage. We could I suppose
680	* realloc, but if the caller is presuming the data will be intact,
681	* that is their poor assumption.
682	*/
683	if (spaces)	581	if (spaces)
684	{
685	LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
686	free (spaces);
687	}
688
689	spaces = (mapspace *)
690	calloc (1, width * height * sizeof (mapspace));
691
692	if (!spaces)
693	fatal (OUT_OF_MEMORY);
694	}
695
696	/* Create and returns a map of the specific size. Used
697	* in random map code and the editor.
698	*/
699	maptile *
700	get_empty_map (int sizex, int sizey)
701	{
702	maptile *m = get_linked_map ();
703
704	m->width = sizex;
705	m->height = sizey;
706	m->in_memory = MAP_SWAPPED;
707	m->allocate ();
708
709	return m;	582	return;
		583
		584	spaces = salloc0<mapspace> (size ());
710	}	585	}
711		586
712	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	587	/* Takes a string from a map definition and outputs a pointer to the array of shopitems
713	* corresponding to that string. Memory is allocated for this, it must be freed	588	* corresponding to that string. Memory is allocated for this, it must be freed
714	* at a later date.	589	* at a later date.
715	* Called by parse_map_headers below.	590	* Called by parse_map_headers below.
716	*/	591	*/
717
718	static shopitems *	592	static shopitems *
719	parse_shop_string (const char *input_string)	593	parse_shop_string (const char *input_string)
720	{	594	{
721	char *shop_string, *p, *q, *next_semicolon, *next_colon;	595	char *shop_string, *p, *q, *next_semicolon, *next_colon;
722	shopitems *items = NULL;	596	shopitems *items = NULL;
…		…
731	p = strchr (p, ';');	605	p = strchr (p, ';');
732	number_of_entries++;	606	number_of_entries++;
733	if (p)	607	if (p)
734	p++;	608	p++;
735	}	609	}
		610
736	p = shop_string;	611	p = shop_string;
737	strip_endline (p);	612	strip_endline (p);
738	items = new shopitems[number_of_entries + 1];	613	items = new shopitems[number_of_entries + 1];
739	for (i = 0; i < number_of_entries; i++)	614	for (i = 0; i < number_of_entries; i++)
740	{	615	{
741	if (!p)	616	if (!p)
742	{	617	{
743	LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");	618	LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
744	break;	619	break;
745	}	620	}
		621
746	next_semicolon = strchr (p, ';');	622	next_semicolon = strchr (p, ';');
747	next_colon = strchr (p, ':');	623	next_colon = strchr (p, ':');
748	/* if there is a stregth specified, figure out what it is, we'll need it soon. */	624	/* if there is a stregth specified, figure out what it is, we'll need it soon. */
749	if (next_colon && (!next_semicolon || next_colon < next_semicolon))	625	if (next_colon && (!next_semicolon || next_colon < next_semicolon))
750	items[i].strength = atoi (strchr (p, ':') + 1);	626	items[i].strength = atoi (strchr (p, ':') + 1);
…		…
777	* the next entry while we're at it, better print a warning	653	* the next entry while we're at it, better print a warning
778	*/	654	*/
779	LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);	655	LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
780	}	656	}
781	}	657	}
		658
782	items[i].index = number_of_entries;	659	items[i].index = number_of_entries;
783	if (next_semicolon)	660	if (next_semicolon)
784	p = ++next_semicolon;	661	p = ++next_semicolon;
785	else	662	else
786	p = NULL;	663	p = NULL;
787	}	664	}
		665
788	free (shop_string);	666	free (shop_string);
789	return items;	667	return items;
790	}	668	}
791		669
792	/* opposite of parse string, this puts the string that was originally fed in to	670	/* opposite of parse string, this puts the string that was originally fed in to
…		…
801	for (i = 0; i < m->shopitems[0].index; i++)	679	for (i = 0; i < m->shopitems[0].index; i++)
802	{	680	{
803	if (m->shopitems[i].typenum)	681	if (m->shopitems[i].typenum)
804	{	682	{
805	if (m->shopitems[i].strength)	683	if (m->shopitems[i].strength)
806	{
807	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	684	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
808	}
809	else	685	else
810	sprintf (tmp, "%s;", m->shopitems[i].name);	686	sprintf (tmp, "%s;", m->shopitems[i].name);
811	}	687	}
812	else	688	else
813	{	689	{
814	if (m->shopitems[i].strength)	690	if (m->shopitems[i].strength)
815	{
816	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	691	sprintf (tmp, "*:%d;", m->shopitems[i].strength);
817	}
818	else	692	else
819	sprintf (tmp, "*");	693	sprintf (tmp, "*");
820	}	694	}
		695
821	strcat (output_string, tmp);	696	strcat (output_string, tmp);
822	}	697	}
823	}	698	}
824		699
825	/* This loads the header information of the map. The header	700	/* This loads the header information of the map. The header
…		…
830	* put all the stuff in the map object so that names actually make	705	* put all the stuff in the map object so that names actually make
831	* sense.	706	* sense.
832	* This could be done in lex (like the object loader), but I think	707	* This could be done in lex (like the object loader), but I think
833	* currently, there are few enough fields this is not a big deal.	708	* currently, there are few enough fields this is not a big deal.
834	* MSW 2001-07-01	709	* MSW 2001-07-01
835	* return 0 on success, 1 on failure.
836	*/	710	*/
837		711	bool
838	static int	712	maptile::load_header (object_thawer &thawer)
839	load_map_header (object_thawer & fp, maptile *m)
840	{	713	{
841	char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;	714	char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
842	int msgpos = 0;	715	int msgpos = 0;
843	int maplorepos = 0;	716	int maplorepos = 0;
844		717
845	while (fgets (buf, HUGE_BUF, fp) != NULL)	718	for (;;)
846	{	719	{
847	buf[HUGE_BUF - 1] = 0;	720	keyword kw = thawer.get_kv ();
848	key = buf;
849		721
850	while (isspace (*key))	722	switch (kw)
851	key++;
852
853	if (*key == 0)
854	continue; /* empty line */
855
856	value = strchr (key, ' ');
857
858	if (!value)
859	{	723	{
860	if ((end = strchr (key, '\n')))	724	case KW_EOF:
861	*end = 0;	725	LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
		726	return false;
		727
		728	case KW_end:
		729	return true;
		730
		731	case KW_msg:
		732	thawer.get_ml (KW_endmsg, msg);
		733	break;
		734
		735	case KW_lore: // CF+ extension
		736	thawer.get_ml (KW_endlore, maplore);
		737	break;
		738
		739	case KW_maplore:
		740	thawer.get_ml (KW_endmaplore, maplore);
		741	break;
		742
		743	case KW_arch:
		744	if (strcmp (thawer.get_str (), "map"))
		745	LOG (llevError, "%s: loading map and got a non 'arch map' line (arch %s), skipping.\n", &path, thawer.get_str ());
		746	break;
		747
		748	case KW_oid:
		749	thawer.get (this, thawer.get_sint32 ());
		750	break;
		751
		752	case KW_file_format_version: break; // nop
		753
		754	case KW_name: thawer.get (name); break;
		755	case KW_attach: thawer.get (attach); break;
		756	case KW_reset_time: thawer.get (reset_time); break;
		757	case KW_shopgreed: thawer.get (shopgreed); break;
		758	case KW_shopmin: thawer.get (shopmin); break;
		759	case KW_shopmax: thawer.get (shopmax); break;
		760	case KW_shoprace: thawer.get (shoprace); break;
		761	case KW_outdoor: thawer.get (outdoor); break;
		762	case KW_temp: thawer.get (temp); break;
		763	case KW_pressure: thawer.get (pressure); break;
		764	case KW_humid: thawer.get (humid); break;
		765	case KW_windspeed: thawer.get (windspeed); break;
		766	case KW_winddir: thawer.get (winddir); break;
		767	case KW_sky: thawer.get (sky); break;
		768
		769	case KW_per_player: thawer.get (per_player); break;
		770	case KW_per_party: thawer.get (per_party); break;
		771
		772	case KW_region: get_region_by_name (thawer.get_str ()); break;
		773	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
		774
		775	// old names new names
		776	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
		777	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
		778	case KW_x: case KW_width: thawer.get (width); break;
		779	case KW_y: case KW_height: thawer.get (height); break;
		780	case KW_weight: case KW_reset_timeout: thawer.get (reset_timeout); break;
		781	case KW_value: case KW_swap_time: thawer.get (timeout); break;
		782	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
		783	case KW_invisible: case KW_darkness: thawer.get (darkness); break;
		784	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
		785
		786	case KW_tile_path_1: thawer.get (tile_path [0]); break;
		787	case KW_tile_path_2: thawer.get (tile_path [1]); break;
		788	case KW_tile_path_3: thawer.get (tile_path [2]); break;
		789	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		790
		791	default:
		792	LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
		793	break;
862	}	794	}
863	else
864	{
865	*value = 0;
866	value++;
867	end = strchr (value, '\n');
868
869	while (isspace (*value))
870	{
871	value++;
872
873	if (*value == '\0' || value == end)
874	{
875	/* Nothing but spaces. */
876	value = NULL;
877	break;
878	}
879	}
880	}
881
882	if (!end)
883	{
884	LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
885	return 1;
886	}
887
888	/* key is the field name, value is what it should be set
889	* to. We've already done the work to null terminate key,
890	* and strip off any leading spaces for both of these.
891	* We have not touched the newline at the end of the line -
892	* these are needed for some values. the end pointer
893	* points to the first of the newlines.
894	* value could be NULL! It would be easy enough to just point
895	* this to "" to prevent cores, but that would let more errors slide
896	* through.
897	*
898	* First check for entries that do not use the value parameter, then
899	* validate that value is given and check for the remaining entries
900	* that use the parameter.
901	*/
902
903	if (!strcmp (key, "msg"))
904	{
905	while (fgets (buf, HUGE_BUF, fp) != NULL)
906	{
907	if (!strcmp (buf, "endmsg\n"))
908	break;
909	else
910	{
911	/* slightly more efficient than strcat */
912	strcpy (msgbuf + msgpos, buf);
913	msgpos += strlen (buf);
914	}
915	}
916	/* There are lots of maps that have empty messages (eg, msg/endmsg
917	* with nothing between). There is no reason in those cases to
918	* keep the empty message. Also, msgbuf contains garbage data
919	* when msgpos is zero, so copying it results in crashes
920	*/
921	if (msgpos != 0)
922	m->msg = strdup (msgbuf);
923	}
924	else if (!strcmp (key, "maplore"))
925	{
926	while (fgets (buf, HUGE_BUF, fp) != NULL)
927	{
928	if (!strcmp (buf, "endmaplore\n"))
929	break;
930	else
931	{
932	/* slightly more efficient than strcat */
933	strcpy (maplorebuf + maplorepos, buf);
934	maplorepos += strlen (buf);
935	}
936	}
937	if (maplorepos != 0)
938	m->maplore = strdup (maplorebuf);
939	}
940	else if (!strcmp (key, "end"))
941	{
942	break;
943	}
944	else if (value == NULL)
945	{
946	LOG (llevError, "Got '%s' line without parameter in map header\n", key);
947	}
948	else if (!strcmp (key, "arch"))
949	{
950	/* This is an oddity, but not something we care about much. */
951	if (strcmp (value, "map\n"))
952	LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
953	}
954	else if (!strcmp (key, "name"))
955	{
956	*end = 0;
957	m->name = strdup (value);
958	}
959	/* first strcmp value on these are old names supported
960	* for compatibility reasons. The new values (second) are
961	* what really should be used.
962	*/
963	else if (!strcmp (key, "oid"))
964	fp.get (m, atoi (value));
965	else if (!strcmp (key, "attach"))
966	m->attach = value;
967	else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
968	m->enter_x = atoi (value);
969	else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
970	m->enter_y = atoi (value);
971	else if (!strcmp (key, "x") || !strcmp (key, "width"))
972	m->width = atoi (value);
973	else if (!strcmp (key, "y") || !strcmp (key, "height"))
974	m->height = atoi (value);
975	else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
976	m->reset_timeout = atoi (value);
977	else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
978	m->timeout = atoi (value);
979	else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
980	m->difficulty = clamp (atoi (value), 1, settings.max_level);
981	else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
982	m->darkness = atoi (value);
983	else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
984	m->fixed_resettime = atoi (value);
985	else if (!strcmp (key, "unique"))
986	m->unique = atoi (value);
987	else if (!strcmp (key, "template"))
988	m->templatemap = atoi (value);
989	else if (!strcmp (key, "region"))
990	m->region = get_region_by_name (value);
991	else if (!strcmp (key, "shopitems"))
992	{
993	*end = 0;
994	m->shopitems = parse_shop_string (value);
995	}
996	else if (!strcmp (key, "shopgreed"))
997	m->shopgreed = atof (value);
998	else if (!strcmp (key, "shopmin"))
999	m->shopmin = atol (value);
1000	else if (!strcmp (key, "shopmax"))
1001	m->shopmax = atol (value);
1002	else if (!strcmp (key, "shoprace"))
1003	{
1004	*end = 0;
1005	m->shoprace = strdup (value);
1006	}
1007	else if (!strcmp (key, "outdoor"))
1008	m->outdoor = atoi (value);
1009	else if (!strcmp (key, "temp"))
1010	m->temp = atoi (value);
1011	else if (!strcmp (key, "pressure"))
1012	m->pressure = atoi (value);
1013	else if (!strcmp (key, "humid"))
1014	m->humid = atoi (value);
1015	else if (!strcmp (key, "windspeed"))
1016	m->windspeed = atoi (value);
1017	else if (!strcmp (key, "winddir"))
1018	m->winddir = atoi (value);
1019	else if (!strcmp (key, "sky"))
1020	m->sky = atoi (value);
1021	else if (!strcmp (key, "nosmooth"))
1022	m->nosmooth = atoi (value);
1023	else if (!strncmp (key, "tile_path_", 10))
1024	{
1025	int tile = atoi (key + 10);
1026
1027	if (tile < 1 || tile > 4)
1028	{
1029	LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
1030	}
1031	else
1032	{
1033	char *path;
1034
1035	*end = 0;
1036
1037	if (m->tile_path[tile - 1])
1038	{
1039	LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
1040	free (m->tile_path[tile - 1]);
1041	m->tile_path[tile - 1] = NULL;
1042	}
1043
1044	if (check_path (value, 1) != -1)
1045	{
1046	/* The unadorned path works. */
1047	path = value;
1048	}
1049	else
1050	{
1051	/* Try again; it could be a relative exit. */
1052
1053	path = path_combine_and_normalize (m->path, value);
1054
1055	if (check_path (path, 1) == -1)
1056	{
1057	LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
1058	path = NULL;
1059	}
1060	}
1061
1062	if (editor)
1063	{
1064	/* Use the value as in the file. */
1065	m->tile_path[tile - 1] = strdup (value);
1066	}
1067	else if (path != NULL)
1068	{
1069	/* Use the normalized value. */
1070	m->tile_path[tile - 1] = strdup (path);
1071	}
1072	} /* end if tile direction (in)valid */
1073	}
1074	else
1075	LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1076	}
1077
1078	if (!key || strcmp (key, "end"))
1079	{	795	}
1080	LOG (llevError, "Got premature eof on map header!\n");
1081	return 1;
1082	}
1083		796
1084	return 0;	797	abort ();
1085	}	798	}
1086		799
1087	/*	800	bool
1088	* Opens the file "filename" and reads information about the map	801	maptile::load_header (const char *path)
1089	* from the given file, and stores it in a newly allocated
1090	* maptile. A pointer to this structure is returned, or NULL on failure.
1091	* flags correspond to those in map.h. Main ones used are
1092	* MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1093	* MAP_BLOCK, in which case we block on this load. This happens in all
1094	* cases, no matter if this flag is set or not.
1095	* MAP_STYLE: style map - don't add active objects, don't add to server
1096	* managed map list.
1097	*/
1098
1099	maptile *
1100	load_original_map (const char *filename, int flags)
1101	{	802	{
1102	maptile *m;
1103	char pathname[MAX_BUF];
1104
1105	if (flags & MAP_PLAYER_UNIQUE)
1106	strcpy (pathname, filename);
1107	else if (flags & MAP_OVERLAY)
1108	strcpy (pathname, create_overlay_pathname (filename));
1109	else
1110	strcpy (pathname, create_pathname (filename));
1111
1112	LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1113
1114	object_thawer thawer (pathname);	803	object_thawer thawer (path);
1115		804
1116	if (!thawer)	805	if (!thawer)
1117	return 0;	806	return false;
1118		807
1119	m = get_linked_map ();	808	return load_header (thawer);
1120
1121	strcpy (m->path, filename);
1122	if (load_map_header (thawer, m))
1123	{
1124	LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1125	delete_map (m);
1126	return NULL;
1127	}
1128
1129	m->allocate ();
1130
1131	m->in_memory = MAP_LOADING;
1132	load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1133
1134	m->in_memory = MAP_IN_MEMORY;
1135	if (!MAP_DIFFICULTY (m))
1136	MAP_DIFFICULTY (m) = calculate_difficulty (m);
1137	set_map_reset_time (m);
1138	m->instantiate ();
1139	return (m);
1140	}
1141
1142	/*
1143	* Loads a map, which has been loaded earlier, from file.
1144	* Return the map object we load into (this can change from the passed
1145	* option if we can't find the original map)
1146	*/
1147
1148	static maptile *
1149	load_temporary_map (maptile *m)
1150	{
1151	char buf[MAX_BUF];
1152
1153	if (!m->tmpname)
1154	{
1155	LOG (llevError, "No temporary filename for map %s\n", m->path);
1156	strcpy (buf, m->path);
1157	delete_map (m);
1158	m = load_original_map (buf, 0);
1159	if (m == NULL)
1160	return NULL;
1161	fix_auto_apply (m); /* Chests which open as default */
1162	return m;
1163	}
1164
1165	object_thawer thawer (m->tmpname);
1166
1167	if (!thawer)
1168	{
1169	strcpy (buf, m->path);
1170	delete_map (m);
1171	m = load_original_map (buf, 0);
1172	if (!m)
1173	return NULL;
1174	fix_auto_apply (m); /* Chests which open as default */
1175	return m;
1176	}
1177
1178	if (load_map_header (thawer, m))
1179	{
1180	LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1181	delete_map (m);
1182	m = load_original_map (m->path, 0);
1183	return NULL;
1184	}
1185
1186	m->allocate ();
1187
1188	m->in_memory = MAP_LOADING;
1189	load_objects (m, thawer, 0);
1190
1191	m->in_memory = MAP_IN_MEMORY;
1192	INVOKE_MAP (SWAPIN, m);
1193	return m;
1194	}
1195
1196	/*
1197	* Loads a map, which has been loaded earlier, from file.
1198	* Return the map object we load into (this can change from the passed
1199	* option if we can't find the original map)
1200	*/
1201
1202	maptile *
1203	load_overlay_map (const char *filename, maptile *m)
1204	{
1205	char pathname[MAX_BUF];
1206
1207	strcpy (pathname, create_overlay_pathname (filename));
1208
1209	object_thawer thawer (pathname);
1210
1211	if (!thawer)
1212	return m;
1213
1214	if (load_map_header (thawer, m))
1215	{
1216	LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1217	delete_map (m);
1218	m = load_original_map (m->path, 0);
1219	return NULL;
1220	}
1221	/*m->allocate ();*/
1222
1223	m->in_memory = MAP_LOADING;
1224	load_objects (m, thawer, MAP_OVERLAY);
1225
1226	m->in_memory = MAP_IN_MEMORY;
1227	return m;
1228	}	809	}
1229		810
1230	/******************************************************************************	811	/******************************************************************************
1231	* This is the start of unique map handling code	812	* This is the start of unique map handling code
1232	*****************************************************************************/	813	*****************************************************************************/
1233		814
1234	/* This goes through map 'm' and removed any unique items on the map. */	815	/* This goes through the maptile and removed any unique items on the map. */
1235	static void	816	void
1236	delete_unique_items (maptile *m)	817	maptile::clear_unique_items ()
1237	{	818	{
1238	int i, j, unique;	819	for (int i = 0; i < size (); ++i)
1239	object *op, *next;	820	{
		821	int unique = 0;
		822	for (object *op = spaces [i].bot; op; )
		823	{
		824	object *above = op->above;
1240		825
1241	for (i = 0; i < MAP_WIDTH (m); i++)	826	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1242	for (j = 0; j < MAP_HEIGHT (m); j++)	827	unique = 1;
		828
		829	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
		830	{
		831	op->destroy_inv (false);
		832	op->destroy ();
		833	}
		834
		835	op = above;
		836	}
		837	}
		838	}
		839
		840	bool
		841	maptile::save_header (object_freezer &freezer)
		842	{
		843	#define MAP_OUT(k) freezer.put (KW_ ## k, k)
		844	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
		845
		846	MAP_OUT2 (arch, "map");
		847
		848	if (name) MAP_OUT (name);
		849	MAP_OUT (swap_time);
		850	MAP_OUT (reset_time);
		851	MAP_OUT (reset_timeout);
		852	MAP_OUT (fixed_resettime);
		853	MAP_OUT (difficulty);
		854
		855	if (region) MAP_OUT2 (region, region->name);
		856
		857	if (shopitems)
		858	{
		859	char shop[MAX_BUF];
		860	print_shop_string (this, shop);
		861	MAP_OUT2 (shopitems, shop);
		862	}
		863
		864	MAP_OUT (shopgreed);
		865	MAP_OUT (shopmin);
		866	MAP_OUT (shopmax);
		867	if (shoprace) MAP_OUT (shoprace);
		868	MAP_OUT (darkness);
		869	MAP_OUT (width);
		870	MAP_OUT (height);
		871	MAP_OUT (enter_x);
		872	MAP_OUT (enter_y);
		873
		874	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
		875	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
		876
		877	MAP_OUT (outdoor);
		878	MAP_OUT (temp);
		879	MAP_OUT (pressure);
		880	MAP_OUT (humid);
		881	MAP_OUT (windspeed);
		882	MAP_OUT (winddir);
		883	MAP_OUT (sky);
		884
		885	MAP_OUT (per_player);
		886	MAP_OUT (per_party);
		887
		888	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
		889	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
		890	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
		891	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
		892
		893	freezer.put (this);
		894	freezer.put (KW_end);
		895
		896	return true;
		897	}
		898
		899	bool
		900	maptile::save_header (const char *path)
		901	{
		902	object_freezer freezer;
		903
		904	if (!save_header (freezer))
		905	return false;
		906
		907	return freezer.save (path);
		908	}
		909
		910	/*
		911	* Remove and free all objects in the given map.
		912	*/
		913	void
		914	maptile::clear ()
		915	{
		916	if (!spaces)
		917	return;
		918
		919	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		920	while (object *op = ms->bot)
1243	{	921	{
1244	unique = 0;	922	if (op->head)
		923	op = op->head;
1245		924
1246	for (op = GET_MAP_OB (m, i, j); op; op = next)	925	op->destroy_inv (false);
		926	op->destroy ();
		927	}
		928
		929	sfree (spaces, size ()), spaces = 0;
		930
		931	if (buttons)
		932	free_objectlinkpt (buttons), buttons = 0;
		933	}
		934
		935	void
		936	maptile::clear_header ()
		937	{
		938	name = 0;
		939	msg = 0;
		940	maplore = 0;
		941	shoprace = 0;
		942	delete [] shopitems, shopitems = 0;
		943
		944	for (int i = 0; i < 4; i++)
		945	tile_path [i] = 0;
		946	}
		947
		948	maptile::~maptile ()
		949	{
		950	assert (destroyed ());
		951	}
		952
		953	void
		954	maptile::clear_links_to (maptile *m)
		955	{
		956	/* We need to look through all the maps and see if any maps
		957	* are pointing at this one for tiling information. Since
		958	* tiling can be asymetric, we just can not look to see which
		959	* maps this map tiles with and clears those.
		960	*/
		961	for (int i = 0; i < 4; i++)
		962	if (tile_map[i] == m)
		963	tile_map[i] = 0;
		964	}
		965
		966	void
		967	maptile::do_destroy ()
		968	{
		969	attachable::do_destroy ();
		970
		971	clear ();
		972	}
		973
		974	/*
		975	* Updates every button on the map (by calling update_button() for them).
		976	*/
		977	void
		978	maptile::update_buttons ()
		979	{
		980	for (oblinkpt *obp = buttons; obp; obp = obp->next)
		981	for (objectlink *ol = obp->link; ol; ol = ol->next)
		982	{
		983	if (!ol->ob)
1247	{	984	{
1248	next = op->above;	985	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1249		986	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1250	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	987	continue;
1251	unique = 1;
1252
1253	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1254	{
1255	clean_object (op);
1256
1257	if (QUERY_FLAG (op, FLAG_IS_LINKED))
1258	remove_button_link (op);
1259
1260	op->destroy ();
1261	}	988	}
		989
		990	if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
		991	{
		992	update_button (ol->ob);
		993	break;
1262	}	994	}
1263	}	995	}
1264	}	996	}
1265
1266
1267	/*
1268	* Loads unique objects from file(s) into the map which is in memory
1269	* m is the map to load unique items into.
1270	*/
1271	static void
1272	load_unique_objects (maptile *m)
1273	{
1274	int count;
1275	char firstname[MAX_BUF];
1276
1277	for (count = 0; count < 10; count++)
1278	{
1279	sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1280	if (!access (firstname, R_OK))
1281	break;
1282	}
1283	/* If we get here, we did not find any map */
1284	if (count == 10)
1285	return;
1286
1287	object_thawer thawer (firstname);
1288
1289	if (!thawer)
1290	return;
1291
1292	m->in_memory = MAP_LOADING;
1293	if (m->tmpname == NULL) /* if we have loaded unique items from */
1294	delete_unique_items (m); /* original map before, don't duplicate them */
1295	load_objects (m, thawer, 0);
1296
1297	m->in_memory = MAP_IN_MEMORY;
1298	}
1299
1300
1301	/*
1302	* Saves a map to file. If flag is set, it is saved into the same
1303	* file it was (originally) loaded from. Otherwise a temporary
1304	* filename will be genarated, and the file will be stored there.
1305	* The temporary filename will be stored in the maptileure.
1306	* If the map is unique, we also save to the filename in the map
1307	* (this should have been updated when first loaded)
1308	*/
1309
1310	int
1311	new_save_map (maptile *m, int flag)
1312	{
1313	char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1314	int i;
1315
1316	if (flag && !*m->path)
1317	{
1318	LOG (llevError, "Tried to save map without path.\n");
1319	return -1;
1320	}
1321
1322	if (flag || (m->unique) || (m->templatemap))
1323	{
1324	if (!m->unique && !m->templatemap)
1325	{ /* flag is set */
1326	if (flag == 2)
1327	strcpy (filename, create_overlay_pathname (m->path));
1328	else
1329	strcpy (filename, create_pathname (m->path));
1330	}
1331	else
1332	strcpy (filename, m->path);
1333
1334	make_path_to_file (filename);
1335	}
1336	else
1337	{
1338	if (!m->tmpname)
1339	m->tmpname = tempnam (settings.tmpdir, NULL);
1340
1341	strcpy (filename, m->tmpname);
1342	}
1343
1344	LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1345	m->in_memory = MAP_SAVING;
1346
1347	object_freezer freezer;
1348
1349	/* legacy */
1350	fprintf (freezer, "arch map\n");
1351	if (m->name)
1352	fprintf (freezer, "name %s\n", m->name);
1353	if (!flag)
1354	fprintf (freezer, "swap_time %d\n", m->swap_time);
1355	if (m->reset_timeout)
1356	fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1357	if (m->fixed_resettime)
1358	fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1359	/* we unfortunately have no idea if this is a value the creator set
1360	* or a difficulty value we generated when the map was first loaded
1361	*/
1362	if (m->difficulty)
1363	fprintf (freezer, "difficulty %d\n", m->difficulty);
1364	if (m->region)
1365	fprintf (freezer, "region %s\n", m->region->name);
1366	if (m->shopitems)
1367	{
1368	print_shop_string (m, shop);
1369	fprintf (freezer, "shopitems %s\n", shop);
1370	}
1371	if (m->shopgreed)
1372	fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1373	if (m->shopmin)
1374	fprintf (freezer, "shopmin %llu\n", m->shopmin);
1375	if (m->shopmax)
1376	fprintf (freezer, "shopmax %llu\n", m->shopmax);
1377	if (m->shoprace)
1378	fprintf (freezer, "shoprace %s\n", m->shoprace);
1379	if (m->darkness)
1380	fprintf (freezer, "darkness %d\n", m->darkness);
1381	if (m->width)
1382	fprintf (freezer, "width %d\n", m->width);
1383	if (m->height)
1384	fprintf (freezer, "height %d\n", m->height);
1385	if (m->enter_x)
1386	fprintf (freezer, "enter_x %d\n", m->enter_x);
1387	if (m->enter_y)
1388	fprintf (freezer, "enter_y %d\n", m->enter_y);
1389	if (m->msg)
1390	fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1391	if (m->maplore)
1392	fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1393	if (m->unique)
1394	fprintf (freezer, "unique %d\n", m->unique);
1395	if (m->templatemap)
1396	fprintf (freezer, "template %d\n", m->templatemap);
1397	if (m->outdoor)
1398	fprintf (freezer, "outdoor %d\n", m->outdoor);
1399	if (m->temp)
1400	fprintf (freezer, "temp %d\n", m->temp);
1401	if (m->pressure)
1402	fprintf (freezer, "pressure %d\n", m->pressure);
1403	if (m->humid)
1404	fprintf (freezer, "humid %d\n", m->humid);
1405	if (m->windspeed)
1406	fprintf (freezer, "windspeed %d\n", m->windspeed);
1407	if (m->winddir)
1408	fprintf (freezer, "winddir %d\n", m->winddir);
1409	if (m->sky)
1410	fprintf (freezer, "sky %d\n", m->sky);
1411	if (m->nosmooth)
1412	fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1413
1414	/* Save any tiling information, except on overlays */
1415	if (flag != 2)
1416	for (i = 0; i < 4; i++)
1417	if (m->tile_path[i])
1418	fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1419
1420	freezer.put (m);
1421	fprintf (freezer, "end\n");
1422
1423	/* In the game save unique items in the different file, but
1424	* in the editor save them to the normal map file.
1425	* If unique map, save files in the proper destination (set by
1426	* player)
1427	*/
1428	if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1429	{
1430	object_freezer unique;
1431
1432	if (flag == 2)
1433	save_objects (m, freezer, unique, 2);
1434	else
1435	save_objects (m, freezer, unique, 0);
1436
1437	sprintf (buf, "%s.v00", create_items_path (m->path));
1438
1439	unique.save (buf);
1440	}
1441	else
1442	{ /* save same file when not playing, like in editor */
1443	save_objects (m, freezer, freezer, 0);
1444	}
1445
1446	freezer.save (filename);
1447
1448	return 0;
1449	}
1450
1451
1452	/*
1453	* Remove and free all objects in the inventory of the given object.
1454	* object.c ?
1455	*/
1456
1457	void
1458	clean_object (object *op)
1459	{
1460	object *tmp, *next;
1461
1462	for (tmp = op->inv; tmp; tmp = next)
1463	{
1464	next = tmp->below;
1465
1466	clean_object (tmp);
1467	if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1468	remove_button_link (tmp);
1469
1470	tmp->destroy ();
1471	}
1472	}
1473
1474	/*
1475	* Remove and free all objects in the given map.
1476	*/
1477
1478	void
1479	free_all_objects (maptile *m)
1480	{
1481	int i, j;
1482	object *op;
1483
1484	for (i = 0; i < MAP_WIDTH (m); i++)
1485	for (j = 0; j < MAP_HEIGHT (m); j++)
1486	{
1487	object *previous_obj = NULL;
1488
1489	while ((op = GET_MAP_OB (m, i, j)) != NULL)
1490	{
1491	if (op == previous_obj)
1492	{
1493	LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1494	break;
1495	}
1496
1497	previous_obj = op;
1498
1499	if (op->head != NULL)
1500	op = op->head;
1501
1502	/* If the map isn't in memory, free_object will remove and
1503	* free objects in op's inventory. So let it do the job.
1504	*/
1505	if (m->in_memory == MAP_IN_MEMORY)
1506	clean_object (op);
1507
1508	op->destroy ();
1509	}
1510	}
1511	}
1512
1513	/*
1514	* Frees everything allocated by the given maptileure.
1515	* don't free tmpname - our caller is left to do that
1516	*/
1517
1518	void
1519	free_map (maptile *m, int flag)
1520	{
1521	int i;
1522
1523	if (!m->in_memory)
1524	{
1525	LOG (llevError, "Trying to free freed map.\n");
1526	return;
1527	}
1528
1529	// TODO: use new/delete
1530	#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1531
1532	if (flag && m->spaces)
1533	free_all_objects (m);
1534	if (m->name)
1535	FREE_AND_CLEAR (m->name);
1536	if (m->spaces)
1537	FREE_AND_CLEAR (m->spaces);
1538	if (m->msg)
1539	FREE_AND_CLEAR (m->msg);
1540	if (m->maplore)
1541	FREE_AND_CLEAR (m->maplore);
1542
1543	delete [] m->shopitems;
1544	m->shopitems = 0;
1545
1546	if (m->shoprace)
1547	FREE_AND_CLEAR (m->shoprace);
1548
1549	if (m->buttons)
1550	free_objectlinkpt (m->buttons);
1551
1552	m->buttons = NULL;
1553
1554	for (i = 0; i < 4; i++)
1555	{
1556	if (m->tile_path[i])
1557	FREE_AND_CLEAR (m->tile_path[i]);
1558	m->tile_map[i] = NULL;
1559	}
1560
1561	m->in_memory = MAP_SWAPPED;
1562
1563	#undef FREE_AND_CLEAR
1564
1565	}
1566
1567	/*
1568	* function: vanish maptile
1569	* m : pointer to maptile, if NULL no action
1570	* this deletes all the data on the map (freeing pointers)
1571	* and then removes this map from the global linked list of maps.
1572	*/
1573
1574	void
1575	delete_map (maptile *m)
1576	{
1577	maptile *tmp, *last;
1578	int i;
1579
1580	if (!m)
1581	return;
1582
1583	m->clear ();
1584
1585	if (m->in_memory == MAP_IN_MEMORY)
1586	{
1587	/* change to MAP_SAVING, even though we are not,
1588	* so that remove_ob doesn't do as much work.
1589	*/
1590	m->in_memory = MAP_SAVING;
1591	free_map (m, 1);
1592	}
1593	/* move this out of free_map, since tmpname can still be needed if
1594	* the map is swapped out.
1595	*/
1596	if (m->tmpname)
1597	{
1598	free (m->tmpname);
1599	m->tmpname = NULL;
1600	}
1601	last = NULL;
1602	/* We need to look through all the maps and see if any maps
1603	* are pointing at this one for tiling information. Since
1604	* tiling can be assymetric, we just can not look to see which
1605	* maps this map tiles with and clears those.
1606	*/
1607	for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1608	{
1609	if (tmp->next == m)
1610	last = tmp;
1611
1612	/* This should hopefully get unrolled on a decent compiler */
1613	for (i = 0; i < 4; i++)
1614	if (tmp->tile_map[i] == m)
1615	tmp->tile_map[i] = NULL;
1616	}
1617
1618	/* If last is null, then this should be the first map in the list */
1619	if (!last)
1620	{
1621	if (m == first_map)
1622	first_map = m->next;
1623	else
1624	/* m->path is a static char, so should hopefully still have
1625	* some useful data in it.
1626	*/
1627	LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1628	}
1629	else
1630	last->next = m->next;
1631
1632	delete m;
1633	}
1634
1635	/*
1636	* Makes sure the given map is loaded and swapped in.
1637	* name is path name of the map.
1638	* flags meaning:
1639	* 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1640	* and don't do unique items or the like.
1641	* 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1642	* dont do any more name translation on it.
1643	*
1644	* Returns a pointer to the given map.
1645	*/
1646	maptile *
1647	ready_map_name (const char *name, int flags)
1648	{
1649	maptile *m;
1650
1651	if (!name)
1652	return (NULL);
1653
1654	/* Have we been at this level before? */
1655	m = has_been_loaded (name);
1656
1657	/* Map is good to go, so just return it */
1658	if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1659	{
1660	return m;
1661	}
1662
1663	/* unique maps always get loaded from their original location, and never
1664	* a temp location. Likewise, if map_flush is set, or we have never loaded
1665	* this map, load it now. I removed the reset checking from here -
1666	* it seems the probability of a player trying to enter a map that should
1667	* reset but hasn't yet is quite low, and removing that makes this function
1668	* a bit cleaner (and players probably shouldn't rely on exact timing for
1669	* resets in any case - if they really care, they should use the 'maps command.
1670	*/
1671	if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1672	{
1673
1674	/* first visit or time to reset */
1675	if (m)
1676	{
1677	clean_tmp_map (m); /* Doesn't make much difference */
1678	delete_map (m);
1679	}
1680
1681	/* create and load a map */
1682	if (flags & MAP_PLAYER_UNIQUE)
1683	LOG (llevDebug, "Trying to load map %s.\n", name);
1684	else
1685	LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1686
1687	//eval_pv ("$x = Event::time", 1);//D
1688	if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1689	return (NULL);
1690	//eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1691
1692	fix_auto_apply (m); /* Chests which open as default */
1693
1694	/* If a player unique map, no extra unique object file to load.
1695	* if from the editor, likewise.
1696	*/
1697	if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1698	load_unique_objects (m);
1699
1700	if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1701	{
1702	m = load_overlay_map (name, m);
1703	if (m == NULL)
1704	return NULL;
1705	}
1706
1707	if (flags & MAP_PLAYER_UNIQUE)
1708	INVOKE_MAP (SWAPIN, m);
1709
1710	}
1711	else
1712	{
1713	/* If in this loop, we found a temporary map, so load it up. */
1714
1715	m = load_temporary_map (m);
1716	if (m == NULL)
1717	return NULL;
1718	load_unique_objects (m);
1719
1720	clean_tmp_map (m);
1721	m->in_memory = MAP_IN_MEMORY;
1722	/* tempnam() on sun systems (probably others) uses malloc
1723	* to allocated space for the string. Free it here.
1724	* In some cases, load_temporary_map above won't find the
1725	* temporary map, and so has reloaded a new map. If that
1726	* is the case, tmpname is now null
1727	*/
1728	if (m->tmpname)
1729	free (m->tmpname);
1730	m->tmpname = NULL;
1731	/* It's going to be saved anew anyway */
1732	}
1733
1734	/* Below here is stuff common to both first time loaded maps and
1735	* temp maps.
1736	*/
1737
1738	decay_objects (m); /* start the decay */
1739	/* In case other objects press some buttons down */
1740	update_buttons (m);
1741	if (m->outdoor)
1742	set_darkness_map (m);
1743	/* run the weather over this map */
1744	weather_effect (name);
1745	return m;
1746	}
1747
1748		997
1749	/*	998	/*
1750	* This routine is supposed to find out the difficulty of the map.	999	* This routine is supposed to find out the difficulty of the map.
1751	* difficulty does not have a lot to do with character level,	1000	* difficulty does not have a lot to do with character level,
1752	* but does have a lot to do with treasure on the map.	1001	* but does have a lot to do with treasure on the map.
…		…
1754	* Difficulty can now be set by the map creature. If the value stored	1003	* Difficulty can now be set by the map creature. If the value stored
1755	* in the map is zero, then use this routine. Maps should really	1004	* in the map is zero, then use this routine. Maps should really
1756	* have a difficulty set than using this function - human calculation	1005	* have a difficulty set than using this function - human calculation
1757	* is much better than this functions guesswork.	1006	* is much better than this functions guesswork.
1758	*/	1007	*/
1759
1760	int	1008	int
1761	calculate_difficulty (maptile *m)	1009	maptile::estimate_difficulty () const
1762	{	1010	{
1763	object *op;
1764	archetype *at;
1765	int x, y, i;
1766	long monster_cnt = 0;	1011	long monster_cnt = 0;
1767	double avgexp = 0;	1012	double avgexp = 0;
1768	sint64 total_exp = 0;	1013	sint64 total_exp = 0;
1769		1014
1770	if (MAP_DIFFICULTY (m))	1015	for (mapspace *ms = spaces + size (); ms-- > spaces; )
1771	{	1016	for (object *op = ms->bot; op; op = op->above)
1772	LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));
1773	return MAP_DIFFICULTY (m);
1774	}
1775
1776	for (x = 0; x < MAP_WIDTH (m); x++)
1777	for (y = 0; y < MAP_HEIGHT (m); y++)
1778	for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1779	{	1017	{
1780	if (QUERY_FLAG (op, FLAG_MONSTER))	1018	if (QUERY_FLAG (op, FLAG_MONSTER))
1781	{	1019	{
1782	total_exp += op->stats.exp;	1020	total_exp += op->stats.exp;
1783	monster_cnt++;	1021	monster_cnt++;
1784	}	1022	}
1785		1023
1786	if (QUERY_FLAG (op, FLAG_GENERATOR))	1024	if (QUERY_FLAG (op, FLAG_GENERATOR))
1787	{	1025	{
1788	total_exp += op->stats.exp;	1026	total_exp += op->stats.exp;
		1027
1789	at = type_to_archetype (GENERATE_TYPE (op));	1028	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1790
1791	if (at != NULL)
1792	total_exp += at->clone.stats.exp * 8;	1029	total_exp += at->clone.stats.exp * 8;
1793		1030
1794	monster_cnt++;	1031	monster_cnt++;
1795	}	1032	}
1796	}	1033	}
1797		1034
1798	avgexp = (double) total_exp / monster_cnt;	1035	avgexp = (double) total_exp / monster_cnt;
1799		1036
1800	for (i = 1; i <= settings.max_level; i++)	1037	for (int i = 1; i <= settings.max_level; i++)
1801	{
1802	if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))	1038	if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))
1803	{
1804	/* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1805	return i;	1039	return i;
1806	}
1807	}
1808		1040
1809	return 1;	1041	return 1;
1810	}
1811
1812	void
1813	clean_tmp_map (maptile *m)
1814	{
1815	if (m->tmpname == NULL)
1816	return;
1817	INVOKE_MAP (CLEAN, m);
1818	(void) unlink (m->tmpname);
1819	}
1820
1821	void
1822	free_all_maps (void)
1823	{
1824	int real_maps = 0;
1825
1826	while (first_map)
1827	{
1828	/* I think some of the callers above before it gets here set this to be
1829	* saving, but we still want to free this data
1830	*/
1831	if (first_map->in_memory == MAP_SAVING)
1832	first_map->in_memory = MAP_IN_MEMORY;
1833	delete_map (first_map);
1834	real_maps++;
1835	}
1836	LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1837	}	1042	}
1838		1043
1839	/* change_map_light() - used to change map light level (darkness)	1044	/* change_map_light() - used to change map light level (darkness)
1840	* up or down. Returns true if successful. It should now be	1045	* up or down. Returns true if successful. It should now be
1841	* possible to change a value by more than 1.	1046	* possible to change a value by more than 1.
1842	* Move this from los.c to map.c since this is more related	1047	* Move this from los.c to map.c since this is more related
1843	* to maps than los.	1048	* to maps than los.
1844	* postive values make it darker, negative make it brighter	1049	* postive values make it darker, negative make it brighter
1845	*/	1050	*/
1846
1847	int	1051	int
1848	change_map_light (maptile *m, int change)	1052	maptile::change_map_light (int change)
1849	{	1053	{
1850	int new_level = m->darkness + change;	1054	int new_level = darkness + change;
1851		1055
1852	/* Nothing to do */	1056	/* Nothing to do */
1853	if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS))	1057	if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
1854	{
1855	return 0;	1058	return 0;
1856	}
1857		1059
1858	/* inform all players on the map */	1060	/* inform all players on the map */
1859	if (change > 0)	1061	if (change > 0)
1860	new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker.");	1062	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1861	else	1063	else
1862	new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter.");	1064	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1863		1065
1864	/* Do extra checking. since m->darkness is a unsigned value,	1066	/* Do extra checking. since darkness is a unsigned value,
1865	* we need to be extra careful about negative values.	1067	* we need to be extra careful about negative values.
1866	* In general, the checks below are only needed if change	1068	* In general, the checks below are only needed if change
1867	* is not +/-1	1069	* is not +/-1
1868	*/	1070	*/
1869	if (new_level < 0)	1071	if (new_level < 0)
1870	m->darkness = 0;	1072	darkness = 0;
1871	else if (new_level >= MAX_DARKNESS)	1073	else if (new_level >= MAX_DARKNESS)
1872	m->darkness = MAX_DARKNESS;	1074	darkness = MAX_DARKNESS;
1873	else	1075	else
1874	m->darkness = new_level;	1076	darkness = new_level;
1875		1077
1876	/* All clients need to get re-updated for the change */	1078	/* All clients need to get re-updated for the change */
1877	update_all_map_los (m);	1079	update_all_map_los (this);
1878	return 1;	1080	return 1;
1879	}	1081	}
1880		1082
1881	/*	1083	/*
1882	* This function updates various attributes about a specific space	1084	* This function updates various attributes about a specific space
…		…
1899		1101
1900	middle_obj = 0;	1102	middle_obj = 0;
1901	top_obj = 0;	1103	top_obj = 0;
1902	floor_obj = 0;	1104	floor_obj = 0;
1903		1105
1904	for (tmp = bottom; tmp; last = tmp, tmp = tmp->above)	1106	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1905	{	1107	{
1906	/* This could be made additive I guess (two lights better than	1108	/* This could be made additive I guess (two lights better than
1907	* one). But if so, it shouldn't be a simple additive - 2	1109	* one). But if so, it shouldn't be a simple additive - 2
1908	* light bulbs do not illuminate twice as far as once since	1110	* light bulbs do not illuminate twice as far as once since
1909	* it is a dissapation factor that is cubed.	1111	* it is a dissapation factor that is cubed.
…		…
2054	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;	1256	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
2055	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;	1257	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
2056	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;	1258	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
2057	}	1259	}
2058		1260
2059	void
2060	set_map_reset_time (maptile *map)
2061	{
2062	int timeout;
2063
2064	timeout = MAP_RESET_TIMEOUT (map);
2065	if (timeout <= 0)
2066	timeout = MAP_DEFAULTRESET;
2067	if (timeout >= MAP_MAXRESET)
2068	timeout = MAP_MAXRESET;
2069	MAP_WHEN_RESET (map) = time (0) + timeout;
2070	}
2071
2072	/* this updates the orig_map->tile_map[tile_num] value after loading	1261	/* this updates the orig_map->tile_map[tile_num] value after loading
2073	* the map. It also takes care of linking back the freshly loaded	1262	* the map. It also takes care of linking back the freshly loaded
2074	* maps tile_map values if it tiles back to this one. It returns	1263	* maps tile_map values if it tiles back to this one. It returns
2075	* the value of orig_map->tile_map[tile_num]. It really only does this	1264	* the value of orig_map->tile_map[tile_num]. It really only does this
2076	* so that it is easier for calling functions to verify success.	1265	* so that it is easier for calling functions to verify success.
2077	*/	1266	*/
2078
2079	static maptile *	1267	static maptile *
2080	load_and_link_tiled_map (maptile *orig_map, int tile_num)	1268	load_and_link_tiled_map (maptile *orig_map, int tile_num)
2081	{	1269	{
		1270	maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map);
		1271
		1272	if (!mp || mp->in_memory != MAP_IN_MEMORY)
		1273	{
		1274	// emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
		1275	LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
		1276	&orig_map->tile_path[tile_num], &orig_map->path);
		1277	mp = new maptile (1, 1);
		1278	mp->alloc ();
		1279	mp->in_memory = MAP_IN_MEMORY;
		1280	}
		1281
2082	int dest_tile = (tile_num + 2) % 4;	1282	int dest_tile = (tile_num + 2) % 4;
2083	char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
2084		1283
2085	orig_map->tile_map[tile_num] = ready_map_name (path, 0);	1284	orig_map->tile_map[tile_num] = mp;
2086		1285
2087	/* need to do a strcmp here as the orig_map->path is not a shared string */	1286	// optimisation: back-link map to origin map if euclidean
2088	if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && !strcmp (orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path))	1287	//TODO: non-euclidean maps MUST GO
		1288	if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
2089	orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;	1289	orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
2090		1290
2091	return orig_map->tile_map[tile_num];	1291	return mp;
2092	}	1292	}
2093		1293
2094	/* this returns TRUE if the coordinates (x,y) are out of	1294	/* this returns TRUE if the coordinates (x,y) are out of
2095	* map m. This function also takes into account any	1295	* map m. This function also takes into account any
2096	* tiling considerations, loading adjacant maps as needed.	1296	* tiling considerations, loading adjacant maps as needed.
2097	* This is the function should always be used when it	1297	* This is the function should always be used when it
2098	* necessary to check for valid coordinates.	1298	* necessary to check for valid coordinates.
2099	* This function will recursively call itself for the	1299	* This function will recursively call itself for the
2100	* tiled maps.	1300	* tiled maps.
2101	*
2102	*
2103	*/	1301	*/
2104	int	1302	int
2105	out_of_map (maptile *m, int x, int y)	1303	out_of_map (maptile *m, int x, int y)
2106	{	1304	{
2107	/* If we get passed a null map, this is obviously the	1305	/* If we get passed a null map, this is obviously the
…		…
2117	return 1;	1315	return 1;
2118		1316
2119	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)	1317	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2120	load_and_link_tiled_map (m, 3);	1318	load_and_link_tiled_map (m, 3);
2121		1319
2122	return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y));	1320	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
2123	}	1321	}
2124		1322
2125	if (x >= MAP_WIDTH (m))	1323	if (x >= m->width)
2126	{	1324	{
2127	if (!m->tile_path[1])	1325	if (!m->tile_path[1])
2128	return 1;	1326	return 1;
2129		1327
2130	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)	1328	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2131	load_and_link_tiled_map (m, 1);	1329	load_and_link_tiled_map (m, 1);
2132		1330
2133	return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y));	1331	return out_of_map (m->tile_map[1], x - m->width, y);
2134	}	1332	}
2135		1333
2136	if (y < 0)	1334	if (y < 0)
2137	{	1335	{
2138	if (!m->tile_path[0])	1336	if (!m->tile_path[0])
2139	return 1;	1337	return 1;
2140		1338
2141	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)	1339	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2142	load_and_link_tiled_map (m, 0);	1340	load_and_link_tiled_map (m, 0);
2143		1341
2144	return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0])));	1342	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
2145	}	1343	}
2146		1344
2147	if (y >= MAP_HEIGHT (m))	1345	if (y >= m->height)
2148	{	1346	{
2149	if (!m->tile_path[2])	1347	if (!m->tile_path[2])
2150	return 1;	1348	return 1;
2151		1349
2152	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)	1350	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2153	load_and_link_tiled_map (m, 2);	1351	load_and_link_tiled_map (m, 2);
2154		1352
2155	return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m)));	1353	return out_of_map (m->tile_map[2], x, y - m->height);
2156	}	1354	}
2157		1355
2158	/* Simple case - coordinates are within this local	1356	/* Simple case - coordinates are within this local
2159	* map.	1357	* map.
2160	*/	1358	*/
…		…
2168	* updates x and y to be the localized coordinates.	1366	* updates x and y to be the localized coordinates.
2169	* Using this is more efficient of calling out_of_map	1367	* Using this is more efficient of calling out_of_map
2170	* and then figuring out what the real map is	1368	* and then figuring out what the real map is
2171	*/	1369	*/
2172	maptile *	1370	maptile *
2173	get_map_from_coord (maptile *m, sint16 * x, sint16 * y)	1371	get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
2174	{	1372	{
2175
2176	if (*x < 0)	1373	if (*x < 0)
2177	{	1374	{
2178	if (!m->tile_path[3])	1375	if (!m->tile_path[3])
2179	return 0;	1376	return 0;
		1377
2180	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)	1378	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2181	load_and_link_tiled_map (m, 3);	1379	load_and_link_tiled_map (m, 3);
2182		1380
2183	*x += MAP_WIDTH (m->tile_map[3]);	1381	*x += m->tile_map[3]->width;
2184	return (get_map_from_coord (m->tile_map[3], x, y));	1382	return (get_map_from_coord (m->tile_map[3], x, y));
2185	}	1383	}
2186		1384
2187	if (*x >= MAP_WIDTH (m))	1385	if (*x >= m->width)
2188	{	1386	{
2189	if (!m->tile_path[1])	1387	if (!m->tile_path[1])
2190	return 0;	1388	return 0;
2191		1389
2192	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)	1390	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2193	load_and_link_tiled_map (m, 1);	1391	load_and_link_tiled_map (m, 1);
2194		1392
2195	*x -= MAP_WIDTH (m);	1393	*x -= m->width;
2196	return (get_map_from_coord (m->tile_map[1], x, y));	1394	return (get_map_from_coord (m->tile_map[1], x, y));
2197	}	1395	}
2198		1396
2199	if (*y < 0)	1397	if (*y < 0)
2200	{	1398	{
…		…
2202	return 0;	1400	return 0;
2203		1401
2204	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)	1402	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2205	load_and_link_tiled_map (m, 0);	1403	load_and_link_tiled_map (m, 0);
2206		1404
2207	*y += MAP_HEIGHT (m->tile_map[0]);	1405	*y += m->tile_map[0]->height;
2208	return (get_map_from_coord (m->tile_map[0], x, y));	1406	return (get_map_from_coord (m->tile_map[0], x, y));
2209	}	1407	}
2210		1408
2211	if (*y >= MAP_HEIGHT (m))	1409	if (*y >= m->height)
2212	{	1410	{
2213	if (!m->tile_path[2])	1411	if (!m->tile_path[2])
2214	return 0;	1412	return 0;
2215		1413
2216	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)	1414	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2217	load_and_link_tiled_map (m, 2);	1415	load_and_link_tiled_map (m, 2);
2218		1416
2219	*y -= MAP_HEIGHT (m);	1417	*y -= m->height;
2220	return (get_map_from_coord (m->tile_map[2], x, y));	1418	return (get_map_from_coord (m->tile_map[2], x, y));
2221	}	1419	}
2222		1420
2223	/* Simple case - coordinates are within this local	1421	/* Simple case - coordinates are within this local
2224	* map.	1422	* map.
2225	*/	1423	*/
2226
2227	return m;	1424	return m;
2228	}	1425	}
2229		1426
2230	/**	1427	/**
2231	* Return whether map2 is adjacent to map1. If so, store the distance from	1428	* Return whether map2 is adjacent to map1. If so, store the distance from
…		…
2239		1436
2240	if (map1 == map2)	1437	if (map1 == map2)
2241	{	1438	{
2242	*dx = 0;	1439	*dx = 0;
2243	*dy = 0;	1440	*dy = 0;
2244
2245	}	1441	}
2246	else if (map1->tile_map[0] == map2)	1442	else if (map1->tile_map[0] == map2)
2247	{ /* up */	1443	{ /* up */
2248	*dx = 0;	1444	*dx = 0;
2249	*dy = -MAP_HEIGHT (map2);	1445	*dy = -map2->height;
2250	}	1446	}
2251	else if (map1->tile_map[1] == map2)	1447	else if (map1->tile_map[1] == map2)
2252	{ /* right */	1448	{ /* right */
2253	*dx = MAP_WIDTH (map1);	1449	*dx = map1->width;
2254	*dy = 0;	1450	*dy = 0;
2255	}	1451	}
2256	else if (map1->tile_map[2] == map2)	1452	else if (map1->tile_map[2] == map2)
2257	{ /* down */	1453	{ /* down */
2258	*dx = 0;	1454	*dx = 0;
2259	*dy = MAP_HEIGHT (map1);	1455	*dy = map1->height;
2260	}	1456	}
2261	else if (map1->tile_map[3] == map2)	1457	else if (map1->tile_map[3] == map2)
2262	{ /* left */	1458	{ /* left */
2263	*dx = -MAP_WIDTH (map2);	1459	*dx = -map2->width;
2264	*dy = 0;	1460	*dy = 0;
2265
2266	}	1461	}
2267	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1462	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2268	{ /* up right */	1463	{ /* up right */
2269	*dx = MAP_WIDTH (map1->tile_map[0]);	1464	*dx = map1->tile_map[0]->width;
2270	*dy = -MAP_HEIGHT (map1->tile_map[0]);	1465	*dy = -map1->tile_map[0]->height;
2271	}	1466	}
2272	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1467	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2273	{ /* up left */	1468	{ /* up left */
2274	*dx = -MAP_WIDTH (map2);	1469	*dx = -map2->width;
2275	*dy = -MAP_HEIGHT (map1->tile_map[0]);	1470	*dy = -map1->tile_map[0]->height;
2276	}	1471	}
2277	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1472	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2278	{ /* right up */	1473	{ /* right up */
2279	*dx = MAP_WIDTH (map1);	1474	*dx = map1->width;
2280	*dy = -MAP_HEIGHT (map2);	1475	*dy = -map2->height;
2281	}	1476	}
2282	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1477	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2283	{ /* right down */	1478	{ /* right down */
2284	*dx = MAP_WIDTH (map1);	1479	*dx = map1->width;
2285	*dy = MAP_HEIGHT (map1->tile_map[1]);	1480	*dy = map1->tile_map[1]->height;
2286	}	1481	}
2287	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1482	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2288	{ /* down right */	1483	{ /* down right */
2289	*dx = MAP_WIDTH (map1->tile_map[2]);	1484	*dx = map1->tile_map[2]->width;
2290	*dy = MAP_HEIGHT (map1);	1485	*dy = map1->height;
2291	}	1486	}
2292	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1487	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2293	{ /* down left */	1488	{ /* down left */
2294	*dx = -MAP_WIDTH (map2);	1489	*dx = -map2->width;
2295	*dy = MAP_HEIGHT (map1);	1490	*dy = map1->height;
2296	}	1491	}
2297	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1492	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2298	{ /* left up */	1493	{ /* left up */
2299	*dx = -MAP_WIDTH (map1->tile_map[3]);	1494	*dx = -map1->tile_map[3]->width;
2300	*dy = -MAP_HEIGHT (map2);	1495	*dy = -map2->height;
2301	}	1496	}
2302	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1497	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2303	{ /* left down */	1498	{ /* left down */
2304	*dx = -MAP_WIDTH (map1->tile_map[3]);	1499	*dx = -map1->tile_map[3]->width;
2305	*dy = MAP_HEIGHT (map1->tile_map[3]);	1500	*dy = map1->tile_map[3]->height;
2306
2307	}	1501	}
2308	else	1502	else
2309	{ /* not "adjacent" enough */
2310	return 0;	1503	return 0;
2311	}
2312		1504
2313	return 1;	1505	return 1;
2314	}	1506	}
2315		1507
2316	/* From map.c	1508	/* From map.c
…		…
2331	* be unexpected	1523	* be unexpected
2332	*	1524	*
2333	* currently, the only flag supported (0x1) is don't translate for	1525	* currently, the only flag supported (0x1) is don't translate for
2334	* closest body part of 'op1'	1526	* closest body part of 'op1'
2335	*/	1527	*/
2336
2337	void	1528	void
2338	get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)	1529	get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2339	{	1530	{
2340	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1531	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2341	{	1532	{
…		…
2422	}	1613	}
2423	}	1614	}
2424		1615
2425	/* Returns true of op1 and op2 are effectively on the same map	1616	/* Returns true of op1 and op2 are effectively on the same map
2426	* (as related to map tiling). Note that this looks for a path from	1617	* (as related to map tiling). Note that this looks for a path from
2427	* op1 to op2, so if the tiled maps are assymetric and op2 has a path	1618	* op1 to op2, so if the tiled maps are asymetric and op2 has a path
2428	* to op1, this will still return false.	1619	* to op1, this will still return false.
2429	* Note we only look one map out to keep the processing simple	1620	* Note we only look one map out to keep the processing simple
2430	* and efficient. This could probably be a macro.	1621	* and efficient. This could probably be a macro.
2431	* MSW 2001-08-05	1622	* MSW 2001-08-05
2432	*/	1623	*/
…		…
2435	{	1626	{
2436	int dx, dy;	1627	int dx, dy;
2437		1628
2438	return adjacent_map (op1->map, op2->map, &dx, &dy);	1629	return adjacent_map (op1->map, op2->map, &dx, &dy);
2439	}	1630	}
		1631
		1632	object *
		1633	maptile::insert (object *op, int x, int y, object *originator, int flags)
		1634	{
		1635	if (!op->flag [FLAG_REMOVED])
		1636	op->remove ();
		1637
		1638	return insert_ob_in_map_at (op, this, originator, flags, x, y);
		1639	}
		1640

Diff Legend

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