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.29 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.82 by root, Mon Jan 29 16:11:48 2007 UTC

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

Diff Legend

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