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.27 by root, Fri Sep 8 12:56:42 2006 UTC vs.
Revision 1.41 by root, Tue Dec 12 22:37:05 2006 UTC

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

Diff Legend

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