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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.161 by root, Mon Oct 12 21:27:55 2009 UTC vs.
Revision 1.196 by root, Sun Apr 25 10:45:38 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 it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* option) any later version.
23	*/	23	*/
24		24
25	#include <unistd.h>	25	#include <unistd.h>
26		26
27	#include "global.h"	27	#include "global.h"
28	#include "loader.h"
29	#include "path.h"	28	#include "path.h"
		29
		30	//+GPL
30		31
31	sint8 maptile::outdoor_darkness;	32	sint8 maptile::outdoor_darkness;
32		33
33	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	34	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34	* one function that just returns a P_.. value (see map.h)	35	* one function that just returns a P_.. value (see map.h)
…		…
76	/* 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
77	* have already checked this.	78	* have already checked this.
78	*/	79	*/
79	if (OUT_OF_REAL_MAP (m, sx, sy))	80	if (OUT_OF_REAL_MAP (m, sx, sy))
80	{	81	{
81	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	82	LOG (llevError \| logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
82	return 1;	83	return 1;
83	}	84	}
84		85
85	/* Save some cycles - instead of calling get_map_flags(), just get the value
86	* directly.
87	*/
88	mapspace &ms = m->at (sx, sy);	86	mapspace &ms = m->at (sx, sy);
89		87
90	int mflags = ms.flags ();	88	int mflags = ms.flags ();
91	int blocked = ms.move_block;	89	int blocked = ms.move_block;
92		90
93	/* If space is currently not blocked by anything, no need to	91	/* If space is currently not blocked by anything, no need to
94	* go further. Not true for players - all sorts of special	92	* go further. Not true for players - all sorts of special
95	* things we need to do for players.	93	* things we need to do for players.
96	*/	94	*/
97	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	95	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
98	return 0;	96	return 0;
99		97
100	/* if there isn't anything alive on this space, and this space isn't	98	/* if there isn't anything alive on this space, and this space isn't
101	* 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
102	* 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
…		…
112	/* 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
113	* 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
114	* true. If we get through the entire stack, that must mean	112	* true. If we get through the entire stack, that must mean
115	* ob is blocking it, so return 0.	113	* ob is blocking it, so return 0.
116	*/	114	*/
117	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	115	for (object *tmp = ms.top; tmp; tmp = tmp->below)
118	{	116	{
119	/* This must be before the checks below. Code for inventory checkers. */	117	if (OB_MOVE_BLOCK (ob, tmp))
120	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
121	{	118	{
122	bool have = check_inv_recursive (ob, tmp);	119	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
123		120	if (RESULT_INT (0))
124	/* If last_sp is set, the player/monster needs an object,	121	return 1;
125	* so we check for it. If they don't have it, they can't
126	* pass through this space.
127	*/	122	else
128	if (tmp->last_sp)	123	continue;
		124
		125	if (tmp->type == CHECK_INV)
129	{	126	{
130	if (!have)	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;
		132	}
		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))
131	return 1;	141	return 1;
132	}	142	}
133	else	143	else
134	{	144	return 1; // unconditional block
135	/* In this case, the player must not have the object -	145
136	* if they do, they can't pass through.
137	*/
138	if (have)
139	return 1;
140	}
141	}
142	else	146	} else {
143	{	147	// space does not block the ob, directly, but
144	/* Broke apart a big nasty if into several here to make	148	// anything alive that is not a door still
145	* this more readable. first check - if the space blocks	149	// blocks anything
146	* movement, can't move here.
147	* second - if a monster, can't move there, unless it is a
148	* dm.
149	*/
150	if (OB_MOVE_BLOCK (ob, tmp))
151	return 1;
152		150
153	if (tmp->flag [FLAG_ALIVE]	151	if (tmp->flag [FLAG_ALIVE]
154	&& tmp->head_ () != ob
155	&& tmp != ob
156	&& tmp->type != DOOR	152	&& tmp->type != DOOR
157	&& !tmp->flag [FLAG_WIZ])	153	&& tmp->head_ () != ob) //TODO: maybe move these check up?
158	return 1;	154	return 1;
159	}	155	}
160	}	156	}
161		157
162	return 0;	158	return 0;
163	}	159	}
164		160
165	/*	161	/*
166	* 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
167	* 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,
168	* just calling get_map_blocked and checking that against movement type	164	* just calling get_map_blocked and checking that against movement type
169	* 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
170	* object and makes sure they can be inserted.	166	* object and makes sure they can be inserted.
171	*	167	*
…		…
218	}	214	}
219		215
220	return 0;	216	return 0;
221	}	217	}
222		218
223	/* When the map is loaded, load_object does not actually insert objects	219	//-GPL
224	* into inventory, but just links them. What this does is go through
225	* and insert them properly.
226	* The object 'container' is the object that contains the inventory.
227	* This is needed so that we can update the containers weight.
228	*/
229	void
230	fix_container (object *container)
231	{
232	object tmp = container->inv, next;
233
234	container->inv = 0;
235	while (tmp)
236	{
237	next = tmp->below;
238	if (tmp->inv)
239	fix_container (tmp);
240
241	insert_ob_in_ob (tmp, container);
242	tmp = next;
243	}
244
245	// go through and calculate what all the containers are carrying.
246	//TODO: remove
247	container->update_weight ();
248	}
249		220
250	void	221	void
251	maptile::set_object_flag (int flag, int value)	222	maptile::set_object_flag (int flag, int value)
252	{	223	{
253	if (!spaces)	224	if (!spaces)
…		…
268		239
269	for (mapspace *ms = spaces + size (); ms-- > spaces; )	240	for (mapspace *ms = spaces + size (); ms-- > spaces; )
270	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	241	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
271	INVOKE_OBJECT (RESET, tmp);	242	INVOKE_OBJECT (RESET, tmp);
272	}	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
273		259
274	/* 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
275	* 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
276	* 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
277	* they are saved).	263	* they are saved).
…		…
304	else	290	else
305	op = op->above;	291	op = op->above;
306	}	292	}
307	}	293	}
308	}	294	}
		295
		296	//-GPL
309		297
310	/*	298	/*
311	* 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
312	* file pointer.	300	* file pointer.
313	*/	301	*/
…		…
433	return false;	421	return false;
434		422
435	return freezer.save (path);	423	return freezer.save (path);
436	}	424	}
437		425
438	maptile::maptile ()	426	void
		427	maptile::init ()
439	{	428	{
440	in_memory = MAP_SWAPPED;	429	in_memory = MAP_SWAPPED;
441		430
442	/* 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
443	* map archetype. Mimic that behaviour.	432	* map archetype. Mimic that behaviour.
444	*/	433	*/
445	width = 16;	434	width = 16;
446	height = 16;	435	height = 16;
447	timeout = 300;	436	timeout = 300;
448	max_nrof = 1000; // 1000 items of anything	437	max_items = MAX_ITEM_PER_ACTION;
449	max_volume = 2000000; // 2m³	438	max_volume = 2000000; // 2m³
450	}
451
452	maptile::maptile (int w, int h)
453	{
454	in_memory = MAP_SWAPPED;
455
456	width = w;
457	height = h;
458	reset_timeout = 0;	439	reset_timeout = 0;
459	timeout = 300;
460	enter_x = 0;	440	enter_x = 0;
461	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;
462		455
463	alloc ();	456	alloc ();
464	}	457	}
465		458
466	/*	459	/*
…		…
474	if (spaces)	467	if (spaces)
475	return;	468	return;
476		469
477	spaces = salloc0<mapspace> (size ());	470	spaces = salloc0<mapspace> (size ());
478	}	471	}
		472
		473	//+GPL
479		474
480	/* 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
481	* 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
482	* at a later date.	477	* at a later date.
483	* Called by parse_map_headers below.	478	* Called by parse_map_headers below.
…		…
560	return items;	555	return items;
561	}	556	}
562		557
563	/* 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
564	* the map (or something equivilent) into output_string. */	559	* the map (or something equivilent) into output_string. */
565	static void	560	static const char *
566	print_shop_string (maptile m, char output_string)	561	print_shop_string (maptile *m)
567	{	562	{
568	int i;	563	static dynbuf_text buf; buf.clear ();
569	char tmp[MAX_BUF];
570		564
571	strcpy (output_string, "");
572	for (i = 0; i < m->shopitems[0].index; i++)	565	for (int i = 0; i < m->shopitems[0].index; i++)
573	{	566	{
574	if (m->shopitems[i].typenum)	567	if (m->shopitems[i].typenum)
575	{	568	{
576	if (m->shopitems[i].strength)	569	if (m->shopitems[i].strength)
577	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);
578	else	571	else
579	sprintf (tmp, "%s;", m->shopitems[i].name);	572	buf.printf ("%s;", m->shopitems[i].name);
580	}	573	}
581	else	574	else
582	{	575	{
583	if (m->shopitems[i].strength)	576	if (m->shopitems[i].strength)
584	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	577	buf.printf ("*:%d;", m->shopitems[i].strength);
585	else	578	else
586	sprintf (tmp, "*");	579	buf.printf ("*");
587	}	580	}
588
589	strcat (output_string, tmp);
590	}	581	}
		582
		583	return buf;
591	}	584	}
		585
		586	//-GPL
592		587
593	/* This loads the header information of the map. The header	588	/* This loads the header information of the map. The header
594	* contains things like difficulty, size, timeout, etc.	589	* contains things like difficulty, size, timeout, etc.
595	* 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
596	* addition of tiling, fields beyond that easily named in an	591	* addition of tiling, fields beyond that easily named in an
…		…
637	case KW_shopgreed: thawer.get (shopgreed); break;	632	case KW_shopgreed: thawer.get (shopgreed); break;
638	case KW_shopmin: thawer.get (shopmin); break;	633	case KW_shopmin: thawer.get (shopmin); break;
639	case KW_shopmax: thawer.get (shopmax); break;	634	case KW_shopmax: thawer.get (shopmax); break;
640	case KW_shoprace: thawer.get (shoprace); break;	635	case KW_shoprace: thawer.get (shoprace); break;
641	case KW_outdoor: thawer.get (outdoor); break;	636	case KW_outdoor: thawer.get (outdoor); break;
642	case KW_temp: thawer.get (temp); break;
643	case KW_pressure: thawer.get (pressure); break;
644	case KW_humid: thawer.get (humid); break;
645	case KW_windspeed: thawer.get (windspeed); break;
646	case KW_winddir: thawer.get (winddir); break;
647	case KW_sky: thawer.get (sky); break;
648		637
649	case KW_per_player: thawer.get (per_player); break;	638	case KW_per_player: thawer.get (per_player); break;
650	case KW_per_party: thawer.get (per_party); break;	639	case KW_per_party: thawer.get (per_party); break;
651	case KW_no_reset: thawer.get (no_reset); break;	640	case KW_no_reset: thawer.get (no_reset); break;
652	case KW_no_drop: thawer.get (no_drop); break;	641	case KW_no_drop: thawer.get (no_drop); break;
653		642
654	case KW_region: default_region = region::find (thawer.get_str ()); break;	643	case KW_region: default_region = region::find (thawer); break;
655	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	644	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
656		645
657	// old names new names	646	// old names new names
658	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;	647	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
659	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;	648	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
…		…
677	case KW_end:	666	case KW_end:
678	thawer.next ();	667	thawer.next ();
679	return true;	668	return true;
680		669
681	default:	670	default:
682	if (!thawer.parse_error ("map", 0))	671	if (!thawer.parse_error ("map"))
683	return false;	672	return false;
684	break;	673	break;
685	}	674	}
686		675
687	thawer.next ();	676	thawer.next ();
688	}	677	}
689		678
690	abort ();	679	abort ();
691	}	680	}
		681
		682	//+GPL
692		683
693	/******************************************************************************	684	/******************************************************************************
694	* This is the start of unique map handling code	685	* This is the start of unique map handling code
695	*****************************************************************************/	686	*****************************************************************************/
696		687
…		…
703	int unique = 0;	694	int unique = 0;
704	for (object *op = spaces [i].bot; op; )	695	for (object *op = spaces [i].bot; op; )
705	{	696	{
706	object *above = op->above;	697	object *above = op->above;
707		698
708	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	699	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
709	unique = 1;	700	unique = 1;
710		701
711	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	702	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
712	op->destroy ();	703	op->destroy ();
713		704
714	op = above;	705	op = above;
715	}	706	}
716	}	707	}
717	}	708	}
718		709
		710	//-GPL
		711
719	bool	712	bool
720	maptile::_save_header (object_freezer &freezer)	713	maptile::_save_header (object_freezer &freezer)
721	{	714	{
722	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	715	#define MAP_OUT(k) freezer.put (KW(k), k)
723	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	716	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
724		717
725	MAP_OUT2 (arch, "map");	718	MAP_OUT2 (arch, CS(map));
726		719
727	if (name) MAP_OUT (name);	720	if (name) MAP_OUT (name);
728	MAP_OUT (swap_time);	721	MAP_OUT (swap_time);
729	MAP_OUT (reset_time);	722	MAP_OUT (reset_time);
730	MAP_OUT (reset_timeout);	723	MAP_OUT (reset_timeout);
731	MAP_OUT (fixed_resettime);	724	MAP_OUT (fixed_resettime);
732	MAP_OUT (no_reset);	725	MAP_OUT (no_reset);
733	MAP_OUT (no_drop);	726	MAP_OUT (no_drop);
734	MAP_OUT (difficulty);	727	MAP_OUT (difficulty);
735
736	if (default_region) MAP_OUT2 (region, default_region->name);	728	if (default_region) MAP_OUT2 (region, default_region->name);
737		729
738	if (shopitems)	730	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
739	{
740	char shop[MAX_BUF];
741	print_shop_string (this, shop);
742	MAP_OUT2 (shopitems, shop);
743	}
744
745	MAP_OUT (shopgreed);	731	MAP_OUT (shopgreed);
746	MAP_OUT (shopmin);	732	MAP_OUT (shopmin);
747	MAP_OUT (shopmax);	733	MAP_OUT (shopmax);
748	if (shoprace) MAP_OUT (shoprace);	734	if (shoprace) MAP_OUT (shoprace);
749	MAP_OUT (darkness);	735
750	MAP_OUT (width);	736	MAP_OUT (width);
751	MAP_OUT (height);	737	MAP_OUT (height);
752	MAP_OUT (enter_x);	738	MAP_OUT (enter_x);
753	MAP_OUT (enter_y);	739	MAP_OUT (enter_y);
754		740	MAP_OUT (darkness);
755	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
756	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
757
758	MAP_OUT (outdoor);	741	MAP_OUT (outdoor);
759	MAP_OUT (temp);	742
760	MAP_OUT (pressure);	743	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
761	MAP_OUT (humid);	744	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
762	MAP_OUT (windspeed);
763	MAP_OUT (winddir);
764	MAP_OUT (sky);
765		745
766	MAP_OUT (per_player);	746	MAP_OUT (per_player);
767	MAP_OUT (per_party);	747	MAP_OUT (per_party);
768		748
769	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]);
770	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]);
771	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]);
772	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]);
773		753
774	freezer.put (this);	754	freezer.put (this);
775	freezer.put (KW_end);	755	freezer.put (KW(end));
776		756
777	return true;	757	return true;
778	}	758	}
779		759
780	bool	760	bool
…		…
785	if (!_save_header (freezer))	765	if (!_save_header (freezer))
786	return false;	766	return false;
787		767
788	return freezer.save (path);	768	return freezer.save (path);
789	}	769	}
		770
		771	//+GPL
790		772
791	/*	773	/*
792	* Remove and free all objects in the given map.	774	* Remove and free all objects in the given map.
793	*/	775	*/
794	void	776	void
…		…
863		845
864	clear ();	846	clear ();
865	}	847	}
866		848
867	/* 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?
868	void	851	void
869	maptile::do_decay_objects ()	852	maptile::do_decay_objects ()
870	{	853	{
871	if (!spaces)	854	if (!spaces)
872	return;	855	return;
…		…
874	for (mapspace *ms = spaces + size (); ms-- > spaces; )	857	for (mapspace *ms = spaces + size (); ms-- > spaces; )
875	for (object above, op = ms->bot; op; op = above)	858	for (object above, op = ms->bot; op; op = above)
876	{	859	{
877	above = op->above;	860	above = op->above;
878		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
879	bool destroy = 0;	866	bool destroy = 0;
880		867
881	// do not decay anything above unique floor tiles (yet :)	868	if (op->flag [FLAG_IS_FLOOR]
882	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	869	\|\| op->flag [FLAG_OBJ_ORIGINAL]
883	break;	870	\|\| op->flag [FLAG_UNIQUE]
884		871	\|\| op->flag [FLAG_OVERLAY_FLOOR]
885	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	872	\|\| op->flag [FLAG_UNPAID]
886	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
887	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
888	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
889	\|\| QUERY_FLAG (op, FLAG_UNPAID)
890	\|\| op->is_alive ())	873	\|\| op->is_alive ())
891	; // do not decay	874	; // do not decay
892	else if (op->is_weapon ())	875	else if (op->is_weapon ())
893	{	876	{
894	op->stats.dam--;	877	op->stats.dam--;
…		…
919	\|\| mat & M_LIQUID	902	\|\| mat & M_LIQUID
920	\|\| (mat & M_IRON && rndm (1, 5) == 1)	903	\|\| (mat & M_IRON && rndm (1, 5) == 1)
921	\|\| (mat & M_GLASS && rndm (1, 2) == 1)	904	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
922	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)	905	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
923	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)	906	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
924	\|\| (mat & M_ICE && temp > 32))	907	//\|\| (mat & M_ICE && temp > 32)
		908	)
925	destroy = 1;	909	destroy = 1;
926	}	910	}
927		911
928	/* adjust overall chance below */	912	/* adjust overall chance below */
929	if (destroy && rndm (0, 1))	913	if (destroy && rndm (0, 1))
…		…
949	sint64 total_exp = 0;	933	sint64 total_exp = 0;
950		934
951	for (mapspace *ms = spaces + size (); ms-- > spaces; )	935	for (mapspace *ms = spaces + size (); ms-- > spaces; )
952	for (object *op = ms->bot; op; op = op->above)	936	for (object *op = ms->bot; op; op = op->above)
953	{	937	{
954	if (QUERY_FLAG (op, FLAG_MONSTER))	938	if (op->flag [FLAG_MONSTER])
955	{	939	{
956	total_exp += op->stats.exp;	940	total_exp += op->stats.exp;
957	monster_cnt++;	941	monster_cnt++;
958	}	942	}
959		943
960	if (QUERY_FLAG (op, FLAG_GENERATOR))	944	if (op->flag [FLAG_GENERATOR])
961	{	945	{
962	total_exp += op->stats.exp;	946	total_exp += op->stats.exp;
963		947
964	if (archetype *at = op->other_arch)	948	if (archetype *at = op->other_arch)
965	{	949	{
…		…
1020	*/	1004	*/
1021	void	1005	void
1022	mapspace::update_ ()	1006	mapspace::update_ ()
1023	{	1007	{
1024	object *last = 0;	1008	object *last = 0;
1025	uint8 flags = P_UPTODATE, anywhere = 0;	1009	uint8 flags = P_UPTODATE;
1026	sint8 light = 0;	1010	sint8 light = 0;
1027	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;
1028		1016
1029	//object *middle = 0;	1017	//object *middle = 0;
1030	//object *top = 0;	1018	//object *top = 0;
1031	//object *floor = 0;	1019	//object *floor = 0;
1032	// this seems to generate better code than using locals, above	1020	// this seems to generate better code than using locals, above
1033	object *&top = faces_obj[0] = 0;	1021	object *&top = faces_obj[0] = 0;
1034	object *&middle = faces_obj[1] = 0;	1022	object *&middle = faces_obj[1] = 0;
1035	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
1036		1026
1037	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)	1027	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1038	{	1028	{
1039	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)	1029	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1040	light += tmp->glow_radius;	1030	light += tmp->glow_radius;
…		…
1045	* 3 times each time the player moves, because many of the	1035	* 3 times each time the player moves, because many of the
1046	* functions the move_player calls eventualy call this.	1036	* functions the move_player calls eventualy call this.
1047	*	1037	*
1048	* Always put the player down for drawing.	1038	* Always put the player down for drawing.
1049	*/	1039	*/
1050	if (!tmp->invisible)	1040	if (expect_true (!tmp->invisible))
1051	{	1041	{
1052	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1042	if (expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))
1053	top = tmp;	1043	top = tmp;
1054	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1044	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1055	{	1045	{
1056	/* 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,
1057	* so should not be visible, so we clear them.	1047	* so should not be visible, so we clear them.
1058	*/	1048	*/
1059	middle = 0;	1049	middle = 0;
1060	top = 0;	1050	top = 0;
1061	floor = tmp;	1051	floor = tmp;
		1052	volume = 0;
		1053	items = 0;
1062	}	1054	}
1063	/* Flag anywhere have high priority */	1055	else
1064	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1065	{	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;
1066	middle = tmp;	1074	middle = tmp;
1067	anywhere = 1;	1075	}
1068	}	1076	}
1069
1070	/* Find the highest visible face around. If equal
1071	* visibilities, we still want the one nearer to the
1072	* top
1073	*/
1074	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1075	middle = tmp;
1076	}
1077
1078	if (tmp == tmp->above)
1079	{
1080	LOG (llevError, "Error in structure of map\n");
1081	exit (-1);
1082	}	1077	}
1083		1078
1084	move_slow \|= tmp->move_slow;	1079	move_slow \|= tmp->move_slow;
1085	move_block \|= tmp->move_block;	1080	move_block \|= tmp->move_block;
1086	move_on \|= tmp->move_on;	1081	move_on \|= tmp->move_on;
1087	move_off \|= tmp->move_off;	1082	move_off \|= tmp->move_off;
1088	move_allow \|= tmp->move_allow;	1083	move_allow \|= tmp->move_allow;
1089		1084
1090	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags \|= P_BLOCKSVIEW;	1085	allflags \|= tmp->flag;
1091	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags \|= P_NO_MAGIC;	1086
1092	if (tmp->type == PLAYER) flags \|= P_PLAYER;	1087	if (tmp->type == PLAYER) flags \|= P_PLAYER;
1093	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1088	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1094	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1095	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1096	}	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;
1097		1100
1098	this->light = min (light, MAX_LIGHT_RADIUS);	1101	this->light = min (light, MAX_LIGHT_RADIUS);
1099	this->flags_ = flags;	1102	this->flags_ = flags;
1100	this->move_block = move_block & ~move_allow;	1103	this->move_block = move_block & ~move_allow;
1101	this->move_on = move_on;	1104	this->move_on = move_on;
1102	this->move_off = move_off;	1105	this->move_off = move_off;
1103	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
1104		1109
1105	/* 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),
1106	* 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
1107	* this point.	1112	* this point.
1108	* middle contains the highest visibility face.	1113	* middle contains the highest visibility face.
…		…
1126	*/	1131	*/
1127		1132
1128	for (object *tmp = last; tmp; tmp = tmp->below)	1133	for (object *tmp = last; tmp; tmp = tmp->below)
1129	{	1134	{
1130	/* 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 */
1131	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1136	if (tmp->flag [FLAG_IS_FLOOR])
1132	break;	1137	break;
1133		1138
1134	/* If two top faces are already set, quit processing */	1139	/* If two top faces are already set, quit processing */
1135	if (top && middle)	1140	if (top && middle)
1136	break;	1141	break;
…		…
1174	faces_obj [1] = middle;	1179	faces_obj [1] = middle;
1175	faces_obj [2] = floor;	1180	faces_obj [2] = floor;
1176	#endif	1181	#endif
1177	}	1182	}
1178		1183
1179	uint64
1180	mapspace::volume () const
1181	{
1182	uint64 vol = 0;
1183
1184	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1185	vol += op->volume ();
1186
1187	return vol;
1188	}
1189
1190	maptile *	1184	maptile *
1191	maptile::tile_available (int dir, bool load)	1185	maptile::tile_available (int dir, bool load)
1192	{	1186	{
1193	if (tile_path[dir])	1187	if (tile_path[dir])
1194	{	1188	{
…		…
1430	*	1424	*
1431	* currently, the only flag supported (0x1) is don't translate for	1425	* currently, the only flag supported (0x1) is don't translate for
1432	* closest body part of 'op1'	1426	* closest body part of 'op1'
1433	*/	1427	*/
1434	void	1428	void
1435	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1429	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1436	{	1430	{
1437	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))
1438	{	1432	{
1439	/* be conservative and fill in _some_ data */	1433	/* be conservative and fill in _some_ data */
1440	retval->distance = 10000;	1434	retval->distance = 10000;
1441	retval->distance_x = 10000;	1435	retval->distance_x = 10000;
1442	retval->distance_y = 10000;	1436	retval->distance_y = 10000;
1443	retval->direction = 0;	1437	retval->direction = 0;
1444	retval->part = 0;	1438	retval->part = 0;
1445	}	1439	}
1446	else	1440	else
1447	{	1441	{
1448	object *best;
1449
1450	retval->distance_x += op2->x - op1->x;	1442	retval->distance_x += op2->x - op1->x;
1451	retval->distance_y += op2->y - op1->y;	1443	retval->distance_y += op2->y - op1->y;
1452		1444
1453	best = op1;	1445	object *best = op1;
		1446
1454	/* If this is multipart, find the closest part now */	1447	/* If this is multipart, find the closest part now */
1455	if (!(flags & 0x1) && op1->more)	1448	if (!(flags & 1) && op1->more)
1456	{	1449	{
1457	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1450	int best_distance = idistance (retval->distance_x, retval->distance_y);
1458		1451
1459	/* 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
1460	* distance instead of doing all that work above again	1453	* distance instead of doing all that work above again
1461	* since the distance fields we set above are positive in the	1454	* since the distance fields we set above are positive in the
1462	* same axis as is used for multipart objects, the simply arithmetic	1455	* same axis as is used for multipart objects, the simply arithmetic
1463	* below works.	1456	* below works.
1464	*/	1457	*/
1465	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1458	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1466	{	1459	{
1467	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1460	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1468	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1461
1469	if (tmpi < best_distance)	1462	if (tmpi < best_distance)
1470	{	1463	{
1471	best_distance = tmpi;	1464	best_distance = tmpi;
1472	best = tmp;	1465	best = tmp;
1473	}	1466	}
1474	}	1467	}
1475		1468
1476	if (best != op1)	1469	if (best != op1)
1477	{	1470	{
1478	retval->distance_x += op1->x - best->x;	1471	retval->distance_x += op1->x - best->x;
1479	retval->distance_y += op1->y - best->y;	1472	retval->distance_y += op1->y - best->y;
1480	}	1473	}
1481	}	1474	}
1482		1475
1483	retval->part = best;	1476	retval->part = best;
1484	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1477	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1485	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1478	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1486	}	1479	}
1487	}	1480	}
1488		1481
1489	/* this is basically the same as get_rangevector above, but instead of	1482	/* this is basically the same as get_rangevector above, but instead of
1490	* the first parameter being an object, it instead is the map	1483	* the first parameter being an object, it instead is the map
…		…
1500	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1493	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1501	{	1494	{
1502	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1495	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1503	{	1496	{
1504	/* be conservative and fill in _some_ data */	1497	/* be conservative and fill in _some_ data */
1505	retval->distance = 100000;	1498	retval->distance = 100000;
1506	retval->distance_x = 32767;	1499	retval->distance_x = 32767;
1507	retval->distance_y = 32767;	1500	retval->distance_y = 32767;
1508	retval->direction = 0;	1501	retval->direction = 0;
1509	retval->part = 0;	1502	retval->part = 0;
1510	}	1503	}
1511	else	1504	else
1512	{	1505	{
1513	retval->distance_x += op2->x - x;	1506	retval->distance_x += op2->x - x;
1514	retval->distance_y += op2->y - y;	1507	retval->distance_y += op2->y - y;
1515		1508
1516	retval->part = 0;	1509	retval->part = 0;
1517	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1510	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1518	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1511	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1519	}	1512	}
1520	}	1513	}
1521		1514
1522	/* 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
1523	* (as related to map tiling). Note that this looks for a path from	1516	* (as related to map tiling). Note that this looks for a path from
…		…
1533	int dx, dy;	1526	int dx, dy;
1534		1527
1535	return adjacent_map (op1->map, op2->map, &dx, &dy);	1528	return adjacent_map (op1->map, op2->map, &dx, &dy);
1536	}	1529	}
1537		1530
		1531	//-GPL
		1532
1538	object *	1533	object *
1539	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)
1540	{	1535	{
1541	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);
1542	}	1537	}
…		…
1553	if (default_region)	1548	if (default_region)
1554	return default_region;	1549	return default_region;
1555		1550
1556	return ::region::default_region ();	1551	return ::region::default_region ();
1557	}	1552	}
		1553
		1554	//+GPL
1558		1555
1559	/* picks a random object from a style map.	1556	/* picks a random object from a style map.
1560	*/	1557	*/
1561	object *	1558	object *
1562	maptile::pick_random_object (rand_gen &gen) const	1559	maptile::pick_random_object (rand_gen &gen) const
…		…
1569	*/	1566	*/
1570	for (int i = 1000; --i;)	1567	for (int i = 1000; --i;)
1571	{	1568	{
1572	object *pick = at (gen (width), gen (height)).bot;	1569	object *pick = at (gen (width), gen (height)).bot;
1573		1570
1574	// do not prefer big monsters just because they are big.	1571	// must be head: do not prefer big monsters just because they are big.
1575	if (pick && pick->is_head ())	1572	if (pick && pick->is_head ())
1576	return pick->head_ ();	1573	return pick;
1577	}	1574	}
1578		1575
1579	// instead of crashing in the unlikely(?) case, try to return something	1576	// instead of crashing in the unlikely(?) case, try to return something
1580	return archetype::find ("bug");	1577	return archetype::find (shstr_bug);
1581	}	1578	}
		1579
		1580	//-GPL
1582		1581
1583	void	1582	void
1584	maptile::play_sound (faceidx sound, int x, int y) const	1583	maptile::play_sound (faceidx sound, int x, int y) const
1585	{	1584	{
1586	if (!sound)	1585	if (!sound)
…		…
1612		1611
1613	if (distance <= MAX_SOUND_DISTANCE)	1612	if (distance <= MAX_SOUND_DISTANCE)
1614	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1613	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1615	}	1614	}
1616	}	1615	}
		1616
		1617	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1617		1618
1618	static void	1619	static void
1619	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)
1620	{	1621	{
1621	// clip to map to the left	1622	// clip to map to the left
…		…
1677	r->dx = dx;	1678	r->dx = dx;
1678	r->dy = dy;	1679	r->dy = dy;
1679	}	1680	}
1680		1681
1681	maprect *	1682	maprect *
1682	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)
1683	{	1684	{
1684	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1685	buf.clear ();	1685	buf.clear ();
1686		1686
1687	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1687	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1688		1688
1689	// 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.161 by root, Mon Oct 12 21:27:55 2009 UTC vs. Revision 1.196 by root, Sun Apr 25 10:45:38 2010 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.161 by root, Mon Oct 12 21:27:55 2009 UTC vs.
Revision 1.196 by root, Sun Apr 25 10:45:38 2010 UTC