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.106 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.216 by root, Sun May 8 21:51:26 2011 UTC

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

Diff Legend

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