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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.157 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.189 by root, Sun Apr 18 05:54:18 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <unistd.h>	25	#include <unistd.h>
25		26
26	#include "global.h"	27	#include "global.h"
27	#include "loader.h"
28	#include "path.h"	28	#include "path.h"
		29
		30	//+GPL
29		31
30	sint8 maptile::outdoor_darkness;	32	sint8 maptile::outdoor_darkness;
31		33
32	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	34	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
33	* one function that just returns a P_.. value (see map.h)	35	* one function that just returns a P_.. value (see map.h)
70	* by the caller.	72	* by the caller.
71	*/	73	*/
72	int	74	int
73	blocked_link (object ob, maptile m, int sx, int sy)	75	blocked_link (object ob, maptile m, int sx, int sy)
74	{	76	{
75	object *tmp;
76	int mflags, blocked;
77
78	/* Make sure the coordinates are valid - they should be, as caller should	77	/* Make sure the coordinates are valid - they should be, as caller should
79	* have already checked this.	78	* have already checked this.
80	*/	79	*/
81	if (OUT_OF_REAL_MAP (m, sx, sy))	80	if (OUT_OF_REAL_MAP (m, sx, sy))
82	{	81	{
83	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	82	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
84	return 1;	83	return 1;
85	}	84	}
86		85
87	/* Save some cycles - instead of calling get_map_flags(), just get the value	86	mapspace &ms = m->at (sx, sy);
88	* directly.
89	*/
90	mflags = m->at (sx, sy).flags ();
91		87
92	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	88	int mflags = ms.flags ();
		89	int blocked = ms.move_block;
93		90
94	/* If space is currently not blocked by anything, no need to	91	/* If space is currently not blocked by anything, no need to
95	* go further. Not true for players - all sorts of special	92	* go further. Not true for players - all sorts of special
96	* things we need to do for players.	93	* things we need to do for players.
97	*/	94	*/
98	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	95	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
99	return 0;	96	return 0;
100		97
101	/* if there isn't anytyhing alive on this space, and this space isn't	98	/* if there isn't anything alive on this space, and this space isn't
102	* otherwise blocked, we can return now. Only if there is a living	99	* otherwise blocked, we can return now. Only if there is a living
103	* creature do we need to investigate if it is part of this creature	100	* creature do we need to investigate if it is part of this creature
104	* or another. Likewise, only if something is blocking us do we	101	* or another. Likewise, only if something is blocking us do we
105	* need to investigate if there is a special circumstance that would	102	* need to investigate if there is a special circumstance that would
106	* let the player through (inventory checkers for example)	103	* let the player through (inventory checkers for example)
…		…
113	/* We basically go through the stack of objects, and if there is	110	/* We basically go through the stack of objects, and if there is
114	* some other object that has NO_PASS or FLAG_ALIVE set, return	111	* some other object that has NO_PASS or FLAG_ALIVE set, return
115	* true. If we get through the entire stack, that must mean	112	* true. If we get through the entire stack, that must mean
116	* ob is blocking it, so return 0.	113	* ob is blocking it, so return 0.
117	*/	114	*/
118	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	115	for (object *tmp = ms.top; tmp; tmp = tmp->below)
119	{	116	{
120		117	if (OB_MOVE_BLOCK (ob, tmp))
121	/* This must be before the checks below. Code for inventory checkers. */
122	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
123	{	118	{
124	/* If last_sp is set, the player/monster needs an object,	119	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125	* so we check for it. If they don't have it, they can't	120	if (RESULT_INT (0))
126	* pass through this space.	121	return 1;
127	*/	122	else
128	if (tmp->last_sp)	123	continue;
		124
		125	if (tmp->type == CHECK_INV)
129	{	126	{
130	if (check_inv_recursive (ob, tmp) == NULL)	127	bool have = check_inv_recursive (ob, tmp);
		128
		129	// last_sp set means we block if we don't have.
		130	if (logical_xor (have, tmp->last_sp))
131	return 1;	131	return 1;
132	else	132	}
133	continue;	133	else if (tmp->type == T_MATCH)
		134	{
		135	// T_MATCH allows "entrance" iff the match is true
		136	// == blocks if the match fails
		137
		138	// we could have used an INVOKE_OBJECT, but decided against it, as we
		139	// assume that T_MATCH is relatively common.
		140	if (!match (tmp->slaying, ob, tmp, ob))
		141	return 1;
134	}	142	}
135	else	143	else
136	{	144	return 1; // unconditional block
137	/* In this case, the player must not have the object -	145
138	* if they do, they can't pass through.
139	*/
140	if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
141	return 1;
142	else
143	continue;
144	}
145	} /* if check_inv */
146	else	146	} else {
147	{	147	// space does not block the ob, directly, but
148	/* Broke apart a big nasty if into several here to make	148	// anything alive that is not a door still
149	* this more readable. first check - if the space blocks	149	// blocks anything
150	* movement, can't move here.
151	* second - if a monster, can't move there, unless it is a
152	* hidden dm
153	*/
154	if (OB_MOVE_BLOCK (ob, tmp))
155	return 1;
156		150
157	if (tmp->flag [FLAG_ALIVE]	151	if (tmp->flag [FLAG_ALIVE]
158	&& tmp->head_ () != ob
159	&& tmp != ob
160	&& tmp->type != DOOR	152	&& tmp->type != DOOR
161	&& !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))	153	&& tmp->head_ () != ob) //TODO: maybe move these check up?
162	return 1;	154	return 1;
163	}	155	}
164
165	}	156	}
		157
166	return 0;	158	return 0;
167	}	159	}
168		160
169	/*	161	/*
170	* Returns qthe blocking object if the given object can't fit in the given	162	* Returns the blocking object if the given object can't fit in the given
171	* spot. This is meant for multi space objects - for single space objecs,	163	* spot. This is meant for multi space objects - for single space objecs,
172	* just calling get_map_blocked and checking that against movement type	164	* just calling get_map_blocked and checking that against movement type
173	* of object. This function goes through all the parts of the multipart	165	* of object. This function goes through all the parts of the multipart
174	* object and makes sure they can be inserted.	166	* object and makes sure they can be inserted.
175	*	167	*
…		…
222	}	214	}
223		215
224	return 0;	216	return 0;
225	}	217	}
226		218
227	/* When the map is loaded, load_object does not actually insert objects	219	//-GPL
228	* into inventory, but just links them. What this does is go through
229	* and insert them properly.
230	* The object 'container' is the object that contains the inventory.
231	* This is needed so that we can update the containers weight.
232	*/
233	void
234	fix_container (object *container)
235	{
236	object tmp = container->inv, next;
237
238	container->inv = 0;
239	while (tmp)
240	{
241	next = tmp->below;
242	if (tmp->inv)
243	fix_container (tmp);
244
245	insert_ob_in_ob (tmp, container);
246	tmp = next;
247	}
248
249	// go through and calculate what all the containers are carrying.
250	//TODO: remove
251	container->update_weight ();
252	}
253		220
254	void	221	void
255	maptile::set_object_flag (int flag, int value)	222	maptile::set_object_flag (int flag, int value)
256	{	223	{
257	if (!spaces)	224	if (!spaces)
…		…
272		239
273	for (mapspace *ms = spaces + size (); ms-- > spaces; )	240	for (mapspace *ms = spaces + size (); ms-- > spaces; )
274	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	241	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
275	INVOKE_OBJECT (RESET, tmp);	242	INVOKE_OBJECT (RESET, tmp);
276	}	243	}
		244
		245	void
		246	maptile::post_load ()
		247	{
		248	#if 0
		249	if (!spaces)
		250	return;
		251
		252	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		253	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		254	; // nop
		255	#endif
		256	}
		257
		258	//+GPL
277		259
278	/* link_multipart_objects go through all the objects on the map looking	260	/* link_multipart_objects go through all the objects on the map looking
279	* for objects whose arch says they are multipart yet according to the	261	* for objects whose arch says they are multipart yet according to the
280	* info we have, they only have the head (as would be expected when	262	* info we have, they only have the head (as would be expected when
281	* they are saved).	263	* they are saved).
…		…
309	op = op->above;	291	op = op->above;
310	}	292	}
311	}	293	}
312	}	294	}
313		295
		296	//-GPL
		297
314	/*	298	/*
315	* Loads (ands parses) the objects into a given map from the specified	299	* Loads (ands parses) the objects into a given map from the specified
316	* file pointer.	300	* file pointer.
317	*/	301	*/
318	bool	302	bool
…		…
334	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))	318	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
335	{	319	{
336	// we insert manually because	320	// we insert manually because
337	// a) its way faster	321	// a) its way faster
338	// b) we remove manually, too, and there are good reasons for that	322	// b) we remove manually, too, and there are good reasons for that
339	// c) its correct	323	// c) it's correct
340	mapspace &ms = at (op->x, op->y);	324	mapspace &ms = at (op->x, op->y);
341		325
342	op->flag [FLAG_REMOVED] = false;	326	op->flag [FLAG_REMOVED] = false;
343		327
344	op->above = 0;	328	op->above = 0;
345	op->below = ms.top;	329	op->below = ms.top;
346		330
347	if (ms.top)
348	ms.top->above = op;	331	*(ms.top ? &ms.top->above : &ms.bot) = op;
349	else
350	ms.bot = op;
351		332
352	ms.top = op;	333	ms.top = op;
353	ms.flags_ = 0;	334	ms.flags_ = 0;
354	}	335	}
355	else	336	else
…		…
440	return false;	421	return false;
441		422
442	return freezer.save (path);	423	return freezer.save (path);
443	}	424	}
444		425
445	maptile::maptile ()	426	void
		427	maptile::init ()
446	{	428	{
447	in_memory = MAP_SWAPPED;	429	in_memory = MAP_SWAPPED;
448		430
449	/* The maps used to pick up default x and y values from the	431	/* The maps used to pick up default x and y values from the
450	* map archetype. Mimic that behaviour.	432	* map archetype. Mimic that behaviour.
451	*/	433	*/
452	width = 16;	434	width = 16;
453	height = 16;	435	height = 16;
454	timeout = 300;	436	timeout = 300;
455	max_nrof = 1000; // 1000 items of anything	437	max_items = MAX_ITEM_PER_ACTION;
456	max_volume = 2000000; // 2m³	438	max_volume = 2000000; // 2m³
457	}
458
459	maptile::maptile (int w, int h)
460	{
461	in_memory = MAP_SWAPPED;
462
463	width = w;
464	height = h;
465	reset_timeout = 0;	439	reset_timeout = 0;
466	timeout = 300;
467	enter_x = 0;	440	enter_x = 0;
468	enter_y = 0;	441	enter_y = 0;
		442	}
		443
		444	maptile::maptile ()
		445	{
		446	init ();
		447	}
		448
		449	maptile::maptile (int w, int h)
		450	{
		451	init ();
		452
		453	width = w;
		454	height = h;
469		455
470	alloc ();	456	alloc ();
471	}	457	}
472		458
473	/*	459	/*
…		…
481	if (spaces)	467	if (spaces)
482	return;	468	return;
483		469
484	spaces = salloc0<mapspace> (size ());	470	spaces = salloc0<mapspace> (size ());
485	}	471	}
		472
		473	//+GPL
486		474
487	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	475	/* Takes a string from a map definition and outputs a pointer to the array of shopitems
488	* corresponding to that string. Memory is allocated for this, it must be freed	476	* corresponding to that string. Memory is allocated for this, it must be freed
489	* at a later date.	477	* at a later date.
490	* Called by parse_map_headers below.	478	* Called by parse_map_headers below.
…		…
567	return items;	555	return items;
568	}	556	}
569		557
570	/* opposite of parse string, this puts the string that was originally fed in to	558	/* opposite of parse string, this puts the string that was originally fed in to
571	* the map (or something equivilent) into output_string. */	559	* the map (or something equivilent) into output_string. */
572	static void	560	static const char *
573	print_shop_string (maptile m, char output_string)	561	print_shop_string (maptile *m)
574	{	562	{
575	int i;	563	static dynbuf_text buf; buf.clear ();
576	char tmp[MAX_BUF];
577		564
578	strcpy (output_string, "");
579	for (i = 0; i < m->shopitems[0].index; i++)	565	for (int i = 0; i < m->shopitems[0].index; i++)
580	{	566	{
581	if (m->shopitems[i].typenum)	567	if (m->shopitems[i].typenum)
582	{	568	{
583	if (m->shopitems[i].strength)	569	if (m->shopitems[i].strength)
584	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	570	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
585	else	571	else
586	sprintf (tmp, "%s;", m->shopitems[i].name);	572	buf.printf ("%s;", m->shopitems[i].name);
587	}	573	}
588	else	574	else
589	{	575	{
590	if (m->shopitems[i].strength)	576	if (m->shopitems[i].strength)
591	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	577	buf.printf ("*:%d;", m->shopitems[i].strength);
592	else	578	else
593	sprintf (tmp, "*");	579	buf.printf ("*");
594	}	580	}
595
596	strcat (output_string, tmp);
597	}	581	}
		582
		583	return buf;
598	}	584	}
		585
		586	//-GPL
599		587
600	/* This loads the header information of the map. The header	588	/* This loads the header information of the map. The header
601	* contains things like difficulty, size, timeout, etc.	589	* contains things like difficulty, size, timeout, etc.
602	* this used to be stored in the map object, but with the	590	* this used to be stored in the map object, but with the
603	* addition of tiling, fields beyond that easily named in an	591	* addition of tiling, fields beyond that easily named in an
…		…
644	case KW_shopgreed: thawer.get (shopgreed); break;	632	case KW_shopgreed: thawer.get (shopgreed); break;
645	case KW_shopmin: thawer.get (shopmin); break;	633	case KW_shopmin: thawer.get (shopmin); break;
646	case KW_shopmax: thawer.get (shopmax); break;	634	case KW_shopmax: thawer.get (shopmax); break;
647	case KW_shoprace: thawer.get (shoprace); break;	635	case KW_shoprace: thawer.get (shoprace); break;
648	case KW_outdoor: thawer.get (outdoor); break;	636	case KW_outdoor: thawer.get (outdoor); break;
649	case KW_temp: thawer.get (temp); break;
650	case KW_pressure: thawer.get (pressure); break;
651	case KW_humid: thawer.get (humid); break;
652	case KW_windspeed: thawer.get (windspeed); break;
653	case KW_winddir: thawer.get (winddir); break;
654	case KW_sky: thawer.get (sky); break;
655		637
656	case KW_per_player: thawer.get (per_player); break;	638	case KW_per_player: thawer.get (per_player); break;
657	case KW_per_party: thawer.get (per_party); break;	639	case KW_per_party: thawer.get (per_party); break;
658	case KW_no_reset: thawer.get (no_reset); break;	640	case KW_no_reset: thawer.get (no_reset); break;
659	case KW_no_drop: thawer.get (no_drop); break;	641	case KW_no_drop: thawer.get (no_drop); break;
…		…
684	case KW_end:	666	case KW_end:
685	thawer.next ();	667	thawer.next ();
686	return true;	668	return true;
687		669
688	default:	670	default:
689	if (!thawer.parse_error ("map", 0))	671	if (!thawer.parse_error ("map"))
690	return false;	672	return false;
691	break;	673	break;
692	}	674	}
693		675
694	thawer.next ();	676	thawer.next ();
695	}	677	}
696		678
697	abort ();	679	abort ();
698	}	680	}
		681
		682	//+GPL
699		683
700	/******************************************************************************	684	/******************************************************************************
701	* This is the start of unique map handling code	685	* This is the start of unique map handling code
702	*****************************************************************************/	686	*****************************************************************************/
703		687
…		…
710	int unique = 0;	694	int unique = 0;
711	for (object *op = spaces [i].bot; op; )	695	for (object *op = spaces [i].bot; op; )
712	{	696	{
713	object *above = op->above;	697	object *above = op->above;
714		698
715	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	699	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
716	unique = 1;	700	unique = 1;
717		701
718	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	702	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
719	op->destroy ();	703	op->destroy ();
720		704
721	op = above;	705	op = above;
722	}	706	}
723	}	707	}
724	}	708	}
725		709
		710	//-GPL
		711
726	bool	712	bool
727	maptile::_save_header (object_freezer &freezer)	713	maptile::_save_header (object_freezer &freezer)
728	{	714	{
729	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	715	#define MAP_OUT(k) freezer.put (KW(k), k)
730	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	716	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
731		717
732	MAP_OUT2 (arch, "map");	718	MAP_OUT2 (arch, CS(map));
733		719
734	if (name) MAP_OUT (name);	720	if (name) MAP_OUT (name);
735	MAP_OUT (swap_time);	721	MAP_OUT (swap_time);
736	MAP_OUT (reset_time);	722	MAP_OUT (reset_time);
737	MAP_OUT (reset_timeout);	723	MAP_OUT (reset_timeout);
738	MAP_OUT (fixed_resettime);	724	MAP_OUT (fixed_resettime);
739	MAP_OUT (no_reset);	725	MAP_OUT (no_reset);
740	MAP_OUT (no_drop);	726	MAP_OUT (no_drop);
741	MAP_OUT (difficulty);	727	MAP_OUT (difficulty);
742
743	if (default_region) MAP_OUT2 (region, default_region->name);	728	if (default_region) MAP_OUT2 (region, default_region->name);
744		729
745	if (shopitems)	730	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
746	{
747	char shop[MAX_BUF];
748	print_shop_string (this, shop);
749	MAP_OUT2 (shopitems, shop);
750	}
751
752	MAP_OUT (shopgreed);	731	MAP_OUT (shopgreed);
753	MAP_OUT (shopmin);	732	MAP_OUT (shopmin);
754	MAP_OUT (shopmax);	733	MAP_OUT (shopmax);
755	if (shoprace) MAP_OUT (shoprace);	734	if (shoprace) MAP_OUT (shoprace);
756	MAP_OUT (darkness);	735
757	MAP_OUT (width);	736	MAP_OUT (width);
758	MAP_OUT (height);	737	MAP_OUT (height);
759	MAP_OUT (enter_x);	738	MAP_OUT (enter_x);
760	MAP_OUT (enter_y);	739	MAP_OUT (enter_y);
761		740	MAP_OUT (darkness);
762	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
763	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
764
765	MAP_OUT (outdoor);	741	MAP_OUT (outdoor);
766	MAP_OUT (temp);	742
767	MAP_OUT (pressure);	743	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
768	MAP_OUT (humid);	744	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
769	MAP_OUT (windspeed);
770	MAP_OUT (winddir);
771	MAP_OUT (sky);
772		745
773	MAP_OUT (per_player);	746	MAP_OUT (per_player);
774	MAP_OUT (per_party);	747	MAP_OUT (per_party);
775		748
776	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	749	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
777	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	750	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
778	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	751	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
779	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	752	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
780		753
781	freezer.put (this);	754	freezer.put (this);
782	freezer.put (KW_end);	755	freezer.put (KW(end));
783		756
784	return true;	757	return true;
785	}	758	}
786		759
787	bool	760	bool
…		…
792	if (!_save_header (freezer))	765	if (!_save_header (freezer))
793	return false;	766	return false;
794		767
795	return freezer.save (path);	768	return freezer.save (path);
796	}	769	}
		770
		771	//+GPL
797		772
798	/*	773	/*
799	* Remove and free all objects in the given map.	774	* Remove and free all objects in the given map.
800	*/	775	*/
801	void	776	void
…		…
870		845
871	clear ();	846	clear ();
872	}	847	}
873		848
874	/* decay and destroy perishable items in a map */	849	/* decay and destroy perishable items in a map */
		850	// TODO: should be done regularly, not on map load?
875	void	851	void
876	maptile::do_decay_objects ()	852	maptile::do_decay_objects ()
877	{	853	{
878	if (!spaces)	854	if (!spaces)
879	return;	855	return;
…		…
881	for (mapspace *ms = spaces + size (); ms-- > spaces; )	857	for (mapspace *ms = spaces + size (); ms-- > spaces; )
882	for (object above, op = ms->bot; op; op = above)	858	for (object above, op = ms->bot; op; op = above)
883	{	859	{
884	above = op->above;	860	above = op->above;
885		861
		862	// do not decay anything above unique floor tiles (yet :)
		863	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
		864	break;
		865
886	bool destroy = 0;	866	bool destroy = 0;
887		867
888	// do not decay anything above unique floor tiles (yet :)	868	if (op->flag [FLAG_IS_FLOOR]
889	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	869	\|\| op->flag [FLAG_OBJ_ORIGINAL]
890	break;	870	\|\| op->flag [FLAG_UNIQUE]
891		871	\|\| op->flag [FLAG_OVERLAY_FLOOR]
892	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	872	\|\| op->flag [FLAG_UNPAID]
893	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
895	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
896	\|\| QUERY_FLAG (op, FLAG_UNPAID)
897	\|\| op->is_alive ())	873	\|\| op->is_alive ())
898	; // do not decay	874	; // do not decay
899	else if (op->is_weapon ())	875	else if (op->is_weapon ())
900	{	876	{
901	op->stats.dam--;	877	op->stats.dam--;
…		…
926	\|\| mat & M_LIQUID	902	\|\| mat & M_LIQUID
927	\|\| (mat & M_IRON && rndm (1, 5) == 1)	903	\|\| (mat & M_IRON && rndm (1, 5) == 1)
928	\|\| (mat & M_GLASS && rndm (1, 2) == 1)	904	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
929	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)	905	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
930	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)	906	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
931	\|\| (mat & M_ICE && temp > 32))	907	//\|\| (mat & M_ICE && temp > 32)
		908	)
932	destroy = 1;	909	destroy = 1;
933	}	910	}
934		911
935	/* adjust overall chance below */	912	/* adjust overall chance below */
936	if (destroy && rndm (0, 1))	913	if (destroy && rndm (0, 1))
…		…
956	sint64 total_exp = 0;	933	sint64 total_exp = 0;
957		934
958	for (mapspace *ms = spaces + size (); ms-- > spaces; )	935	for (mapspace *ms = spaces + size (); ms-- > spaces; )
959	for (object *op = ms->bot; op; op = op->above)	936	for (object *op = ms->bot; op; op = op->above)
960	{	937	{
961	if (QUERY_FLAG (op, FLAG_MONSTER))	938	if (op->flag [FLAG_MONSTER])
962	{	939	{
963	total_exp += op->stats.exp;	940	total_exp += op->stats.exp;
964	monster_cnt++;	941	monster_cnt++;
965	}	942	}
966		943
967	if (QUERY_FLAG (op, FLAG_GENERATOR))	944	if (op->flag [FLAG_GENERATOR])
968	{	945	{
969	total_exp += op->stats.exp;	946	total_exp += op->stats.exp;
970		947
971	if (archetype *at = op->other_arch)	948	if (archetype *at = op->other_arch)
972	{	949	{
…		…
1027	*/	1004	*/
1028	void	1005	void
1029	mapspace::update_ ()	1006	mapspace::update_ ()
1030	{	1007	{
1031	object *last = 0;	1008	object *last = 0;
1032	uint8 flags = P_UPTODATE, anywhere = 0;	1009	uint8 flags = P_UPTODATE;
1033	sint8 light = 0;	1010	sint8 light = 0;
1034	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1011	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
		1012	uint64_t volume = 0;
		1013	uint32_t items = 0;
		1014	object *anywhere = 0;
		1015	uint8_t middle_visibility = 0;
1035		1016
1036	//object *middle = 0;	1017	//object *middle = 0;
1037	//object *top = 0;	1018	//object *top = 0;
1038	//object *floor = 0;	1019	//object *floor = 0;
1039	// this seems to generate better code than using locals, above	1020	// this seems to generate better code than using locals, above
1040	object *&top = faces_obj[0] = 0;	1021	object *&top = faces_obj[0] = 0;
1041	object *&middle = faces_obj[1] = 0;	1022	object *&middle = faces_obj[1] = 0;
1042	object *&floor = faces_obj[2] = 0;	1023	object *&floor = faces_obj[2] = 0;
		1024
		1025	object::flags_t allflags; // all flags of all objects or'ed together
1043		1026
1044	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)	1027	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1045	{	1028	{
1046	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)	1029	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1047	light += tmp->glow_radius;	1030	light += tmp->glow_radius;
…		…
1052	* 3 times each time the player moves, because many of the	1035	* 3 times each time the player moves, because many of the
1053	* functions the move_player calls eventualy call this.	1036	* functions the move_player calls eventualy call this.
1054	*	1037	*
1055	* Always put the player down for drawing.	1038	* Always put the player down for drawing.
1056	*/	1039	*/
1057	if (!tmp->invisible)	1040	if (expect_true (!tmp->invisible))
1058	{	1041	{
1059	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1042	if (expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))
1060	top = tmp;	1043	top = tmp;
1061	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1044	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1062	{	1045	{
1063	/* If we got a floor, that means middle and top were below it,	1046	/* If we got a floor, that means middle and top were below it,
1064	* so should not be visible, so we clear them.	1047	* so should not be visible, so we clear them.
1065	*/	1048	*/
1066	middle = 0;	1049	middle = 0;
1067	top = 0;	1050	top = 0;
1068	floor = tmp;	1051	floor = tmp;
		1052	volume = 0;
		1053	items = 0;
1069	}	1054	}
1070	/* Flag anywhere have high priority */	1055	else
1071	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1072	{	1056	{
		1057	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
		1058	{
		1059	++items;
		1060	volume += tmp->volume ();
		1061	}
		1062
		1063	/* Flag anywhere have high priority */
		1064	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
		1065	anywhere = tmp;
		1066
		1067	/* Find the highest visible face around. If equal
		1068	* visibilities, we still want the one nearer to the
		1069	* top
		1070	*/
		1071	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
		1072	{
		1073	middle_visibility = ::faces [tmp->face].visibility;
1073	middle = tmp;	1074	middle = tmp;
1074	anywhere = 1;	1075	}
1075	}	1076	}
1076
1077	/* Find the highest visible face around. If equal
1078	* visibilities, we still want the one nearer to the
1079	* top
1080	*/
1081	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1082	middle = tmp;
1083	}
1084
1085	if (tmp == tmp->above)
1086	{
1087	LOG (llevError, "Error in structure of map\n");
1088	exit (-1);
1089	}	1077	}
1090		1078
1091	move_slow \|= tmp->move_slow;	1079	move_slow \|= tmp->move_slow;
1092	move_block \|= tmp->move_block;	1080	move_block \|= tmp->move_block;
1093	move_on \|= tmp->move_on;	1081	move_on \|= tmp->move_on;
1094	move_off \|= tmp->move_off;	1082	move_off \|= tmp->move_off;
1095	move_allow \|= tmp->move_allow;	1083	move_allow \|= tmp->move_allow;
1096		1084
1097	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags \|= P_BLOCKSVIEW;	1085	allflags \|= tmp->flag;
1098	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags \|= P_NO_MAGIC;	1086
1099	if (tmp->type == PLAYER) flags \|= P_PLAYER;	1087	if (tmp->type == PLAYER) flags \|= P_PLAYER;
1100	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1088	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1101	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1102	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1103	}	1089	}
		1090
		1091	// FLAG_SEE_ANYWHERE takes precedence
		1092	if (anywhere)
		1093	middle = anywhere;
		1094
		1095	// ORing all flags together and checking them here is much faster
		1096	if (allflags [FLAG_BLOCKSVIEW]) flags \|= P_BLOCKSVIEW;
		1097	if (allflags [FLAG_NO_MAGIC] ) flags \|= P_NO_MAGIC;
		1098	if (allflags [FLAG_ALIVE] ) flags \|= P_IS_ALIVE;
		1099	if (allflags [FLAG_DAMNED] ) flags \|= P_NO_CLERIC;
1104		1100
1105	this->light = min (light, MAX_LIGHT_RADIUS);	1101	this->light = min (light, MAX_LIGHT_RADIUS);
1106	this->flags_ = flags;	1102	this->flags_ = flags;
1107	this->move_block = move_block & ~move_allow;	1103	this->move_block = move_block & ~move_allow;
1108	this->move_on = move_on;	1104	this->move_on = move_on;
1109	this->move_off = move_off;	1105	this->move_off = move_off;
1110	this->move_slow = move_slow;	1106	this->move_slow = move_slow;
		1107	this->volume_ = (volume + 1023) / 1024;
		1108	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1111		1109
1112	/* At this point, we have a floor face (if there is a floor),	1110	/* At this point, we have a floor face (if there is a floor),
1113	* and the floor is set - we are not going to touch it at	1111	* and the floor is set - we are not going to touch it at
1114	* this point.	1112	* this point.
1115	* middle contains the highest visibility face.	1113	* middle contains the highest visibility face.
…		…
1133	*/	1131	*/
1134		1132
1135	for (object *tmp = last; tmp; tmp = tmp->below)	1133	for (object *tmp = last; tmp; tmp = tmp->below)
1136	{	1134	{
1137	/* Once we get to a floor, stop, since we already have a floor object */	1135	/* Once we get to a floor, stop, since we already have a floor object */
1138	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1136	if (tmp->flag [FLAG_IS_FLOOR])
1139	break;	1137	break;
1140		1138
1141	/* If two top faces are already set, quit processing */	1139	/* If two top faces are already set, quit processing */
1142	if (top && middle)	1140	if (top && middle)
1143	break;	1141	break;
…		…
1181	faces_obj [1] = middle;	1179	faces_obj [1] = middle;
1182	faces_obj [2] = floor;	1180	faces_obj [2] = floor;
1183	#endif	1181	#endif
1184	}	1182	}
1185		1183
1186	uint64
1187	mapspace::volume () const
1188	{
1189	uint64 vol = 0;
1190
1191	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1192	vol += op->volume ();
1193
1194	return vol;
1195	}
1196
1197	maptile *	1184	maptile *
1198	maptile::tile_available (int dir, bool load)	1185	maptile::tile_available (int dir, bool load)
1199	{	1186	{
1200	if (tile_path[dir])	1187	if (tile_path[dir])
1201	{	1188	{
…		…
1437	*	1424	*
1438	* currently, the only flag supported (0x1) is don't translate for	1425	* currently, the only flag supported (0x1) is don't translate for
1439	* closest body part of 'op1'	1426	* closest body part of 'op1'
1440	*/	1427	*/
1441	void	1428	void
1442	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1429	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1443	{	1430	{
1444	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1431	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1445	{	1432	{
1446	/* be conservative and fill in _some_ data */	1433	/* be conservative and fill in _some_ data */
1447	retval->distance = 10000;	1434	retval->distance = 10000;
…		…
1450	retval->direction = 0;	1437	retval->direction = 0;
1451	retval->part = 0;	1438	retval->part = 0;
1452	}	1439	}
1453	else	1440	else
1454	{	1441	{
1455	object *best;
1456
1457	retval->distance_x += op2->x - op1->x;	1442	retval->distance_x += op2->x - op1->x;
1458	retval->distance_y += op2->y - op1->y;	1443	retval->distance_y += op2->y - op1->y;
1459		1444
1460	best = op1;	1445	object *best = op1;
		1446
1461	/* If this is multipart, find the closest part now */	1447	/* If this is multipart, find the closest part now */
1462	if (!(flags & 0x1) && op1->more)	1448	if (!(flags & 1) && op1->more)
1463	{	1449	{
1464	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1450	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1465		1451
1466	/* we just take the offset of the piece to head to figure	1452	/* we just take the offset of the piece to head to figure
1467	* distance instead of doing all that work above again	1453	* distance instead of doing all that work above again
…		…
1518	else	1504	else
1519	{	1505	{
1520	retval->distance_x += op2->x - x;	1506	retval->distance_x += op2->x - x;
1521	retval->distance_y += op2->y - y;	1507	retval->distance_y += op2->y - y;
1522		1508
1523	retval->part = NULL;	1509	retval->part = 0;
1524	retval->distance = idistance (retval->distance_x, retval->distance_y);	1510	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1525	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1511	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1526	}	1512	}
1527	}	1513	}
1528		1514
1529	/* Returns true of op1 and op2 are effectively on the same map	1515	/* Returns true of op1 and op2 are effectively on the same map
…		…
1540	int dx, dy;	1526	int dx, dy;
1541		1527
1542	return adjacent_map (op1->map, op2->map, &dx, &dy);	1528	return adjacent_map (op1->map, op2->map, &dx, &dy);
1543	}	1529	}
1544		1530
		1531	//-GPL
		1532
1545	object *	1533	object *
1546	maptile::insert (object op, int x, int y, object originator, int flags)	1534	maptile::insert (object op, int x, int y, object originator, int flags)
1547	{	1535	{
1548	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1536	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1549	}	1537	}
…		…
1560	if (default_region)	1548	if (default_region)
1561	return default_region;	1549	return default_region;
1562		1550
1563	return ::region::default_region ();	1551	return ::region::default_region ();
1564	}	1552	}
		1553
		1554	//+GPL
1565		1555
1566	/* picks a random object from a style map.	1556	/* picks a random object from a style map.
1567	*/	1557	*/
1568	object *	1558	object *
1569	maptile::pick_random_object (rand_gen &gen) const	1559	maptile::pick_random_object (rand_gen &gen) const
…		…
1576	*/	1566	*/
1577	for (int i = 1000; --i;)	1567	for (int i = 1000; --i;)
1578	{	1568	{
1579	object *pick = at (gen (width), gen (height)).bot;	1569	object *pick = at (gen (width), gen (height)).bot;
1580		1570
1581	// do not prefer big monsters just because they are big.	1571	// must be head: do not prefer big monsters just because they are big.
1582	if (pick && pick->is_head ())	1572	if (pick && pick->is_head ())
1583	return pick->head_ ();	1573	return pick;
1584	}	1574	}
1585		1575
1586	// instead of crashing in the unlikely(?) case, try to return something	1576	// instead of crashing in the unlikely(?) case, try to return something
1587	return archetype::find ("bug");	1577	return archetype::find (shstr_bug);
1588	}	1578	}
		1579
		1580	//-GPL
1589		1581
1590	void	1582	void
1591	maptile::play_sound (faceidx sound, int x, int y) const	1583	maptile::play_sound (faceidx sound, int x, int y) const
1592	{	1584	{
1593	if (!sound)	1585	if (!sound)
…		…
1619		1611
1620	if (distance <= MAX_SOUND_DISTANCE)	1612	if (distance <= MAX_SOUND_DISTANCE)
1621	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1613	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1622	}	1614	}
1623	}	1615	}
		1616
		1617	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1624		1618
1625	static void	1619	static void
1626	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1620	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1627	{	1621	{
1628	// clip to map to the left	1622	// clip to map to the left
…		…
1684	r->dx = dx;	1678	r->dx = dx;
1685	r->dy = dy;	1679	r->dy = dy;
1686	}	1680	}
1687		1681
1688	maprect *	1682	maprect *
1689	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1683	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1690	{	1684	{
1691	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1692	buf.clear ();	1685	buf.clear ();
1693		1686
1694	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1687	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1695		1688
1696	// add end marker	1689	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.157 by root, Thu Jan 8 19:23:44 2009 UTC vs. Revision 1.189 by root, Sun Apr 18 05:54:18 2010 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.157 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.189 by root, Sun Apr 18 05:54:18 2010 UTC