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.78 by root, Fri Jan 19 17:50:10 2007 UTC vs.
Revision 1.180 by root, Thu Jan 14 23:46:14 2010 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
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 "loader.h"
31	#include "path.h"	29	#include "path.h"
32		30
33	/*	31	//+GPL
34	* This makes a path absolute outside the world of Crossfire.
35	* In other words, it prepends LIBDIR/MAPDIR/ to the given path
36	* and returns the pointer to a static array containing the result.
37	* it really should be called create_mapname
38	*/
39	const char *
40	create_pathname (const char *name)
41	{
42	static char buf[8192];
43	snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44	return buf;
45	}
46		32
47	/*	33	sint8 maptile::outdoor_darkness;
48	* This function checks if a file with the given path exists.
49	* -1 is returned if it fails, otherwise the mode of the file
50	* is returned.
51	* It tries out all the compression suffixes listed in the uncomp[] array.
52	*
53	* If prepend_dir is set, then we call create_pathname (which prepends
54	* libdir & mapdir). Otherwise, we assume the name given is fully
55	* complete.
56	* Only the editor actually cares about the writablity of this -
57	* the rest of the code only cares that the file is readable.
58	* when the editor goes away, the call to stat should probably be
59	* replaced by an access instead (similar to the windows one, but
60	* that seems to be missing the prepend_dir processing
61	*/
62	int
63	check_path (const char *name, int prepend_dir)
64	{
65	char buf[MAX_BUF];
66
67	char *endbuf;
68	struct stat statbuf;
69	int mode = 0;
70
71	if (prepend_dir)
72	strcpy (buf, create_pathname (name));
73	else
74	strcpy (buf, name);
75
76	/* old method (strchr(buf, '\0')) seemd very odd to me -
77	* this method should be equivalant and is clearer.
78	* Can not use strcat because we need to cycle through
79	* all the names.
80	*/
81	endbuf = buf + strlen (buf);
82
83	if (stat (buf, &statbuf))
84	return -1;
85	if (!S_ISREG (statbuf.st_mode))
86	return (-1);
87
88	if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
89	((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
90	mode |= 4;
91
92	if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
93	(statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
94	mode |= 2;
95
96	return (mode);
97	}
98		34
99	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	35	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100	* one function that just returns a P_.. value (see map.h)	36	* one function that just returns a P_.. value (see map.h)
101	* it will also do map translation for tiled maps, returning	37	* it will also do map translation for tiled maps, returning
102	* new values into newmap, nx, and ny. Any and all of those	38	* new values into newmap, nx, and ny. Any and all of those
…		…
137	* by the caller.	73	* by the caller.
138	*/	74	*/
139	int	75	int
140	blocked_link (object *ob, maptile *m, int sx, int sy)	76	blocked_link (object *ob, maptile *m, int sx, int sy)
141	{	77	{
142	object *tmp;
143	int mflags, blocked;
144
145	/* Make sure the coordinates are valid - they should be, as caller should	78	/* Make sure the coordinates are valid - they should be, as caller should
146	* have already checked this.	79	* have already checked this.
147	*/	80	*/
148	if (OUT_OF_REAL_MAP (m, sx, sy))	81	if (OUT_OF_REAL_MAP (m, sx, sy))
149	{	82	{
150	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	83	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
151	return 1;	84	return 1;
152	}	85	}
153		86
154	/* Save some cycles - instead of calling get_map_flags(), just get the value	87	mapspace &ms = m->at (sx, sy);
155	* directly.
156	*/
157	mflags = m->at (sx, sy).flags ();
158		88
159	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	89	int mflags = ms.flags ();
		90	int blocked = ms.move_block;
160		91
161	/* If space is currently not blocked by anything, no need to	92	/* If space is currently not blocked by anything, no need to
162	* go further. Not true for players - all sorts of special	93	* go further. Not true for players - all sorts of special
163	* things we need to do for players.	94	* things we need to do for players.
164	*/	95	*/
165	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	96	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
166	return 0;	97	return 0;
167		98
168	/* if there isn't anytyhing alive on this space, and this space isn't	99	/* if there isn't anything alive on this space, and this space isn't
169	* otherwise blocked, we can return now. Only if there is a living	100	* otherwise blocked, we can return now. Only if there is a living
170	* creature do we need to investigate if it is part of this creature	101	* creature do we need to investigate if it is part of this creature
171	* or another. Likewise, only if something is blocking us do we	102	* or another. Likewise, only if something is blocking us do we
172	* need to investigate if there is a special circumstance that would	103	* need to investigate if there is a special circumstance that would
173	* let the player through (inventory checkers for example)	104	* let the player through (inventory checkers for example)
174	*/	105	*/
175	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))	106	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176	return 0;	107	return 0;
177		108
178	if (ob->head != NULL)
179	ob = ob->head;	109	ob = ob->head_ ();
180		110
181	/* We basically go through the stack of objects, and if there is	111	/* We basically go through the stack of objects, and if there is
182	* some other object that has NO_PASS or FLAG_ALIVE set, return	112	* some other object that has NO_PASS or FLAG_ALIVE set, return
183	* true. If we get through the entire stack, that must mean	113	* true. If we get through the entire stack, that must mean
184	* ob is blocking it, so return 0.	114	* ob is blocking it, so return 0.
185	*/	115	*/
186	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	116	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
187	{	117	{
188		118	if (OB_MOVE_BLOCK (ob, tmp))
189	/* This must be before the checks below. Code for inventory checkers. */
190	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
191	{	119	{
192	/* If last_sp is set, the player/monster needs an object,	120	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
193	* so we check for it. If they don't have it, they can't	121	if (RESULT_INT (0))
194	* pass through this space.	122	return 1;
195	*/	123	else
196	if (tmp->last_sp)	124	continue;
		125
		126	if (tmp->type == CHECK_INV)
197	{	127	{
198	if (check_inv_recursive (ob, tmp) == NULL)	128	bool have = check_inv_recursive (ob, tmp);
		129
		130	// last_sp set means we block if we don't have.
		131	if (logical_xor (have, tmp->last_sp))
199	return 1;	132	return 1;
200	else	133	}
201	continue;	134	else if (tmp->type == T_MATCH)
		135	{
		136	// T_MATCH allows "entrance" iff the match is true
		137	// == blocks if the match fails
		138
		139	// we could have used an INVOKE_OBJECT, but decided against it, as we
		140	// assume that T_MATCH is relatively common.
		141	if (!match (tmp->slaying, ob, tmp, ob))
		142	return 1;
202	}	143	}
203	else	144	else
204	{	145	return 1; // unconditional block
205	/* In this case, the player must not have the object -	146
206	* if they do, they can't pass through.
207	*/
208	if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
209	return 1;
210	else
211	continue;
212	}
213	} /* if check_inv */
214	else	147	} else {
215	{	148	// space does not block the ob, directly, but
216	/* Broke apart a big nasty if into several here to make	149	// anything alive that is not a door still
217	* this more readable. first check - if the space blocks	150	// blocks anything but wizards.
218	* movement, can't move here.	151
219	* second - if a monster, can't move there, unles it is a	152	if (tmp->flag [FLAG_ALIVE]
220	* hidden dm	153	&& tmp->head_ () != ob
221	*/	154	&& tmp != ob
222	if (OB_MOVE_BLOCK (ob, tmp))	155	&& tmp->type != DOOR)
223	return 1;
224	if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
225	tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
226	return 1;	156	return 1;
227	}	157	}
228
229	}	158	}
		159
230	return 0;	160	return 0;
231	}	161	}
232		162
233	/*	163	/*
234	* Returns true if the given object can't fit in the given spot.	164	* Returns qthe blocking object if the given object can't fit in the given
235	* This is meant for multi space objects - for single space objecs,	165	* spot. This is meant for multi space objects - for single space objecs,
236	* just calling get_map_blocked and checking that against movement type	166	* just calling get_map_blocked and checking that against movement type
237	* of object. This function goes through all the parts of the	167	* of object. This function goes through all the parts of the multipart
238	* multipart object and makes sure they can be inserted.	168	* object and makes sure they can be inserted.
239	*	169	*
240	* While this doesn't call out of map, the get_map_flags does.	170	* While this doesn't call out of map, the get_map_flags does.
241	*	171	*
242	* This function has been used to deprecate arch_out_of_map -	172	* This function has been used to deprecate arch_out_of_map -
243	* this function also does that check, and since in most cases,	173	* this function also does that check, and since in most cases,
…		…
254	*	184	*
255	* Note this used to be arch_blocked, but with new movement	185	* Note this used to be arch_blocked, but with new movement
256	* code, we need to have actual object to check its move_type	186	* code, we need to have actual object to check its move_type
257	* against the move_block values.	187	* against the move_block values.
258	*/	188	*/
259	int	189	bool
260	ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)	190	object::blocked (maptile *m, int x, int y) const
261	{	191	{
262	archetype *tmp;	192	for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
263	int flag;
264	maptile *m1;
265	sint16 sx, sy;
266
267	if (!ob)
268	{
269	flag = get_map_flags (m, &m1, x, y, &sx, &sy);
270	if (flag & P_OUT_OF_MAP)
271	return P_OUT_OF_MAP;
272
273	/* don't have object, so don't know what types would block */
274	return m1->at (sx, sy).move_block;
275	}	193	{
		194	mapxy pos (m, x + tmp->x, y + tmp->y);
276		195
277	for (tmp = ob->arch; tmp; tmp = tmp->more)	196	if (!pos.normalise ())
278	{	197	return 1;
279	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
280		198
281	if (flag & P_OUT_OF_MAP)	199	mapspace &ms = *pos;
282	return P_OUT_OF_MAP;	200
283	if (flag & P_IS_ALIVE)	201	if (ms.flags () & P_IS_ALIVE)
284	return P_IS_ALIVE;	202	return 1;
285		203
286	mapspace &ms = m1->at (sx, sy);	204	/* However, often ob doesn't have any move type
287		205	* (signifying non-moving objects)
288	/* find_first_free_spot() calls this function. However, often
289	* ob doesn't have any move type (when used to place exits)
290	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	206	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
291	*/	207	*/
292
293	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	208	if (!move_type && ms.move_block != MOVE_ALL)
294	continue;	209	continue;
295		210
296	/* Note it is intentional that we check ob - the movement type of the	211	/* Note it is intentional that we check ob - the movement type of the
297	* head of the object should correspond for the entire object.	212	* head of the object should correspond for the entire object.
298	*/	213	*/
299	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	214	if (ms.blocks (move_type))
300	return P_NO_PASS;	215	return 1;
301	}	216	}
302		217
303	return 0;	218	return 0;
304	}	219	}
305		220
306	/* When the map is loaded, load_object does not actually insert objects	221	//-GPL
307	* into inventory, but just links them. What this does is go through
308	* and insert them properly.
309	* The object 'container' is the object that contains the inventory.
310	* This is needed so that we can update the containers weight.
311	*/
312	void
313	fix_container (object *container)
314	{
315	object *tmp = container->inv, *next;
316
317	container->inv = 0;
318	while (tmp)
319	{
320	next = tmp->below;
321	if (tmp->inv)
322	fix_container (tmp);
323
324	insert_ob_in_ob (tmp, container);
325	tmp = next;
326	}
327
328	/* sum_weight will go through and calculate what all the containers are
329	* carrying.
330	*/
331	sum_weight (container);
332	}
333		222
334	void	223	void
335	maptile::set_object_flag (int flag, int value)	224	maptile::set_object_flag (int flag, int value)
336	{	225	{
337	if (!spaces)	226	if (!spaces)
…		…
340	for (mapspace *ms = spaces + size (); ms-- > spaces; )	229	for (mapspace *ms = spaces + size (); ms-- > spaces; )
341	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	230	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
342	tmp->flag [flag] = value;	231	tmp->flag [flag] = value;
343	}	232	}
344		233
		234	void
		235	maptile::post_load_original ()
		236	{
		237	if (!spaces)
		238	return;
		239
		240	set_object_flag (FLAG_OBJ_ORIGINAL);
		241
		242	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		243	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		244	INVOKE_OBJECT (RESET, tmp);
		245	}
		246
		247	void
		248	maptile::post_load ()
		249	{
		250	#if 0
		251	if (!spaces)
		252	return;
		253
		254	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		255	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		256	; // nop
		257	#endif
		258	}
		259
		260	//+GPL
		261
345	/* link_multipart_objects go through all the objects on the map looking	262	/* link_multipart_objects go through all the objects on the map looking
346	* for objects whose arch says they are multipart yet according to the	263	* for objects whose arch says they are multipart yet according to the
347	* info we have, they only have the head (as would be expected when	264	* info we have, they only have the head (as would be expected when
348	* they are saved). We do have to look for the old maps that did save	265	* they are saved).
349	* the more sections and not re-add sections for them.
350	*/	266	*/
351	void	267	void
352	maptile::link_multipart_objects ()	268	maptile::link_multipart_objects ()
353	{	269	{
354	if (!spaces)	270	if (!spaces)
355	return;	271	return;
356		272
357	for (mapspace *ms = spaces + size (); ms-- > spaces; )	273	for (mapspace *ms = spaces + size (); ms-- > spaces; )
358	for (object *tmp = ms->bot; tmp; )	274	{
		275	object *op = ms->bot;
		276	while (op)
359	{	277	{
360	object *above = tmp->above;
361
362	/* already multipart - don't do anything more */	278	/* already multipart - don't do anything more */
363	if (!tmp->head && !tmp->more)	279	if (op->head_ () == op && !op->more && op->arch->more)
364	{
365	/* If there is nothing more to this object, this for loop
366	* won't do anything.
367	*/
368	archetype *at;
369	object *last, *op;
370	for (at = tmp->arch->more, last = tmp;
371	at;
372	at = at->more, last = op)
373	{	280	{
374	op = arch_to_object (at);	281	op->remove ();
		282	op->expand_tail ();
375		283
376	/* update x,y coordinates */	284	// FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
377	op->x += tmp->x;	285	// multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
378	op->y += tmp->y;	286	// below the pentagrams... hopefully INS_ON_TOP doesn't break anything
379	op->head = tmp;
380	op->map = this;
381	last->more = op;
382	op->name = tmp->name;
383	op->title = tmp->title;
384
385	/* we could link all the parts onto tmp, and then just
386	* call insert_ob_in_map once, but the effect is the same,
387	* as insert_ob_in_map will call itself with each part, and
388	* the coding is simpler to just to it here with each part.
389	*/
390	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);	287	insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
		288
		289	op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
		290	// so we have to reset the iteration through the mapspace
391	}	291	}
		292	else
		293	op = op->above;
392	}	294	}
393
394	tmp = above;
395	}	295	}
396	}	296	}
		297
		298	//-GPL
397		299
398	/*	300	/*
399	* Loads (ands parses) the objects into a given map from the specified	301	* Loads (ands parses) the objects into a given map from the specified
400	* file pointer.	302	* file pointer.
401	* mapflags is the same as we get with load_original_map
402	*/	303	*/
403	bool	304	bool
404	maptile::_load_objects (object_thawer &thawer)	305	maptile::_load_objects (object_thawer &f)
405	{	306	{
406	int unique;	307	for (;;)
407	object *op, *prev = NULL, *last_more = NULL, *otmp;
408
409	op = object::create ();
410	op->map = this; /* To handle buttons correctly */
411
412	while (int i = load_object (thawer, op, 0))
413	{	308	{
414	/* if the archetype for the object is null, means that we	309	coroapi::cede_to_tick (); // cede once in a while
415	* got an invalid object. Don't do anything with it - the game	310
416	* or editor will not be able to do anything with it either.	311	switch (f.kw)
417	*/
418	if (op->arch == NULL)
419	{	312	{
420	LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");	313	case KW_arch:
		314	if (object *op = object::read (f, this))
		315	{
		316	// TODO: why?
		317	if (op->inv)
		318	op->update_weight ();
		319
		320	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
		321	{
		322	// we insert manually because
		323	// a) its way faster
		324	// b) we remove manually, too, and there are good reasons for that
		325	// c) it's correct
		326	mapspace &ms = at (op->x, op->y);
		327
		328	op->flag [FLAG_REMOVED] = false;
		329
		330	op->above = 0;
		331	op->below = ms.top;
		332
		333	*(ms.top ? &ms.top->above : &ms.bot) = op;
		334
		335	ms.top = op;
		336	ms.flags_ = 0;
		337	}
		338	else
		339	{
		340	f.parse_warn (format ("object %s out of range", op->debug_desc ()));
		341	op->destroy ();
		342	}
		343	}
		344
421	continue;	345	continue;
422	}
423		346
424	switch (i)
425	{
426	case LL_NORMAL:
427	insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
428
429	if (op->inv)
430	sum_weight (op);
431
432	prev = op, last_more = op;
433	break;
434
435	case LL_MORE:	347	case KW_EOF:
436	insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);	348	return true;
437	op->head = prev, last_more->more = op, last_more = op;	349
		350	default:
		351	if (!f.parse_error ("map file"))
		352	return false;
438	break;	353	break;
439	}	354	}
440		355
441	op = object::create ();	356	f.next ();
442	op->map = this;
443	}
444
445	op->destroy ();
446
447	#if 0
448	for (i = 0; i < width; i++)
449	for (j = 0; j < height; j++)
450	{
451	unique = 0;
452	/* check for unique items, or unique squares */
453	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454	{
455	if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456	unique = 1;
457
458	if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460	}
461	}	357	}
462	#endif
463		358
464	return true;	359	return true;
465	}	360	}
466		361
467	void	362	void
468	maptile::activate ()	363	maptile::activate ()
469	{	364	{
470	if (!spaces)	365	if (spaces)
471	return;
472
473	for (mapspace *ms = spaces + size (); ms-- > spaces; )	366	for (mapspace *ms = spaces + size (); ms-- > spaces; )
474	for (object *op = ms->bot; op; op = op->above)	367	for (object *op = ms->bot; op; op = op->above)
475	op->activate_recursive ();	368	op->activate_recursive ();
476	}	369	}
477		370
478	void	371	void
479	maptile::deactivate ()	372	maptile::deactivate ()
480	{	373	{
481	if (!spaces)	374	if (spaces)
482	return;
483
484	for (mapspace *ms = spaces + size (); ms-- > spaces; )	375	for (mapspace *ms = spaces + size (); ms-- > spaces; )
485	for (object *op = ms->bot; op; op = op->above)	376	for (object *op = ms->bot; op; op = op->above)
486	op->deactivate_recursive ();	377	op->deactivate_recursive ();
487	}	378	}
488		379
489	bool	380	bool
490	maptile::_save_objects (object_freezer &freezer, int flags)	381	maptile::_save_objects (object_freezer &f, int flags)
491	{	382	{
492	static int cede_count = 0;	383	coroapi::cede_to_tick ();
493		384
494	if (flags & IO_HEADER)	385	if (flags & IO_HEADER)
495	_save_header (freezer);	386	_save_header (f);
496		387
497	if (!spaces)	388	if (!spaces)
498	return false;	389	return false;
499		390
500	for (int i = 0; i < size (); ++i)	391	for (int i = 0; i < size (); ++i)
501	{	392	{
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;	393	bool unique = 0;
		394
511	for (object *op = spaces [i].bot; op; op = op->above)	395	for (object *op = spaces [i].bot; op; op = op->above)
512	{	396	{
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])	397	unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
517	unique = 1;
518		398
519	if (!op->can_map_save ())	399	if (expect_false (!op->can_map_save ()))
520	continue;	400	continue;
521		401
522	if (unique || op->flag [FLAG_UNIQUE])	402	if (expect_false (unique || op->flag [FLAG_UNIQUE]))
523	{	403	{
524	if (flags & IO_UNIQUES)	404	if (flags & IO_UNIQUES)
525	save_object (freezer, op, 1);	405	op->write (f);
526	}	406	}
527	else if (flags & IO_OBJECTS)	407	else if (expect_true (flags & IO_OBJECTS))
528	save_object (freezer, op, 1);	408	op->write (f);
529	}	409	}
530	}	410	}
531		411
		412	coroapi::cede_to_tick ();
		413
532	return true;	414	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	}	415	}
556		416
557	bool	417	bool
558	maptile::_save_objects (const char *path, int flags)	418	maptile::_save_objects (const char *path, int flags)
559	{	419	{
…		…
568	maptile::maptile ()	428	maptile::maptile ()
569	{	429	{
570	in_memory = MAP_SWAPPED;	430	in_memory = MAP_SWAPPED;
571		431
572	/* The maps used to pick up default x and y values from the	432	/* The maps used to pick up default x and y values from the
573	* map archetype. Mimic that behaviour.	433	* map archetype. Mimic that behaviour.
574	*/	434	*/
575	width = 16;	435	width = 16;
576	height = 16;	436	height = 16;
577	reset_timeout = 0;
578	timeout = 300;	437	timeout = 300;
579	enter_x = 0;	438	max_items = MAX_ITEM_PER_ACTION;
580	enter_y = 0;	439	max_volume = 2000000; // 2m³
581	}	440	}
582		441
583	maptile::maptile (int w, int h)	442	maptile::maptile (int w, int h)
584	{	443	{
585	in_memory = MAP_SWAPPED;	444	in_memory = MAP_SWAPPED;
…		…
605	if (spaces)	464	if (spaces)
606	return;	465	return;
607		466
608	spaces = salloc0<mapspace> (size ());	467	spaces = salloc0<mapspace> (size ());
609	}	468	}
		469
		470	//+GPL
610		471
611	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	472	/* Takes a string from a map definition and outputs a pointer to the array of shopitems
612	* corresponding to that string. Memory is allocated for this, it must be freed	473	* corresponding to that string. Memory is allocated for this, it must be freed
613	* at a later date.	474	* at a later date.
614	* Called by parse_map_headers below.	475	* Called by parse_map_headers below.
…		…
691	return items;	552	return items;
692	}	553	}
693		554
694	/* opposite of parse string, this puts the string that was originally fed in to	555	/* opposite of parse string, this puts the string that was originally fed in to
695	* the map (or something equivilent) into output_string. */	556	* the map (or something equivilent) into output_string. */
696	static void	557	static const char *
697	print_shop_string (maptile *m, char *output_string)	558	print_shop_string (maptile *m)
698	{	559	{
699	int i;	560	static dynbuf_text buf; buf.clear ();
700	char tmp[MAX_BUF];
701		561
702	strcpy (output_string, "");
703	for (i = 0; i < m->shopitems[0].index; i++)	562	for (int i = 0; i < m->shopitems[0].index; i++)
704	{	563	{
705	if (m->shopitems[i].typenum)	564	if (m->shopitems[i].typenum)
706	{	565	{
707	if (m->shopitems[i].strength)	566	if (m->shopitems[i].strength)
708	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	567	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
709	else	568	else
710	sprintf (tmp, "%s;", m->shopitems[i].name);	569	buf.printf ("%s;", m->shopitems[i].name);
711	}	570	}
712	else	571	else
713	{	572	{
714	if (m->shopitems[i].strength)	573	if (m->shopitems[i].strength)
715	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	574	buf.printf ("*:%d;", m->shopitems[i].strength);
716	else	575	else
717	sprintf (tmp, "*");	576	buf.printf ("*");
718	}	577	}
719
720	strcat (output_string, tmp);
721	}	578	}
		579
		580	return buf;
722	}	581	}
		582
		583	//-GPL
723		584
724	/* This loads the header information of the map. The header	585	/* This loads the header information of the map. The header
725	* contains things like difficulty, size, timeout, etc.	586	* contains things like difficulty, size, timeout, etc.
726	* this used to be stored in the map object, but with the	587	* this used to be stored in the map object, but with the
727	* addition of tiling, fields beyond that easily named in an	588	* addition of tiling, fields beyond that easily named in an
…		…
735	bool	596	bool
736	maptile::_load_header (object_thawer &thawer)	597	maptile::_load_header (object_thawer &thawer)
737	{	598	{
738	for (;;)	599	for (;;)
739	{	600	{
740	keyword kw = thawer.get_kv ();
741
742	switch (kw)	601	switch (thawer.kw)
743	{	602	{
744	case KW_EOF:
745	LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
746	return false;
747
748	case KW_end:
749	return true;
750
751	default:
752	case KW_ERROR:
753	LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
754	break;
755
756	case KW_msg:	603	case KW_msg:
757	thawer.get_ml (KW_endmsg, msg);	604	thawer.get_ml (KW_endmsg, msg);
758	break;	605	break;
759		606
760	case KW_lore: // CF+ extension	607	case KW_lore: // CF+ extension
…		…
782	case KW_shopgreed: thawer.get (shopgreed); break;	629	case KW_shopgreed: thawer.get (shopgreed); break;
783	case KW_shopmin: thawer.get (shopmin); break;	630	case KW_shopmin: thawer.get (shopmin); break;
784	case KW_shopmax: thawer.get (shopmax); break;	631	case KW_shopmax: thawer.get (shopmax); break;
785	case KW_shoprace: thawer.get (shoprace); break;	632	case KW_shoprace: thawer.get (shoprace); break;
786	case KW_outdoor: thawer.get (outdoor); break;	633	case KW_outdoor: thawer.get (outdoor); break;
787	case KW_temp: thawer.get (temp); break;
788	case KW_pressure: thawer.get (pressure); break;
789	case KW_humid: thawer.get (humid); break;
790	case KW_windspeed: thawer.get (windspeed); break;
791	case KW_winddir: thawer.get (winddir); break;
792	case KW_sky: thawer.get (sky); break;
793		634
794	case KW_per_player: thawer.get (per_player); break;	635	case KW_per_player: thawer.get (per_player); break;
795	case KW_per_party: thawer.get (per_party); break;	636	case KW_per_party: thawer.get (per_party); break;
		637	case KW_no_reset: thawer.get (no_reset); break;
		638	case KW_no_drop: thawer.get (no_drop); break;
796		639
797	case KW_region: get_region_by_name (thawer.get_str ()); break;	640	case KW_region: default_region = region::find (thawer.get_str ()); break;
798	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	641	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
799		642
800	// old names new names	643	// old names new names
801	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;	644	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
802	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;	645	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
…		…
810		653
811	case KW_tile_path_1: thawer.get (tile_path [0]); break;	654	case KW_tile_path_1: thawer.get (tile_path [0]); break;
812	case KW_tile_path_2: thawer.get (tile_path [1]); break;	655	case KW_tile_path_2: thawer.get (tile_path [1]); break;
813	case KW_tile_path_3: thawer.get (tile_path [2]); break;	656	case KW_tile_path_3: thawer.get (tile_path [2]); break;
814	case KW_tile_path_4: thawer.get (tile_path [3]); break;	657	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		658
		659	case KW_ERROR:
		660	set_key_text (thawer.kw_str, thawer.value);
		661	break;
		662
		663	case KW_end:
		664	thawer.next ();
		665	return true;
		666
		667	default:
		668	if (!thawer.parse_error ("map", 0))
		669	return false;
		670	break;
815	}	671	}
		672
		673	thawer.next ();
816	}	674	}
817		675
818	abort ();	676	abort ();
819	}	677	}
820		678
821	bool	679	//+GPL
822	maptile::_load_header (const char *path)
823	{
824	object_thawer thawer (path);
825
826	if (!thawer)
827	return false;
828
829	return _load_header (thawer);
830	}
831		680
832	/******************************************************************************	681	/******************************************************************************
833	* This is the start of unique map handling code	682	* This is the start of unique map handling code
834	*****************************************************************************/	683	*****************************************************************************/
835		684
…		…
845	object *above = op->above;	694	object *above = op->above;
846		695
847	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	696	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
848	unique = 1;	697	unique = 1;
849		698
850	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))	699	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
851	{
852	op->destroy_inv (false);
853	op->destroy ();	700	op->destroy ();
854	}
855		701
856	op = above;	702	op = above;
857	}	703	}
858	}	704	}
859	}	705	}
860		706
		707	//-GPL
		708
861	bool	709	bool
862	maptile::_save_header (object_freezer &freezer)	710	maptile::_save_header (object_freezer &freezer)
863	{	711	{
864	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	712	#define MAP_OUT(k) freezer.put (KW(k), k)
865	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	713	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
866		714
867	MAP_OUT2 (arch, "map");	715	MAP_OUT2 (arch, CS(map));
868		716
869	if (name) MAP_OUT (name);	717	if (name) MAP_OUT (name);
870	MAP_OUT (swap_time);	718	MAP_OUT (swap_time);
871	MAP_OUT (reset_time);	719	MAP_OUT (reset_time);
872	MAP_OUT (reset_timeout);	720	MAP_OUT (reset_timeout);
873	MAP_OUT (fixed_resettime);	721	MAP_OUT (fixed_resettime);
		722	MAP_OUT (no_reset);
		723	MAP_OUT (no_drop);
874	MAP_OUT (difficulty);	724	MAP_OUT (difficulty);
875
876	if (region) MAP_OUT2 (region, region->name);	725	if (default_region) MAP_OUT2 (region, default_region->name);
877		726
878	if (shopitems)	727	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
879	{
880	char shop[MAX_BUF];
881	print_shop_string (this, shop);
882	MAP_OUT2 (shopitems, shop);
883	}
884
885	MAP_OUT (shopgreed);	728	MAP_OUT (shopgreed);
886	MAP_OUT (shopmin);	729	MAP_OUT (shopmin);
887	MAP_OUT (shopmax);	730	MAP_OUT (shopmax);
888	if (shoprace) MAP_OUT (shoprace);	731	if (shoprace) MAP_OUT (shoprace);
889	MAP_OUT (darkness);	732
890	MAP_OUT (width);	733	MAP_OUT (width);
891	MAP_OUT (height);	734	MAP_OUT (height);
892	MAP_OUT (enter_x);	735	MAP_OUT (enter_x);
893	MAP_OUT (enter_y);	736	MAP_OUT (enter_y);
894		737	MAP_OUT (darkness);
895	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
896	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
897
898	MAP_OUT (outdoor);	738	MAP_OUT (outdoor);
899	MAP_OUT (temp);	739
900	MAP_OUT (pressure);	740	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
901	MAP_OUT (humid);	741	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
902	MAP_OUT (windspeed);
903	MAP_OUT (winddir);
904	MAP_OUT (sky);
905		742
906	MAP_OUT (per_player);	743	MAP_OUT (per_player);
907	MAP_OUT (per_party);	744	MAP_OUT (per_party);
908		745
909	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	746	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
910	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	747	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
911	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	748	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
912	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	749	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
913		750
914	freezer.put (this);	751	freezer.put (this);
915	freezer.put (KW_end);	752	freezer.put (KW(end));
916		753
917	return true;	754	return true;
918	}	755	}
919		756
920	bool	757	bool
…		…
926	return false;	763	return false;
927		764
928	return freezer.save (path);	765	return freezer.save (path);
929	}	766	}
930		767
		768	//+GPL
		769
931	/*	770	/*
932	* Remove and free all objects in the given map.	771	* Remove and free all objects in the given map.
933	*/	772	*/
934	void	773	void
935	maptile::clear ()	774	maptile::clear ()
936	{	775	{
937	if (!spaces)	776	if (spaces)
938	return;	777	{
939
940	for (mapspace *ms = spaces + size (); ms-- > spaces; )	778	for (mapspace *ms = spaces + size (); ms-- > spaces; )
941	while (object *op = ms->bot)	779	while (object *op = ms->bot)
942	{	780	{
		781	// manually remove, as to not trigger anything
		782	if (ms->bot = op->above)
		783	ms->bot->below = 0;
		784
		785	op->flag [FLAG_REMOVED] = true;
		786
		787	object *head = op->head_ ();
943	if (op->head)	788	if (op == head)
944	op = op->head;
945
946	op->destroy_inv (false);
947	op->destroy ();	789	op->destroy ();
		790	else if (head->map != op->map)
		791	{
		792	LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
		793	head->destroy ();
		794	}
		795	}
		796
		797	sfree0 (spaces, size ());
948	}	798	}
949
950	sfree (spaces, size ()), spaces = 0;
951		799
952	if (buttons)	800	if (buttons)
953	free_objectlinkpt (buttons), buttons = 0;	801	free_objectlinkpt (buttons), buttons = 0;
		802
		803	sfree0 (regions, size ());
		804	delete [] regionmap; regionmap = 0;
954	}	805	}
955		806
956	void	807	void
957	maptile::clear_header ()	808	maptile::clear_header ()
958	{	809	{
…		…
990	attachable::do_destroy ();	841	attachable::do_destroy ();
991		842
992	clear ();	843	clear ();
993	}	844	}
994		845
995	/*	846	/* decay and destroy perishable items in a map */
996	* Updates every button on the map (by calling update_button() for them).	847	// TODO: should be done regularly, not on map load?
997	*/
998	void	848	void
999	maptile::update_buttons ()	849	maptile::do_decay_objects ()
1000	{	850	{
1001	for (oblinkpt *obp = buttons; obp; obp = obp->next)	851	if (!spaces)
1002	for (objectlink *ol = obp->link; ol; ol = ol->next)	852	return;
		853
		854	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		855	for (object *above, *op = ms->bot; op; op = above)
1003	{	856	{
1004	if (!ol->ob)	857	above = op->above;
		858
		859	// do not decay anything above unique floor tiles (yet :)
		860	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
		861	break;
		862
		863	bool destroy = 0;
		864
		865	if (QUERY_FLAG (op, FLAG_IS_FLOOR)
		866	|| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
		867	|| QUERY_FLAG (op, FLAG_UNIQUE)
		868	|| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
		869	|| QUERY_FLAG (op, FLAG_UNPAID)
		870	|| op->is_alive ())
		871	; // do not decay
		872	else if (op->is_weapon ())
1005	{	873	{
1006	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",	874	op->stats.dam--;
1007	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);	875	if (op->stats.dam < 0)
1008	continue;	876	destroy = 1;
1009	}	877	}
1010		878	else if (op->is_armor ())
1011	if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1012	{	879	{
1013	update_button (ol->ob);	880	op->stats.ac--;
1014	break;	881	if (op->stats.ac < 0)
		882	destroy = 1;
1015	}	883	}
		884	else if (op->type == FOOD)
		885	{
		886	op->stats.food -= rndm (5, 20);
		887	if (op->stats.food < 0)
		888	destroy = 1;
		889	}
		890	else
		891	{
		892	int mat = op->materials;
		893
		894	if (mat & M_PAPER
		895	|| mat & M_LEATHER
		896	|| mat & M_WOOD
		897	|| mat & M_ORGANIC
		898	|| mat & M_CLOTH
		899	|| mat & M_LIQUID
		900	|| (mat & M_IRON && rndm (1, 5) == 1)
		901	|| (mat & M_GLASS && rndm (1, 2) == 1)
		902	|| ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
		903	|| ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
		904	//|| (mat & M_ICE && temp > 32)
		905	)
		906	destroy = 1;
		907	}
		908
		909	/* adjust overall chance below */
		910	if (destroy && rndm (0, 1))
		911	op->destroy ();
1016	}	912	}
1017	}	913	}
1018		914
1019	/*	915	/*
1020	* This routine is supposed to find out the difficulty of the map.	916	* This routine is supposed to find out the difficulty of the map.
1021	* difficulty does not have a lot to do with character level,	917	* difficulty does not have a lot to do with character level,
1022	* but does have a lot to do with treasure on the map.	918	* but does have a lot to do with treasure on the map.
1023	*	919	*
1024	* Difficulty can now be set by the map creature. If the value stored	920	* Difficulty can now be set by the map creator. If the value stored
1025	* in the map is zero, then use this routine. Maps should really	921	* in the map is zero, then use this routine. Maps should really
1026	* have a difficulty set than using this function - human calculation	922	* have a difficulty set rather than using this function - human calculation
1027	* is much better than this functions guesswork.	923	* is much better than this function's guesswork.
1028	*/	924	*/
1029	int	925	int
1030	maptile::estimate_difficulty () const	926	maptile::estimate_difficulty () const
1031	{	927	{
1032	long monster_cnt = 0;	928	long monster_cnt = 0;
…		…
1044		940
1045	if (QUERY_FLAG (op, FLAG_GENERATOR))	941	if (QUERY_FLAG (op, FLAG_GENERATOR))
1046	{	942	{
1047	total_exp += op->stats.exp;	943	total_exp += op->stats.exp;
1048		944
1049	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))	945	if (archetype *at = op->other_arch)
		946	{
1050	total_exp += at->clone.stats.exp * 8;	947	total_exp += at->stats.exp * 8;
1051
1052	monster_cnt++;	948	monster_cnt++;
		949	}
		950
		951	for (object *inv = op->inv; inv; inv = inv->below)
		952	{
		953	total_exp += op->stats.exp * 8;
		954	monster_cnt++;
		955	}
1053	}	956	}
1054	}	957	}
1055		958
1056	avgexp = (double) total_exp / monster_cnt;	959	avgexp = (double) total_exp / monster_cnt;
1057		960
…		…
1070	* postive values make it darker, negative make it brighter	973	* postive values make it darker, negative make it brighter
1071	*/	974	*/
1072	int	975	int
1073	maptile::change_map_light (int change)	976	maptile::change_map_light (int change)
1074	{	977	{
1075	int new_level = darkness + change;
1076
1077	/* Nothing to do */	978	/* Nothing to do */
1078	if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))	979	if (!change)
1079	return 0;	980	return 0;
1080		981
1081	/* inform all players on the map */	982	/* inform all players on the map */
1082	if (change > 0)	983	if (change > 0)
1083	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");	984	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1084	else	985	else
1085	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");	986	new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1086		987
1087	/* Do extra checking. since darkness is a unsigned value,	988	darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1088	* we need to be extra careful about negative values.
1089	* In general, the checks below are only needed if change
1090	* is not +/-1
1091	*/
1092	if (new_level < 0)
1093	darkness = 0;
1094	else if (new_level >= MAX_DARKNESS)
1095	darkness = MAX_DARKNESS;
1096	else
1097	darkness = new_level;
1098		989
1099	/* All clients need to get re-updated for the change */	990	/* All clients need to get re-updated for the change */
1100	update_all_map_los (this);	991	update_all_map_los (this);
		992
1101	return 1;	993	return 1;
1102	}	994	}
1103		995
1104	/*	996	/*
1105	* This function updates various attributes about a specific space	997	* This function updates various attributes about a specific space
…		…
1108	* through, etc)	1000	* through, etc)
1109	*/	1001	*/
1110	void	1002	void
1111	mapspace::update_ ()	1003	mapspace::update_ ()
1112	{	1004	{
1113	object *tmp, *last = 0;	1005	object *last = 0;
1114	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;	1006	uint8 flags = P_UPTODATE;
1115	facetile *top, *floor, *middle;	1007	sint8 light = 0;
1116	object *top_obj, *floor_obj, *middle_obj;
1117	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1008	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
		1009	uint64_t volume = 0;
		1010	uint32_t items = 0;
		1011	object *anywhere = 0;
		1012	uint8_t middle_visibility = 0;
1118		1013
1119	middle = blank_face;	1014	//object *middle = 0;
1120	top = blank_face;	1015	//object *top = 0;
1121	floor = blank_face;	1016	//object *floor = 0;
		1017	// this seems to generate better code than using locals, above
		1018	object *&top = faces_obj[0] = 0;
		1019	object *&middle = faces_obj[1] = 0;
		1020	object *&floor = faces_obj[2] = 0;
1122		1021
1123	middle_obj = 0;	1022	object::flags_t allflags; // all flags of all objects or'ed together
1124	top_obj = 0;
1125	floor_obj = 0;
1126		1023
1127	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)	1024	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1128	{	1025	{
1129	/* This could be made additive I guess (two lights better than	1026	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1130	* one). But if so, it shouldn't be a simple additive - 2
1131	* light bulbs do not illuminate twice as far as once since
1132	* it is a dissapation factor that is cubed.
1133	*/
1134	if (tmp->glow_radius > light)
1135	light = tmp->glow_radius;	1027	light += tmp->glow_radius;
1136		1028
1137	/* This call is needed in order to update objects the player	1029	/* This call is needed in order to update objects the player
1138	* is standing in that have animations (ie, grass, fire, etc).	1030	* is standing in that have animations (ie, grass, fire, etc).
1139	* However, it also causes the look window to be re-drawn	1031	* However, it also causes the look window to be re-drawn
1140	* 3 times each time the player moves, because many of the	1032	* 3 times each time the player moves, because many of the
1141	* functions the move_player calls eventualy call this.	1033	* functions the move_player calls eventualy call this.
1142	*	1034	*
1143	* Always put the player down for drawing.	1035	* Always put the player down for drawing.
1144	*/	1036	*/
1145	if (!tmp->invisible)	1037	if (expect_true (!tmp->invisible))
1146	{	1038	{
1147	if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))	1039	if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1148	{
1149	top = tmp->face;
1150	top_obj = tmp;	1040	top = tmp;
1151	}	1041	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1152	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1153	{	1042	{
1154	/* If we got a floor, that means middle and top were below it,	1043	/* If we got a floor, that means middle and top were below it,
1155	* so should not be visible, so we clear them.	1044	* so should not be visible, so we clear them.
1156	*/	1045	*/
1157	middle = blank_face;	1046	middle = 0;
1158	top = blank_face;	1047	top = 0;
1159	floor = tmp->face;
1160	floor_obj = tmp;	1048	floor = tmp;
		1049	volume = 0;
		1050	items = 0;
1161	}	1051	}
1162	/* Flag anywhere have high priority */	1052	else
1163	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1164	{	1053	{
1165	middle = tmp->face;	1054	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
		1055	{
		1056	++items;
		1057	volume += tmp->volume ();
		1058	}
1166		1059
1167	middle_obj = tmp;	1060	/* Flag anywhere have high priority */
		1061	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1168	anywhere = 1;	1062	anywhere = tmp;
		1063
		1064	/* Find the highest visible face around. If equal
		1065	* visibilities, we still want the one nearer to the
		1066	* top
		1067	*/
		1068	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
		1069	{
		1070	middle_visibility = ::faces [tmp->face].visibility;
		1071	middle = tmp;
		1072	}
1169	}	1073	}
1170	/* Find the highest visible face around. If equal
1171	* visibilities, we still want the one nearer to the
1172	* top
1173	*/
1174	else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere))
1175	{
1176	middle = tmp->face;
1177	middle_obj = tmp;
1178	}
1179	}
1180
1181	if (tmp == tmp->above)
1182	{
1183	LOG (llevError, "Error in structure of map\n");
1184	exit (-1);
1185	}	1074	}
1186		1075
1187	move_slow |= tmp->move_slow;	1076	move_slow |= tmp->move_slow;
1188	move_block |= tmp->move_block;	1077	move_block |= tmp->move_block;
1189	move_on |= tmp->move_on;	1078	move_on |= tmp->move_on;
1190	move_off |= tmp->move_off;	1079	move_off |= tmp->move_off;
1191	move_allow |= tmp->move_allow;	1080	move_allow |= tmp->move_allow;
1192		1081
1193	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;	1082	allflags |= tmp->flag;
1194	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;	1083
1195	if (tmp->type == PLAYER) flags |= P_PLAYER;	1084	if (tmp->type == PLAYER) flags |= P_PLAYER;
1196	if (tmp->type == SAFE_GROUND) flags |= P_SAFE;	1085	if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1197	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1198	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1199	}	1086	}
1200		1087
1201	this->light = light;	1088	// FLAG_SEE_ANYWHERE takes precedence
		1089	if (anywhere)
		1090	middle = anywhere;
		1091
		1092	// ORing all flags together and checking them here is much faster
		1093	if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
		1094	if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
		1095	if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
		1096	if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
		1097
		1098	this->light = min (light, MAX_LIGHT_RADIUS);
1202	this->flags_ = flags;	1099	this->flags_ = flags;
1203	this->move_block = move_block & ~move_allow;	1100	this->move_block = move_block & ~move_allow;
1204	this->move_on = move_on;	1101	this->move_on = move_on;
1205	this->move_off = move_off;	1102	this->move_off = move_off;
1206	this->move_slow = move_slow;	1103	this->move_slow = move_slow;
		1104	this->volume_ = (volume + 1023) / 1024;
		1105	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1207		1106
1208	/* At this point, we have a floor face (if there is a floor),	1107	/* At this point, we have a floor face (if there is a floor),
1209	* and the floor is set - we are not going to touch it at	1108	* and the floor is set - we are not going to touch it at
1210	* this point.	1109	* this point.
1211	* middle contains the highest visibility face.	1110	* middle contains the highest visibility face.
…		…
1218	* middle face. This should not happen, as we already have the	1117	* middle face. This should not happen, as we already have the
1219	* else statement above so middle should not get set. OTOH, it	1118	* else statement above so middle should not get set. OTOH, it
1220	* may be possible for the faces to match but be different objects.	1119	* may be possible for the faces to match but be different objects.
1221	*/	1120	*/
1222	if (top == middle)	1121	if (top == middle)
1223	middle = blank_face;	1122	middle = 0;
1224		1123
1225	/* There are three posibilities at this point:	1124	/* There are three posibilities at this point:
1226	* 1) top face is set, need middle to be set.	1125	* 1) top face is set, need middle to be set.
1227	* 2) middle is set, need to set top.	1126	* 2) middle is set, need to set top.
1228	* 3) neither middle or top is set - need to set both.	1127	* 3) neither middle or top is set - need to set both.
1229	*/	1128	*/
1230		1129
1231	for (tmp = last; tmp; tmp = tmp->below)	1130	for (object *tmp = last; tmp; tmp = tmp->below)
1232	{	1131	{
1233	/* Once we get to a floor, stop, since we already have a floor object */	1132	/* Once we get to a floor, stop, since we already have a floor object */
1234	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1133	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1235	break;	1134	break;
1236		1135
1237	/* If two top faces are already set, quit processing */	1136	/* If two top faces are already set, quit processing */
1238	if ((top != blank_face) && (middle != blank_face))	1137	if (top && middle)
1239	break;	1138	break;
1240		1139
1241	/* Only show visible faces */	1140	/* Only show visible faces */
1242	if (!tmp->invisible)	1141	if (!tmp->invisible)
1243	{	1142	{
1244	/* Fill in top if needed */	1143	/* Fill in top if needed */
1245	if (top == blank_face)	1144	if (!top)
1246	{	1145	{
1247	top = tmp->face;
1248	top_obj = tmp;	1146	top = tmp;
1249	if (top == middle)	1147	if (top == middle)
1250	middle = blank_face;	1148	middle = 0;
1251	}	1149	}
1252	else	1150	else
1253	{	1151	{
1254	/* top is already set - we should only get here if	1152	/* top is already set - we should only get here if
1255	* middle is not set	1153	* middle is not set
1256	*	1154	*
1257	* Set the middle face and break out, since there is nothing	1155	* Set the middle face and break out, since there is nothing
1258	* more to fill in. We don't check visiblity here, since	1156	* more to fill in. We don't check visiblity here, since
1259	*	1157	*
1260	*/	1158	*/
1261	if (tmp->face != top)	1159	if (tmp != top)
1262	{	1160	{
1263	middle = tmp->face;
1264	middle_obj = tmp;	1161	middle = tmp;
1265	break;	1162	break;
1266	}	1163	}
1267	}	1164	}
1268	}	1165	}
1269	}	1166	}
1270		1167
1271	if (middle == floor)	1168	if (middle == floor)
1272	middle = blank_face;	1169	middle = 0;
1273		1170
1274	if (top == middle)	1171	if (top == middle)
1275	middle = blank_face;	1172	middle = 0;
1276		1173
1277	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;	1174	#if 0
1278	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;	1175	faces_obj [0] = top;
1279	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;	1176	faces_obj [1] = middle;
		1177	faces_obj [2] = floor;
		1178	#endif
1280	}	1179	}
1281		1180
1282	/* this updates the orig_map->tile_map[tile_num] value after finding	1181	maptile *
1283	* the map. It also takes care of linking back the freshly found	1182	maptile::tile_available (int dir, bool load)
1284	* maps tile_map values if it tiles back to this one. It returns
1285	* the value of orig_map->tile_map[tile_num].
1286	*/
1287	static inline maptile *
1288	find_and_link (maptile *orig_map, int tile_num)
1289	{	1183	{
1290	maptile *mp = orig_map->tile_map [tile_num];	1184	if (tile_path[dir])
1291
1292	if (!mp)
1293	{
1294	mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1295
1296	if (!mp)
1297	{
1298	// emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1299	LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1300	&orig_map->tile_path[tile_num], &orig_map->path);
1301	mp = new maptile (1, 1);
1302	mp->alloc ();
1303	mp->in_memory = MAP_IN_MEMORY;
1304	}
1305	}	1185	{
		1186	if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
		1187	return tile_map[dir];
1306		1188
1307	int dest_tile = (tile_num + 2) % 4;	1189	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
		1190	return tile_map[dir];
		1191	}
1308		1192
1309	orig_map->tile_map [tile_num] = mp;
1310
1311	// optimisation: back-link map to origin map if euclidean
1312	//TODO: non-euclidean maps MUST GO
1313	if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1314	orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1315
1316	return mp;	1193	return 0;
1317	}
1318
1319	static inline void
1320	load_and_link (maptile *orig_map, int tile_num)
1321	{
1322	find_and_link (orig_map, tile_num)->load_sync ();
1323	}	1194	}
1324		1195
1325	/* this returns TRUE if the coordinates (x,y) are out of	1196	/* this returns TRUE if the coordinates (x,y) are out of
1326	* map m. This function also takes into account any	1197	* map m. This function also takes into account any
1327	* tiling considerations, loading adjacant maps as needed.	1198	* tiling considerations, loading adjacant maps as needed.
…		…
1340	if (!m)	1211	if (!m)
1341	return 0;	1212	return 0;
1342		1213
1343	if (x < 0)	1214	if (x < 0)
1344	{	1215	{
1345	if (!m->tile_path[3])	1216	if (!m->tile_available (3))
1346	return 1;	1217	return 1;
1347		1218
1348	if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1349	find_and_link (m, 3);
1350
1351	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1219	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1352	}	1220	}
1353		1221
1354	if (x >= m->width)	1222	if (x >= m->width)
1355	{	1223	{
1356	if (!m->tile_path[1])	1224	if (!m->tile_available (1))
1357	return 1;	1225	return 1;
1358		1226
1359	if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1360	find_and_link (m, 1);
1361
1362	return out_of_map (m->tile_map[1], x - m->width, y);	1227	return out_of_map (m->tile_map[1], x - m->width, y);
1363	}	1228	}
1364		1229
1365	if (y < 0)	1230	if (y < 0)
1366	{	1231	{
1367	if (!m->tile_path[0])	1232	if (!m->tile_available (0))
1368	return 1;	1233	return 1;
1369		1234
1370	if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1371	find_and_link (m, 0);
1372
1373	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1235	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1374	}	1236	}
1375		1237
1376	if (y >= m->height)	1238	if (y >= m->height)
1377	{	1239	{
1378	if (!m->tile_path[2])	1240	if (!m->tile_available (2))
1379	return 1;	1241	return 1;
1380
1381	if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1382	find_and_link (m, 2);
1383		1242
1384	return out_of_map (m->tile_map[2], x, y - m->height);	1243	return out_of_map (m->tile_map[2], x, y - m->height);
1385	}	1244	}
1386		1245
1387	/* Simple case - coordinates are within this local	1246	/* Simple case - coordinates are within this local
…		…
1401	maptile *	1260	maptile *
1402	maptile::xy_find (sint16 &x, sint16 &y)	1261	maptile::xy_find (sint16 &x, sint16 &y)
1403	{	1262	{
1404	if (x < 0)	1263	if (x < 0)
1405	{	1264	{
1406	if (!tile_path[3])	1265	if (!tile_available (3))
1407	return 0;	1266	return 0;
1408		1267
1409	find_and_link (this, 3);
1410	x += tile_map[3]->width;	1268	x += tile_map[3]->width;
1411	return tile_map[3]->xy_find (x, y);	1269	return tile_map[3]->xy_find (x, y);
1412	}	1270	}
1413		1271
1414	if (x >= width)	1272	if (x >= width)
1415	{	1273	{
1416	if (!tile_path[1])	1274	if (!tile_available (1))
1417	return 0;	1275	return 0;
1418		1276
1419	find_and_link (this, 1);
1420	x -= width;	1277	x -= width;
1421	return tile_map[1]->xy_find (x, y);	1278	return tile_map[1]->xy_find (x, y);
1422	}	1279	}
1423		1280
1424	if (y < 0)	1281	if (y < 0)
1425	{	1282	{
1426	if (!tile_path[0])	1283	if (!tile_available (0))
1427	return 0;	1284	return 0;
1428		1285
1429	find_and_link (this, 0);
1430	y += tile_map[0]->height;	1286	y += tile_map[0]->height;
1431	return tile_map[0]->xy_find (x, y);	1287	return tile_map[0]->xy_find (x, y);
1432	}	1288	}
1433		1289
1434	if (y >= height)	1290	if (y >= height)
1435	{	1291	{
1436	if (!tile_path[2])	1292	if (!tile_available (2))
1437	return 0;	1293	return 0;
1438		1294
1439	find_and_link (this, 2);
1440	y -= height;	1295	y -= height;
1441	return tile_map[2]->xy_find (x, y);	1296	return tile_map[2]->xy_find (x, y);
1442	}	1297	}
1443		1298
1444	/* Simple case - coordinates are within this local	1299	/* Simple case - coordinates are within this local
…		…
1449		1304
1450	/**	1305	/**
1451	* Return whether map2 is adjacent to map1. If so, store the distance from	1306	* Return whether map2 is adjacent to map1. If so, store the distance from
1452	* map1 to map2 in dx/dy.	1307	* map1 to map2 in dx/dy.
1453	*/	1308	*/
1454	static int	1309	int
1455	adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)	1310	adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1456	{	1311	{
1457	if (!map1 || !map2)	1312	if (!map1 || !map2)
1458	return 0;	1313	return 0;
1459		1314
1460	//TODO: this doesn't actually check corretcly when intermediate maps are not loaded	1315	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
1461	//fix: compare paths instead (this is likely faster, too!)	1316	//fix: compare paths instead (this is likely faster, too!)
1462	if (map1 == map2)	1317	if (map1 == map2)
1463	{	1318	{
1464	*dx = 0;	1319	*dx = 0;
1465	*dy = 0;	1320	*dy = 0;
…		…
1550	/* From map.c	1405	/* From map.c
1551	* This is used by get_player to determine where the other	1406	* This is used by get_player to determine where the other
1552	* creature is. get_rangevector takes into account map tiling,	1407	* creature is. get_rangevector takes into account map tiling,
1553	* so you just can not look the the map coordinates and get the	1408	* so you just can not look the the map coordinates and get the
1554	* righte value. distance_x/y are distance away, which	1409	* righte value. distance_x/y are distance away, which
1555	* can be negativbe. direction is the crossfire direction scheme	1410	* can be negative. direction is the crossfire direction scheme
1556	* that the creature should head. part is the part of the	1411	* that the creature should head. part is the part of the
1557	* monster that is closest.	1412	* monster that is closest.
1558	*	1413	*
1559	* get_rangevector looks at op1 and op2, and fills in the	1414	* get_rangevector looks at op1 and op2, and fills in the
1560	* structure for op1 to get to op2.	1415	* structure for op1 to get to op2.
…		…
1571	get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)	1426	get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1572	{	1427	{
1573	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1428	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1574	{	1429	{
1575	/* be conservative and fill in _some_ data */	1430	/* be conservative and fill in _some_ data */
1576	retval->distance = 100000;	1431	retval->distance = 10000;
1577	retval->distance_x = 32767;	1432	retval->distance_x = 10000;
1578	retval->distance_y = 32767;	1433	retval->distance_y = 10000;
1579	retval->direction = 0;	1434	retval->direction = 0;
1580	retval->part = 0;	1435	retval->part = 0;
1581	}	1436	}
1582	else	1437	else
1583	{	1438	{
…		…
1588		1443
1589	best = op1;	1444	best = op1;
1590	/* If this is multipart, find the closest part now */	1445	/* If this is multipart, find the closest part now */
1591	if (!(flags & 0x1) && op1->more)	1446	if (!(flags & 0x1) && op1->more)
1592	{	1447	{
1593	object *tmp;
1594	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1448	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1595		1449
1596	/* we just take the offset of the piece to head to figure	1450	/* we just take the offset of the piece to head to figure
1597	* distance instead of doing all that work above again	1451	* distance instead of doing all that work above again
1598	* since the distance fields we set above are positive in the	1452	* since the distance fields we set above are positive in the
1599	* same axis as is used for multipart objects, the simply arithmetic	1453	* same axis as is used for multipart objects, the simply arithmetic
1600	* below works.	1454	* below works.
1601	*/	1455	*/
1602	for (tmp = op1->more; tmp != NULL; tmp = tmp->more)	1456	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1603	{	1457	{
1604	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1458	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1605	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1459	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1606	if (tmpi < best_distance)	1460	if (tmpi < best_distance)
1607	{	1461	{
…		…
1616	retval->distance_y += op1->y - best->y;	1470	retval->distance_y += op1->y - best->y;
1617	}	1471	}
1618	}	1472	}
1619		1473
1620	retval->part = best;	1474	retval->part = best;
1621	retval->distance = idistance (retval->distance_x, retval->distance_y);	1475	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1622	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1476	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1623	}	1477	}
1624	}	1478	}
1625		1479
1626	/* this is basically the same as get_rangevector above, but instead of	1480	/* this is basically the same as get_rangevector above, but instead of
…		…
1631	* flags has no meaning for this function at this time - I kept it in to	1485	* flags has no meaning for this function at this time - I kept it in to
1632	* be more consistant with the above function and also in case they are needed	1486	* be more consistant with the above function and also in case they are needed
1633	* for something in the future. Also, since no object is pasted, the best	1487	* for something in the future. Also, since no object is pasted, the best
1634	* field of the rv_vector is set to NULL.	1488	* field of the rv_vector is set to NULL.
1635	*/	1489	*/
1636
1637	void	1490	void
1638	get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags)	1491	get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1639	{	1492	{
1640	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1493	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1641	{	1494	{
1642	/* be conservative and fill in _some_ data */	1495	/* be conservative and fill in _some_ data */
1643	retval->distance = 100000;	1496	retval->distance = 100000;
…		…
1649	else	1502	else
1650	{	1503	{
1651	retval->distance_x += op2->x - x;	1504	retval->distance_x += op2->x - x;
1652	retval->distance_y += op2->y - y;	1505	retval->distance_y += op2->y - y;
1653		1506
1654	retval->part = NULL;	1507	retval->part = 0;
1655	retval->distance = idistance (retval->distance_x, retval->distance_y);	1508	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1656	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1509	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1657	}	1510	}
1658	}	1511	}
1659		1512
1660	/* Returns true of op1 and op2 are effectively on the same map	1513	/* Returns true of op1 and op2 are effectively on the same map
…		…
1671	int dx, dy;	1524	int dx, dy;
1672		1525
1673	return adjacent_map (op1->map, op2->map, &dx, &dy);	1526	return adjacent_map (op1->map, op2->map, &dx, &dy);
1674	}	1527	}
1675		1528
		1529	//-GPL
		1530
1676	object *	1531	object *
1677	maptile::insert (object *op, int x, int y, object *originator, int flags)	1532	maptile::insert (object *op, int x, int y, object *originator, int flags)
1678	{	1533	{
1679	if (!op->flag [FLAG_REMOVED])
1680	op->remove ();
1681
1682	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1534	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1683	}	1535	}
1684		1536
		1537	region *
		1538	maptile::region (int x, int y) const
		1539	{
		1540	if (regions
		1541	&& regionmap
		1542	&& !OUT_OF_REAL_MAP (this, x, y))
		1543	if (struct region *reg = regionmap [regions [y * width + x]])
		1544	return reg;
		1545
		1546	if (default_region)
		1547	return default_region;
		1548
		1549	return ::region::default_region ();
		1550	}
		1551
		1552	//+GPL
		1553
		1554	/* picks a random object from a style map.
		1555	*/
		1556	object *
		1557	maptile::pick_random_object (rand_gen &gen) const
		1558	{
		1559	/* while returning a null object will result in a crash, that
		1560	* is actually preferable to an infinite loop. That is because
		1561	* most servers will automatically restart in case of crash.
		1562	* Change the logic on getting the random space - shouldn't make
		1563	* any difference, but this seems clearer to me.
		1564	*/
		1565	for (int i = 1000; --i;)
		1566	{
		1567	object *pick = at (gen (width), gen (height)).bot;
		1568
		1569	// do not prefer big monsters just because they are big.
		1570	if (pick && pick->is_head ())
		1571	return pick->head_ ();
		1572	}
		1573
		1574	// instead of crashing in the unlikely(?) case, try to return *something*
		1575	return archetype::find (shstr_bug);
		1576	}
		1577
		1578	//-GPL
		1579
		1580	void
		1581	maptile::play_sound (faceidx sound, int x, int y) const
		1582	{
		1583	if (!sound)
		1584	return;
		1585
		1586	for_all_players_on_map (pl, this)
		1587	if (client *ns = pl->ns)
		1588	{
		1589	int dx = x - pl->ob->x;
		1590	int dy = y - pl->ob->y;
		1591
		1592	int distance = idistance (dx, dy);
		1593
		1594	if (distance <= MAX_SOUND_DISTANCE)
		1595	ns->play_sound (sound, dx, dy);
		1596	}
		1597	}
		1598
		1599	void
		1600	maptile::say_msg (const char *msg, int x, int y) const
		1601	{
		1602	for_all_players (pl)
		1603	if (client *ns = pl->ns)
		1604	{
		1605	int dx = x - pl->ob->x;
		1606	int dy = y - pl->ob->y;
		1607
		1608	int distance = idistance (dx, dy);
		1609
		1610	if (distance <= MAX_SOUND_DISTANCE)
		1611	ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
		1612	}
		1613	}
		1614
		1615	static void
		1616	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
		1617	{
		1618	// clip to map to the left
		1619	if (x0 < 0)
		1620	{
		1621	if (maptile *tile = m->tile_available (TILE_LEFT, 1))
		1622	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
		1623
		1624	if (x1 < 0) // entirely to the left
		1625	return;
		1626
		1627	x0 = 0;
		1628	}
		1629
		1630	// clip to map to the right
		1631	if (x1 > m->width)
		1632	{
		1633	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
		1634	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
		1635
		1636	if (x0 > m->width) // entirely to the right
		1637	return;
		1638
		1639	x1 = m->width;
		1640	}
		1641
		1642	// clip to map above
		1643	if (y0 < 0)
		1644	{
		1645	if (maptile *tile = m->tile_available (TILE_UP, 1))
		1646	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
		1647
		1648	if (y1 < 0) // entirely above
		1649	return;
		1650
		1651	y0 = 0;
		1652	}
		1653
		1654	// clip to map below
		1655	if (y1 > m->height)
		1656	{
		1657	if (maptile *tile = m->tile_available (TILE_DOWN, 1))
		1658	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
		1659
		1660	if (y0 > m->height) // entirely below
		1661	return;
		1662
		1663	y1 = m->height;
		1664	}
		1665
		1666	// if we get here, the rect is within the current map
		1667	maprect *r = (maprect *)buf.alloc (sizeof (maprect));
		1668
		1669	r->m = m;
		1670	r->x0 = x0;
		1671	r->y0 = y0;
		1672	r->x1 = x1;
		1673	r->y1 = y1;
		1674	r->dx = dx;
		1675	r->dy = dy;
		1676	}
		1677
		1678	maprect *
		1679	maptile::split_to_tiles (int x0, int y0, int x1, int y1)
		1680	{
		1681	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
		1682	buf.clear ();
		1683
		1684	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
		1685
		1686	// add end marker
		1687	maprect *r = (maprect *)buf.alloc (sizeof (maprect));
		1688	r->m = 0;
		1689
		1690	return (maprect *)buf.linearise ();
		1691	}
		1692

Diff Legend

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