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.51 by root, Mon Dec 25 17:11:16 2006 UTC vs.
Revision 1.84 by root, Mon Feb 5 01:24:45 2007 UTC

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

Diff Legend

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