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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.146 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.172 by root, Sun Nov 8 20:55:39 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 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 "loader.h"
28	#include "path.h"	29	#include "path.h"
		30
		31	//+GPL
		32
		33	sint8 maptile::outdoor_darkness;
29		34
30	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	35	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
31	* one function that just returns a P_.. value (see map.h)	36	* one function that just returns a P_.. value (see map.h)
32	* it will also do map translation for tiled maps, returning	37	* it will also do map translation for tiled maps, returning
33	* new values into newmap, nx, and ny. Any and all of those	38	* new values into newmap, nx, and ny. Any and all of those
68	* by the caller.	73	* by the caller.
69	*/	74	*/
70	int	75	int
71	blocked_link (object ob, maptile m, int sx, int sy)	76	blocked_link (object ob, maptile m, int sx, int sy)
72	{	77	{
73	object *tmp;
74	int mflags, blocked;
75
76	/* Make sure the coordinates are valid - they should be, as caller should	78	/* Make sure the coordinates are valid - they should be, as caller should
77	* have already checked this.	79	* have already checked this.
78	*/	80	*/
79	if (OUT_OF_REAL_MAP (m, sx, sy))	81	if (OUT_OF_REAL_MAP (m, sx, sy))
80	{	82	{
81	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	83	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
82	return 1;	84	return 1;
83	}	85	}
84		86
85	/* Save some cycles - instead of calling get_map_flags(), just get the value	87	mapspace &ms = m->at (sx, sy);
86	* directly.
87	*/
88	mflags = m->at (sx, sy).flags ();
89		88
90	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	89	int mflags = ms.flags ();
		90	int blocked = ms.move_block;
91		91
92	/* If space is currently not blocked by anything, no need to	92	/* If space is currently not blocked by anything, no need to
93	* go further. Not true for players - all sorts of special	93	* go further. Not true for players - all sorts of special
94	* things we need to do for players.	94	* things we need to do for players.
95	*/	95	*/
96	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	96	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
97	return 0;	97	return 0;
98		98
99	/* if there isn't anytyhing alive on this space, and this space isn't	99	/* if there isn't anything alive on this space, and this space isn't
100	* otherwise blocked, we can return now. Only if there is a living	100	* otherwise blocked, we can return now. Only if there is a living
101	* creature do we need to investigate if it is part of this creature	101	* creature do we need to investigate if it is part of this creature
102	* or another. Likewise, only if something is blocking us do we	102	* or another. Likewise, only if something is blocking us do we
103	* need to investigate if there is a special circumstance that would	103	* need to investigate if there is a special circumstance that would
104	* let the player through (inventory checkers for example)	104	* let the player through (inventory checkers for example)
…		…
111	/* We basically go through the stack of objects, and if there is	111	/* We basically go through the stack of objects, and if there is
112	* some other object that has NO_PASS or FLAG_ALIVE set, return	112	* some other object that has NO_PASS or FLAG_ALIVE set, return
113	* true. If we get through the entire stack, that must mean	113	* true. If we get through the entire stack, that must mean
114	* ob is blocking it, so return 0.	114	* ob is blocking it, so return 0.
115	*/	115	*/
116	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	116	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
117	{	117	{
118		118	if (OB_MOVE_BLOCK (ob, tmp))
119	/* This must be before the checks below. Code for inventory checkers. */
120	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
121	{	119	{
122	/* If last_sp is set, the player/monster needs an object,	120	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
123	* so we check for it. If they don't have it, they can't	121	if (RESULT_INT (0))
124	* pass through this space.	122	return 1;
125	*/	123	else
126	if (tmp->last_sp)	124	continue;
		125
		126	if (tmp->type == CHECK_INV)
127	{	127	{
128	if (check_inv_recursive (ob, tmp) == NULL)	128	bool have = check_inv_recursive (ob, tmp);
		129
		130	// last_sp set means we block if we don't have.
		131	if (logical_xor (have, tmp->last_sp))
129	return 1;	132	return 1;
130	else	133	}
131	continue;	134	else if (tmp->type == T_MATCH)
		135	{
		136	// T_MATCH allows "entrance" iff the match is true
		137	// == blocks if the match fails
		138
		139	// we could have used an INVOKE_OBJECT, but decided against it, as we
		140	// assume that T_MATCH is relatively common.
		141	if (!match (tmp->slaying, ob, tmp, ob))
		142	return 1;
132	}	143	}
133	else	144	else
134	{	145	return 1; // unconditional block
135	/* In this case, the player must not have the object -	146
136	* if they do, they can't pass through.
137	*/
138	if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
139	return 1;
140	else
141	continue;
142	}
143	} /* if check_inv */
144	else	147	} else {
145	{	148	// space does not block the ob, directly, but
146	/* Broke apart a big nasty if into several here to make	149	// anything alive that is not a door still
147	* this more readable. first check - if the space blocks	150	// blocks anything but wizards.
148	* movement, can't move here.
149	* second - if a monster, can't move there, unless it is a
150	* hidden dm
151	*/
152	if (OB_MOVE_BLOCK (ob, tmp))
153	return 1;
154		151
155	if (tmp->flag [FLAG_ALIVE]	152	if (tmp->flag [FLAG_ALIVE]
156	&& tmp->head_ () != ob	153	&& tmp->head_ () != ob
157	&& tmp != ob	154	&& tmp != ob
158	&& tmp->type != DOOR	155	&& tmp->type != DOOR
159	&& !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))	156	&& !tmp->flag [FLAG_WIZPASS])
160	return 1;	157	return 1;
161	}	158	}
162
163	}	159	}
		160
164	return 0;	161	return 0;
165	}	162	}
166		163
167	/*	164	/*
168	* Returns qthe blocking object if the given object can't fit in the given	165	* Returns qthe blocking object if the given object can't fit in the given
…		…
226	* into inventory, but just links them. What this does is go through	223	* into inventory, but just links them. What this does is go through
227	* and insert them properly.	224	* and insert them properly.
228	* The object 'container' is the object that contains the inventory.	225	* The object 'container' is the object that contains the inventory.
229	* This is needed so that we can update the containers weight.	226	* This is needed so that we can update the containers weight.
230	*/	227	*/
231	void	228	static void
232	fix_container (object *container)	229	fix_container (object *container)
233	{	230	{
234	object tmp = container->inv, next;	231	object tmp = container->inv, next;
235		232
236	container->inv = 0;	233	container->inv = 0;
…		…
247	// go through and calculate what all the containers are carrying.	244	// go through and calculate what all the containers are carrying.
248	//TODO: remove	245	//TODO: remove
249	container->update_weight ();	246	container->update_weight ();
250	}	247	}
251		248
		249	//-GPL
		250
252	void	251	void
253	maptile::set_object_flag (int flag, int value)	252	maptile::set_object_flag (int flag, int value)
254	{	253	{
255	if (!spaces)	254	if (!spaces)
256	return;	255	return;
…		…
270		269
271	for (mapspace *ms = spaces + size (); ms-- > spaces; )	270	for (mapspace *ms = spaces + size (); ms-- > spaces; )
272	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	271	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
273	INVOKE_OBJECT (RESET, tmp);	272	INVOKE_OBJECT (RESET, tmp);
274	}	273	}
		274
		275	//+GPL
275		276
276	/* link_multipart_objects go through all the objects on the map looking	277	/* link_multipart_objects go through all the objects on the map looking
277	* for objects whose arch says they are multipart yet according to the	278	* for objects whose arch says they are multipart yet according to the
278	* info we have, they only have the head (as would be expected when	279	* info we have, they only have the head (as would be expected when
279	* they are saved).	280	* they are saved).
…		…
307	op = op->above;	308	op = op->above;
308	}	309	}
309	}	310	}
310	}	311	}
311		312
		313	//-GPL
		314
312	/*	315	/*
313	* Loads (ands parses) the objects into a given map from the specified	316	* Loads (ands parses) the objects into a given map from the specified
314	* file pointer.	317	* file pointer.
315	*/	318	*/
316	bool	319	bool
…		…
332	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))	335	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
333	{	336	{
334	// we insert manually because	337	// we insert manually because
335	// a) its way faster	338	// a) its way faster
336	// b) we remove manually, too, and there are good reasons for that	339	// b) we remove manually, too, and there are good reasons for that
337	// c) its correct	340	// c) it's correct
338	mapspace &ms = at (op->x, op->y);	341	mapspace &ms = at (op->x, op->y);
339		342
340	op->flag [FLAG_REMOVED] = false;	343	op->flag [FLAG_REMOVED] = false;
341		344
342	op->above = 0;	345	op->above = 0;
343	op->below = ms.top;	346	op->below = ms.top;
344		347
345	if (ms.top)
346	ms.top->above = op;	348	*(ms.top ? &ms.top->above : &ms.bot) = op;
347	else
348	ms.bot = op;
349		349
350	ms.top = op;	350	ms.top = op;
351	ms.flags_ = 0;	351	ms.flags_ = 0;
352	}	352	}
353	else	353	else
…		…
449	*/	449	*/
450	width = 16;	450	width = 16;
451	height = 16;	451	height = 16;
452	timeout = 300;	452	timeout = 300;
453	max_nrof = 1000; // 1000 items of anything	453	max_nrof = 1000; // 1000 items of anything
		454	max_items = MAX_ITEM_PER_ACTION;
454	max_volume = 2000000; // 2m³	455	max_volume = 2000000; // 2m³
455	}	456	}
456		457
457	maptile::maptile (int w, int h)	458	maptile::maptile (int w, int h)
458	{	459	{
…		…
479	if (spaces)	480	if (spaces)
480	return;	481	return;
481		482
482	spaces = salloc0<mapspace> (size ());	483	spaces = salloc0<mapspace> (size ());
483	}	484	}
		485
		486	//+GPL
484		487
485	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	488	/* Takes a string from a map definition and outputs a pointer to the array of shopitems
486	* corresponding to that string. Memory is allocated for this, it must be freed	489	* corresponding to that string. Memory is allocated for this, it must be freed
487	* at a later date.	490	* at a later date.
488	* Called by parse_map_headers below.	491	* Called by parse_map_headers below.
…		…
565	return items;	568	return items;
566	}	569	}
567		570
568	/* opposite of parse string, this puts the string that was originally fed in to	571	/* opposite of parse string, this puts the string that was originally fed in to
569	* the map (or something equivilent) into output_string. */	572	* the map (or something equivilent) into output_string. */
570	static void	573	static const char *
571	print_shop_string (maptile m, char output_string)	574	print_shop_string (maptile *m)
572	{	575	{
573	int i;	576	static dynbuf_text buf; buf.clear ();
574	char tmp[MAX_BUF];
575		577
576	strcpy (output_string, "");
577	for (i = 0; i < m->shopitems[0].index; i++)	578	for (int i = 0; i < m->shopitems[0].index; i++)
578	{	579	{
579	if (m->shopitems[i].typenum)	580	if (m->shopitems[i].typenum)
580	{	581	{
581	if (m->shopitems[i].strength)	582	if (m->shopitems[i].strength)
582	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	583	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
583	else	584	else
584	sprintf (tmp, "%s;", m->shopitems[i].name);	585	buf.printf ("%s;", m->shopitems[i].name);
585	}	586	}
586	else	587	else
587	{	588	{
588	if (m->shopitems[i].strength)	589	if (m->shopitems[i].strength)
589	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	590	buf.printf ("*:%d;", m->shopitems[i].strength);
590	else	591	else
591	sprintf (tmp, "*");	592	buf.printf ("*");
592	}	593	}
593
594	strcat (output_string, tmp);
595	}	594	}
		595
		596	return buf;
596	}	597	}
		598
		599	//-GPL
597		600
598	/* This loads the header information of the map. The header	601	/* This loads the header information of the map. The header
599	* contains things like difficulty, size, timeout, etc.	602	* contains things like difficulty, size, timeout, etc.
600	* this used to be stored in the map object, but with the	603	* this used to be stored in the map object, but with the
601	* addition of tiling, fields beyond that easily named in an	604	* addition of tiling, fields beyond that easily named in an
…		…
693	}	696	}
694		697
695	abort ();	698	abort ();
696	}	699	}
697		700
		701	//+GPL
		702
698	/******************************************************************************	703	/******************************************************************************
699	* This is the start of unique map handling code	704	* This is the start of unique map handling code
700	*****************************************************************************/	705	*****************************************************************************/
701		706
702	/* This goes through the maptile and removed any unique items on the map. */	707	/* This goes through the maptile and removed any unique items on the map. */
…		…
712		717
713	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	718	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
714	unique = 1;	719	unique = 1;
715		720
716	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	721	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))
717	{
718	op->destroy_inv (false);
719	op->destroy ();	722	op->destroy ();
720	}
721		723
722	op = above;	724	op = above;
723	}	725	}
724	}	726	}
725	}	727	}
		728
		729	//-GPL
726		730
727	bool	731	bool
728	maptile::_save_header (object_freezer &freezer)	732	maptile::_save_header (object_freezer &freezer)
729	{	733	{
730	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	734	#define MAP_OUT(k) freezer.put (KW_ ## k, k)
…		…
738	MAP_OUT (reset_timeout);	742	MAP_OUT (reset_timeout);
739	MAP_OUT (fixed_resettime);	743	MAP_OUT (fixed_resettime);
740	MAP_OUT (no_reset);	744	MAP_OUT (no_reset);
741	MAP_OUT (no_drop);	745	MAP_OUT (no_drop);
742	MAP_OUT (difficulty);	746	MAP_OUT (difficulty);
743
744	if (default_region) MAP_OUT2 (region, default_region->name);	747	if (default_region) MAP_OUT2 (region, default_region->name);
745		748
746	if (shopitems)	749	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
747	{
748	char shop[MAX_BUF];
749	print_shop_string (this, shop);
750	MAP_OUT2 (shopitems, shop);
751	}
752
753	MAP_OUT (shopgreed);	750	MAP_OUT (shopgreed);
754	MAP_OUT (shopmin);	751	MAP_OUT (shopmin);
755	MAP_OUT (shopmax);	752	MAP_OUT (shopmax);
756	if (shoprace) MAP_OUT (shoprace);	753	if (shoprace) MAP_OUT (shoprace);
		754
757	MAP_OUT (darkness);	755	MAP_OUT (darkness);
758	MAP_OUT (width);	756	MAP_OUT (width);
759	MAP_OUT (height);	757	MAP_OUT (height);
760	MAP_OUT (enter_x);	758	MAP_OUT (enter_x);
761	MAP_OUT (enter_y);	759	MAP_OUT (enter_y);
…		…
794	return false;	792	return false;
795		793
796	return freezer.save (path);	794	return freezer.save (path);
797	}	795	}
798		796
		797	//+GPL
		798
799	/*	799	/*
800	* Remove and free all objects in the given map.	800	* Remove and free all objects in the given map.
801	*/	801	*/
802	void	802	void
803	maptile::clear ()	803	maptile::clear ()
…		…
813		813
814	op->flag [FLAG_REMOVED] = true;	814	op->flag [FLAG_REMOVED] = true;
815		815
816	object *head = op->head_ ();	816	object *head = op->head_ ();
817	if (op == head)	817	if (op == head)
818	{
819	op->destroy_inv (false);
820	op->destroy ();	818	op->destroy ();
821	}
822	else if (head->map != op->map)	819	else if (head->map != op->map)
823	{	820	{
824	LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());	821	LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
825	head->destroy ();	822	head->destroy ();
826	}	823	}
…		…
941	op->destroy ();	938	op->destroy ();
942	}	939	}
943	}	940	}
944		941
945	/*	942	/*
946	* Updates every button on the map (by calling update_button() for them).
947	*/
948	void
949	maptile::update_buttons ()
950	{
951	for (oblinkpt *obp = buttons; obp; obp = obp->next)
952	for (objectlink *ol = obp->link; ol; ol = ol->next)
953	{
954	if (!ol->ob)
955	{
956	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
957	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
958	continue;
959	}
960
961	if (ol->ob->type == BUTTON \|\| ol->ob->type == PEDESTAL)
962	{
963	update_button (ol->ob);
964	break;
965	}
966	}
967	}
968
969	/*
970	* This routine is supposed to find out the difficulty of the map.	943	* This routine is supposed to find out the difficulty of the map.
971	* difficulty does not have a lot to do with character level,	944	* difficulty does not have a lot to do with character level,
972	* but does have a lot to do with treasure on the map.	945	* but does have a lot to do with treasure on the map.
973	*	946	*
974	* Difficulty can now be set by the map creature. If the value stored	947	* Difficulty can now be set by the map creator. If the value stored
975	* in the map is zero, then use this routine. Maps should really	948	* in the map is zero, then use this routine. Maps should really
976	* have a difficulty set than using this function - human calculation	949	* have a difficulty set rather than using this function - human calculation
977	* is much better than this functions guesswork.	950	* is much better than this function's guesswork.
978	*/	951	*/
979	int	952	int
980	maptile::estimate_difficulty () const	953	maptile::estimate_difficulty () const
981	{	954	{
982	long monster_cnt = 0;	955	long monster_cnt = 0;
…		…
1027	* postive values make it darker, negative make it brighter	1000	* postive values make it darker, negative make it brighter
1028	*/	1001	*/
1029	int	1002	int
1030	maptile::change_map_light (int change)	1003	maptile::change_map_light (int change)
1031	{	1004	{
1032	int new_level = darkness + change;
1033
1034	/* Nothing to do */	1005	/* Nothing to do */
1035	if (!change \|\| (new_level <= 0 && darkness == 0) \|\| (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))	1006	if (!change)
1036	return 0;	1007	return 0;
1037		1008
1038	/* inform all players on the map */	1009	/* inform all players on the map */
1039	if (change > 0)	1010	if (change > 0)
1040	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");	1011	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes darker.");
1041	else	1012	else
1042	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");	1013	new_info_map (NDI_BLACK \| NDI_UNIQUE, this, "It becomes brighter.");
1043		1014
1044	/* Do extra checking. since darkness is a unsigned value,	1015	darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1045	* we need to be extra careful about negative values.
1046	* In general, the checks below are only needed if change
1047	* is not +/-1
1048	*/
1049	if (new_level < 0)
1050	darkness = 0;
1051	else if (new_level >= MAX_DARKNESS)
1052	darkness = MAX_DARKNESS;
1053	else
1054	darkness = new_level;
1055		1016
1056	/* All clients need to get re-updated for the change */	1017	/* All clients need to get re-updated for the change */
1057	update_all_map_los (this);	1018	update_all_map_los (this);
1058		1019
1059	return 1;	1020	return 1;
…		…
1067	*/	1028	*/
1068	void	1029	void
1069	mapspace::update_ ()	1030	mapspace::update_ ()
1070	{	1031	{
1071	object *last = 0;	1032	object *last = 0;
1072	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;	1033	uint8 flags = P_UPTODATE;
		1034	sint8 light = 0;
1073	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1035	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
		1036	uint64_t volume = 0;
		1037	uint32_t items = 0;
		1038	object *anywhere = 0;
1074		1039
1075	//object *middle = 0;	1040	//object *middle = 0;
1076	//object *top = 0;	1041	//object *top = 0;
1077	//object *floor = 0;	1042	//object *floor = 0;
1078	// this seems to generate better code than using locals, above	1043	// this seems to generate better code than using locals, above
1079	object *&top = faces_obj[0] = 0;	1044	object *&top = faces_obj[0] = 0;
1080	object *&middle = faces_obj[1] = 0;	1045	object *&middle = faces_obj[1] = 0;
1081	object *&floor = faces_obj[2] = 0;	1046	object *&floor = faces_obj[2] = 0;
1082		1047
		1048	object::flags_t allflags; // all flags of all objects or'ed together
		1049
1083	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)	1050	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1084	{	1051	{
1085	/* This could be made additive I guess (two lights better than	1052	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1086	* one). But if so, it shouldn't be a simple additive - 2
1087	* light bulbs do not illuminate twice as far as once since
1088	* it is a dissapation factor that is cubed.
1089	*/
1090	light = max (light, tmp->glow_radius);	1053	light += tmp->glow_radius;
1091		1054
1092	/* This call is needed in order to update objects the player	1055	/* This call is needed in order to update objects the player
1093	* is standing in that have animations (ie, grass, fire, etc).	1056	* is standing in that have animations (ie, grass, fire, etc).
1094	* However, it also causes the look window to be re-drawn	1057	* However, it also causes the look window to be re-drawn
1095	* 3 times each time the player moves, because many of the	1058	* 3 times each time the player moves, because many of the
1096	* functions the move_player calls eventualy call this.	1059	* functions the move_player calls eventualy call this.
1097	*	1060	*
1098	* Always put the player down for drawing.	1061	* Always put the player down for drawing.
1099	*/	1062	*/
1100	if (!tmp->invisible)	1063	if (expect_true (!tmp->invisible))
1101	{	1064	{
1102	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1065	if (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER])
1103	top = tmp;	1066	top = tmp;
1104	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1067	else
1105	{	1068	{
		1069	if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
		1070	{
1106	/* If we got a floor, that means middle and top were below it,	1071	/* If we got a floor, that means middle and top were below it,
1107	* so should not be visible, so we clear them.	1072	* so should not be visible, so we clear them.
1108	*/	1073	*/
1109	middle = 0;	1074	middle = 0;
1110	top = 0;	1075	top = 0;
1111	floor = tmp;	1076	floor = tmp;
		1077	volume = 0;
		1078	items = 0;
		1079	}
		1080	else
		1081	{
		1082	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
		1083	{
		1084	++items;
		1085	volume += tmp->volume ();
		1086	}
		1087
		1088	/* Flag anywhere have high priority */
		1089	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
		1090	anywhere = tmp;
		1091	/* Find the highest visible face around. If equal
		1092	* visibilities, we still want the one nearer to the
		1093	* top
		1094	*/
		1095	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility))
		1096	middle = tmp;
		1097	}
1112	}	1098	}
1113	/* Flag anywhere have high priority */
1114	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1115	{
1116	middle = tmp;
1117	anywhere = 1;
1118	}
1119
1120	/* Find the highest visible face around. If equal
1121	* visibilities, we still want the one nearer to the
1122	* top
1123	*/
1124	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1125	middle = tmp;
1126	}
1127
1128	if (tmp == tmp->above)
1129	{
1130	LOG (llevError, "Error in structure of map\n");
1131	exit (-1);
1132	}	1099	}
1133		1100
1134	move_slow \|= tmp->move_slow;	1101	move_slow \|= tmp->move_slow;
1135	move_block \|= tmp->move_block;	1102	move_block \|= tmp->move_block;
1136	move_on \|= tmp->move_on;	1103	move_on \|= tmp->move_on;
1137	move_off \|= tmp->move_off;	1104	move_off \|= tmp->move_off;
1138	move_allow \|= tmp->move_allow;	1105	move_allow \|= tmp->move_allow;
1139		1106
1140	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags \|= P_BLOCKSVIEW;	1107	allflags \|= tmp->flag;
1141	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags \|= P_NO_MAGIC;	1108
1142	if (tmp->type == PLAYER) flags \|= P_PLAYER;	1109	if (tmp->type == PLAYER) flags \|= P_PLAYER;
1143	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1110	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1144	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1145	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1146	}	1111	}
1147		1112
1148	this->light = light;	1113	// FLAG_SEE_ANYWHERE takes precedence
		1114	if (anywhere)
		1115	middle = anywhere;
		1116
		1117	// ORing all flags together and checking them here is much faster
		1118	if (allflags [FLAG_BLOCKSVIEW]) flags \|= P_BLOCKSVIEW;
		1119	if (allflags [FLAG_NO_MAGIC] ) flags \|= P_NO_MAGIC;
		1120	if (allflags [FLAG_ALIVE] ) flags \|= P_IS_ALIVE;
		1121	if (allflags [FLAG_DAMNED] ) flags \|= P_NO_CLERIC;
		1122
		1123	this->light = min (light, MAX_LIGHT_RADIUS);
1149	this->flags_ = flags;	1124	this->flags_ = flags;
1150	this->move_block = move_block & ~move_allow;	1125	this->move_block = move_block & ~move_allow;
1151	this->move_on = move_on;	1126	this->move_on = move_on;
1152	this->move_off = move_off;	1127	this->move_off = move_off;
1153	this->move_slow = move_slow;	1128	this->move_slow = move_slow;
		1129	this->volume_ = (volume + 1023) / 1024;
		1130	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1154		1131
1155	/* At this point, we have a floor face (if there is a floor),	1132	/* At this point, we have a floor face (if there is a floor),
1156	* and the floor is set - we are not going to touch it at	1133	* and the floor is set - we are not going to touch it at
1157	* this point.	1134	* this point.
1158	* middle contains the highest visibility face.	1135	* middle contains the highest visibility face.
…		…
1224	faces_obj [1] = middle;	1201	faces_obj [1] = middle;
1225	faces_obj [2] = floor;	1202	faces_obj [2] = floor;
1226	#endif	1203	#endif
1227	}	1204	}
1228		1205
1229	uint64	1206	maptile *
1230	mapspace::volume () const
1231	{
1232	uint64 vol = 0;
1233
1234	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1235	vol += op->volume ();
1236
1237	return vol;
1238	}
1239
1240	bool
1241	maptile::tile_available (int dir, bool load)	1207	maptile::tile_available (int dir, bool load)
1242	{	1208	{
1243	if (!tile_path[dir])	1209	if (tile_path[dir])
1244	return 0;	1210	{
1245
1246	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1211	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))
1247	return 1;	1212	return tile_map[dir];
1248		1213
1249	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))	1214	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1250	return 1;	1215	return tile_map[dir];
		1216	}
1251		1217
1252	return 0;	1218	return 0;
1253	}	1219	}
1254		1220
1255	/* this returns TRUE if the coordinates (x,y) are out of	1221	/* this returns TRUE if the coordinates (x,y) are out of
…		…
1561	else	1527	else
1562	{	1528	{
1563	retval->distance_x += op2->x - x;	1529	retval->distance_x += op2->x - x;
1564	retval->distance_y += op2->y - y;	1530	retval->distance_y += op2->y - y;
1565		1531
1566	retval->part = NULL;	1532	retval->part = 0;
1567	retval->distance = idistance (retval->distance_x, retval->distance_y);	1533	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1568	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1534	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1569	}	1535	}
1570	}	1536	}
1571		1537
1572	/* Returns true of op1 and op2 are effectively on the same map	1538	/* Returns true of op1 and op2 are effectively on the same map
…		…
1583	int dx, dy;	1549	int dx, dy;
1584		1550
1585	return adjacent_map (op1->map, op2->map, &dx, &dy);	1551	return adjacent_map (op1->map, op2->map, &dx, &dy);
1586	}	1552	}
1587		1553
		1554	//-GPL
		1555
1588	object *	1556	object *
1589	maptile::insert (object op, int x, int y, object originator, int flags)	1557	maptile::insert (object op, int x, int y, object originator, int flags)
1590	{	1558	{
1591	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1559	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1592	}	1560	}
…		…
1603	if (default_region)	1571	if (default_region)
1604	return default_region;	1572	return default_region;
1605		1573
1606	return ::region::default_region ();	1574	return ::region::default_region ();
1607	}	1575	}
		1576
		1577	//+GPL
1608		1578
1609	/* picks a random object from a style map.	1579	/* picks a random object from a style map.
1610	*/	1580	*/
1611	object *	1581	object *
1612	maptile::pick_random_object (rand_gen &gen) const	1582	maptile::pick_random_object (rand_gen &gen) const
…		…
1625	if (pick && pick->is_head ())	1595	if (pick && pick->is_head ())
1626	return pick->head_ ();	1596	return pick->head_ ();
1627	}	1597	}
1628		1598
1629	// instead of crashing in the unlikely(?) case, try to return something	1599	// instead of crashing in the unlikely(?) case, try to return something
1630	return archetype::find ("bug");	1600	return archetype::find (shstr_bug);
1631	}	1601	}
		1602
		1603	//-GPL
1632		1604
1633	void	1605	void
1634	maptile::play_sound (faceidx sound, int x, int y) const	1606	maptile::play_sound (faceidx sound, int x, int y) const
1635	{	1607	{
1636	if (!sound)	1608	if (!sound)
1637	return;	1609	return;
1638		1610
		1611	for_all_players_on_map (pl, this)
		1612	if (client *ns = pl->ns)
		1613	{
		1614	int dx = x - pl->ob->x;
		1615	int dy = y - pl->ob->y;
		1616
		1617	int distance = idistance (dx, dy);
		1618
		1619	if (distance <= MAX_SOUND_DISTANCE)
		1620	ns->play_sound (sound, dx, dy);
		1621	}
		1622	}
		1623
		1624	void
		1625	maptile::say_msg (const char *msg, int x, int y) const
		1626	{
1639	for_all_players (pl)	1627	for_all_players (pl)
1640	if (pl->ob->map == this)
1641	if (client *ns = pl->ns)	1628	if (client *ns = pl->ns)
1642	{	1629	{
1643	int dx = x - pl->ob->x;	1630	int dx = x - pl->ob->x;
1644	int dy = y - pl->ob->y;	1631	int dy = y - pl->ob->y;
1645		1632
1646	int distance = idistance (dx, dy);	1633	int distance = idistance (dx, dy);
1647		1634
1648	if (distance <= MAX_SOUND_DISTANCE)	1635	if (distance <= MAX_SOUND_DISTANCE)
1649	ns->play_sound (sound, dx, dy);	1636	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1650	}	1637	}
1651	}	1638	}
1652		1639
		1640	static void
		1641	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
		1642	{
		1643	// clip to map to the left
		1644	if (x0 < 0)
		1645	{
		1646	if (maptile *tile = m->tile_available (TILE_LEFT, 1))
		1647	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
		1648
		1649	if (x1 < 0) // entirely to the left
		1650	return;
		1651
		1652	x0 = 0;
		1653	}
		1654
		1655	// clip to map to the right
		1656	if (x1 > m->width)
		1657	{
		1658	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
		1659	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
		1660
		1661	if (x0 > m->width) // entirely to the right
		1662	return;
		1663
		1664	x1 = m->width;
		1665	}
		1666
		1667	// clip to map above
		1668	if (y0 < 0)
		1669	{
		1670	if (maptile *tile = m->tile_available (TILE_UP, 1))
		1671	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
		1672
		1673	if (y1 < 0) // entirely above
		1674	return;
		1675
		1676	y0 = 0;
		1677	}
		1678
		1679	// clip to map below
		1680	if (y1 > m->height)
		1681	{
		1682	if (maptile *tile = m->tile_available (TILE_DOWN, 1))
		1683	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
		1684
		1685	if (y0 > m->height) // entirely below
		1686	return;
		1687
		1688	y1 = m->height;
		1689	}
		1690
		1691	// if we get here, the rect is within the current map
		1692	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1693
		1694	r->m = m;
		1695	r->x0 = x0;
		1696	r->y0 = y0;
		1697	r->x1 = x1;
		1698	r->y1 = y1;
		1699	r->dx = dx;
		1700	r->dy = dy;
		1701	}
		1702
		1703	maprect *
		1704	maptile::split_to_tiles (int x0, int y0, int x1, int y1)
		1705	{
		1706	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
		1707	buf.clear ();
		1708
		1709	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
		1710
		1711	// add end marker
		1712	maprect r = (maprect )buf.alloc (sizeof (maprect));
		1713	r->m = 0;
		1714
		1715	return (maprect *)buf.linearise ();
		1716	}
		1717

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.146 by root, Sun Aug 17 22:46:26 2008 UTC vs. Revision 1.172 by root, Sun Nov 8 20:55:39 2009 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.146 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.172 by root, Sun Nov 8 20:55:39 2009 UTC