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

Diff Legend

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