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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.81 by root, Sat Jan 27 23:59:29 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 <global.h>
26	#include <funcpoint.h>
27
28	#include <loader.h>
29	#include <unistd.h>	25	#include <unistd.h>
30		26
		27	#include "global.h"
		28	#include "loader.h"
31	#include "path.h"	29	#include "path.h"
32		30
33	/*	31	sint8 maptile::outdoor_darkness;
34	* This makes a path absolute outside the world of Crossfire.
35	* In other words, it prepends LIBDIR/MAPDIR/ to the given path
36	* and returns the pointer to a static array containing the result.
37	* it really should be called create_mapname
38	*/
39	const char *
40	create_pathname (const char *name)
41	{
42	static char buf[8192];
43	snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44	return buf;
45	}
46
47	/*
48	* This function checks if a file with the given path exists.
49	* -1 is returned if it fails, otherwise the mode of the file
50	* is returned.
51	* It tries out all the compression suffixes listed in the uncomp[] array.
52	*
53	* If prepend_dir is set, then we call create_pathname (which prepends
54	* libdir & mapdir). Otherwise, we assume the name given is fully
55	* complete.
56	* Only the editor actually cares about the writablity of this -
57	* the rest of the code only cares that the file is readable.
58	* when the editor goes away, the call to stat should probably be
59	* replaced by an access instead (similar to the windows one, but
60	* that seems to be missing the prepend_dir processing
61	*/
62	int
63	check_path (const char *name, int prepend_dir)
64	{
65	char buf[MAX_BUF];
66
67	char *endbuf;
68	struct stat statbuf;
69	int mode = 0;
70
71	if (prepend_dir)
72	strcpy (buf, create_pathname (name));
73	else
74	strcpy (buf, name);
75
76	/* old method (strchr(buf, '\0')) seemd very odd to me -
77	* this method should be equivalant and is clearer.
78	* Can not use strcat because we need to cycle through
79	* all the names.
80	*/
81	endbuf = buf + strlen (buf);
82
83	if (stat (buf, &statbuf))
84	return -1;
85	if (!S_ISREG (statbuf.st_mode))
86	return (-1);
87
88	if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) \|\|
89	((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) \|\| (statbuf.st_mode & S_IROTH))
90	mode \|= 4;
91
92	if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) \|\|
93	(statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) \|\| (statbuf.st_mode & S_IWOTH))
94	mode \|= 2;
95
96	return (mode);
97	}
98		32
99	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	33	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100	* one function that just returns a P_.. value (see map.h)	34	* one function that just returns a P_.. value (see map.h)
101	* it will also do map translation for tiled maps, returning	35	* it will also do map translation for tiled maps, returning
102	* 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
137	* by the caller.	71	* by the caller.
138	*/	72	*/
139	int	73	int
140	blocked_link (object ob, maptile m, int sx, int sy)	74	blocked_link (object ob, maptile m, int sx, int sy)
141	{	75	{
142	object *tmp;
143	int mflags, blocked;
144
145	/* 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
146	* have already checked this.	77	* have already checked this.
147	*/	78	*/
148	if (OUT_OF_REAL_MAP (m, sx, sy))	79	if (OUT_OF_REAL_MAP (m, sx, sy))
149	{	80	{
…		…
152	}	83	}
153		84
154	/* 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
155	* directly.	86	* directly.
156	*/	87	*/
157	mflags = m->at (sx, sy).flags ();	88	mapspace &ms = m->at (sx, sy);
158		89
159	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	90	int mflags = ms.flags ();
		91	int blocked = ms.move_block;
160		92
161	/* If space is currently not blocked by anything, no need to	93	/* If space is currently not blocked by anything, no need to
162	* go further. Not true for players - all sorts of special	94	* go further. Not true for players - all sorts of special
163	* things we need to do for players.	95	* things we need to do for players.
164	*/	96	*/
165	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	97	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
166	return 0;	98	return 0;
167		99
168	/* 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
169	* 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
170	* 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
171	* or another. Likewise, only if something is blocking us do we	103	* or another. Likewise, only if something is blocking us do we
172	* need to investigate if there is a special circumstance that would	104	* need to investigate if there is a special circumstance that would
173	* let the player through (inventory checkers for example)	105	* let the player through (inventory checkers for example)
174	*/	106	*/
175	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))	107	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176	return 0;	108	return 0;
177		109
178	if (ob->head != NULL)
179	ob = ob->head;	110	ob = ob->head_ ();
180		111
181	/* 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
182	* 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
183	* true. If we get through the entire stack, that must mean	114	* true. If we get through the entire stack, that must mean
184	* ob is blocking it, so return 0.	115	* ob is blocking it, so return 0.
185	*/	116	*/
186	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	117	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
187	{	118	{
188		119	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	{	120	{
192	/* If last_sp is set, the player/monster needs an object,	121	if (tmp->type == CHECK_INV)
193	* so we check for it. If they don't have it, they can't
194	* pass through this space.
195	*/
196	if (tmp->last_sp)
197	{	122	{
198	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))
199	return 1;	127	return 1;
200	else	128	}
201	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;
202	}	138	}
203	else	139	else
204	{	140	return 1; // unconditional block
205	/* In this case, the player must not have the object -	141
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	142	} else {
215	{	143	// space does not block the ob, directly, but
216	/* Broke apart a big nasty if into several here to make	144	// anything alive that is not a door still
217	* this more readable. first check - if the space blocks	145	// blocks anything but wizards.
218	* movement, can't move here.	146
219	* second - if a monster, can't move there, unles it is a	147	if (tmp->flag [FLAG_ALIVE]
220	* hidden dm	148	&& tmp->head_ () != ob
221	*/	149	&& tmp != ob
222	if (OB_MOVE_BLOCK (ob, tmp))	150	&& tmp->type != DOOR
223	return 1;	151	&& !tmp->flag [FLAG_WIZPASS])
224	if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
225	tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
226	return 1;	152	return 1;
227	}	153	}
228
229	}	154	}
		155
230	return 0;	156	return 0;
231	}	157	}
232		158
233	/*	159	/*
234	* 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
235	* This is meant for multi space objects - for single space objecs,	161	* spot. This is meant for multi space objects - for single space objecs,
236	* just calling get_map_blocked and checking that against movement type	162	* just calling get_map_blocked and checking that against movement type
237	* of object. This function goes through all the parts of the	163	* of object. This function goes through all the parts of the multipart
238	* multipart object and makes sure they can be inserted.	164	* object and makes sure they can be inserted.
239	*	165	*
240	* 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.
241	*	167	*
242	* This function has been used to deprecate arch_out_of_map -	168	* This function has been used to deprecate arch_out_of_map -
243	* this function also does that check, and since in most cases,	169	* this function also does that check, and since in most cases,
…		…
254	*	180	*
255	* Note this used to be arch_blocked, but with new movement	181	* Note this used to be arch_blocked, but with new movement
256	* 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
257	* against the move_block values.	183	* against the move_block values.
258	*/	184	*/
259	int	185	bool
260	ob_blocked (const object ob, maptile m, sint16 x, sint16 y)	186	object::blocked (maptile *m, int x, int y) const
261	{	187	{
262	archetype *tmp;	188	for (archetype tmp = arch; tmp; tmp = (archetype )tmp->more)
263	int flag;
264	maptile *m1;
265	sint16 sx, sy;
266
267	if (!ob)
268	{
269	flag = get_map_flags (m, &m1, x, y, &sx, &sy);
270	if (flag & P_OUT_OF_MAP)
271	return P_OUT_OF_MAP;
272
273	/* don't have object, so don't know what types would block */
274	return m1->at (sx, sy).move_block;
275	}	189	{
		190	mapxy pos (m, x + tmp->x, y + tmp->y);
276		191
277	for (tmp = ob->arch; tmp; tmp = tmp->more)	192	if (!pos.normalise ())
278	{	193	return 1;
279	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
280		194
281	if (flag & P_OUT_OF_MAP)	195	mapspace &ms = *pos;
282	return P_OUT_OF_MAP;	196
283	if (flag & P_IS_ALIVE)	197	if (ms.flags () & P_IS_ALIVE)
284	return P_IS_ALIVE;	198	return 1;
285		199
286	mapspace &ms = m1->at (sx, sy);	200	/* However, often ob doesn't have any move type
287		201	* (signifying non-moving objects)
288	/* find_first_free_spot() calls this function. However, often
289	* ob doesn't have any move type (when used to place exits)
290	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	202	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
291	*/	203	*/
292
293	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	204	if (!move_type && ms.move_block != MOVE_ALL)
294	continue;	205	continue;
295		206
296	/* 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
297	* head of the object should correspond for the entire object.	208	* head of the object should correspond for the entire object.
298	*/	209	*/
299	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	210	if (ms.blocks (move_type))
300	return P_NO_PASS;	211	return 1;
301	}	212	}
302		213
303	return 0;	214	return 0;
304	}	215	}
305		216
…		…
323		234
324	insert_ob_in_ob (tmp, container);	235	insert_ob_in_ob (tmp, container);
325	tmp = next;	236	tmp = next;
326	}	237	}
327		238
328	/* sum_weight will go through and calculate what all the containers are	239	// go through and calculate what all the containers are carrying.
329	* carrying.	240	//TODO: remove
330	*/	241	container->update_weight ();
331	sum_weight (container);
332	}	242	}
333		243
334	void	244	void
335	maptile::set_object_flag (int flag, int value)	245	maptile::set_object_flag (int flag, int value)
336	{	246	{
…		…
340	for (mapspace *ms = spaces + size (); ms-- > spaces; )	250	for (mapspace *ms = spaces + size (); ms-- > spaces; )
341	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	251	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
342	tmp->flag [flag] = value;	252	tmp->flag [flag] = value;
343	}	253	}
344		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
345	/* 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
346	* 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
347	* 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
348	* they are saved). We do have to look for the old maps that did save	271	* they are saved).
349	* the more sections and not re-add sections for them.
350	*/	272	*/
351	void	273	void
352	maptile::link_multipart_objects ()	274	maptile::link_multipart_objects ()
353	{	275	{
354	if (!spaces)	276	if (!spaces)
355	return;	277	return;
356		278
357	for (mapspace *ms = spaces + size (); ms-- > spaces; )	279	for (mapspace *ms = spaces + size (); ms-- > spaces; )
358	for (object *tmp = ms->bot; tmp; )	280	{
		281	object *op = ms->bot;
		282	while (op)
359	{	283	{
360	object *above = tmp->above;
361
362	/* already multipart - don't do anything more */	284	/* already multipart - don't do anything more */
363	if (!tmp->head && !tmp->more)	285	if (op->head_ () == op && !op->more && op->arch->more)
364	{
365	/* If there is nothing more to this object, this for loop
366	* won't do anything.
367	*/
368	archetype *at;
369	object last, op;
370	for (at = tmp->arch->more, last = tmp;
371	at;
372	at = at->more, last = op)
373	{	286	{
374	op = arch_to_object (at);	287	op->remove ();
		288	op->expand_tail ();
375		289
376	/* update x,y coordinates */	290	// FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
377	op->x += tmp->x;	291	// multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
378	op->y += tmp->y;	292	// below the pentagrams... hopefully INS_ON_TOP doesn't break anything
379	op->head = tmp;
380	op->map = this;
381	last->more = op;
382	op->name = tmp->name;
383	op->title = tmp->title;
384
385	/* we could link all the parts onto tmp, and then just
386	* call insert_ob_in_map once, but the effect is the same,
387	* as insert_ob_in_map will call itself with each part, and
388	* the coding is simpler to just to it here with each part.
389	*/
390	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE \| INS_ABOVE_FLOOR_ONLY \| INS_NO_WALK_ON);	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
391	}	297	}
		298	else
		299	op = op->above;
392	}	300	}
393
394	tmp = above;
395	}	301	}
396	}	302	}
397		303
398	/*	304	/*
399	* 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
400	* file pointer.	306	* file pointer.
401	* mapflags is the same as we get with load_original_map
402	*/	307	*/
403	bool	308	bool
404	maptile::_load_objects (object_thawer &thawer)	309	maptile::_load_objects (object_thawer &f)
405	{	310	{
406	int unique;	311	for (;;)
407	object op, prev = NULL, last_more = NULL, otmp;
408
409	op = object::create ();
410	op->map = this; /* To handle buttons correctly */
411
412	while (int i = load_object (thawer, op, 0))
413	{	312	{
414	/* if the archetype for the object is null, means that we	313	coroapi::cede_to_tick (); // cede once in a while
415	* got an invalid object. Don't do anything with it - the game	314
416	* or editor will not be able to do anything with it either.	315	switch (f.kw)
417	*/
418	if (op->arch == NULL)
419	{	316	{
420	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
421	continue;	349	continue;
422	}
423		350
424	switch (i)
425	{
426	case LL_NORMAL:
427	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ON_TOP \| INS_MAP_LOAD);
428
429	if (op->inv)
430	sum_weight (op);
431
432	prev = op, last_more = op;
433	break;
434
435	case LL_MORE:	351	case KW_EOF:
436	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ABOVE_FLOOR_ONLY);	352	return true;
437	op->head = prev, last_more->more = op, last_more = op;	353
		354	default:
		355	if (!f.parse_error ("map file"))
		356	return false;
438	break;	357	break;
439	}	358	}
440		359
441	op = object::create ();	360	f.next ();
442	op->map = this;
443	}
444
445	op->destroy ();
446
447	#if 0
448	for (i = 0; i < width; i++)
449	for (j = 0; j < height; j++)
450	{
451	unique = 0;
452	/* check for unique items, or unique squares */
453	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454	{
455	if (QUERY_FLAG (otmp, FLAG_UNIQUE) \|\| QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456	unique = 1;
457
458	if (!(mapflags & (MAP_OVERLAY \| MAP_PLAYER_UNIQUE) \|\| unique))
459	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460	}
461	}	361	}
462	#endif
463		362
464	return true;	363	return true;
465	}	364	}
466		365
467	void	366	void
468	maptile::activate ()	367	maptile::activate ()
469	{	368	{
470	if (!spaces)	369	if (spaces)
471	return;
472
473	for (mapspace *ms = spaces + size (); ms-- > spaces; )	370	for (mapspace *ms = spaces + size (); ms-- > spaces; )
474	for (object *op = ms->bot; op; op = op->above)	371	for (object *op = ms->bot; op; op = op->above)
475	op->activate_recursive ();	372	op->activate_recursive ();
476	}	373	}
477		374
478	void	375	void
479	maptile::deactivate ()	376	maptile::deactivate ()
480	{	377	{
481	if (!spaces)	378	if (spaces)
482	return;
483
484	for (mapspace *ms = spaces + size (); ms-- > spaces; )	379	for (mapspace *ms = spaces + size (); ms-- > spaces; )
485	for (object *op = ms->bot; op; op = op->above)	380	for (object *op = ms->bot; op; op = op->above)
486	op->deactivate_recursive ();	381	op->deactivate_recursive ();
487	}	382	}
488		383
489	bool	384	bool
490	maptile::_save_objects (object_freezer &freezer, int flags)	385	maptile::_save_objects (object_freezer &f, int flags)
491	{	386	{
492	static int cede_count = 0;	387	coroapi::cede_to_tick ();
493		388
494	if (flags & IO_HEADER)	389	if (flags & IO_HEADER)
495	_save_header (freezer);	390	_save_header (f);
496		391
497	if (!spaces)	392	if (!spaces)
498	return false;	393	return false;
499		394
500	for (int i = 0; i < size (); ++i)	395	for (int i = 0; i < size (); ++i)
501	{	396	{
502	#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503	if (cede_count >= 500)
504	{
505	cede_count = 0;
506	coroapi::cede ();
507	}
508	#endif
509
510	int unique = 0;	397	bool unique = 0;
		398
511	for (object *op = spaces [i].bot; op; op = op->above)	399	for (object *op = spaces [i].bot; op; op = op->above)
512	{	400	{
513	// count per-object, but cede only when modification-safe
514	cede_count++;
515
516	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])	401	unique \|= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
517	unique = 1;
518		402
519	if (!op->can_map_save ())	403	if (expect_false (!op->can_map_save ()))
520	continue;	404	continue;
521		405
522	if (unique \|\| op->flag [FLAG_UNIQUE])	406	if (expect_false (unique \|\| op->flag [FLAG_UNIQUE]))
523	{	407	{
524	if (flags & IO_UNIQUES)	408	if (flags & IO_UNIQUES)
525	save_object (freezer, op, 1);	409	op->write (f);
526	}	410	}
527	else if (flags & IO_OBJECTS)	411	else if (expect_true (flags & IO_OBJECTS))
528	save_object (freezer, op, 1);	412	op->write (f);
529	}	413	}
530	}	414	}
531		415
		416	coroapi::cede_to_tick ();
		417
532	return true;	418	return true;
533	}
534
535	bool
536	maptile::_load_objects (const char *path, bool skip_header)
537	{
538	object_thawer thawer (path);
539
540	if (!thawer)
541	return false;
542
543	if (skip_header)
544	for (;;)
545	{
546	keyword kw = thawer.get_kv ();
547
548	if (kw == KW_end)
549	break;
550
551	thawer.skip_kv (kw);
552	}
553
554	return _load_objects (thawer);
555	}	419	}
556		420
557	bool	421	bool
558	maptile::_save_objects (const char *path, int flags)	422	maptile::_save_objects (const char *path, int flags)
559	{	423	{
…		…
568	maptile::maptile ()	432	maptile::maptile ()
569	{	433	{
570	in_memory = MAP_SWAPPED;	434	in_memory = MAP_SWAPPED;
571		435
572	/* The maps used to pick up default x and y values from the	436	/* The maps used to pick up default x and y values from the
573	* map archetype. Mimic that behaviour.	437	* map archetype. Mimic that behaviour.
574	*/	438	*/
575	width = 16;	439	width = 16;
576	height = 16;	440	height = 16;
577	reset_timeout = 0;
578	timeout = 300;	441	timeout = 300;
579	enter_x = 0;	442	max_nrof = 1000; // 1000 items of anything
580	enter_y = 0;	443	max_volume = 2000000; // 2m³
581	}	444	}
582		445
583	maptile::maptile (int w, int h)	446	maptile::maptile (int w, int h)
584	{	447	{
585	in_memory = MAP_SWAPPED;	448	in_memory = MAP_SWAPPED;
…		…
691	return items;	554	return items;
692	}	555	}
693		556
694	/* 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
695	* the map (or something equivilent) into output_string. */	558	* the map (or something equivilent) into output_string. */
696	static void	559	static const char *
697	print_shop_string (maptile m, char output_string)	560	print_shop_string (maptile *m)
698	{	561	{
699	int i;	562	static dynbuf_text buf; buf.clear ();
700	char tmp[MAX_BUF];
701		563
702	strcpy (output_string, "");
703	for (i = 0; i < m->shopitems[0].index; i++)	564	for (int i = 0; i < m->shopitems[0].index; i++)
704	{	565	{
705	if (m->shopitems[i].typenum)	566	if (m->shopitems[i].typenum)
706	{	567	{
707	if (m->shopitems[i].strength)	568	if (m->shopitems[i].strength)
708	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);
709	else	570	else
710	sprintf (tmp, "%s;", m->shopitems[i].name);	571	buf.printf ("%s;", m->shopitems[i].name);
711	}	572	}
712	else	573	else
713	{	574	{
714	if (m->shopitems[i].strength)	575	if (m->shopitems[i].strength)
715	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	576	buf.printf ("*:%d;", m->shopitems[i].strength);
716	else	577	else
717	sprintf (tmp, "*");	578	buf.printf ("*");
718	}	579	}
719
720	strcat (output_string, tmp);
721	}	580	}
		581
		582	return buf;
722	}	583	}
723		584
724	/* This loads the header information of the map. The header	585	/* This loads the header information of the map. The header
725	* contains things like difficulty, size, timeout, etc.	586	* contains things like difficulty, size, timeout, etc.
726	* this used to be stored in the map object, but with the	587	* this used to be stored in the map object, but with the
…		…
735	bool	596	bool
736	maptile::_load_header (object_thawer &thawer)	597	maptile::_load_header (object_thawer &thawer)
737	{	598	{
738	for (;;)	599	for (;;)
739	{	600	{
740	keyword kw = thawer.get_kv ();
741
742	switch (kw)	601	switch (thawer.kw)
743	{	602	{
744	case KW_EOF:
745	LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
746	return false;
747
748	case KW_end:
749	return true;
750
751	default:
752	case KW_ERROR:
753	LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
754	break;
755
756	case KW_msg:	603	case KW_msg:
757	thawer.get_ml (KW_endmsg, msg);	604	thawer.get_ml (KW_endmsg, msg);
758	break;	605	break;
759		606
760	case KW_lore: // CF+ extension	607	case KW_lore: // CF+ extension
…		…
791	case KW_winddir: thawer.get (winddir); break;	638	case KW_winddir: thawer.get (winddir); break;
792	case KW_sky: thawer.get (sky); break;	639	case KW_sky: thawer.get (sky); break;
793		640
794	case KW_per_player: thawer.get (per_player); break;	641	case KW_per_player: thawer.get (per_player); break;
795	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;
796		645
797	case KW_region: default_region = region::find (thawer.get_str ()); break;	646	case KW_region: default_region = region::find (thawer.get_str ()); break;
798	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	647	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
799		648
800	// old names new names	649	// old names new names
…		…
810		659
811	case KW_tile_path_1: thawer.get (tile_path [0]); break;	660	case KW_tile_path_1: thawer.get (tile_path [0]); break;
812	case KW_tile_path_2: thawer.get (tile_path [1]); break;	661	case KW_tile_path_2: thawer.get (tile_path [1]); break;
813	case KW_tile_path_3: thawer.get (tile_path [2]); break;	662	case KW_tile_path_3: thawer.get (tile_path [2]); break;
814	case KW_tile_path_4: thawer.get (tile_path [3]); break;	663	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		664
		665	case KW_ERROR:
		666	set_key_text (thawer.kw_str, thawer.value);
		667	break;
		668
		669	case KW_end:
		670	thawer.next ();
		671	return true;
		672
		673	default:
		674	if (!thawer.parse_error ("map", 0))
		675	return false;
		676	break;
815	}	677	}
		678
		679	thawer.next ();
816	}	680	}
817		681
818	abort ();	682	abort ();
819	}
820
821	bool
822	maptile::_load_header (const char *path)
823	{
824	object_thawer thawer (path);
825
826	if (!thawer)
827	return false;
828
829	return _load_header (thawer);
830	}	683	}
831		684
832	/******************************************************************************	685	/******************************************************************************
833	* This is the start of unique map handling code	686	* This is the start of unique map handling code
834	*****************************************************************************/	687	*****************************************************************************/
…		…
845	object *above = op->above;	698	object *above = op->above;
846		699
847	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))
848	unique = 1;	701	unique = 1;
849		702
850	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	703	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))
851	{
852	op->destroy_inv (false);
853	op->destroy ();	704	op->destroy ();
854	}
855		705
856	op = above;	706	op = above;
857	}	707	}
858	}	708	}
859	}	709	}
…		…
869	if (name) MAP_OUT (name);	719	if (name) MAP_OUT (name);
870	MAP_OUT (swap_time);	720	MAP_OUT (swap_time);
871	MAP_OUT (reset_time);	721	MAP_OUT (reset_time);
872	MAP_OUT (reset_timeout);	722	MAP_OUT (reset_timeout);
873	MAP_OUT (fixed_resettime);	723	MAP_OUT (fixed_resettime);
		724	MAP_OUT (no_reset);
		725	MAP_OUT (no_drop);
874	MAP_OUT (difficulty);	726	MAP_OUT (difficulty);
875
876	if (default_region) MAP_OUT2 (region, default_region->name);	727	if (default_region) MAP_OUT2 (region, default_region->name);
877		728
878	if (shopitems)	729	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
879	{
880	char shop[MAX_BUF];
881	print_shop_string (this, shop);
882	MAP_OUT2 (shopitems, shop);
883	}
884
885	MAP_OUT (shopgreed);	730	MAP_OUT (shopgreed);
886	MAP_OUT (shopmin);	731	MAP_OUT (shopmin);
887	MAP_OUT (shopmax);	732	MAP_OUT (shopmax);
888	if (shoprace) MAP_OUT (shoprace);	733	if (shoprace) MAP_OUT (shoprace);
		734
889	MAP_OUT (darkness);	735	MAP_OUT (darkness);
890	MAP_OUT (width);	736	MAP_OUT (width);
891	MAP_OUT (height);	737	MAP_OUT (height);
892	MAP_OUT (enter_x);	738	MAP_OUT (enter_x);
893	MAP_OUT (enter_y);	739	MAP_OUT (enter_y);
…		…
932	* Remove and free all objects in the given map.	778	* Remove and free all objects in the given map.
933	*/	779	*/
934	void	780	void
935	maptile::clear ()	781	maptile::clear ()
936	{	782	{
937	sfree (regions, size ()), regions = 0;
938	free (regionmap), regionmap = 0;
939
940	if (spaces)	783	if (spaces)
941	{	784	{
942	for (mapspace *ms = spaces + size (); ms-- > spaces; )	785	for (mapspace *ms = spaces + size (); ms-- > spaces; )
943	while (object *op = ms->bot)	786	while (object *op = ms->bot)
944	{	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_ ();
945	if (op->head)	795	if (op == head)
946	op = op->head;
947
948	op->destroy_inv (false);
949	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	}
950	}	802	}
951		803
952	sfree (spaces, size ()), spaces = 0;	804	sfree0 (spaces, size ());
953	}	805	}
954		806
955	if (buttons)	807	if (buttons)
956	free_objectlinkpt (buttons), buttons = 0;	808	free_objectlinkpt (buttons), buttons = 0;
		809
		810	sfree0 (regions, size ());
		811	delete [] regionmap; regionmap = 0;
957	}	812	}
958		813
959	void	814	void
960	maptile::clear_header ()	815	maptile::clear_header ()
961	{	816	{
…		…
993	attachable::do_destroy ();	848	attachable::do_destroy ();
994		849
995	clear ();	850	clear ();
996	}	851	}
997		852
998	/*	853	/* decay and destroy perishable items in a map */
999	* Updates every button on the map (by calling update_button() for them).
1000	*/
1001	void	854	void
1002	maptile::update_buttons ()	855	maptile::do_decay_objects ()
1003	{	856	{
1004	for (oblinkpt *obp = buttons; obp; obp = obp->next)	857	if (!spaces)
1005	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)
1006	{	862	{
1007	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 ())
1008	{	879	{
1009	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",	880	op->stats.dam--;
1010	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)
1011	continue;	882	destroy = 1;
1012	}	883	}
1013		884	else if (op->is_armor ())
1014	if (ol->ob->type == BUTTON \|\| ol->ob->type == PEDESTAL)
1015	{	885	{
1016	update_button (ol->ob);	886	op->stats.ac--;
1017	break;	887	if (op->stats.ac < 0)
		888	destroy = 1;
1018	}	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 ();
1019	}	917	}
1020	}	918	}
1021		919
1022	/*	920	/*
1023	* 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.
1024	* difficulty does not have a lot to do with character level,	922	* difficulty does not have a lot to do with character level,
1025	* 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.
1026	*	924	*
1027	* 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
1028	* 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
1029	* have a difficulty set than using this function - human calculation	927	* have a difficulty set rather than using this function - human calculation
1030	* is much better than this functions guesswork.	928	* is much better than this function's guesswork.
1031	*/	929	*/
1032	int	930	int
1033	maptile::estimate_difficulty () const	931	maptile::estimate_difficulty () const
1034	{	932	{
1035	long monster_cnt = 0;	933	long monster_cnt = 0;
…		…
1047		945
1048	if (QUERY_FLAG (op, FLAG_GENERATOR))	946	if (QUERY_FLAG (op, FLAG_GENERATOR))
1049	{	947	{
1050	total_exp += op->stats.exp;	948	total_exp += op->stats.exp;
1051		949
1052	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))	950	if (archetype *at = op->other_arch)
		951	{
1053	total_exp += at->clone.stats.exp * 8;	952	total_exp += at->stats.exp * 8;
1054
1055	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	}
1056	}	961	}
1057	}	962	}
1058		963
1059	avgexp = (double) total_exp / monster_cnt;	964	avgexp = (double) total_exp / monster_cnt;
1060		965
…		…
1073	* postive values make it darker, negative make it brighter	978	* postive values make it darker, negative make it brighter
1074	*/	979	*/
1075	int	980	int
1076	maptile::change_map_light (int change)	981	maptile::change_map_light (int change)
1077	{	982	{
1078	int new_level = darkness + change;
1079
1080	/* Nothing to do */	983	/* Nothing to do */
1081	if (!change \|\| (new_level <= 0 && darkness == 0) \|\| (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))	984	if (!change)
1082	return 0;	985	return 0;
1083		986
1084	/* inform all players on the map */	987	/* inform all players on the map */
1085	if (change > 0)	988	if (change > 0)
1086	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");	989	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");
1087	else	990	else
1088	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");	991	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");
1089		992
1090	/* Do extra checking. since darkness is a unsigned value,	993	darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1091	* we need to be extra careful about negative values.
1092	* In general, the checks below are only needed if change
1093	* is not +/-1
1094	*/
1095	if (new_level < 0)
1096	darkness = 0;
1097	else if (new_level >= MAX_DARKNESS)
1098	darkness = MAX_DARKNESS;
1099	else
1100	darkness = new_level;
1101		994
1102	/* All clients need to get re-updated for the change */	995	/* All clients need to get re-updated for the change */
1103	update_all_map_los (this);	996	update_all_map_los (this);
		997
1104	return 1;	998	return 1;
1105	}	999	}
1106		1000
1107	/*	1001	/*
1108	* This function updates various attributes about a specific space	1002	* This function updates various attributes about a specific space
…		…
1111	* through, etc)	1005	* through, etc)
1112	*/	1006	*/
1113	void	1007	void
1114	mapspace::update_ ()	1008	mapspace::update_ ()
1115	{	1009	{
1116	object tmp, last = 0;	1010	object *last = 0;
1117	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;	1011	uint8 flags = P_UPTODATE, anywhere = 0;
1118	facetile top, floor, *middle;	1012	sint8 light = 0;
1119	object top_obj, floor_obj, *middle_obj;
1120	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;
1121		1014
1122	middle = blank_face;	1015	//object *middle = 0;
1123	top = blank_face;	1016	//object *top = 0;
1124	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;
1125		1022
1126	middle_obj = 0;
1127	top_obj = 0;
1128	floor_obj = 0;
1129
1130	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)	1023	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1131	{	1024	{
1132	/* This could be made additive I guess (two lights better than	1025	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1133	* one). But if so, it shouldn't be a simple additive - 2
1134	* light bulbs do not illuminate twice as far as once since
1135	* it is a dissapation factor that is cubed.
1136	*/
1137	if (tmp->glow_radius > light)
1138	light = tmp->glow_radius;	1026	light += tmp->glow_radius;
1139		1027
1140	/* This call is needed in order to update objects the player	1028	/* This call is needed in order to update objects the player
1141	* is standing in that have animations (ie, grass, fire, etc).	1029	* is standing in that have animations (ie, grass, fire, etc).
1142	* However, it also causes the look window to be re-drawn	1030	* However, it also causes the look window to be re-drawn
1143	* 3 times each time the player moves, because many of the	1031	* 3 times each time the player moves, because many of the
…		…
1146	* Always put the player down for drawing.	1034	* Always put the player down for drawing.
1147	*/	1035	*/
1148	if (!tmp->invisible)	1036	if (!tmp->invisible)
1149	{	1037	{
1150	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1038	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))
1151	{
1152	top = tmp->face;
1153	top_obj = tmp;	1039	top = tmp;
1154	}
1155	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1040	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1156	{	1041	{
1157	/* 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,
1158	* so should not be visible, so we clear them.	1043	* so should not be visible, so we clear them.
1159	*/	1044	*/
1160	middle = blank_face;	1045	middle = 0;
1161	top = blank_face;	1046	top = 0;
1162	floor = tmp->face;
1163	floor_obj = tmp;	1047	floor = tmp;
1164	}	1048	}
1165	/* Flag anywhere have high priority */	1049	/* Flag anywhere have high priority */
1166	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))	1050	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1167	{	1051	{
1168	middle = tmp->face;
1169
1170	middle_obj = tmp;	1052	middle = tmp;
1171	anywhere = 1;	1053	anywhere = 1;
1172	}	1054	}
		1055
1173	/* Find the highest visible face around. If equal	1056	/* Find the highest visible face around. If equal
1174	* visibilities, we still want the one nearer to the	1057	* visibilities, we still want the one nearer to the
1175	* top	1058	* top
1176	*/	1059	*/
1177	else if (middle == blank_face \|\| (tmp->face->visibility > middle->visibility && !anywhere))	1060	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1178	{
1179	middle = tmp->face;
1180	middle_obj = tmp;	1061	middle = tmp;
1181	}
1182	}	1062	}
1183		1063
1184	if (tmp == tmp->above)	1064	if (tmp == tmp->above)
1185	{	1065	{
1186	LOG (llevError, "Error in structure of map\n");	1066	LOG (llevError, "Error in structure of map\n");
…		…
1199	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1079	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1200	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;	1080	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1201	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;	1081	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1202	}	1082	}
1203		1083
1204	this->light = light;	1084	this->light = min (light, MAX_LIGHT_RADIUS);
1205	this->flags_ = flags;	1085	this->flags_ = flags;
1206	this->move_block = move_block & ~move_allow;	1086	this->move_block = move_block & ~move_allow;
1207	this->move_on = move_on;	1087	this->move_on = move_on;
1208	this->move_off = move_off;	1088	this->move_off = move_off;
1209	this->move_slow = move_slow;	1089	this->move_slow = move_slow;
…		…
1221	* middle face. This should not happen, as we already have the	1101	* middle face. This should not happen, as we already have the
1222	* else statement above so middle should not get set. OTOH, it	1102	* else statement above so middle should not get set. OTOH, it
1223	* 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.
1224	*/	1104	*/
1225	if (top == middle)	1105	if (top == middle)
1226	middle = blank_face;	1106	middle = 0;
1227		1107
1228	/* There are three posibilities at this point:	1108	/* There are three posibilities at this point:
1229	* 1) top face is set, need middle to be set.	1109	* 1) top face is set, need middle to be set.
1230	* 2) middle is set, need to set top.	1110	* 2) middle is set, need to set top.
1231	* 3) neither middle or top is set - need to set both.	1111	* 3) neither middle or top is set - need to set both.
1232	*/	1112	*/
1233		1113
1234	for (tmp = last; tmp; tmp = tmp->below)	1114	for (object *tmp = last; tmp; tmp = tmp->below)
1235	{	1115	{
1236	/* 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 */
1237	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1117	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1238	break;	1118	break;
1239		1119
1240	/* If two top faces are already set, quit processing */	1120	/* If two top faces are already set, quit processing */
1241	if ((top != blank_face) && (middle != blank_face))	1121	if (top && middle)
1242	break;	1122	break;
1243		1123
1244	/* Only show visible faces */	1124	/* Only show visible faces */
1245	if (!tmp->invisible)	1125	if (!tmp->invisible)
1246	{	1126	{
1247	/* Fill in top if needed */	1127	/* Fill in top if needed */
1248	if (top == blank_face)	1128	if (!top)
1249	{	1129	{
1250	top = tmp->face;
1251	top_obj = tmp;	1130	top = tmp;
1252	if (top == middle)	1131	if (top == middle)
1253	middle = blank_face;	1132	middle = 0;
1254	}	1133	}
1255	else	1134	else
1256	{	1135	{
1257	/* top is already set - we should only get here if	1136	/* top is already set - we should only get here if
1258	* middle is not set	1137	* middle is not set
1259	*	1138	*
1260	* Set the middle face and break out, since there is nothing	1139	* Set the middle face and break out, since there is nothing
1261	* more to fill in. We don't check visiblity here, since	1140	* more to fill in. We don't check visiblity here, since
1262	*	1141	*
1263	*/	1142	*/
1264	if (tmp->face != top)	1143	if (tmp != top)
1265	{	1144	{
1266	middle = tmp->face;
1267	middle_obj = tmp;	1145	middle = tmp;
1268	break;	1146	break;
1269	}	1147	}
1270	}	1148	}
1271	}	1149	}
1272	}	1150	}
1273		1151
1274	if (middle == floor)	1152	if (middle == floor)
1275	middle = blank_face;	1153	middle = 0;
1276		1154
1277	if (top == middle)	1155	if (top == middle)
1278	middle = blank_face;	1156	middle = 0;
1279		1157
1280	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;	1158	#if 0
1281	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;	1159	faces_obj [0] = top;
1282	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;	1160	faces_obj [1] = middle;
		1161	faces_obj [2] = floor;
		1162	#endif
1283	}	1163	}
1284		1164
1285	/* this updates the orig_map->tile_map[tile_num] value after finding	1165	uint64
1286	* the map. It also takes care of linking back the freshly found	1166	mapspace::volume () const
1287	* maps tile_map values if it tiles back to this one. It returns
1288	* the value of orig_map->tile_map[tile_num].
1289	*/
1290	static inline maptile *
1291	find_and_link (maptile *orig_map, int tile_num)
1292	{	1167	{
1293	maptile *mp = orig_map->tile_map [tile_num];	1168	uint64 vol = 0;
1294		1169
1295	if (!mp)	1170	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1296	{	1171	vol += op->volume ();
1297	mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1298		1172
1299	if (!mp)	1173	return vol;
1300	{	1174	}
1301	// emergency mode, manufacture a dummy map, this creates a memleak, but thats fine	1175
1302	LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",	1176	maptile *
1303	&orig_map->tile_path[tile_num], &orig_map->path);	1177	maptile::tile_available (int dir, bool load)
1304	mp = new maptile (1, 1);	1178	{
1305	mp->alloc ();	1179	if (tile_path[dir])
1306	mp->in_memory = MAP_IN_MEMORY;
1307	}
1308	}	1180	{
		1181	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))
		1182	return tile_map[dir];
1309		1183
1310	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	}
1311		1187
1312	orig_map->tile_map [tile_num] = mp;
1313
1314	// optimisation: back-link map to origin map if euclidean
1315	//TODO: non-euclidean maps MUST GO
1316	if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1317	orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1318
1319	return mp;	1188	return 0;
1320	}
1321
1322	static inline void
1323	load_and_link (maptile *orig_map, int tile_num)
1324	{
1325	find_and_link (orig_map, tile_num)->load_sync ();
1326	}	1189	}
1327		1190
1328	/* this returns TRUE if the coordinates (x,y) are out of	1191	/* this returns TRUE if the coordinates (x,y) are out of
1329	* map m. This function also takes into account any	1192	* map m. This function also takes into account any
1330	* tiling considerations, loading adjacant maps as needed.	1193	* tiling considerations, loading adjacant maps as needed.
…		…
1343	if (!m)	1206	if (!m)
1344	return 0;	1207	return 0;
1345		1208
1346	if (x < 0)	1209	if (x < 0)
1347	{	1210	{
1348	if (!m->tile_path[3])	1211	if (!m->tile_available (3))
1349	return 1;	1212	return 1;
1350		1213
1351	if (!m->tile_map[3] \|\| m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1352	find_and_link (m, 3);
1353
1354	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);
1355	}	1215	}
1356		1216
1357	if (x >= m->width)	1217	if (x >= m->width)
1358	{	1218	{
1359	if (!m->tile_path[1])	1219	if (!m->tile_available (1))
1360	return 1;	1220	return 1;
1361		1221
1362	if (!m->tile_map[1] \|\| m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1363	find_and_link (m, 1);
1364
1365	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);
1366	}	1223	}
1367		1224
1368	if (y < 0)	1225	if (y < 0)
1369	{	1226	{
1370	if (!m->tile_path[0])	1227	if (!m->tile_available (0))
1371	return 1;	1228	return 1;
1372		1229
1373	if (!m->tile_map[0] \|\| m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1374	find_and_link (m, 0);
1375
1376	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);
1377	}	1231	}
1378		1232
1379	if (y >= m->height)	1233	if (y >= m->height)
1380	{	1234	{
1381	if (!m->tile_path[2])	1235	if (!m->tile_available (2))
1382	return 1;	1236	return 1;
1383
1384	if (!m->tile_map[2] \|\| m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1385	find_and_link (m, 2);
1386		1237
1387	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);
1388	}	1239	}
1389		1240
1390	/* Simple case - coordinates are within this local	1241	/* Simple case - coordinates are within this local
…		…
1404	maptile *	1255	maptile *
1405	maptile::xy_find (sint16 &x, sint16 &y)	1256	maptile::xy_find (sint16 &x, sint16 &y)
1406	{	1257	{
1407	if (x < 0)	1258	if (x < 0)
1408	{	1259	{
1409	if (!tile_path[3])	1260	if (!tile_available (3))
1410	return 0;	1261	return 0;
1411		1262
1412	find_and_link (this, 3);
1413	x += tile_map[3]->width;	1263	x += tile_map[3]->width;
1414	return tile_map[3]->xy_find (x, y);	1264	return tile_map[3]->xy_find (x, y);
1415	}	1265	}
1416		1266
1417	if (x >= width)	1267	if (x >= width)
1418	{	1268	{
1419	if (!tile_path[1])	1269	if (!tile_available (1))
1420	return 0;	1270	return 0;
1421		1271
1422	find_and_link (this, 1);
1423	x -= width;	1272	x -= width;
1424	return tile_map[1]->xy_find (x, y);	1273	return tile_map[1]->xy_find (x, y);
1425	}	1274	}
1426		1275
1427	if (y < 0)	1276	if (y < 0)
1428	{	1277	{
1429	if (!tile_path[0])	1278	if (!tile_available (0))
1430	return 0;	1279	return 0;
1431		1280
1432	find_and_link (this, 0);
1433	y += tile_map[0]->height;	1281	y += tile_map[0]->height;
1434	return tile_map[0]->xy_find (x, y);	1282	return tile_map[0]->xy_find (x, y);
1435	}	1283	}
1436		1284
1437	if (y >= height)	1285	if (y >= height)
1438	{	1286	{
1439	if (!tile_path[2])	1287	if (!tile_available (2))
1440	return 0;	1288	return 0;
1441		1289
1442	find_and_link (this, 2);
1443	y -= height;	1290	y -= height;
1444	return tile_map[2]->xy_find (x, y);	1291	return tile_map[2]->xy_find (x, y);
1445	}	1292	}
1446		1293
1447	/* Simple case - coordinates are within this local	1294	/* Simple case - coordinates are within this local
…		…
1452		1299
1453	/**	1300	/**
1454	* Return whether map2 is adjacent to map1. If so, store the distance from	1301	* Return whether map2 is adjacent to map1. If so, store the distance from
1455	* map1 to map2 in dx/dy.	1302	* map1 to map2 in dx/dy.
1456	*/	1303	*/
1457	static int	1304	int
1458	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)
1459	{	1306	{
1460	if (!map1 \|\| !map2)	1307	if (!map1 \|\| !map2)
1461	return 0;	1308	return 0;
1462		1309
1463	//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
1464	//fix: compare paths instead (this is likely faster, too!)	1311	//fix: compare paths instead (this is likely faster, too!)
1465	if (map1 == map2)	1312	if (map1 == map2)
1466	{	1313	{
1467	*dx = 0;	1314	*dx = 0;
1468	*dy = 0;	1315	*dy = 0;
…		…
1574	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1421	get_rangevector (object op1, object op2, rv_vector * retval, int flags)
1575	{	1422	{
1576	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1423	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1577	{	1424	{
1578	/* be conservative and fill in _some_ data */	1425	/* be conservative and fill in _some_ data */
1579	retval->distance = 100000;	1426	retval->distance = 10000;
1580	retval->distance_x = 32767;	1427	retval->distance_x = 10000;
1581	retval->distance_y = 32767;	1428	retval->distance_y = 10000;
1582	retval->direction = 0;	1429	retval->direction = 0;
1583	retval->part = 0;	1430	retval->part = 0;
1584	}	1431	}
1585	else	1432	else
1586	{	1433	{
…		…
1591		1438
1592	best = op1;	1439	best = op1;
1593	/* If this is multipart, find the closest part now */	1440	/* If this is multipart, find the closest part now */
1594	if (!(flags & 0x1) && op1->more)	1441	if (!(flags & 0x1) && op1->more)
1595	{	1442	{
1596	object *tmp;
1597	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1443	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1598		1444
1599	/* we just take the offset of the piece to head to figure	1445	/* we just take the offset of the piece to head to figure
1600	* distance instead of doing all that work above again	1446	* distance instead of doing all that work above again
1601	* since the distance fields we set above are positive in the	1447	* since the distance fields we set above are positive in the
1602	* same axis as is used for multipart objects, the simply arithmetic	1448	* same axis as is used for multipart objects, the simply arithmetic
1603	* below works.	1449	* below works.
1604	*/	1450	*/
1605	for (tmp = op1->more; tmp != NULL; tmp = tmp->more)	1451	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1606	{	1452	{
1607	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1453	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1608	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1454	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1609	if (tmpi < best_distance)	1455	if (tmpi < best_distance)
1610	{	1456	{
…		…
1619	retval->distance_y += op1->y - best->y;	1465	retval->distance_y += op1->y - best->y;
1620	}	1466	}
1621	}	1467	}
1622		1468
1623	retval->part = best;	1469	retval->part = best;
1624	retval->distance = idistance (retval->distance_x, retval->distance_y);	1470	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1625	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1471	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1626	}	1472	}
1627	}	1473	}
1628		1474
1629	/* this is basically the same as get_rangevector above, but instead of	1475	/* this is basically the same as get_rangevector above, but instead of
…		…
1634	* flags has no meaning for this function at this time - I kept it in to	1480	* flags has no meaning for this function at this time - I kept it in to
1635	* be more consistant with the above function and also in case they are needed	1481	* be more consistant with the above function and also in case they are needed
1636	* for something in the future. Also, since no object is pasted, the best	1482	* for something in the future. Also, since no object is pasted, the best
1637	* field of the rv_vector is set to NULL.	1483	* field of the rv_vector is set to NULL.
1638	*/	1484	*/
1639
1640	void	1485	void
1641	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector * retval, int flags)	1486	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1642	{	1487	{
1643	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1488	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1644	{	1489	{
1645	/* be conservative and fill in _some_ data */	1490	/* be conservative and fill in _some_ data */
1646	retval->distance = 100000;	1491	retval->distance = 100000;
…		…
1652	else	1497	else
1653	{	1498	{
1654	retval->distance_x += op2->x - x;	1499	retval->distance_x += op2->x - x;
1655	retval->distance_y += op2->y - y;	1500	retval->distance_y += op2->y - y;
1656		1501
1657	retval->part = NULL;	1502	retval->part = 0;
1658	retval->distance = idistance (retval->distance_x, retval->distance_y);	1503	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1659	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1504	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1660	}	1505	}
1661	}	1506	}
1662		1507
1663	/* 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
…		…
1677	}	1522	}
1678		1523
1679	object *	1524	object *
1680	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)
1681	{	1526	{
1682	if (!op->flag [FLAG_REMOVED])
1683	op->remove ();
1684
1685	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);
1686	}	1528	}
1687		1529
1688	region *	1530	region *
1689	maptile::region (int x, int y) const	1531	maptile::region (int x, int y) const
…		…
1698	return default_region;	1540	return default_region;
1699		1541
1700	return ::region::default_region ();	1542	return ::region::default_region ();
1701	}	1543	}
1702		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;
		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.81 by root, Sat Jan 27 23:59:29 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.81 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.165 by root, Tue Oct 20 05:57:08 2009 UTC