[ViewVC] Diff of: cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.87 by root, Thu Feb 15 21:07:48 2007 UTC vs.
Revision 1.165 by root, Tue Oct 20 05:57:08 2009 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 <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"	28	#include "loader.h"
31
32	#include "path.h"	29	#include "path.h"
33		30
34	/*	31	sint8 maptile::outdoor_darkness;
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
48	/*
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		32
100	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	33	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101	* one function that just returns a P_.. value (see map.h)	34	* one function that just returns a P_.. value (see map.h)
102	* it will also do map translation for tiled maps, returning	35	* it will also do map translation for tiled maps, returning
103	* new values into newmap, nx, and ny. Any and all of those	36	* new values into newmap, nx, and ny. Any and all of those
138	* by the caller.	71	* by the caller.
139	*/	72	*/
140	int	73	int
141	blocked_link (object ob, maptile m, int sx, int sy)	74	blocked_link (object ob, maptile m, int sx, int sy)
142	{	75	{
143	object *tmp;
144	int mflags, blocked;
145
146	/* Make sure the coordinates are valid - they should be, as caller should	76	/* Make sure the coordinates are valid - they should be, as caller should
147	* have already checked this.	77	* have already checked this.
148	*/	78	*/
149	if (OUT_OF_REAL_MAP (m, sx, sy))	79	if (OUT_OF_REAL_MAP (m, sx, sy))
150	{	80	{
…		…
153	}	83	}
154		84
155	/* Save some cycles - instead of calling get_map_flags(), just get the value	85	/* Save some cycles - instead of calling get_map_flags(), just get the value
156	* directly.	86	* directly.
157	*/	87	*/
158	mflags = m->at (sx, sy).flags ();	88	mapspace &ms = m->at (sx, sy);
159		89
160	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	90	int mflags = ms.flags ();
		91	int blocked = ms.move_block;
161		92
162	/* If space is currently not blocked by anything, no need to	93	/* If space is currently not blocked by anything, no need to
163	* go further. Not true for players - all sorts of special	94	* go further. Not true for players - all sorts of special
164	* things we need to do for players.	95	* things we need to do for players.
165	*/	96	*/
166	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	97	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
167	return 0;	98	return 0;
168		99
169	/* if there isn't anytyhing alive on this space, and this space isn't	100	/* 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	101	* 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	102	* 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	103	* or another. Likewise, only if something is blocking us do we
173	* need to investigate if there is a special circumstance that would	104	* need to investigate if there is a special circumstance that would
174	* let the player through (inventory checkers for example)	105	* let the player through (inventory checkers for example)
175	*/	106	*/
176	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))	107	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177	return 0;	108	return 0;
178		109
179	if (ob->head != NULL)
180	ob = ob->head;	110	ob = ob->head_ ();
181		111
182	/* We basically go through the stack of objects, and if there is	112	/* We basically go through the stack of objects, and if there is
183	* some other object that has NO_PASS or FLAG_ALIVE set, return	113	* some other object that has NO_PASS or FLAG_ALIVE set, return
184	* true. If we get through the entire stack, that must mean	114	* true. If we get through the entire stack, that must mean
185	* ob is blocking it, so return 0.	115	* ob is blocking it, so return 0.
186	*/	116	*/
187	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	117	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
188	{	118	{
189		119	if (OB_MOVE_BLOCK (ob, tmp))
190	/* This must be before the checks below. Code for inventory checkers. */
191	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
192	{	120	{
193	/* If last_sp is set, the player/monster needs an object,	121	if (tmp->type == CHECK_INV)
194	* so we check for it. If they don't have it, they can't
195	* pass through this space.
196	*/
197	if (tmp->last_sp)
198	{	122	{
199	if (check_inv_recursive (ob, tmp) == NULL)	123	bool have = check_inv_recursive (ob, tmp);
		124
		125	// last_sp set means we block if we don't have.
		126	if (logical_xor (have, tmp->last_sp))
200	return 1;	127	return 1;
201	else	128	}
202	continue;	129	else if (tmp->type == T_MATCH)
		130	{
		131	// T_MATCH allows "entrance" iff the match is true
		132	// == blocks if the match fails
		133
		134	// we could have used an INVOKE_OBJECT, but decided against it, as we
		135	// assume that T_MATCH is very common.
		136	if (!match (tmp->slaying, ob, tmp, ob))
		137	return 1;
203	}	138	}
204	else	139	else
205	{	140	return 1; // unconditional block
206	/* In this case, the player must not have the object -	141
207	* if they do, they can't pass through.
208	*/
209	if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
210	return 1;
211	else
212	continue;
213	}
214	} /* if check_inv */
215	else	142	} else {
216	{	143	// space does not block the ob, directly, but
217	/* Broke apart a big nasty if into several here to make	144	// anything alive that is not a door still
218	* this more readable. first check - if the space blocks	145	// blocks anything but wizards.
219	* movement, can't move here.	146
220	* second - if a monster, can't move there, unles it is a	147	if (tmp->flag [FLAG_ALIVE]
221	* hidden dm	148	&& tmp->head_ () != ob
222	*/	149	&& tmp != ob
223	if (OB_MOVE_BLOCK (ob, tmp))	150	&& tmp->type != DOOR
224	return 1;	151	&& !tmp->flag [FLAG_WIZPASS])
225	if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
226	tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
227	return 1;	152	return 1;
228	}	153	}
229
230	}	154	}
		155
231	return 0;	156	return 0;
232	}	157	}
233		158
234	/*	159	/*
235	* Returns true if the given object can't fit in the given spot.	160	* Returns qthe blocking object if the given object can't fit in the given
236	* This is meant for multi space objects - for single space objecs,	161	* spot. This is meant for multi space objects - for single space objecs,
237	* just calling get_map_blocked and checking that against movement type	162	* just calling get_map_blocked and checking that against movement type
238	* of object. This function goes through all the parts of the	163	* of object. This function goes through all the parts of the multipart
239	* multipart object and makes sure they can be inserted.	164	* object and makes sure they can be inserted.
240	*	165	*
241	* While this doesn't call out of map, the get_map_flags does.	166	* While this doesn't call out of map, the get_map_flags does.
242	*	167	*
243	* This function has been used to deprecate arch_out_of_map -	168	* This function has been used to deprecate arch_out_of_map -
244	* this function also does that check, and since in most cases,	169	* this function also does that check, and since in most cases,
…		…
255	*	180	*
256	* Note this used to be arch_blocked, but with new movement	181	* Note this used to be arch_blocked, but with new movement
257	* code, we need to have actual object to check its move_type	182	* code, we need to have actual object to check its move_type
258	* against the move_block values.	183	* against the move_block values.
259	*/	184	*/
260	int	185	bool
261	ob_blocked (const object ob, maptile m, sint16 x, sint16 y)	186	object::blocked (maptile *m, int x, int y) const
262	{	187	{
263	archetype *tmp;	188	for (archetype tmp = arch; tmp; tmp = (archetype )tmp->more)
264	int flag;
265	maptile *m1;
266	sint16 sx, sy;
267
268	if (!ob)
269	{
270	flag = get_map_flags (m, &m1, x, y, &sx, &sy);
271	if (flag & P_OUT_OF_MAP)
272	return P_OUT_OF_MAP;
273
274	/* don't have object, so don't know what types would block */
275	return m1->at (sx, sy).move_block;
276	}	189	{
		190	mapxy pos (m, x + tmp->x, y + tmp->y);
277		191
278	for (tmp = ob->arch; tmp; tmp = tmp->more)	192	if (!pos.normalise ())
279	{	193	return 1;
280	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281		194
282	if (flag & P_OUT_OF_MAP)	195	mapspace &ms = *pos;
283	return P_OUT_OF_MAP;	196
284	if (flag & P_IS_ALIVE)	197	if (ms.flags () & P_IS_ALIVE)
285	return P_IS_ALIVE;	198	return 1;
286		199
287	mapspace &ms = m1->at (sx, sy);	200	/* However, often ob doesn't have any move type
288		201	* (signifying non-moving objects)
289	/* find_first_free_spot() calls this function. However, often
290	* ob doesn't have any move type (when used to place exits)
291	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	202	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292	*/	203	*/
293
294	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	204	if (!move_type && ms.move_block != MOVE_ALL)
295	continue;	205	continue;
296		206
297	/* Note it is intentional that we check ob - the movement type of the	207	/* Note it is intentional that we check ob - the movement type of the
298	* head of the object should correspond for the entire object.	208	* head of the object should correspond for the entire object.
299	*/	209	*/
300	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	210	if (ms.blocks (move_type))
301	return P_NO_PASS;	211	return 1;
302	}	212	}
303		213
304	return 0;	214	return 0;
305	}	215	}
306		216
…		…
324		234
325	insert_ob_in_ob (tmp, container);	235	insert_ob_in_ob (tmp, container);
326	tmp = next;	236	tmp = next;
327	}	237	}
328		238
329	/* sum_weight will go through and calculate what all the containers are	239	// go through and calculate what all the containers are carrying.
330	* carrying.	240	//TODO: remove
331	*/	241	container->update_weight ();
332	sum_weight (container);
333	}	242	}
334		243
335	void	244	void
336	maptile::set_object_flag (int flag, int value)	245	maptile::set_object_flag (int flag, int value)
337	{	246	{
…		…
341	for (mapspace *ms = spaces + size (); ms-- > spaces; )	250	for (mapspace *ms = spaces + size (); ms-- > spaces; )
342	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	251	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343	tmp->flag [flag] = value;	252	tmp->flag [flag] = value;
344	}	253	}
345		254
		255	void
		256	maptile::post_load_original ()
		257	{
		258	if (!spaces)
		259	return;
		260
		261	set_object_flag (FLAG_OBJ_ORIGINAL);
		262
		263	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		264	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		265	INVOKE_OBJECT (RESET, tmp);
		266	}
		267
346	/* link_multipart_objects go through all the objects on the map looking	268	/* link_multipart_objects go through all the objects on the map looking
347	* for objects whose arch says they are multipart yet according to the	269	* for objects whose arch says they are multipart yet according to the
348	* info we have, they only have the head (as would be expected when	270	* info we have, they only have the head (as would be expected when
349	* they are saved). We do have to look for the old maps that did save	271	* they are saved).
350	* the more sections and not re-add sections for them.
351	*/	272	*/
352	void	273	void
353	maptile::link_multipart_objects ()	274	maptile::link_multipart_objects ()
354	{	275	{
355	if (!spaces)	276	if (!spaces)
356	return;	277	return;
357		278
358	for (mapspace *ms = spaces + size (); ms-- > spaces; )	279	for (mapspace *ms = spaces + size (); ms-- > spaces; )
359	for (object *tmp = ms->bot; tmp; )	280	{
		281	object *op = ms->bot;
		282	while (op)
360	{	283	{
361	object *above = tmp->above;
362
363	/* already multipart - don't do anything more */	284	/* already multipart - don't do anything more */
364	if (!tmp->head && !tmp->more)	285	if (op->head_ () == op && !op->more && op->arch->more)
365	{
366	/* If there is nothing more to this object, this for loop
367	* won't do anything.
368	*/
369	archetype *at;
370	object last, op;
371	for (at = tmp->arch->more, last = tmp;
372	at;
373	at = at->more, last = op)
374	{	286	{
375	op = arch_to_object (at);	287	op->remove ();
		288	op->expand_tail ();
376		289
377	/* update x,y coordinates */	290	// FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
378	op->x += tmp->x;	291	// multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
379	op->y += tmp->y;	292	// below the pentagrams... hopefully INS_ON_TOP doesn't break anything
380	op->head = tmp;
381	op->map = this;
382	last->more = op;
383	op->name = tmp->name;
384	op->title = tmp->title;
385
386	/* we could link all the parts onto tmp, and then just
387	* call insert_ob_in_map once, but the effect is the same,
388	* as insert_ob_in_map will call itself with each part, and
389	* the coding is simpler to just to it here with each part.
390	*/
391	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE \| INS_ABOVE_FLOOR_ONLY \| INS_NO_WALK_ON);	293	insert (op, op->x, op->y, 0, INS_NO_MERGE \| INS_ON_TOP \| INS_NO_WALK_ON);
		294
		295	op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
		296	// so we have to reset the iteration through the mapspace
392	}	297	}
		298	else
		299	op = op->above;
393	}	300	}
394
395	tmp = above;
396	}	301	}
397	}	302	}
398		303
399	/*	304	/*
400	* Loads (ands parses) the objects into a given map from the specified	305	* Loads (ands parses) the objects into a given map from the specified
401	* file pointer.	306	* file pointer.
402	* mapflags is the same as we get with load_original_map
403	*/	307	*/
404	bool	308	bool
405	maptile::_load_objects (object_thawer &thawer)	309	maptile::_load_objects (object_thawer &f)
406	{	310	{
407	int unique;	311	for (;;)
408	object op, prev = NULL, last_more = NULL, otmp;
409
410	op = object::create ();
411	op->map = this; /* To handle buttons correctly */
412
413	while (int i = load_object (thawer, op, 0))
414	{	312	{
415	/* if the archetype for the object is null, means that we	313	coroapi::cede_to_tick (); // cede once in a while
416	* got an invalid object. Don't do anything with it - the game	314
417	* or editor will not be able to do anything with it either.	315	switch (f.kw)
418	*/
419	if (op->arch == NULL)
420	{	316	{
421	LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");	317	case KW_arch:
		318	if (object *op = object::read (f, this))
		319	{
		320	// TODO: why?
		321	if (op->inv)
		322	op->update_weight ();
		323
		324	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
		325	{
		326	// we insert manually because
		327	// a) its way faster
		328	// b) we remove manually, too, and there are good reasons for that
		329	// c) it's correct
		330	mapspace &ms = at (op->x, op->y);
		331
		332	op->flag [FLAG_REMOVED] = false;
		333
		334	op->above = 0;
		335	op->below = ms.top;
		336
		337	*(ms.top ? &ms.top->above : &ms.bot) = op;
		338
		339	ms.top = op;
		340	ms.flags_ = 0;
		341	}
		342	else
		343	{
		344	f.parse_warn (format ("object %s out of range", op->debug_desc ()));
		345	op->destroy ();
		346	}
		347	}
		348
422	continue;	349	continue;
423	}
424		350
425	switch (i)
426	{
427	case LL_NORMAL:
428	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ON_TOP \| INS_MAP_LOAD);
429
430	if (op->inv)
431	sum_weight (op);
432
433	prev = op, last_more = op;
434	break;
435
436	case LL_MORE:	351	case KW_EOF:
437	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ABOVE_FLOOR_ONLY);	352	return true;
438	op->head = prev, last_more->more = op, last_more = op;	353
		354	default:
		355	if (!f.parse_error ("map file"))
		356	return false;
439	break;	357	break;
440	}	358	}
441		359
442	op = object::create ();	360	f.next ();
443	op->map = this;
444	}
445
446	op->destroy ();
447
448	#if 0
449	for (i = 0; i < width; i++)
450	for (j = 0; j < height; j++)
451	{
452	unique = 0;
453	/* check for unique items, or unique squares */
454	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
455	{
456	if (QUERY_FLAG (otmp, FLAG_UNIQUE) \|\| QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
457	unique = 1;
458
459	if (!(mapflags & (MAP_OVERLAY \| MAP_PLAYER_UNIQUE) \|\| unique))
460	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
461	}
462	}	361	}
463	#endif
464		362
465	return true;	363	return true;
466	}	364	}
467		365
468	void	366	void
469	maptile::activate ()	367	maptile::activate ()
470	{	368	{
471	if (!spaces)	369	if (spaces)
472	return;
473
474	for (mapspace *ms = spaces + size (); ms-- > spaces; )	370	for (mapspace *ms = spaces + size (); ms-- > spaces; )
475	for (object *op = ms->bot; op; op = op->above)	371	for (object *op = ms->bot; op; op = op->above)
476	op->activate_recursive ();	372	op->activate_recursive ();
477	}	373	}
478		374
479	void	375	void
480	maptile::deactivate ()	376	maptile::deactivate ()
481	{	377	{
482	if (!spaces)	378	if (spaces)
483	return;
484
485	for (mapspace *ms = spaces + size (); ms-- > spaces; )	379	for (mapspace *ms = spaces + size (); ms-- > spaces; )
486	for (object *op = ms->bot; op; op = op->above)	380	for (object *op = ms->bot; op; op = op->above)
487	op->deactivate_recursive ();	381	op->deactivate_recursive ();
488	}	382	}
489		383
490	bool	384	bool
491	maptile::_save_objects (object_freezer &freezer, int flags)	385	maptile::_save_objects (object_freezer &f, int flags)
492	{	386	{
493	static int cede_count = 0;	387	coroapi::cede_to_tick ();
494		388
495	if (flags & IO_HEADER)	389	if (flags & IO_HEADER)
496	_save_header (freezer);	390	_save_header (f);
497		391
498	if (!spaces)	392	if (!spaces)
499	return false;	393	return false;
500		394
501	for (int i = 0; i < size (); ++i)	395	for (int i = 0; i < size (); ++i)
502	{	396	{
503	#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
504	if (cede_count >= 500)
505	{
506	cede_count = 0;
507	coroapi::cede ();
508	}
509	#endif
510
511	int unique = 0;	397	bool unique = 0;
		398
512	for (object *op = spaces [i].bot; op; op = op->above)	399	for (object *op = spaces [i].bot; op; op = op->above)
513	{	400	{
514	// count per-object, but cede only when modification-safe
515	cede_count++;
516
517	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])	401	unique \|= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
518	unique = 1;
519		402
520	if (!op->can_map_save ())	403	if (expect_false (!op->can_map_save ()))
521	continue;	404	continue;
522		405
523	if (unique \|\| op->flag [FLAG_UNIQUE])	406	if (expect_false (unique \|\| op->flag [FLAG_UNIQUE]))
524	{	407	{
525	if (flags & IO_UNIQUES)	408	if (flags & IO_UNIQUES)
526	save_object (freezer, op, 1);	409	op->write (f);
527	}	410	}
528	else if (flags & IO_OBJECTS)	411	else if (expect_true (flags & IO_OBJECTS))
529	save_object (freezer, op, 1);	412	op->write (f);
530	}	413	}
531	}	414	}
532		415
		416	coroapi::cede_to_tick ();
		417
533	return true;	418	return true;
534	}
535
536	bool
537	maptile::_load_objects (const char *path, bool skip_header)
538	{
539	object_thawer thawer (path);
540
541	if (!thawer)
542	return false;
543
544	if (skip_header)
545	for (;;)
546	{
547	if (thawer.kw == KW_end)
548	break;
549
550	thawer.skip_kv ();
551	}
552
553	return _load_objects (thawer);
554	}	419	}
555		420
556	bool	421	bool
557	maptile::_save_objects (const char *path, int flags)	422	maptile::_save_objects (const char *path, int flags)
558	{	423	{
…		…
689	return items;	554	return items;
690	}	555	}
691		556
692	/* opposite of parse string, this puts the string that was originally fed in to	557	/* opposite of parse string, this puts the string that was originally fed in to
693	* the map (or something equivilent) into output_string. */	558	* the map (or something equivilent) into output_string. */
694	static void	559	static const char *
695	print_shop_string (maptile m, char output_string)	560	print_shop_string (maptile *m)
696	{	561	{
697	int i;	562	static dynbuf_text buf; buf.clear ();
698	char tmp[MAX_BUF];
699		563
700	strcpy (output_string, "");
701	for (i = 0; i < m->shopitems[0].index; i++)	564	for (int i = 0; i < m->shopitems[0].index; i++)
702	{	565	{
703	if (m->shopitems[i].typenum)	566	if (m->shopitems[i].typenum)
704	{	567	{
705	if (m->shopitems[i].strength)	568	if (m->shopitems[i].strength)
706	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	569	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
707	else	570	else
708	sprintf (tmp, "%s;", m->shopitems[i].name);	571	buf.printf ("%s;", m->shopitems[i].name);
709	}	572	}
710	else	573	else
711	{	574	{
712	if (m->shopitems[i].strength)	575	if (m->shopitems[i].strength)
713	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	576	buf.printf ("*:%d;", m->shopitems[i].strength);
714	else	577	else
715	sprintf (tmp, "*");	578	buf.printf ("*");
716	}	579	}
717
718	strcat (output_string, tmp);
719	}	580	}
		581
		582	return buf;
720	}	583	}
721		584
722	/* This loads the header information of the map. The header	585	/* This loads the header information of the map. The header
723	* contains things like difficulty, size, timeout, etc.	586	* contains things like difficulty, size, timeout, etc.
724	* 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
…		…
733	bool	596	bool
734	maptile::_load_header (object_thawer &thawer)	597	maptile::_load_header (object_thawer &thawer)
735	{	598	{
736	for (;;)	599	for (;;)
737	{	600	{
738	keyword kw = thawer.get_kv ();
739
740	switch (kw)	601	switch (thawer.kw)
741	{	602	{
742	case KW_msg:	603	case KW_msg:
743	thawer.get_ml (KW_endmsg, msg);	604	thawer.get_ml (KW_endmsg, msg);
744	break;	605	break;
745		606
…		…
777	case KW_winddir: thawer.get (winddir); break;	638	case KW_winddir: thawer.get (winddir); break;
778	case KW_sky: thawer.get (sky); break;	639	case KW_sky: thawer.get (sky); break;
779		640
780	case KW_per_player: thawer.get (per_player); break;	641	case KW_per_player: thawer.get (per_player); break;
781	case KW_per_party: thawer.get (per_party); break;	642	case KW_per_party: thawer.get (per_party); break;
		643	case KW_no_reset: thawer.get (no_reset); break;
		644	case KW_no_drop: thawer.get (no_drop); break;
782		645
783	case KW_region: default_region = region::find (thawer.get_str ()); break;	646	case KW_region: default_region = region::find (thawer.get_str ()); break;
784	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	647	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
785		648
786	// old names new names	649	// old names new names
…		…
797	case KW_tile_path_1: thawer.get (tile_path [0]); break;	660	case KW_tile_path_1: thawer.get (tile_path [0]); break;
798	case KW_tile_path_2: thawer.get (tile_path [1]); break;	661	case KW_tile_path_2: thawer.get (tile_path [1]); break;
799	case KW_tile_path_3: thawer.get (tile_path [2]); break;	662	case KW_tile_path_3: thawer.get (tile_path [2]); break;
800	case KW_tile_path_4: thawer.get (tile_path [3]); break;	663	case KW_tile_path_4: thawer.get (tile_path [3]); break;
801		664
		665	case KW_ERROR:
		666	set_key_text (thawer.kw_str, thawer.value);
		667	break;
		668
802	case KW_end:	669	case KW_end:
		670	thawer.next ();
803	return true;	671	return true;
804		672
805	default:	673	default:
806	if (!thawer.parse_error ("map", 0))	674	if (!thawer.parse_error ("map", 0))
807	return false;	675	return false;
808	break;	676	break;
809	}	677	}
		678
		679	thawer.next ();
810	}	680	}
811		681
812	abort ();	682	abort ();
813	}
814
815	bool
816	maptile::_load_header (const char *path)
817	{
818	object_thawer thawer (path);
819
820	if (!thawer)
821	return false;
822
823	return _load_header (thawer);
824	}	683	}
825		684
826	/******************************************************************************	685	/******************************************************************************
827	* This is the start of unique map handling code	686	* This is the start of unique map handling code
828	*****************************************************************************/	687	*****************************************************************************/
…		…
839	object *above = op->above;	698	object *above = op->above;
840		699
841	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	700	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
842	unique = 1;	701	unique = 1;
843		702
844	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	703	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))
845	{
846	op->destroy_inv (false);
847	op->destroy ();	704	op->destroy ();
848	}
849		705
850	op = above;	706	op = above;
851	}	707	}
852	}	708	}
853	}	709	}
…		…
863	if (name) MAP_OUT (name);	719	if (name) MAP_OUT (name);
864	MAP_OUT (swap_time);	720	MAP_OUT (swap_time);
865	MAP_OUT (reset_time);	721	MAP_OUT (reset_time);
866	MAP_OUT (reset_timeout);	722	MAP_OUT (reset_timeout);
867	MAP_OUT (fixed_resettime);	723	MAP_OUT (fixed_resettime);
		724	MAP_OUT (no_reset);
		725	MAP_OUT (no_drop);
868	MAP_OUT (difficulty);	726	MAP_OUT (difficulty);
869
870	if (default_region) MAP_OUT2 (region, default_region->name);	727	if (default_region) MAP_OUT2 (region, default_region->name);
871		728
872	if (shopitems)	729	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
873	{
874	char shop[MAX_BUF];
875	print_shop_string (this, shop);
876	MAP_OUT2 (shopitems, shop);
877	}
878
879	MAP_OUT (shopgreed);	730	MAP_OUT (shopgreed);
880	MAP_OUT (shopmin);	731	MAP_OUT (shopmin);
881	MAP_OUT (shopmax);	732	MAP_OUT (shopmax);
882	if (shoprace) MAP_OUT (shoprace);	733	if (shoprace) MAP_OUT (shoprace);
		734
883	MAP_OUT (darkness);	735	MAP_OUT (darkness);
884	MAP_OUT (width);	736	MAP_OUT (width);
885	MAP_OUT (height);	737	MAP_OUT (height);
886	MAP_OUT (enter_x);	738	MAP_OUT (enter_x);
887	MAP_OUT (enter_y);	739	MAP_OUT (enter_y);
…		…
926	* Remove and free all objects in the given map.	778	* Remove and free all objects in the given map.
927	*/	779	*/
928	void	780	void
929	maptile::clear ()	781	maptile::clear ()
930	{	782	{
931	sfree (regions, size ()), regions = 0;
932	free (regionmap), regionmap = 0;
933
934	if (spaces)	783	if (spaces)
935	{	784	{
936	for (mapspace *ms = spaces + size (); ms-- > spaces; )	785	for (mapspace *ms = spaces + size (); ms-- > spaces; )
937	while (object *op = ms->bot)	786	while (object *op = ms->bot)
938	{	787	{
		788	// manually remove, as to not trigger anything
		789	if (ms->bot = op->above)
		790	ms->bot->below = 0;
		791
		792	op->flag [FLAG_REMOVED] = true;
		793
		794	object *head = op->head_ ();
939	if (op->head)	795	if (op == head)
940	op = op->head;
941
942	op->destroy_inv (false);
943	op->destroy ();	796	op->destroy ();
		797	else if (head->map != op->map)
		798	{
		799	LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
		800	head->destroy ();
		801	}
944	}	802	}
945		803
946	sfree (spaces, size ()), spaces = 0;	804	sfree0 (spaces, size ());
947	}	805	}
948		806
949	if (buttons)	807	if (buttons)
950	free_objectlinkpt (buttons), buttons = 0;	808	free_objectlinkpt (buttons), buttons = 0;
		809
		810	sfree0 (regions, size ());
		811	delete [] regionmap; regionmap = 0;
951	}	812	}
952		813
953	void	814	void
954	maptile::clear_header ()	815	maptile::clear_header ()
955	{	816	{
…		…
987	attachable::do_destroy ();	848	attachable::do_destroy ();
988		849
989	clear ();	850	clear ();
990	}	851	}
991		852
992	/*	853	/* decay and destroy perishable items in a map */
993	* Updates every button on the map (by calling update_button() for them).
994	*/
995	void	854	void
996	maptile::update_buttons ()	855	maptile::do_decay_objects ()
997	{	856	{
998	for (oblinkpt *obp = buttons; obp; obp = obp->next)	857	if (!spaces)
999	for (objectlink *ol = obp->link; ol; ol = ol->next)	858	return;
		859
		860	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		861	for (object above, op = ms->bot; op; op = above)
1000	{	862	{
1001	if (!ol->ob)	863	above = op->above;
		864
		865	bool destroy = 0;
		866
		867	// do not decay anything above unique floor tiles (yet :)
		868	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
		869	break;
		870
		871	if (QUERY_FLAG (op, FLAG_IS_FLOOR)
		872	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
		873	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
		874	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
		875	\|\| QUERY_FLAG (op, FLAG_UNPAID)
		876	\|\| op->is_alive ())
		877	; // do not decay
		878	else if (op->is_weapon ())
1002	{	879	{
1003	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",	880	op->stats.dam--;
1004	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);	881	if (op->stats.dam < 0)
1005	continue;	882	destroy = 1;
1006	}	883	}
1007		884	else if (op->is_armor ())
1008	if (ol->ob->type == BUTTON \|\| ol->ob->type == PEDESTAL)
1009	{	885	{
1010	update_button (ol->ob);	886	op->stats.ac--;
1011	break;	887	if (op->stats.ac < 0)
		888	destroy = 1;
1012	}	889	}
		890	else if (op->type == FOOD)
		891	{
		892	op->stats.food -= rndm (5, 20);
		893	if (op->stats.food < 0)
		894	destroy = 1;
		895	}
		896	else
		897	{
		898	int mat = op->materials;
		899
		900	if (mat & M_PAPER
		901	\|\| mat & M_LEATHER
		902	\|\| mat & M_WOOD
		903	\|\| mat & M_ORGANIC
		904	\|\| mat & M_CLOTH
		905	\|\| mat & M_LIQUID
		906	\|\| (mat & M_IRON && rndm (1, 5) == 1)
		907	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
		908	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
		909	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
		910	\|\| (mat & M_ICE && temp > 32))
		911	destroy = 1;
		912	}
		913
		914	/* adjust overall chance below */
		915	if (destroy && rndm (0, 1))
		916	op->destroy ();
1013	}	917	}
1014	}	918	}
1015		919
1016	/*	920	/*
1017	* This routine is supposed to find out the difficulty of the map.	921	* This routine is supposed to find out the difficulty of the map.
1018	* difficulty does not have a lot to do with character level,	922	* difficulty does not have a lot to do with character level,
1019	* but does have a lot to do with treasure on the map.	923	* but does have a lot to do with treasure on the map.
1020	*	924	*
1021	* Difficulty can now be set by the map creature. If the value stored	925	* Difficulty can now be set by the map creator. If the value stored
1022	* in the map is zero, then use this routine. Maps should really	926	* in the map is zero, then use this routine. Maps should really
1023	* have a difficulty set than using this function - human calculation	927	* have a difficulty set rather than using this function - human calculation
1024	* is much better than this functions guesswork.	928	* is much better than this function's guesswork.
1025	*/	929	*/
1026	int	930	int
1027	maptile::estimate_difficulty () const	931	maptile::estimate_difficulty () const
1028	{	932	{
1029	long monster_cnt = 0;	933	long monster_cnt = 0;
…		…
1041		945
1042	if (QUERY_FLAG (op, FLAG_GENERATOR))	946	if (QUERY_FLAG (op, FLAG_GENERATOR))
1043	{	947	{
1044	total_exp += op->stats.exp;	948	total_exp += op->stats.exp;
1045		949
1046	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))	950	if (archetype *at = op->other_arch)
		951	{
1047	total_exp += at->clone.stats.exp * 8;	952	total_exp += at->stats.exp * 8;
1048
1049	monster_cnt++;	953	monster_cnt++;
		954	}
		955
		956	for (object *inv = op->inv; inv; inv = inv->below)
		957	{
		958	total_exp += op->stats.exp * 8;
		959	monster_cnt++;
		960	}
1050	}	961	}
1051	}	962	}
1052		963
1053	avgexp = (double) total_exp / monster_cnt;	964	avgexp = (double) total_exp / monster_cnt;
1054		965
…		…
1067	* postive values make it darker, negative make it brighter	978	* postive values make it darker, negative make it brighter
1068	*/	979	*/
1069	int	980	int
1070	maptile::change_map_light (int change)	981	maptile::change_map_light (int change)
1071	{	982	{
1072	int new_level = darkness + change;
1073
1074	/* Nothing to do */	983	/* Nothing to do */
1075	if (!change \|\| (new_level <= 0 && darkness == 0) \|\| (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))	984	if (!change)
1076	return 0;	985	return 0;
1077		986
1078	/* inform all players on the map */	987	/* inform all players on the map */
1079	if (change > 0)	988	if (change > 0)
1080	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");	989	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");
1081	else	990	else
1082	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");	991	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");
1083		992
1084	/* Do extra checking. since darkness is a unsigned value,	993	darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1085	* we need to be extra careful about negative values.
1086	* In general, the checks below are only needed if change
1087	* is not +/-1
1088	*/
1089	if (new_level < 0)
1090	darkness = 0;
1091	else if (new_level >= MAX_DARKNESS)
1092	darkness = MAX_DARKNESS;
1093	else
1094	darkness = new_level;
1095		994
1096	/* All clients need to get re-updated for the change */	995	/* All clients need to get re-updated for the change */
1097	update_all_map_los (this);	996	update_all_map_los (this);
		997
1098	return 1;	998	return 1;
1099	}	999	}
1100		1000
1101	/*	1001	/*
1102	* This function updates various attributes about a specific space	1002	* This function updates various attributes about a specific space
…		…
1105	* through, etc)	1005	* through, etc)
1106	*/	1006	*/
1107	void	1007	void
1108	mapspace::update_ ()	1008	mapspace::update_ ()
1109	{	1009	{
1110	object tmp, last = 0;	1010	object *last = 0;
1111	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;	1011	uint8 flags = P_UPTODATE, anywhere = 0;
1112	facetile top, floor, *middle;	1012	sint8 light = 0;
1113	object top_obj, floor_obj, *middle_obj;
1114	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1013	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1115		1014
1116	middle = blank_face;	1015	//object *middle = 0;
1117	top = blank_face;	1016	//object *top = 0;
1118	floor = blank_face;	1017	//object *floor = 0;
		1018	// this seems to generate better code than using locals, above
		1019	object *&top = faces_obj[0] = 0;
		1020	object *&middle = faces_obj[1] = 0;
		1021	object *&floor = faces_obj[2] = 0;
1119		1022
1120	middle_obj = 0;
1121	top_obj = 0;
1122	floor_obj = 0;
1123
1124	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)	1023	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1125	{	1024	{
1126	/* This could be made additive I guess (two lights better than	1025	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1127	* one). But if so, it shouldn't be a simple additive - 2
1128	* light bulbs do not illuminate twice as far as once since
1129	* it is a dissapation factor that is cubed.
1130	*/
1131	if (tmp->glow_radius > light)
1132	light = tmp->glow_radius;	1026	light += tmp->glow_radius;
1133		1027
1134	/* This call is needed in order to update objects the player	1028	/* This call is needed in order to update objects the player
1135	* is standing in that have animations (ie, grass, fire, etc).	1029	* is standing in that have animations (ie, grass, fire, etc).
1136	* However, it also causes the look window to be re-drawn	1030	* However, it also causes the look window to be re-drawn
1137	* 3 times each time the player moves, because many of the	1031	* 3 times each time the player moves, because many of the
…		…
1140	* Always put the player down for drawing.	1034	* Always put the player down for drawing.
1141	*/	1035	*/
1142	if (!tmp->invisible)	1036	if (!tmp->invisible)
1143	{	1037	{
1144	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1038	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))
1145	{
1146	top = tmp->face;
1147	top_obj = tmp;	1039	top = tmp;
1148	}
1149	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1040	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1150	{	1041	{
1151	/* If we got a floor, that means middle and top were below it,	1042	/* If we got a floor, that means middle and top were below it,
1152	* so should not be visible, so we clear them.	1043	* so should not be visible, so we clear them.
1153	*/	1044	*/
1154	middle = blank_face;	1045	middle = 0;
1155	top = blank_face;	1046	top = 0;
1156	floor = tmp->face;
1157	floor_obj = tmp;	1047	floor = tmp;
1158	}	1048	}
1159	/* Flag anywhere have high priority */	1049	/* Flag anywhere have high priority */
1160	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))	1050	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1161	{	1051	{
1162	middle = tmp->face;
1163
1164	middle_obj = tmp;	1052	middle = tmp;
1165	anywhere = 1;	1053	anywhere = 1;
1166	}	1054	}
		1055
1167	/* Find the highest visible face around. If equal	1056	/* Find the highest visible face around. If equal
1168	* visibilities, we still want the one nearer to the	1057	* visibilities, we still want the one nearer to the
1169	* top	1058	* top
1170	*/	1059	*/
1171	else if (middle == blank_face \|\| (tmp->face->visibility > middle->visibility && !anywhere))	1060	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1172	{
1173	middle = tmp->face;
1174	middle_obj = tmp;	1061	middle = tmp;
1175	}
1176	}	1062	}
1177		1063
1178	if (tmp == tmp->above)	1064	if (tmp == tmp->above)
1179	{	1065	{
1180	LOG (llevError, "Error in structure of map\n");	1066	LOG (llevError, "Error in structure of map\n");
…		…
1193	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1079	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1194	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;	1080	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1195	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;	1081	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1196	}	1082	}
1197		1083
1198	this->light = light;	1084	this->light = min (light, MAX_LIGHT_RADIUS);
1199	this->flags_ = flags;	1085	this->flags_ = flags;
1200	this->move_block = move_block & ~move_allow;	1086	this->move_block = move_block & ~move_allow;
1201	this->move_on = move_on;	1087	this->move_on = move_on;
1202	this->move_off = move_off;	1088	this->move_off = move_off;
1203	this->move_slow = move_slow;	1089	this->move_slow = move_slow;
…		…
1215	* middle face. This should not happen, as we already have the	1101	* middle face. This should not happen, as we already have the
1216	* else statement above so middle should not get set. OTOH, it	1102	* else statement above so middle should not get set. OTOH, it
1217	* may be possible for the faces to match but be different objects.	1103	* may be possible for the faces to match but be different objects.
1218	*/	1104	*/
1219	if (top == middle)	1105	if (top == middle)
1220	middle = blank_face;	1106	middle = 0;
1221		1107
1222	/* There are three posibilities at this point:	1108	/* There are three posibilities at this point:
1223	* 1) top face is set, need middle to be set.	1109	* 1) top face is set, need middle to be set.
1224	* 2) middle is set, need to set top.	1110	* 2) middle is set, need to set top.
1225	* 3) neither middle or top is set - need to set both.	1111	* 3) neither middle or top is set - need to set both.
1226	*/	1112	*/
1227		1113
1228	for (tmp = last; tmp; tmp = tmp->below)	1114	for (object *tmp = last; tmp; tmp = tmp->below)
1229	{	1115	{
1230	/* Once we get to a floor, stop, since we already have a floor object */	1116	/* Once we get to a floor, stop, since we already have a floor object */
1231	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1117	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1232	break;	1118	break;
1233		1119
1234	/* If two top faces are already set, quit processing */	1120	/* If two top faces are already set, quit processing */
1235	if ((top != blank_face) && (middle != blank_face))	1121	if (top && middle)
1236	break;	1122	break;
1237		1123
1238	/* Only show visible faces */	1124	/* Only show visible faces */
1239	if (!tmp->invisible)	1125	if (!tmp->invisible)
1240	{	1126	{
1241	/* Fill in top if needed */	1127	/* Fill in top if needed */
1242	if (top == blank_face)	1128	if (!top)
1243	{	1129	{
1244	top = tmp->face;
1245	top_obj = tmp;	1130	top = tmp;
1246	if (top == middle)	1131	if (top == middle)
1247	middle = blank_face;	1132	middle = 0;
1248	}	1133	}
1249	else	1134	else
1250	{	1135	{
1251	/* top is already set - we should only get here if	1136	/* top is already set - we should only get here if
1252	* middle is not set	1137	* middle is not set
1253	*	1138	*
1254	* Set the middle face and break out, since there is nothing	1139	* Set the middle face and break out, since there is nothing
1255	* more to fill in. We don't check visiblity here, since	1140	* more to fill in. We don't check visiblity here, since
1256	*	1141	*
1257	*/	1142	*/
1258	if (tmp->face != top)	1143	if (tmp != top)
1259	{	1144	{
1260	middle = tmp->face;
1261	middle_obj = tmp;	1145	middle = tmp;
1262	break;	1146	break;
1263	}	1147	}
1264	}	1148	}
1265	}	1149	}
1266	}	1150	}
1267		1151
1268	if (middle == floor)	1152	if (middle == floor)
1269	middle = blank_face;	1153	middle = 0;
1270		1154
1271	if (top == middle)	1155	if (top == middle)
1272	middle = blank_face;	1156	middle = 0;
1273		1157
1274	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;	1158	#if 0
1275	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;	1159	faces_obj [0] = top;
1276	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;	1160	faces_obj [1] = middle;
		1161	faces_obj [2] = floor;
		1162	#endif
1277	}	1163	}
1278		1164
1279	uint64	1165	uint64
1280	mapspace::volume () const	1166	mapspace::volume () const
1281	{	1167	{
…		…
1285	vol += op->volume ();	1171	vol += op->volume ();
1286		1172
1287	return vol;	1173	return vol;
1288	}	1174	}
1289		1175
1290	/* this updates the orig_map->tile_map[tile_num] value after finding	1176	maptile *
1291	* the map. It also takes care of linking back the freshly found	1177	maptile::tile_available (int dir, bool load)
1292	* maps tile_map values if it tiles back to this one. It returns
1293	* the value of orig_map->tile_map[tile_num].
1294	*/
1295	static inline maptile *
1296	find_and_link (maptile *orig_map, int tile_num)
1297	{	1178	{
1298	maptile *mp = orig_map->tile_map [tile_num];	1179	if (tile_path[dir])
1299
1300	if (!mp)
1301	{
1302	mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1303
1304	if (!mp)
1305	{
1306	// emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1307	LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1308	&orig_map->tile_path[tile_num], &orig_map->path);
1309	mp = new maptile (1, 1);
1310	mp->alloc ();
1311	mp->in_memory = MAP_IN_MEMORY;
1312	}
1313	}	1180	{
		1181	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))
		1182	return tile_map[dir];
1314		1183
1315	int dest_tile = (tile_num + 2) % 4;	1184	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
		1185	return tile_map[dir];
		1186	}
1316		1187
1317	orig_map->tile_map [tile_num] = mp;
1318
1319	// optimisation: back-link map to origin map if euclidean
1320	//TODO: non-euclidean maps MUST GO
1321	if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1322	orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1323
1324	return mp;	1188	return 0;
1325	}
1326
1327	static inline void
1328	load_and_link (maptile *orig_map, int tile_num)
1329	{
1330	find_and_link (orig_map, tile_num)->load_sync ();
1331	}	1189	}
1332		1190
1333	/* this returns TRUE if the coordinates (x,y) are out of	1191	/* this returns TRUE if the coordinates (x,y) are out of
1334	* map m. This function also takes into account any	1192	* map m. This function also takes into account any
1335	* tiling considerations, loading adjacant maps as needed.	1193	* tiling considerations, loading adjacant maps as needed.
…		…
1348	if (!m)	1206	if (!m)
1349	return 0;	1207	return 0;
1350		1208
1351	if (x < 0)	1209	if (x < 0)
1352	{	1210	{
1353	if (!m->tile_path[3])	1211	if (!m->tile_available (3))
1354	return 1;	1212	return 1;
1355		1213
1356	if (!m->tile_map[3] \|\| m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1357	find_and_link (m, 3);
1358
1359	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1214	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1360	}	1215	}
1361		1216
1362	if (x >= m->width)	1217	if (x >= m->width)
1363	{	1218	{
1364	if (!m->tile_path[1])	1219	if (!m->tile_available (1))
1365	return 1;	1220	return 1;
1366		1221
1367	if (!m->tile_map[1] \|\| m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1368	find_and_link (m, 1);
1369
1370	return out_of_map (m->tile_map[1], x - m->width, y);	1222	return out_of_map (m->tile_map[1], x - m->width, y);
1371	}	1223	}
1372		1224
1373	if (y < 0)	1225	if (y < 0)
1374	{	1226	{
1375	if (!m->tile_path[0])	1227	if (!m->tile_available (0))
1376	return 1;	1228	return 1;
1377		1229
1378	if (!m->tile_map[0] \|\| m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1379	find_and_link (m, 0);
1380
1381	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1230	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1382	}	1231	}
1383		1232
1384	if (y >= m->height)	1233	if (y >= m->height)
1385	{	1234	{
1386	if (!m->tile_path[2])	1235	if (!m->tile_available (2))
1387	return 1;	1236	return 1;
1388
1389	if (!m->tile_map[2] \|\| m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1390	find_and_link (m, 2);
1391		1237
1392	return out_of_map (m->tile_map[2], x, y - m->height);	1238	return out_of_map (m->tile_map[2], x, y - m->height);
1393	}	1239	}
1394		1240
1395	/* Simple case - coordinates are within this local	1241	/* Simple case - coordinates are within this local
…		…
1409	maptile *	1255	maptile *
1410	maptile::xy_find (sint16 &x, sint16 &y)	1256	maptile::xy_find (sint16 &x, sint16 &y)
1411	{	1257	{
1412	if (x < 0)	1258	if (x < 0)
1413	{	1259	{
1414	if (!tile_path[3])	1260	if (!tile_available (3))
1415	return 0;	1261	return 0;
1416		1262
1417	find_and_link (this, 3);
1418	x += tile_map[3]->width;	1263	x += tile_map[3]->width;
1419	return tile_map[3]->xy_find (x, y);	1264	return tile_map[3]->xy_find (x, y);
1420	}	1265	}
1421		1266
1422	if (x >= width)	1267	if (x >= width)
1423	{	1268	{
1424	if (!tile_path[1])	1269	if (!tile_available (1))
1425	return 0;	1270	return 0;
1426		1271
1427	find_and_link (this, 1);
1428	x -= width;	1272	x -= width;
1429	return tile_map[1]->xy_find (x, y);	1273	return tile_map[1]->xy_find (x, y);
1430	}	1274	}
1431		1275
1432	if (y < 0)	1276	if (y < 0)
1433	{	1277	{
1434	if (!tile_path[0])	1278	if (!tile_available (0))
1435	return 0;	1279	return 0;
1436		1280
1437	find_and_link (this, 0);
1438	y += tile_map[0]->height;	1281	y += tile_map[0]->height;
1439	return tile_map[0]->xy_find (x, y);	1282	return tile_map[0]->xy_find (x, y);
1440	}	1283	}
1441		1284
1442	if (y >= height)	1285	if (y >= height)
1443	{	1286	{
1444	if (!tile_path[2])	1287	if (!tile_available (2))
1445	return 0;	1288	return 0;
1446		1289
1447	find_and_link (this, 2);
1448	y -= height;	1290	y -= height;
1449	return tile_map[2]->xy_find (x, y);	1291	return tile_map[2]->xy_find (x, y);
1450	}	1292	}
1451		1293
1452	/* Simple case - coordinates are within this local	1294	/* Simple case - coordinates are within this local
…		…
1463	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1305	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)
1464	{	1306	{
1465	if (!map1 \|\| !map2)	1307	if (!map1 \|\| !map2)
1466	return 0;	1308	return 0;
1467		1309
1468	//TODO: this doesn't actually check corretcly when intermediate maps are not loaded	1310	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
1469	//fix: compare paths instead (this is likely faster, too!)	1311	//fix: compare paths instead (this is likely faster, too!)
1470	if (map1 == map2)	1312	if (map1 == map2)
1471	{	1313	{
1472	*dx = 0;	1314	*dx = 0;
1473	*dy = 0;	1315	*dy = 0;
…		…
1655	else	1497	else
1656	{	1498	{
1657	retval->distance_x += op2->x - x;	1499	retval->distance_x += op2->x - x;
1658	retval->distance_y += op2->y - y;	1500	retval->distance_y += op2->y - y;
1659		1501
1660	retval->part = NULL;	1502	retval->part = 0;
1661	retval->distance = idistance (retval->distance_x, retval->distance_y);	1503	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1662	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1504	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1663	}	1505	}
1664	}	1506	}
1665		1507
1666	/* Returns true of op1 and op2 are effectively on the same map	1508	/* Returns true of op1 and op2 are effectively on the same map
…		…
1680	}	1522	}
1681		1523
1682	object *	1524	object *
1683	maptile::insert (object op, int x, int y, object originator, int flags)	1525	maptile::insert (object op, int x, int y, object originator, int flags)
1684	{	1526	{
1685	if (!op->flag [FLAG_REMOVED])
1686	op->remove ();
1687
1688	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1527	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1689	}	1528	}
1690		1529
1691	region *	1530	region *
1692	maptile::region (int x, int y) const	1531	maptile::region (int x, int y) const
…		…
1701	return default_region;	1540	return default_region;
1702		1541
1703	return ::region::default_region ();	1542	return ::region::default_region ();
1704	}	1543	}
1705		1544
		1545	/* picks a random object from a style map.
		1546	*/
		1547	object *
		1548	maptile::pick_random_object (rand_gen &gen) const
		1549	{
		1550	/* while returning a null object will result in a crash, that
		1551	* is actually preferable to an infinite loop. That is because
		1552	* most servers will automatically restart in case of crash.
		1553	* Change the logic on getting the random space - shouldn't make
		1554	* any difference, but this seems clearer to me.
		1555	*/
		1556	for (int i = 1000; --i;)
		1557	{
		1558	object *pick = at (gen (width), gen (height)).bot;
1706		1559
		1560	// do not prefer big monsters just because they are big.
		1561	if (pick && pick->is_head ())
		1562	return pick->head_ ();
		1563	}
		1564
		1565	// instead of crashing in the unlikely(?) case, try to return something
		1566	return archetype::find ("bug");
		1567	}
		1568
		1569	void
		1570	maptile::play_sound (faceidx sound, int x, int y) const
		1571	{
		1572	if (!sound)
		1573	return;
		1574
		1575	for_all_players_on_map (pl, this)
		1576	if (client *ns = pl->ns)
		1577	{
		1578	int dx = x - pl->ob->x;
		1579	int dy = y - pl->ob->y;
		1580
		1581	int distance = idistance (dx, dy);
		1582
		1583	if (distance <= MAX_SOUND_DISTANCE)
		1584	ns->play_sound (sound, dx, dy);
		1585	}
		1586	}
		1587
		1588	void
		1589	maptile::say_msg (const char *msg, int x, int y) const
		1590	{
		1591	for_all_players (pl)
		1592	if (client *ns = pl->ns)
		1593	{
		1594	int dx = x - pl->ob->x;
		1595	int dy = y - pl->ob->y;
		1596
		1597	int distance = idistance (dx, dy);
		1598
		1599	if (distance <= MAX_SOUND_DISTANCE)
		1600	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
		1601	}
		1602	}
		1603
		1604	static void
		1605	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
		1606	{
		1607	// clip to map to the left
		1608	if (x0 < 0)
		1609	{
		1610	if (maptile *tile = m->tile_available (TILE_LEFT, 1))
		1611	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
		1612
		1613	if (x1 < 0) // entirely to the left
		1614	return;
		1615
		1616	x0 = 0;
		1617	}
		1618
		1619	// clip to map to the right
		1620	if (x1 > m->width)
		1621	{
		1622	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
		1623	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
		1624
		1625	if (x0 > m->width) // entirely to the right
		1626	return;
		1627
		1628	x1 = m->width;
		1629	}
		1630
		1631	// clip to map above
		1632	if (y0 < 0)
		1633	{
		1634	if (maptile *tile = m->tile_available (TILE_UP, 1))
		1635	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
		1636
		1637	if (y1 < 0) // entirely above
		1638	return;
		1639
		1640	y0 = 0;
		1641	}
		1642
		1643	// clip to map below
		1644	if (y1 > m->height)
		1645	{
		1646	if (maptile *tile = m->tile_available (TILE_DOWN, 1))
		1647	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
		1648
		1649	if (y0 > m->height) // entirely below
		1650	return;
		1651
		1652	y1 = m->height;
		1653	}
		1654
		1655	// if we get here, the rect is within the current map
		1656	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1657
		1658	r->m = m;
		1659	r->x0 = x0;
		1660	r->y0 = y0;
		1661	r->x1 = x1;
		1662	r->y1 = y1;
		1663	r->dx = dx;
		1664	r->dy = dy;
		1665	}
		1666
		1667	maprect *
		1668	maptile::split_to_tiles (int x0, int y0, int x1, int y1)
		1669	{
		1670	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
		1671	buf.clear ();
		1672
		1673	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
		1674
		1675	// add end marker
		1676	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1677	r->m = 0;
		1678
		1679	return (maprect *)buf.linearise ();
		1680	}
		1681

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.87 by root, Thu Feb 15 21:07:48 2007 UTC vs. Revision 1.165 by root, Tue Oct 20 05:57:08 2009 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.87 by root, Thu Feb 15 21:07:48 2007 UTC vs.
Revision 1.165 by root, Tue Oct 20 05:57:08 2009 UTC