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.45 by root, Wed Dec 20 09:14:21 2006 UTC vs.
Revision 1.60 by root, Sun Dec 31 10:28:35 2006 UTC

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

Diff Legend

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