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.50 by root, Mon Dec 25 15:28:35 2006 UTC vs.
Revision 1.84 by root, Mon Feb 5 01:24:45 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23
24		24
25	#include <global.h>	25	#include <global.h>
26	#include <funcpoint.h>	26	#include <funcpoint.h>
27		27
28	#include <loader.h>	28	#include <loader.h>
29	#include <unistd.h>	29	#include <unistd.h>
30		30
31	#include "path.h"	31	#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	maptile *
38	has_been_loaded (const char *name)
39	{
40	maptile *map;
41
42	if (!name || !*name)
43	return 0;
44
45	for (map = first_map; map; map = map->next)
46	if (!strcmp (name, map->path))
47	break;
48
49	return (map);
50	}
51		32
52	/*	33	/*
53	* This makes a path absolute outside the world of Crossfire.	34	* This makes a path absolute outside the world of Crossfire.
54	* In other words, it prepends LIBDIR/MAPDIR/ to the given path	35	* In other words, it prepends LIBDIR/MAPDIR/ to the given path
55	* and returns the pointer to a static array containing the result.	36	* and returns the pointer to a static array containing the result.
56	* it really should be called create_mapname	37	* it really should be called create_mapname
57	*/	38	*/
58
59	const char *	39	const char *
60	create_pathname (const char *name)	40	create_pathname (const char *name)
61	{	41	{
62	static char buf[MAX_BUF];	42	static char buf[8192];
63
64	/* Why? having extra / doesn't confuse unix anyplace? Dependancies
65	* someplace else in the code? msw 2-17-97
66	*/
67	if (*name == '/')
68	sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
69	else
70	sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name);	43	snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
71	return (buf);	44	return buf;
72	}	45	}
73
74	/*
75	* same as create_pathname, but for the overlay maps.
76	*/
77
78	const char *
79	create_overlay_pathname (const char *name)
80	{
81	static char buf[MAX_BUF];
82
83	/* Why? having extra / doesn't confuse unix anyplace? Dependancies
84	* someplace else in the code? msw 2-17-97
85	*/
86	if (*name == '/')
87	sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
88	else
89	sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
90	return (buf);
91	}
92
93	/*
94	* same as create_pathname, but for the template maps.
95	*/
96
97	const char *
98	create_template_pathname (const char *name)
99	{
100	static char buf[MAX_BUF];
101
102	/* Why? having extra / doesn't confuse unix anyplace? Dependancies
103	* someplace else in the code? msw 2-17-97
104	*/
105	if (*name == '/')
106	sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
107	else
108	sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
109	return (buf);
110	}
111
112	/*
113	* This makes absolute path to the itemfile where unique objects
114	* will be saved. Converts '/' to '@'. I think it's essier maintain
115	* files than full directory structure, but if this is problem it can
116	* be changed.
117	*/
118	static const char *
119	create_items_path (const char *s)
120	{
121	static char buf[MAX_BUF];
122	char *t;
123
124	if (*s == '/')
125	s++;
126
127	sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
128
129	for (t = buf + strlen (buf); *s; s++, t++)
130	if (*s == '/')
131	*t = '@';
132	else
133	*t = *s;
134	*t = 0;
135	return (buf);
136	}
137
138		46
139	/*	47	/*
140	* This function checks if a file with the given path exists.	48	* This function checks if a file with the given path exists.
141	* -1 is returned if it fails, otherwise the mode of the file	49	* -1 is returned if it fails, otherwise the mode of the file
142	* is returned.	50	* is returned.
…		…
149	* the rest of the code only cares that the file is readable.	57	* the rest of the code only cares that the file is readable.
150	* when the editor goes away, the call to stat should probably be	58	* when the editor goes away, the call to stat should probably be
151	* replaced by an access instead (similar to the windows one, but	59	* replaced by an access instead (similar to the windows one, but
152	* that seems to be missing the prepend_dir processing	60	* that seems to be missing the prepend_dir processing
153	*/	61	*/
154
155	int	62	int
156	check_path (const char *name, int prepend_dir)	63	check_path (const char *name, int prepend_dir)
157	{	64	{
158	char buf[MAX_BUF];	65	char buf[MAX_BUF];
159		66
160	char *endbuf;	67	char *endbuf;
161	struct stat statbuf;	68	struct stat statbuf;
162	int mode = 0;	69	int mode = 0;
163		70
164	if (prepend_dir)	71	if (prepend_dir)
165	strcpy (buf, create_pathname (name));	72	assign (buf, create_pathname (name));
166	else	73	else
167	strcpy (buf, name);	74	assign (buf, name);
168		75
169	/* old method (strchr(buf, '\0')) seemd very odd to me -	76	/* old method (strchr(buf, '\0')) seemd very odd to me -
170	* this method should be equivalant and is clearer.	77	* this method should be equivalant and is clearer.
171	* Can not use strcat because we need to cycle through	78	* Can not use strcat because we need to cycle through
172	* all the names.	79	* all the names.
…		…
185	if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||	92	if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
186	(statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))	93	(statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
187	mode |= 2;	94	mode |= 2;
188		95
189	return (mode);	96	return (mode);
190	}
191
192	/*
193	* Prints out debug-information about a map.
194	* Dumping these at llevError doesn't seem right, but is
195	* necessary to make sure the information is in fact logged.
196	*/
197
198	void
199	dump_map (const maptile *m)
200	{
201	LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
202	LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
203
204	if (m->msg != NULL)
205	LOG (llevError, "Message:\n%s", m->msg);
206
207	if (m->maplore != NULL)
208	LOG (llevError, "Lore:\n%s", m->maplore);
209
210	if (m->tmpname != NULL)
211	LOG (llevError, "Tmpname: %s\n", m->tmpname);
212
213	LOG (llevError, "Difficulty: %d\n", m->difficulty);
214	LOG (llevError, "Darkness: %d\n", m->darkness);
215	}
216
217	/*
218	* Prints out debug-information about all maps.
219	* This basically just goes through all the maps and calls
220	* dump_map on each one.
221	*/
222
223	void
224	dump_all_maps (void)
225	{
226	maptile *m;
227
228	for (m = first_map; m; m = m->next)
229	dump_map (m);
230	}	97	}
231		98
232	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	99	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
233	* one function that just returns a P_.. value (see map.h)	100	* one function that just returns a P_.. value (see map.h)
234	* it will also do map translation for tiled maps, returning	101	* it will also do map translation for tiled maps, returning
…		…
240	* don't expect to insert/remove anything from those spaces.	107	* don't expect to insert/remove anything from those spaces.
241	*/	108	*/
242	int	109	int
243	get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)	110	get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
244	{	111	{
245	sint16 newx, newy;
246	int retval = 0;
247	maptile *mp;
248
249	newx = x;	112	sint16 newx = x;
250	newy = y;	113	sint16 newy = y;
251		114
252	mp = get_map_from_coord (oldmap, &newx, &newy);	115	maptile *mp = get_map_from_coord (oldmap, &newx, &newy);
253		116
254	if (!mp)	117	if (!mp)
255	return P_OUT_OF_MAP;	118	return P_OUT_OF_MAP;
256
257	if (mp != oldmap)
258	retval |= P_NEW_MAP;
259		119
260	if (newmap) *newmap = mp;	120	if (newmap) *newmap = mp;
261	if (nx) *nx = newx;	121	if (nx) *nx = newx;
262	if (ny) *ny = newy;	122	if (ny) *ny = newy;
263		123
264	return retval | mp->at (newx, newy).flags ();	124	return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
265	}	125	}
266		126
267	/*	127	/*
268	* Returns true if the given coordinate is blocked except by the	128	* Returns true if the given coordinate is blocked except by the
269	* object passed is not blocking. This is used with	129	* object passed is not blocking. This is used with
…		…
368		228
369	}	229	}
370	return 0;	230	return 0;
371	}	231	}
372		232
373
374	/*	233	/*
375	* Returns true if the given object can't fit in the given spot.	234	* Returns true if the given object can't fit in the given spot.
376	* This is meant for multi space objects - for single space objecs,	235	* This is meant for multi space objects - for single space objecs,
377	* just calling get_map_blocked and checking that against movement type	236	* just calling get_map_blocked and checking that against movement type
378	* of object. This function goes through all the parts of the	237	* of object. This function goes through all the parts of the
…		…
403	archetype *tmp;	262	archetype *tmp;
404	int flag;	263	int flag;
405	maptile *m1;	264	maptile *m1;
406	sint16 sx, sy;	265	sint16 sx, sy;
407		266
408	if (ob == NULL)	267	if (!ob)
409	{	268	{
410	flag = get_map_flags (m, &m1, x, y, &sx, &sy);	269	flag = get_map_flags (m, &m1, x, y, &sx, &sy);
411	if (flag & P_OUT_OF_MAP)	270	if (flag & P_OUT_OF_MAP)
412	return P_OUT_OF_MAP;	271	return P_OUT_OF_MAP;
413		272
…		…
423	return P_OUT_OF_MAP;	282	return P_OUT_OF_MAP;
424	if (flag & P_IS_ALIVE)	283	if (flag & P_IS_ALIVE)
425	return P_IS_ALIVE;	284	return P_IS_ALIVE;
426		285
427	mapspace &ms = m1->at (sx, sy);	286	mapspace &ms = m1->at (sx, sy);
428
429		287
430	/* find_first_free_spot() calls this function. However, often	288	/* find_first_free_spot() calls this function. However, often
431	* 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)
432	* 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.
433	*/	291	*/
…		…
449	* 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
450	* and insert them properly.	308	* and insert them properly.
451	* The object 'container' is the object that contains the inventory.	309	* The object 'container' is the object that contains the inventory.
452	* This is needed so that we can update the containers weight.	310	* This is needed so that we can update the containers weight.
453	*/	311	*/
454
455	void	312	void
456	fix_container (object *container)	313	fix_container (object *container)
457	{	314	{
458	object *tmp = container->inv, *next;	315	object *tmp = container->inv, *next;
459		316
460	container->inv = NULL;	317	container->inv = 0;
461	while (tmp != NULL)	318	while (tmp)
462	{	319	{
463	next = tmp->below;	320	next = tmp->below;
464	if (tmp->inv)	321	if (tmp->inv)
465	fix_container (tmp);	322	fix_container (tmp);
		323
466	(void) insert_ob_in_ob (tmp, container);	324	insert_ob_in_ob (tmp, container);
467	tmp = next;	325	tmp = next;
468	}	326	}
		327
469	/* 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
470	* carrying.	329	* carrying.
471	*/	330	*/
472	sum_weight (container);	331	sum_weight (container);
		332	}
		333
		334	void
		335	maptile::set_object_flag (int flag, int value)
		336	{
		337	if (!spaces)
		338	return;
		339
		340	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		341	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		342	tmp->flag [flag] = value;
473	}	343	}
474		344
475	/* link_multipart_objects go through all the objects on the map looking	345	/* link_multipart_objects go through all the objects on the map looking
476	* for objects whose arch says they are multipart yet according to the	346	* for objects whose arch says they are multipart yet according to the
477	* info we have, they only have the head (as would be expected when	347	* info we have, they only have the head (as would be expected when
478	* they are saved). We do have to look for the old maps that did save	348	* they are saved). We do have to look for the old maps that did save
479	* the more sections and not re-add sections for them.	349	* the more sections and not re-add sections for them.
480	*/	350	*/
481		351	void
482	static void	352	maptile::link_multipart_objects ()
483	link_multipart_objects (maptile *m)
484	{	353	{
485	int x, y;	354	if (!spaces)
486	object *tmp, *op, *last, *above;	355	return;
487	archetype *at;
488		356
489	for (x = 0; x < m->width; x++)	357	for (mapspace *ms = spaces + size (); ms-- > spaces; )
490	for (y = 0; y < m->height; y++)	358	for (object *tmp = ms->bot; tmp; )
491	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
492	{	359	{
493	above = tmp->above;	360	object *above = tmp->above;
494		361
495	/* already multipart - don't do anything more */	362	/* already multipart - don't do anything more */
496	if (tmp->head || tmp->more)	363	if (!tmp->head && !tmp->more)
497	continue;	364	{
498
499	/* If there is nothing more to this object, this for loop	365	/* If there is nothing more to this object, this for loop
500	* won't do anything.	366	* won't do anything.
501	*/	367	*/
502	for (at = tmp->arch->more, last = tmp; at != NULL; at = at->more, last = op)	368	archetype *at;
		369	object *last, *op;
		370	for (at = tmp->arch->more, last = tmp;
		371	at;
		372	at = at->more, last = op)
503	{	373	{
504	op = arch_to_object (at);	374	op = arch_to_object (at);
505		375
506	/* update x,y coordinates */	376	/* update x,y coordinates */
507	op->x += tmp->x;	377	op->x += tmp->x;
508	op->y += tmp->y;	378	op->y += tmp->y;
509	op->head = tmp;	379	op->head = tmp;
510	op->map = m;	380	op->map = this;
511	last->more = op;	381	last->more = op;
512	op->name = tmp->name;	382	op->name = tmp->name;
513	op->title = tmp->title;	383	op->title = tmp->title;
		384
514	/* we could link all the parts onto tmp, and then just	385	/* we could link all the parts onto tmp, and then just
515	* call insert_ob_in_map once, but the effect is the same,	386	* call insert_ob_in_map once, but the effect is the same,
516	* as insert_ob_in_map will call itself with each part, and	387	* as insert_ob_in_map will call itself with each part, and
517	* the coding is simpler to just to it here with each part.	388	* the coding is simpler to just to it here with each part.
518	*/	389	*/
519	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);	390	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
520	} /* for at = tmp->arch->more */	391	}
521	} /* for objects on this space */	392	}
		393
		394	tmp = above;
		395	}
522	}	396	}
523		397
524	/*	398	/*
525	* Loads (ands parses) the objects into a given map from the specified	399	* Loads (ands parses) the objects into a given map from the specified
526	* file pointer.	400	* file pointer.
527	* mapflags is the same as we get with load_original_map	401	* mapflags is the same as we get with load_original_map
528	*/	402	*/
529	void	403	bool
530	load_objects (maptile *m, object_thawer & fp, int mapflags)	404	maptile::_load_objects (object_thawer &thawer)
531	{	405	{
532	int i, j;
533	int unique;	406	int unique;
534	object *op, *prev = NULL, *last_more = NULL, *otmp;	407	object *op, *prev = NULL, *last_more = NULL, *otmp;
535		408
536	op = object::create ();	409	op = object::create ();
537	op->map = m; /* To handle buttons correctly */	410	op->map = this; /* To handle buttons correctly */
538		411
539	while ((i = load_object (fp, op, mapflags)))	412	while (int i = load_object (thawer, op, 0))
540	{	413	{
541	/* if the archetype for the object is null, means that we	414	/* if the archetype for the object is null, means that we
542	* got an invalid object. Don't do anything with it - the game	415	* got an invalid object. Don't do anything with it - the game
543	* or editor will not be able to do anything with it either.	416	* or editor will not be able to do anything with it either.
544	*/	417	*/
…		…
549	}	422	}
550		423
551	switch (i)	424	switch (i)
552	{	425	{
553	case LL_NORMAL:	426	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);	427	insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
559		428
560	if (op->inv)	429	if (op->inv)
561	sum_weight (op);	430	sum_weight (op);
562		431
563	prev = op, last_more = op;	432	prev = op, last_more = op;
564	break;	433	break;
565		434
566	case LL_MORE:	435	case LL_MORE:
567	insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);	436	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;	437	op->head = prev, last_more->more = op, last_more = op;
569	break;	438	break;
570	}	439	}
571		440
572	if (mapflags & MAP_STYLE)
573	remove_from_active_list (op);
574
575	op = object::create ();	441	op = object::create ();
576	op->map = m;	442	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	}	443	}
595		444
596	op->destroy ();	445	op->destroy ();
597	link_multipart_objects (m);
598	}
599		446
600	/* This saves all the objects on the map in a non destructive fashion.	447	#if 0
601	* Modified by MSW 2001-07-01 to do in a single pass - reduces code,
602	* and we only save the head of multi part objects - this is needed
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 < m->width; i++)	448	for (i = 0; i < width; i++)
613	for (j = 0; j < m->height; j++)	449	for (j = 0; j < height; j++)
614	{	450	{
615	unique = 0;	451	unique = 0;
616	for (op = m->at (i, j).bot; op; op = op->above)	452	/* check for unique items, or unique squares */
		453	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
617	{	454	{
618	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])	455	if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
619	unique = 1;	456	unique = 1;
620		457
621	if (op->type == PLAYER)	458	if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
622	continue;	459	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
623
624	if (op->head || op->owner)
625	continue;
626
627	if (unique || op->flag [FLAG_UNIQUE])
628	save_object (fp2, op, 3);
629	else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
630	save_object (fp, op, 3);
631	}	460	}
632	}	461	}
		462	#endif
		463
		464	return true;
		465	}
		466
		467	void
		468	maptile::activate ()
		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->activate_recursive ();
		476	}
		477
		478	void
		479	maptile::deactivate ()
		480	{
		481	if (!spaces)
		482	return;
		483
		484	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		485	for (object *op = ms->bot; op; op = op->above)
		486	op->deactivate_recursive ();
		487	}
		488
		489	bool
		490	maptile::_save_objects (object_freezer &freezer, int flags)
		491	{
		492	static int cede_count = 0;
		493
		494	if (flags & IO_HEADER)
		495	_save_header (freezer);
		496
		497	if (!spaces)
		498	return false;
		499
		500	for (int i = 0; i < size (); ++i)
		501	{
		502	#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
		503	if (cede_count >= 500)
		504	{
		505	cede_count = 0;
		506	coroapi::cede ();
		507	}
		508	#endif
		509
		510	int unique = 0;
		511	for (object *op = spaces [i].bot; op; op = op->above)
		512	{
		513	// count per-object, but cede only when modification-safe
		514	cede_count++;
		515
		516	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
		517	unique = 1;
		518
		519	if (!op->can_map_save ())
		520	continue;
		521
		522	if (unique || op->flag [FLAG_UNIQUE])
		523	{
		524	if (flags & IO_UNIQUES)
		525	save_object (freezer, op, 1);
		526	}
		527	else if (flags & IO_OBJECTS)
		528	save_object (freezer, op, 1);
		529	}
		530	}
		531
		532	return true;
		533	}
		534
		535	bool
		536	maptile::_load_objects (const char *path, bool skip_header)
		537	{
		538	object_thawer thawer (path);
		539
		540	if (!thawer)
		541	return false;
		542
		543	if (skip_header)
		544	for (;;)
		545	{
		546	keyword kw = thawer.get_kv ();
		547
		548	if (kw == KW_end)
		549	break;
		550
		551	thawer.skip_kv (kw);
		552	}
		553
		554	return _load_objects (thawer);
		555	}
		556
		557	bool
		558	maptile::_save_objects (const char *path, int flags)
		559	{
		560	object_freezer freezer;
		561
		562	if (!_save_objects (freezer, flags))
		563	return false;
		564
		565	return freezer.save (path);
633	}	566	}
634		567
635	maptile::maptile ()	568	maptile::maptile ()
636	{	569	{
637	in_memory = MAP_SWAPPED;	570	in_memory = MAP_SWAPPED;
		571
638	/* The maps used to pick up default x and y values from the	572	/* The maps used to pick up default x and y values from the
639	* map archetype. Mimic that behaviour.	573	* map archetype. Mimic that behaviour.
640	*/	574	*/
641	this->width = 16;	575	width = 16;
642	this->height = 16;	576	height = 16;
643	this->reset_timeout = 0;	577	reset_timeout = 0;
644	this->timeout = 300;	578	timeout = 300;
645	this->enter_x = 0;	579	enter_x = 0;
646	this->enter_y = 0;	580	enter_y = 0;
647	/*set part to -1 indicating conversion to weather map not yet done */
648	this->worldpartx = -1;
649	this->worldparty = -1;
650	}	581	}
651		582
652	/*	583	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	{	584	{
660	maptile *mp, *map = new maptile;	585	in_memory = MAP_SWAPPED;
661		586
662	for (mp = first_map; mp && mp->next; mp = mp->next);	587	width = w;
		588	height = h;
		589	reset_timeout = 0;
		590	timeout = 300;
		591	enter_x = 0;
		592	enter_y = 0;
663		593
664	if (mp == NULL)	594	alloc ();
665	first_map = map;
666	else
667	mp->next = map;
668
669	return map;
670	}	595	}
671		596
672	/*	597	/*
673	* Allocates the arrays contained in a maptile.	598	* Allocates the arrays contained in a maptile.
674	* This basically allocates the dynamic array of spaces for the	599	* This basically allocates the dynamic array of spaces for the
675	* map.	600	* map.
676	*/	601	*/
677	void	602	void
678	maptile::allocate ()	603	maptile::alloc ()
679	{	604	{
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)	605	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;	606	return;
		607
		608	spaces = salloc0<mapspace> (size ());
713	}	609	}
714		610
715	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	611	/* 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	612	* corresponding to that string. Memory is allocated for this, it must be freed
717	* at a later date.	613	* at a later date.
718	* Called by parse_map_headers below.	614	* Called by parse_map_headers below.
719	*/	615	*/
720
721	static shopitems *	616	static shopitems *
722	parse_shop_string (const char *input_string)	617	parse_shop_string (const char *input_string)
723	{	618	{
724	char *shop_string, *p, *q, *next_semicolon, *next_colon;	619	char *shop_string, *p, *q, *next_semicolon, *next_colon;
725	shopitems *items = NULL;	620	shopitems *items = NULL;
…		…
734	p = strchr (p, ';');	629	p = strchr (p, ';');
735	number_of_entries++;	630	number_of_entries++;
736	if (p)	631	if (p)
737	p++;	632	p++;
738	}	633	}
		634
739	p = shop_string;	635	p = shop_string;
740	strip_endline (p);	636	strip_endline (p);
741	items = new shopitems[number_of_entries + 1];	637	items = new shopitems[number_of_entries + 1];
742	for (i = 0; i < number_of_entries; i++)	638	for (i = 0; i < number_of_entries; i++)
743	{	639	{
744	if (!p)	640	if (!p)
745	{	641	{
746	LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");	642	LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
747	break;	643	break;
748	}	644	}
		645
749	next_semicolon = strchr (p, ';');	646	next_semicolon = strchr (p, ';');
750	next_colon = strchr (p, ':');	647	next_colon = strchr (p, ':');
751	/* if there is a stregth specified, figure out what it is, we'll need it soon. */	648	/* 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))	649	if (next_colon && (!next_semicolon || next_colon < next_semicolon))
753	items[i].strength = atoi (strchr (p, ':') + 1);	650	items[i].strength = atoi (strchr (p, ':') + 1);
…		…
780	* the next entry while we're at it, better print a warning	677	* the next entry while we're at it, better print a warning
781	*/	678	*/
782	LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);	679	LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
783	}	680	}
784	}	681	}
		682
785	items[i].index = number_of_entries;	683	items[i].index = number_of_entries;
786	if (next_semicolon)	684	if (next_semicolon)
787	p = ++next_semicolon;	685	p = ++next_semicolon;
788	else	686	else
789	p = NULL;	687	p = NULL;
790	}	688	}
		689
791	free (shop_string);	690	free (shop_string);
792	return items;	691	return items;
793	}	692	}
794		693
795	/* opposite of parse string, this puts the string that was originally fed in to	694	/* opposite of parse string, this puts the string that was originally fed in to
…		…
804	for (i = 0; i < m->shopitems[0].index; i++)	703	for (i = 0; i < m->shopitems[0].index; i++)
805	{	704	{
806	if (m->shopitems[i].typenum)	705	if (m->shopitems[i].typenum)
807	{	706	{
808	if (m->shopitems[i].strength)	707	if (m->shopitems[i].strength)
809	{
810	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	708	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
811	}
812	else	709	else
813	sprintf (tmp, "%s;", m->shopitems[i].name);	710	sprintf (tmp, "%s;", m->shopitems[i].name);
814	}	711	}
815	else	712	else
816	{	713	{
817	if (m->shopitems[i].strength)	714	if (m->shopitems[i].strength)
818	{
819	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	715	sprintf (tmp, "*:%d;", m->shopitems[i].strength);
820	}
821	else	716	else
822	sprintf (tmp, "*");	717	sprintf (tmp, "*");
823	}	718	}
		719
824	strcat (output_string, tmp);	720	strcat (output_string, tmp);
825	}	721	}
826	}	722	}
827		723
828	/* This loads the header information of the map. The header	724	/* This loads the header information of the map. The header
…		…
833	* put all the stuff in the map object so that names actually make	729	* put all the stuff in the map object so that names actually make
834	* sense.	730	* sense.
835	* This could be done in lex (like the object loader), but I think	731	* 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.	732	* currently, there are few enough fields this is not a big deal.
837	* MSW 2001-07-01	733	* MSW 2001-07-01
838	* return 0 on success, 1 on failure.
839	*/	734	*/
840		735	bool
841	static int	736	maptile::_load_header (object_thawer &thawer)
842	load_map_header (object_thawer & fp, maptile *m)
843	{	737	{
844	char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;	738	for (;;)
845	int msgpos = 0;
846	int maplorepos = 0;
847
848	while (fgets (buf, HUGE_BUF, fp) != NULL)
849	{	739	{
850	buf[HUGE_BUF - 1] = 0;	740	keyword kw = thawer.get_kv ();
851	key = buf;
852		741
853	while (isspace (*key))	742	switch (kw)
854	key++;
855
856	if (*key == 0)
857	continue; /* empty line */
858
859	value = strchr (key, ' ');
860
861	if (!value)
862	{	743	{
863	if ((end = strchr (key, '\n')))	744	case KW_msg:
864	*end = 0;	745	thawer.get_ml (KW_endmsg, msg);
		746	break;
		747
		748	case KW_lore: // CF+ extension
		749	thawer.get_ml (KW_endlore, maplore);
		750	break;
		751
		752	case KW_maplore:
		753	thawer.get_ml (KW_endmaplore, maplore);
		754	break;
		755
		756	case KW_arch:
		757	if (strcmp (thawer.get_str (), "map"))
		758	LOG (llevError, "%s: loading map and got a non 'arch map' line (arch %s), skipping.\n", &path, thawer.get_str ());
		759	break;
		760
		761	case KW_oid:
		762	thawer.get (this, thawer.get_sint32 ());
		763	break;
		764
		765	case KW_file_format_version: break; // nop
		766
		767	case KW_name: thawer.get (name); break;
		768	case KW_attach: thawer.get (attach); break;
		769	case KW_reset_time: thawer.get (reset_time); break;
		770	case KW_shopgreed: thawer.get (shopgreed); break;
		771	case KW_shopmin: thawer.get (shopmin); break;
		772	case KW_shopmax: thawer.get (shopmax); break;
		773	case KW_shoprace: thawer.get (shoprace); break;
		774	case KW_outdoor: thawer.get (outdoor); break;
		775	case KW_temp: thawer.get (temp); break;
		776	case KW_pressure: thawer.get (pressure); break;
		777	case KW_humid: thawer.get (humid); break;
		778	case KW_windspeed: thawer.get (windspeed); break;
		779	case KW_winddir: thawer.get (winddir); break;
		780	case KW_sky: thawer.get (sky); break;
		781
		782	case KW_per_player: thawer.get (per_player); break;
		783	case KW_per_party: thawer.get (per_party); break;
		784
		785	case KW_region: default_region = region::find (thawer.get_str ()); break;
		786	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
		787
		788	// old names new names
		789	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
		790	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
		791	case KW_x: case KW_width: thawer.get (width); break;
		792	case KW_y: case KW_height: thawer.get (height); break;
		793	case KW_weight: case KW_reset_timeout: thawer.get (reset_timeout); break;
		794	case KW_value: case KW_swap_time: thawer.get (timeout); break;
		795	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
		796	case KW_invisible: case KW_darkness: thawer.get (darkness); break;
		797	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
		798
		799	case KW_tile_path_1: thawer.get (tile_path [0]); break;
		800	case KW_tile_path_2: thawer.get (tile_path [1]); break;
		801	case KW_tile_path_3: thawer.get (tile_path [2]); break;
		802	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		803
		804	case KW_end:
		805	return true;
		806
		807	default:
		808	if (!thawer.parse_error (kw, "map", 0))
		809	return false;
		810	break;
865	}	811	}
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	{	812	}
1083	LOG (llevError, "Got premature eof on map header!\n");
1084	return 1;
1085	}
1086		813
1087	return 0;	814	abort ();
1088	}	815	}
1089		816
1090	/*	817	bool
1091	* Opens the file "filename" and reads information about the map	818	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	{	819	{
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);	820	object_thawer thawer (path);
1118		821
1119	if (!thawer)	822	if (!thawer)
1120	return 0;	823	return false;
1121		824
1122	m = get_linked_map ();	825	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 0;
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 (!m->difficulty)
1139	m->difficulty = 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 0;
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	}	826	}
1232		827
1233	/******************************************************************************	828	/******************************************************************************
1234	* This is the start of unique map handling code	829	* This is the start of unique map handling code
1235	*****************************************************************************/	830	*****************************************************************************/
1236		831
1237	/* This goes through map 'm' and removed any unique items on the map. */	832	/* This goes through the maptile and removed any unique items on the map. */
1238	static void	833	void
1239	delete_unique_items (maptile *m)	834	maptile::clear_unique_items ()
1240	{	835	{
1241	int i, j, unique;	836	for (int i = 0; i < size (); ++i)
1242	object *op, *next;
1243
1244	for (i = 0; i < m->width; i++)
1245	for (j = 0; j < m->height; j++)
1246	{	837	{
1247	unique = 0;	838	int unique = 0;
1248		839	for (object *op = spaces [i].bot; op; )
1249	for (op = GET_MAP_OB (m, i, j); op; op = next)
1250	{	840	{
1251	next = op->above;	841	object *above = op->above;
1252		842
1253	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	843	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1254	unique = 1;	844	unique = 1;
1255		845
1256	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))	846	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1257	{	847	{
1258	op->destroy_inv (false);	848	op->destroy_inv (false);
1259	op->destroy ();	849	op->destroy ();
1260	}	850	}
1261	}
1262	}
1263	}
1264		851
1265		852	op = above;
1266	/*
1267	* Loads unique objects from file(s) into the map which is in memory
1268	* m is the map to load unique items into.
1269	*/
1270	static void
1271	load_unique_objects (maptile *m)
1272	{
1273	int count;
1274	char firstname[MAX_BUF];
1275
1276	for (count = 0; count < 10; count++)
1277	{
1278	sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1279	if (!access (firstname, R_OK))
1280	break;
1281	}
1282	/* If we get here, we did not find any map */
1283	if (count == 10)
1284	return;
1285
1286	object_thawer thawer (firstname);
1287
1288	if (!thawer)
1289	return;
1290
1291	m->in_memory = MAP_LOADING;
1292	if (m->tmpname == NULL) /* if we have loaded unique items from */
1293	delete_unique_items (m); /* original map before, don't duplicate them */
1294
1295	load_objects (m, thawer, 0);
1296
1297	m->in_memory = MAP_IN_MEMORY;
1298	}
1299
1300	/*
1301	* Saves a map to file. If flag is set, it is saved into the same
1302	* file it was (originally) loaded from. Otherwise a temporary
1303	* filename will be genarated, and the file will be stored there.
1304	* The temporary filename will be stored in the maptileure.
1305	* If the map is unique, we also save to the filename in the map
1306	* (this should have been updated when first loaded)
1307	*/
1308	int
1309	new_save_map (maptile *m, int flag)
1310	{
1311	char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1312	int i;
1313
1314	if (flag && !*m->path)
1315	{
1316	LOG (llevError, "Tried to save map without path.\n");
1317	return -1;
1318	}
1319
1320	if (flag || (m->unique) || (m->templatemap))
1321	{
1322	if (!m->unique && !m->templatemap)
1323	{ /* flag is set */
1324	if (flag == 2)
1325	strcpy (filename, create_overlay_pathname (m->path));
1326	else
1327	strcpy (filename, create_pathname (m->path));
1328	}	853	}
1329	else
1330	strcpy (filename, m->path);
1331
1332	make_path_to_file (filename);
1333	}
1334	else
1335	{	854	}
1336	if (!m->tmpname)	855	}
1337	m->tmpname = tempnam (settings.tmpdir, NULL);
1338		856
1339	strcpy (filename, m->tmpname);	857	bool
		858	maptile::_save_header (object_freezer &freezer)
		859	{
		860	#define MAP_OUT(k) freezer.put (KW_ ## k, k)
		861	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
		862
		863	MAP_OUT2 (arch, "map");
		864
		865	if (name) MAP_OUT (name);
		866	MAP_OUT (swap_time);
		867	MAP_OUT (reset_time);
		868	MAP_OUT (reset_timeout);
		869	MAP_OUT (fixed_resettime);
		870	MAP_OUT (difficulty);
		871
		872	if (default_region) MAP_OUT2 (region, default_region->name);
		873
		874	if (shopitems)
1340	}	875	{
		876	char shop[MAX_BUF];
		877	print_shop_string (this, shop);
		878	MAP_OUT2 (shopitems, shop);
		879	}
1341		880
1342	LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);	881	MAP_OUT (shopgreed);
1343	m->in_memory = MAP_SAVING;	882	MAP_OUT (shopmin);
		883	MAP_OUT (shopmax);
		884	if (shoprace) MAP_OUT (shoprace);
		885	MAP_OUT (darkness);
		886	MAP_OUT (width);
		887	MAP_OUT (height);
		888	MAP_OUT (enter_x);
		889	MAP_OUT (enter_y);
1344		890
		891	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
		892	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
		893
		894	MAP_OUT (outdoor);
		895	MAP_OUT (temp);
		896	MAP_OUT (pressure);
		897	MAP_OUT (humid);
		898	MAP_OUT (windspeed);
		899	MAP_OUT (winddir);
		900	MAP_OUT (sky);
		901
		902	MAP_OUT (per_player);
		903	MAP_OUT (per_party);
		904
		905	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
		906	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
		907	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
		908	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
		909
		910	freezer.put (this);
		911	freezer.put (KW_end);
		912
		913	return true;
		914	}
		915
		916	bool
		917	maptile::_save_header (const char *path)
		918	{
1345	object_freezer freezer;	919	object_freezer freezer;
1346		920
1347	/* legacy */	921	if (!_save_header (freezer))
1348	fprintf (freezer, "arch map\n");	922	return false;
1349	if (m->name)
1350	fprintf (freezer, "name %s\n", m->name);
1351	if (!flag)
1352	fprintf (freezer, "swap_time %d\n", m->swap_time);
1353	if (m->reset_timeout)
1354	fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1355	if (m->fixed_resettime)
1356	fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1357	/* we unfortunately have no idea if this is a value the creator set
1358	* or a difficulty value we generated when the map was first loaded
1359	*/
1360	if (m->difficulty)
1361	fprintf (freezer, "difficulty %d\n", m->difficulty);
1362	if (m->region)
1363	fprintf (freezer, "region %s\n", m->region->name);
1364	if (m->shopitems)
1365	{
1366	print_shop_string (m, shop);
1367	fprintf (freezer, "shopitems %s\n", shop);
1368	}
1369	if (m->shopgreed)
1370	fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1371	if (m->shopmin)
1372	fprintf (freezer, "shopmin %llu\n", m->shopmin);
1373	if (m->shopmax)
1374	fprintf (freezer, "shopmax %llu\n", m->shopmax);
1375	if (m->shoprace)
1376	fprintf (freezer, "shoprace %s\n", m->shoprace);
1377	if (m->darkness)
1378	fprintf (freezer, "darkness %d\n", m->darkness);
1379	if (m->width)
1380	fprintf (freezer, "width %d\n", m->width);
1381	if (m->height)
1382	fprintf (freezer, "height %d\n", m->height);
1383	if (m->enter_x)
1384	fprintf (freezer, "enter_x %d\n", m->enter_x);
1385	if (m->enter_y)
1386	fprintf (freezer, "enter_y %d\n", m->enter_y);
1387	if (m->msg)
1388	fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1389	if (m->maplore)
1390	fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1391	if (m->unique)
1392	fprintf (freezer, "unique %d\n", m->unique);
1393	if (m->templatemap)
1394	fprintf (freezer, "template %d\n", m->templatemap);
1395	if (m->outdoor)
1396	fprintf (freezer, "outdoor %d\n", m->outdoor);
1397	if (m->temp)
1398	fprintf (freezer, "temp %d\n", m->temp);
1399	if (m->pressure)
1400	fprintf (freezer, "pressure %d\n", m->pressure);
1401	if (m->humid)
1402	fprintf (freezer, "humid %d\n", m->humid);
1403	if (m->windspeed)
1404	fprintf (freezer, "windspeed %d\n", m->windspeed);
1405	if (m->winddir)
1406	fprintf (freezer, "winddir %d\n", m->winddir);
1407	if (m->sky)
1408	fprintf (freezer, "sky %d\n", m->sky);
1409	if (m->nosmooth)
1410	fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1411		923
1412	/* Save any tiling information, except on overlays */	924	return freezer.save (path);
1413	if (flag != 2)
1414	for (i = 0; i < 4; i++)
1415	if (m->tile_path[i])
1416	fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1417
1418	freezer.put (m);
1419	fprintf (freezer, "end\n");
1420
1421	/* In the game save unique items in the different file, but
1422	* in the editor save them to the normal map file.
1423	* If unique map, save files in the proper destination (set by
1424	* player)
1425	*/
1426	if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1427	{
1428	object_freezer unique;
1429
1430	if (flag == 2)
1431	save_objects (m, freezer, unique, 2);
1432	else
1433	save_objects (m, freezer, unique, 0);
1434
1435	sprintf (buf, "%s.v00", create_items_path (m->path));
1436
1437	unique.save (buf);
1438	}
1439	else
1440	{ /* save same file when not playing, like in editor */
1441	save_objects (m, freezer, freezer, 0);
1442	}
1443
1444	freezer.save (filename);
1445
1446	return 0;
1447	}	925	}
1448		926
1449	/*	927	/*
1450	* Remove and free all objects in the given map.	928	* Remove and free all objects in the given map.
1451	*/	929	*/
1452	void	930	void
1453	free_all_objects (maptile *m)	931	maptile::clear ()
1454	{	932	{
		933	sfree (regions, size ()), regions = 0;
		934	free (regionmap), regionmap = 0;
		935
1455	if (!m->spaces)	936	if (spaces)
1456	return;
1457
1458	for (int i = 0; i < m->width; i++)
1459	for (int j = 0; j < m->height; j++)
1460	{	937	{
1461	mapspace &ms = m->at (i, j);	938	for (mapspace *ms = spaces + size (); ms-- > spaces; )
1462
1463	while (object *op = ms.bot)	939	while (object *op = ms->bot)
1464	{	940	{
1465	if (op->head)	941	if (op->head)
1466	op = op->head;	942	op = op->head;
1467		943
1468	op->destroy_inv (false);	944	op->destroy_inv (false);
1469	op->destroy ();	945	op->destroy ();
1470	}	946	}
		947
		948	sfree (spaces, size ()), spaces = 0;
1471	}	949	}
1472	}
1473		950
1474	/*	951	if (buttons)
1475	* Frees everything allocated by the given maptileure.	952	free_objectlinkpt (buttons), buttons = 0;
1476	* don't free tmpname - our caller is left to do that	953	}
1477	*/	954
1478	void	955	void
1479	free_map (maptile *m, int flag)	956	maptile::clear_header ()
1480	{	957	{
1481	if (!m->in_memory) //TODO: makes no sense to me?	958	name = 0;
1482	return;	959	msg = 0;
1483		960	maplore = 0;
1484	m->in_memory = MAP_SAVING;	961	shoprace = 0;
1485
1486	// TODO: use new/delete
1487
1488	if (flag && m->spaces)
1489	free_all_objects (m);
1490
1491	free (m->name), m->name = 0;
1492	free (m->spaces), m->spaces = 0;
1493	free (m->msg), m->msg = 0;
1494	free (m->maplore), m->maplore = 0;
1495	free (m->shoprace), m->shoprace = 0;
1496	delete [] m->shopitems, m->shopitems = 0;	962	delete [] shopitems, shopitems = 0;
1497
1498	if (m->buttons)
1499	free_objectlinkpt (m->buttons), m->buttons = 0;
1500		963
1501	for (int i = 0; i < 4; i++)	964	for (int i = 0; i < 4; i++)
1502	{
1503	if (m->tile_path[i])
1504	free (m->tile_path[i]), m->tile_path[i] = 0;
1505
1506	m->tile_map[i] = 0;	965	tile_path [i] = 0;
1507	}
1508
1509	m->in_memory = MAP_SWAPPED;
1510	}	966	}
1511		967
1512	maptile::~maptile ()	968	maptile::~maptile ()
1513	{	969	{
1514	free_map (this, 1);	970	assert (destroyed ());
1515	free (tmpname);
1516	}	971	}
1517		972
1518	void	973	void
1519	maptile::do_destroy ()	974	maptile::clear_links_to (maptile *m)
1520	{	975	{
1521	attachable::do_destroy ();
1522
1523	free_all_objects (this);
1524
1525	/* We need to look through all the maps and see if any maps	976	/* We need to look through all the maps and see if any maps
1526	* are pointing at this one for tiling information. Since	977	* are pointing at this one for tiling information. Since
1527	* tiling can be asymetric, we just can not look to see which	978	* tiling can be asymetric, we just can not look to see which
1528	* maps this map tiles with and clears those.	979	* maps this map tiles with and clears those.
1529	*/	980	*/
1530	//TODO: non-euclidean-tiling MUST GO
1531	for (maptile *m = first_map; m; m = m->next)
1532	for (int i = 0; i < 4; i++)	981	for (int i = 0; i < 4; i++)
1533	if (m->tile_map[i] == this)	982	if (tile_map[i] == m)
1534	m->tile_map[i] = 0;	983	tile_map[i] = 0;
1535
1536	if (first_map == this)
1537	first_map = next;
1538	else
1539	for (maptile *m = first_map; m; m = m->next)
1540	if (m->next = this)
1541	{
1542	m->next = next;
1543	break;
1544	}
1545	}	984	}
1546		985
1547	//TODO: must go
1548	void	986	void
1549	delete_map (maptile *m)	987	maptile::do_destroy ()
1550	{	988	{
1551	if (m)	989	attachable::do_destroy ();
1552	m->destroy ();	990
		991	clear ();
1553	}	992	}
1554		993
1555	/*	994	/*
1556	* Makes sure the given map is loaded and swapped in.	995	* Updates every button on the map (by calling update_button() for them).
1557	* name is path name of the map.
1558	* flags meaning:
1559	* 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1560	* and don't do unique items or the like.
1561	* 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1562	* dont do any more name translation on it.
1563	*	996	*/
1564	* Returns a pointer to the given map.	997	void
1565	*/	998	maptile::update_buttons ()
1566	maptile *
1567	ready_map_name (const char *name, int flags)
1568	{	999	{
1569	if (!name)	1000	for (oblinkpt *obp = buttons; obp; obp = obp->next)
1570	return 0;	1001	for (objectlink *ol = obp->link; ol; ol = ol->next)
1571
1572	/* Have we been at this level before? */
1573	maptile *m = has_been_loaded (name);
1574
1575	/* Map is good to go, so just return it */
1576	if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1577	return m;
1578
1579	/* unique maps always get loaded from their original location, and never
1580	* a temp location. Likewise, if map_flush is set, or we have never loaded
1581	* this map, load it now. I removed the reset checking from here -
1582	* it seems the probability of a player trying to enter a map that should
1583	* reset but hasn't yet is quite low, and removing that makes this function
1584	* a bit cleaner (and players probably shouldn't rely on exact timing for
1585	* resets in any case - if they really care, they should use the 'maps command.
1586	*/
1587	if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1588	{	1002	{
1589	/* first visit or time to reset */	1003	if (!ol->ob)
1590	if (m)
1591	{	1004	{
1592	clean_tmp_map (m); /* Doesn't make much difference */	1005	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1593	delete_map (m);	1006	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
		1007	continue;
1594	}	1008	}
1595		1009
1596	/* create and load a map */	1010	if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1597	if (flags & MAP_PLAYER_UNIQUE)
1598	LOG (llevDebug, "Trying to load map %s.\n", name);
1599	else
1600	LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1601
1602	//eval_pv ("$x = Event::time", 1);//D
1603	if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1604	return (NULL);
1605	//eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1606
1607	fix_auto_apply (m); /* Chests which open as default */
1608
1609	/* If a player unique map, no extra unique object file to load.
1610	* if from the editor, likewise.
1611	*/
1612	if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1613	load_unique_objects (m);
1614
1615	if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1616	{	1011	{
1617	m = load_overlay_map (name, m);	1012	update_button (ol->ob);
1618	if (m == NULL)	1013	break;
1619	return NULL;
1620	}	1014	}
1621
1622	if (flags & MAP_PLAYER_UNIQUE)
1623	INVOKE_MAP (SWAPIN, m);
1624
1625	}	1015	}
1626	else
1627	{
1628	/* If in this loop, we found a temporary map, so load it up. */
1629
1630	m = load_temporary_map (m);
1631	if (m == NULL)
1632	return NULL;
1633	load_unique_objects (m);
1634
1635	clean_tmp_map (m);
1636	m->in_memory = MAP_IN_MEMORY;
1637	/* tempnam() on sun systems (probably others) uses malloc
1638	* to allocated space for the string. Free it here.
1639	* In some cases, load_temporary_map above won't find the
1640	* temporary map, and so has reloaded a new map. If that
1641	* is the case, tmpname is now null
1642	*/
1643	if (m->tmpname)
1644	free (m->tmpname);
1645	m->tmpname = NULL;
1646	/* It's going to be saved anew anyway */
1647	}
1648
1649	/* Below here is stuff common to both first time loaded maps and
1650	* temp maps.
1651	*/
1652
1653	decay_objects (m); /* start the decay */
1654	/* In case other objects press some buttons down */
1655	update_buttons (m);
1656	if (m->outdoor)
1657	set_darkness_map (m);
1658	/* run the weather over this map */
1659	weather_effect (name);
1660	return m;
1661	}	1016	}
1662
1663		1017
1664	/*	1018	/*
1665	* This routine is supposed to find out the difficulty of the map.	1019	* This routine is supposed to find out the difficulty of the map.
1666	* difficulty does not have a lot to do with character level,	1020	* difficulty does not have a lot to do with character level,
1667	* but does have a lot to do with treasure on the map.	1021	* but does have a lot to do with treasure on the map.
…		…
1669	* Difficulty can now be set by the map creature. If the value stored	1023	* Difficulty can now be set by the map creature. If the value stored
1670	* in the map is zero, then use this routine. Maps should really	1024	* in the map is zero, then use this routine. Maps should really
1671	* have a difficulty set than using this function - human calculation	1025	* have a difficulty set than using this function - human calculation
1672	* is much better than this functions guesswork.	1026	* is much better than this functions guesswork.
1673	*/	1027	*/
1674
1675	int	1028	int
1676	calculate_difficulty (maptile *m)	1029	maptile::estimate_difficulty () const
1677	{	1030	{
1678	object *op;
1679	archetype *at;
1680	int x, y, i;
1681	long monster_cnt = 0;	1031	long monster_cnt = 0;
1682	double avgexp = 0;	1032	double avgexp = 0;
1683	sint64 total_exp = 0;	1033	sint64 total_exp = 0;
1684		1034
1685	if (m->difficulty)	1035	for (mapspace *ms = spaces + size (); ms-- > spaces; )
1686	{	1036	for (object *op = ms->bot; op; op = op->above)
1687	LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1688	return m->difficulty;
1689	}
1690
1691	for (x = 0; x < m->width; x++)
1692	for (y = 0; y < m->height; y++)
1693	for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1694	{	1037	{
1695	if (QUERY_FLAG (op, FLAG_MONSTER))	1038	if (QUERY_FLAG (op, FLAG_MONSTER))
1696	{	1039	{
1697	total_exp += op->stats.exp;	1040	total_exp += op->stats.exp;
1698	monster_cnt++;	1041	monster_cnt++;
1699	}	1042	}
1700		1043
1701	if (QUERY_FLAG (op, FLAG_GENERATOR))	1044	if (QUERY_FLAG (op, FLAG_GENERATOR))
1702	{	1045	{
1703	total_exp += op->stats.exp;	1046	total_exp += op->stats.exp;
		1047
1704	at = type_to_archetype (GENERATE_TYPE (op));	1048	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1705
1706	if (at != NULL)
1707	total_exp += at->clone.stats.exp * 8;	1049	total_exp += at->clone.stats.exp * 8;
1708		1050
1709	monster_cnt++;	1051	monster_cnt++;
1710	}	1052	}
1711	}	1053	}
1712		1054
1713	avgexp = (double) total_exp / monster_cnt;	1055	avgexp = (double) total_exp / monster_cnt;
1714		1056
1715	for (i = 1; i <= settings.max_level; i++)	1057	for (int i = 1; i <= settings.max_level; i++)
1716	{
1717	if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))	1058	if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))
1718	{
1719	/* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1720	return i;	1059	return i;
1721	}
1722	}
1723		1060
1724	return 1;	1061	return 1;
1725	}
1726
1727	void
1728	clean_tmp_map (maptile *m)
1729	{
1730	if (m->tmpname == NULL)
1731	return;
1732	INVOKE_MAP (CLEAN, m);
1733	(void) unlink (m->tmpname);
1734	}
1735
1736	void
1737	free_all_maps (void)
1738	{
1739	int real_maps = 0;
1740
1741	while (first_map)
1742	{
1743	/* I think some of the callers above before it gets here set this to be
1744	* saving, but we still want to free this data
1745	*/
1746	if (first_map->in_memory == MAP_SAVING)
1747	first_map->in_memory = MAP_IN_MEMORY;
1748	delete_map (first_map);
1749	real_maps++;
1750	}
1751	LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1752	}	1062	}
1753		1063
1754	/* change_map_light() - used to change map light level (darkness)	1064	/* change_map_light() - used to change map light level (darkness)
1755	* up or down. Returns true if successful. It should now be	1065	* up or down. Returns true if successful. It should now be
1756	* possible to change a value by more than 1.	1066	* possible to change a value by more than 1.
1757	* Move this from los.c to map.c since this is more related	1067	* Move this from los.c to map.c since this is more related
1758	* to maps than los.	1068	* to maps than los.
1759	* postive values make it darker, negative make it brighter	1069	* postive values make it darker, negative make it brighter
1760	*/	1070	*/
1761
1762	int	1071	int
1763	change_map_light (maptile *m, int change)	1072	maptile::change_map_light (int change)
1764	{	1073	{
1765	int new_level = m->darkness + change;	1074	int new_level = darkness + change;
1766		1075
1767	/* Nothing to do */	1076	/* Nothing to do */
1768	if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS))	1077	if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
1769	{
1770	return 0;	1078	return 0;
1771	}
1772		1079
1773	/* inform all players on the map */	1080	/* inform all players on the map */
1774	if (change > 0)	1081	if (change > 0)
1775	new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker.");	1082	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1776	else	1083	else
1777	new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter.");	1084	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1778		1085
1779	/* Do extra checking. since m->darkness is a unsigned value,	1086	/* Do extra checking. since darkness is a unsigned value,
1780	* we need to be extra careful about negative values.	1087	* we need to be extra careful about negative values.
1781	* In general, the checks below are only needed if change	1088	* In general, the checks below are only needed if change
1782	* is not +/-1	1089	* is not +/-1
1783	*/	1090	*/
1784	if (new_level < 0)	1091	if (new_level < 0)
1785	m->darkness = 0;	1092	darkness = 0;
1786	else if (new_level >= MAX_DARKNESS)	1093	else if (new_level >= MAX_DARKNESS)
1787	m->darkness = MAX_DARKNESS;	1094	darkness = MAX_DARKNESS;
1788	else	1095	else
1789	m->darkness = new_level;	1096	darkness = new_level;
1790		1097
1791	/* All clients need to get re-updated for the change */	1098	/* All clients need to get re-updated for the change */
1792	update_all_map_los (m);	1099	update_all_map_los (this);
1793	return 1;	1100	return 1;
1794	}	1101	}
1795		1102
1796	/*	1103	/*
1797	* This function updates various attributes about a specific space	1104	* This function updates various attributes about a specific space
…		…
1801	*/	1108	*/
1802	void	1109	void
1803	mapspace::update_ ()	1110	mapspace::update_ ()
1804	{	1111	{
1805	object *tmp, *last = 0;	1112	object *tmp, *last = 0;
1806	uint8 flags = 0, light = 0, anywhere = 0;	1113	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1807	New_Face *top, *floor, *middle;	1114	facetile *top, *floor, *middle;
1808	object *top_obj, *floor_obj, *middle_obj;	1115	object *top_obj, *floor_obj, *middle_obj;
1809	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1116	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1810		1117
1811	middle = blank_face;	1118	middle = blank_face;
1812	top = blank_face;	1119	top = blank_face;
…		…
1928		1235
1929	/* If two top faces are already set, quit processing */	1236	/* If two top faces are already set, quit processing */
1930	if ((top != blank_face) && (middle != blank_face))	1237	if ((top != blank_face) && (middle != blank_face))
1931	break;	1238	break;
1932		1239
1933	/* Only show visible faces, unless its the editor - show all */	1240	/* Only show visible faces */
1934	if (!tmp->invisible || editor)	1241	if (!tmp->invisible)
1935	{	1242	{
1936	/* Fill in top if needed */	1243	/* Fill in top if needed */
1937	if (top == blank_face)	1244	if (top == blank_face)
1938	{	1245	{
1939	top = tmp->face;	1246	top = tmp->face;
…		…
1969	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;	1276	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1970	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;	1277	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1971	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;	1278	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1972	}	1279	}
1973		1280
1974	void
1975	set_map_reset_time (maptile *map)
1976	{
1977	int timeout;
1978
1979	timeout = map->reset_timeout;
1980	if (timeout <= 0)
1981	timeout = MAP_DEFAULTRESET;
1982	if (timeout >= MAP_MAXRESET)
1983	timeout = MAP_MAXRESET;
1984	map->reset_time = time (0) + timeout;
1985	}
1986
1987	/* this updates the orig_map->tile_map[tile_num] value after loading	1281	/* this updates the orig_map->tile_map[tile_num] value after finding
1988	* the map. It also takes care of linking back the freshly loaded	1282	* the map. It also takes care of linking back the freshly found
1989	* maps tile_map values if it tiles back to this one. It returns	1283	* maps tile_map values if it tiles back to this one. It returns
1990	* the value of orig_map->tile_map[tile_num]. It really only does this	1284	* the value of orig_map->tile_map[tile_num].
1991	* so that it is easier for calling functions to verify success.
1992	*/	1285	*/
1993
1994	static maptile *	1286	static inline maptile *
1995	load_and_link_tiled_map (maptile *orig_map, int tile_num)	1287	find_and_link (maptile *orig_map, int tile_num)
1996	{	1288	{
		1289	maptile *mp = orig_map->tile_map [tile_num];
		1290
		1291	if (!mp)
		1292	{
		1293	mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
		1294
		1295	if (!mp)
		1296	{
		1297	// emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
		1298	LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
		1299	&orig_map->tile_path[tile_num], &orig_map->path);
		1300	mp = new maptile (1, 1);
		1301	mp->alloc ();
		1302	mp->in_memory = MAP_IN_MEMORY;
		1303	}
		1304	}
		1305
1997	int dest_tile = (tile_num + 2) % 4;	1306	int dest_tile = (tile_num + 2) % 4;
1998	char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
1999		1307
2000	orig_map->tile_map[tile_num] = ready_map_name (path, 0);	1308	orig_map->tile_map [tile_num] = mp;
2001		1309
2002	/* need to do a strcmp here as the orig_map->path is not a shared string */	1310	// optimisation: back-link map to origin map if euclidean
2003	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))	1311	//TODO: non-euclidean maps MUST GO
		1312	if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
2004	orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;	1313	orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
2005		1314
2006	return orig_map->tile_map[tile_num];	1315	return mp;
		1316	}
		1317
		1318	static inline void
		1319	load_and_link (maptile *orig_map, int tile_num)
		1320	{
		1321	find_and_link (orig_map, tile_num)->load_sync ();
2007	}	1322	}
2008		1323
2009	/* this returns TRUE if the coordinates (x,y) are out of	1324	/* this returns TRUE if the coordinates (x,y) are out of
2010	* map m. This function also takes into account any	1325	* map m. This function also takes into account any
2011	* tiling considerations, loading adjacant maps as needed.	1326	* tiling considerations, loading adjacant maps as needed.
2012	* This is the function should always be used when it	1327	* This is the function should always be used when it
2013	* necessary to check for valid coordinates.	1328	* necessary to check for valid coordinates.
2014	* This function will recursively call itself for the	1329	* This function will recursively call itself for the
2015	* tiled maps.	1330	* tiled maps.
2016	*
2017	*
2018	*/	1331	*/
2019	int	1332	int
2020	out_of_map (maptile *m, int x, int y)	1333	out_of_map (maptile *m, int x, int y)
2021	{	1334	{
2022	/* If we get passed a null map, this is obviously the	1335	/* If we get passed a null map, this is obviously the
…		…
2030	{	1343	{
2031	if (!m->tile_path[3])	1344	if (!m->tile_path[3])
2032	return 1;	1345	return 1;
2033		1346
2034	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)	1347	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2035	load_and_link_tiled_map (m, 3);	1348	find_and_link (m, 3);
2036		1349
2037	return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));	1350	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
2038	}	1351	}
2039		1352
2040	if (x >= m->width)	1353	if (x >= m->width)
2041	{	1354	{
2042	if (!m->tile_path[1])	1355	if (!m->tile_path[1])
2043	return 1;	1356	return 1;
2044		1357
2045	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)	1358	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2046	load_and_link_tiled_map (m, 1);	1359	find_and_link (m, 1);
2047		1360
2048	return (out_of_map (m->tile_map[1], x - m->width, y));	1361	return out_of_map (m->tile_map[1], x - m->width, y);
2049	}	1362	}
2050		1363
2051	if (y < 0)	1364	if (y < 0)
2052	{	1365	{
2053	if (!m->tile_path[0])	1366	if (!m->tile_path[0])
2054	return 1;	1367	return 1;
2055		1368
2056	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)	1369	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2057	load_and_link_tiled_map (m, 0);	1370	find_and_link (m, 0);
2058		1371
2059	return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));	1372	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
2060	}	1373	}
2061		1374
2062	if (y >= m->height)	1375	if (y >= m->height)
2063	{	1376	{
2064	if (!m->tile_path[2])	1377	if (!m->tile_path[2])
2065	return 1;	1378	return 1;
2066		1379
2067	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)	1380	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2068	load_and_link_tiled_map (m, 2);	1381	find_and_link (m, 2);
2069		1382
2070	return (out_of_map (m->tile_map[2], x, y - m->height));	1383	return out_of_map (m->tile_map[2], x, y - m->height);
2071	}	1384	}
2072		1385
2073	/* Simple case - coordinates are within this local	1386	/* Simple case - coordinates are within this local
2074	* map.	1387	* map.
2075	*/	1388	*/
…		…
2078		1391
2079	/* This is basically the same as out_of_map above, but	1392	/* This is basically the same as out_of_map above, but
2080	* instead we return NULL if no map is valid (coordinates	1393	* instead we return NULL if no map is valid (coordinates
2081	* out of bounds and no tiled map), otherwise it returns	1394	* out of bounds and no tiled map), otherwise it returns
2082	* the map as that the coordinates are really on, and	1395	* the map as that the coordinates are really on, and
2083	* updates x and y to be the localized coordinates.	1396	* updates x and y to be the localised coordinates.
2084	* Using this is more efficient of calling out_of_map	1397	* Using this is more efficient of calling out_of_map
2085	* and then figuring out what the real map is	1398	* and then figuring out what the real map is
2086	*/	1399	*/
2087	maptile *	1400	maptile *
2088	get_map_from_coord (maptile *m, sint16 * x, sint16 * y)	1401	maptile::xy_find (sint16 &x, sint16 &y)
2089	{	1402	{
2090
2091	if (*x < 0)	1403	if (x < 0)
2092	{	1404	{
2093	if (!m->tile_path[3])	1405	if (!tile_path[3])
2094	return 0;	1406	return 0;
2095	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2096	load_and_link_tiled_map (m, 3);
2097		1407
		1408	find_and_link (this, 3);
2098	*x += m->tile_map[3]->width;	1409	x += tile_map[3]->width;
2099	return (get_map_from_coord (m->tile_map[3], x, y));	1410	return tile_map[3]->xy_find (x, y);
2100	}	1411	}
2101		1412
2102	if (*x >= m->width)	1413	if (x >= width)
2103	{	1414	{
2104	if (!m->tile_path[1])	1415	if (!tile_path[1])
2105	return 0;	1416	return 0;
2106		1417
2107	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)	1418	find_and_link (this, 1);
2108	load_and_link_tiled_map (m, 1);
2109
2110	*x -= m->width;	1419	x -= width;
2111	return (get_map_from_coord (m->tile_map[1], x, y));	1420	return tile_map[1]->xy_find (x, y);
2112	}	1421	}
2113		1422
2114	if (*y < 0)	1423	if (y < 0)
2115	{	1424	{
2116	if (!m->tile_path[0])	1425	if (!tile_path[0])
2117	return 0;	1426	return 0;
2118		1427
2119	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)	1428	find_and_link (this, 0);
2120	load_and_link_tiled_map (m, 0);
2121
2122	*y += m->tile_map[0]->height;	1429	y += tile_map[0]->height;
2123	return (get_map_from_coord (m->tile_map[0], x, y));	1430	return tile_map[0]->xy_find (x, y);
2124	}	1431	}
2125		1432
2126	if (*y >= m->height)	1433	if (y >= height)
2127	{	1434	{
2128	if (!m->tile_path[2])	1435	if (!tile_path[2])
2129	return 0;	1436	return 0;
2130		1437
2131	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)	1438	find_and_link (this, 2);
2132	load_and_link_tiled_map (m, 2);
2133
2134	*y -= m->height;	1439	y -= height;
2135	return (get_map_from_coord (m->tile_map[2], x, y));	1440	return tile_map[2]->xy_find (x, y);
2136	}	1441	}
2137		1442
2138	/* Simple case - coordinates are within this local	1443	/* Simple case - coordinates are within this local
2139	* map.	1444	* map.
2140	*/	1445	*/
2141
2142	return m;	1446	return this;
2143	}	1447	}
2144		1448
2145	/**	1449	/**
2146	* Return whether map2 is adjacent to map1. If so, store the distance from	1450	* Return whether map2 is adjacent to map1. If so, store the distance from
2147	* map1 to map2 in dx/dy.	1451	* map1 to map2 in dx/dy.
2148	*/	1452	*/
2149	static int	1453	int
2150	adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)	1454	adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
2151	{	1455	{
2152	if (!map1 || !map2)	1456	if (!map1 || !map2)
2153	return 0;	1457	return 0;
2154		1458
		1459	//TODO: this doesn't actually check corretcly when intermediate maps are not loaded
		1460	//fix: compare paths instead (this is likely faster, too!)
2155	if (map1 == map2)	1461	if (map1 == map2)
2156	{	1462	{
2157	*dx = 0;	1463	*dx = 0;
2158	*dy = 0;	1464	*dy = 0;
2159
2160	}	1465	}
2161	else if (map1->tile_map[0] == map2)	1466	else if (map1->tile_map[0] == map2)
2162	{ /* up */	1467	{ /* up */
2163	*dx = 0;	1468	*dx = 0;
2164	*dy = -map2->height;	1469	*dy = -map2->height;
…		…
2175	}	1480	}
2176	else if (map1->tile_map[3] == map2)	1481	else if (map1->tile_map[3] == map2)
2177	{ /* left */	1482	{ /* left */
2178	*dx = -map2->width;	1483	*dx = -map2->width;
2179	*dy = 0;	1484	*dy = 0;
2180
2181	}	1485	}
2182	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1486	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2183	{ /* up right */	1487	{ /* up right */
2184	*dx = map1->tile_map[0]->width;	1488	*dx = map1->tile_map[0]->width;
2185	*dy = -map1->tile_map[0]->height;	1489	*dy = -map1->tile_map[0]->height;
…		…
2216	}	1520	}
2217	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1521	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2218	{ /* left down */	1522	{ /* left down */
2219	*dx = -map1->tile_map[3]->width;	1523	*dx = -map1->tile_map[3]->width;
2220	*dy = map1->tile_map[3]->height;	1524	*dy = map1->tile_map[3]->height;
2221
2222	}	1525	}
2223	else	1526	else
2224	{ /* not "adjacent" enough */
2225	return 0;	1527	return 0;
2226	}
2227		1528
2228	return 1;	1529	return 1;
		1530	}
		1531
		1532	maptile *
		1533	maptile::xy_load (sint16 &x, sint16 &y)
		1534	{
		1535	maptile *map = xy_find (x, y);
		1536
		1537	if (map)
		1538	map->load_sync ();
		1539
		1540	return map;
		1541	}
		1542
		1543	maptile *
		1544	get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
		1545	{
		1546	return m->xy_load (*x, *y);
2229	}	1547	}
2230		1548
2231	/* From map.c	1549	/* From map.c
2232	* This is used by get_player to determine where the other	1550	* This is used by get_player to determine where the other
2233	* creature is. get_rangevector takes into account map tiling,	1551	* creature is. get_rangevector takes into account map tiling,
2234	* so you just can not look the the map coordinates and get the	1552	* so you just can not look the the map coordinates and get the
2235	* righte value. distance_x/y are distance away, which	1553	* righte value. distance_x/y are distance away, which
2236	* can be negativbe. direction is the crossfire direction scheme	1554	* can be negative. direction is the crossfire direction scheme
2237	* that the creature should head. part is the part of the	1555	* that the creature should head. part is the part of the
2238	* monster that is closest.	1556	* monster that is closest.
2239	*	1557	*
2240	* get_rangevector looks at op1 and op2, and fills in the	1558	* get_rangevector looks at op1 and op2, and fills in the
2241	* structure for op1 to get to op2.	1559	* structure for op1 to get to op2.
…		…
2246	* be unexpected	1564	* be unexpected
2247	*	1565	*
2248	* currently, the only flag supported (0x1) is don't translate for	1566	* currently, the only flag supported (0x1) is don't translate for
2249	* closest body part of 'op1'	1567	* closest body part of 'op1'
2250	*/	1568	*/
2251
2252	void	1569	void
2253	get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)	1570	get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2254	{	1571	{
2255	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1572	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2256	{	1573	{
…		…
2289	{	1606	{
2290	best_distance = tmpi;	1607	best_distance = tmpi;
2291	best = tmp;	1608	best = tmp;
2292	}	1609	}
2293	}	1610	}
		1611
2294	if (best != op1)	1612	if (best != op1)
2295	{	1613	{
2296	retval->distance_x += op1->x - best->x;	1614	retval->distance_x += op1->x - best->x;
2297	retval->distance_y += op1->y - best->y;	1615	retval->distance_y += op1->y - best->y;
2298	}	1616	}
2299	}	1617	}
		1618
2300	retval->part = best;	1619	retval->part = best;
2301	retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);	1620	retval->distance = idistance (retval->distance_x, retval->distance_y);
2302	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1621	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2303	}	1622	}
2304	}	1623	}
2305		1624
2306	/* this is basically the same as get_rangevector above, but instead of	1625	/* this is basically the same as get_rangevector above, but instead of
…		…
2311	* flags has no meaning for this function at this time - I kept it in to	1630	* flags has no meaning for this function at this time - I kept it in to
2312	* be more consistant with the above function and also in case they are needed	1631	* be more consistant with the above function and also in case they are needed
2313	* for something in the future. Also, since no object is pasted, the best	1632	* for something in the future. Also, since no object is pasted, the best
2314	* field of the rv_vector is set to NULL.	1633	* field of the rv_vector is set to NULL.
2315	*/	1634	*/
2316
2317	void	1635	void
2318	get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags)	1636	get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
2319	{	1637	{
2320	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1638	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
2321	{	1639	{
2322	/* be conservative and fill in _some_ data */	1640	/* be conservative and fill in _some_ data */
2323	retval->distance = 100000;	1641	retval->distance = 100000;
…		…
2330	{	1648	{
2331	retval->distance_x += op2->x - x;	1649	retval->distance_x += op2->x - x;
2332	retval->distance_y += op2->y - y;	1650	retval->distance_y += op2->y - y;
2333		1651
2334	retval->part = NULL;	1652	retval->part = NULL;
2335	retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);	1653	retval->distance = idistance (retval->distance_x, retval->distance_y);
2336	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1654	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2337	}	1655	}
2338	}	1656	}
2339		1657
2340	/* Returns true of op1 and op2 are effectively on the same map	1658	/* Returns true of op1 and op2 are effectively on the same map
2341	* (as related to map tiling). Note that this looks for a path from	1659	* (as related to map tiling). Note that this looks for a path from
2342	* op1 to op2, so if the tiled maps are assymetric and op2 has a path	1660	* op1 to op2, so if the tiled maps are asymetric and op2 has a path
2343	* to op1, this will still return false.	1661	* to op1, this will still return false.
2344	* Note we only look one map out to keep the processing simple	1662	* Note we only look one map out to keep the processing simple
2345	* and efficient. This could probably be a macro.	1663	* and efficient. This could probably be a macro.
2346	* MSW 2001-08-05	1664	* MSW 2001-08-05
2347	*/	1665	*/
…		…
2350	{	1668	{
2351	int dx, dy;	1669	int dx, dy;
2352		1670
2353	return adjacent_map (op1->map, op2->map, &dx, &dy);	1671	return adjacent_map (op1->map, op2->map, &dx, &dy);
2354	}	1672	}
		1673
		1674	object *
		1675	maptile::insert (object *op, int x, int y, object *originator, int flags)
		1676	{
		1677	if (!op->flag [FLAG_REMOVED])
		1678	op->remove ();
		1679
		1680	return insert_ob_in_map_at (op, this, originator, flags, x, y);
		1681	}
		1682
		1683	region *
		1684	maptile::region (int x, int y) const
		1685	{
		1686	if (regions
		1687	&& regionmap
		1688	&& !OUT_OF_REAL_MAP (this, x, y))
		1689	if (struct region *reg = regionmap [regions [y * width + x]])
		1690	return reg;
		1691
		1692	if (default_region)
		1693	return default_region;
		1694
		1695	return ::region::default_region ();
		1696	}
		1697

Diff Legend

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