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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.168 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.204 by root, Wed May 4 07:36:40 2011 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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011 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"
30		29
31	//+GPL	30	//+GPL
32		31
33	sint8 maptile::outdoor_darkness;	32	sint8 maptile::outdoor_darkness;
…		…
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 \| logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
84	return 1;	83	return 1;
85	}	84	}
86		85
87	mapspace &ms = m->at (sx, sy);	86	mapspace &ms = m->at (sx, sy);
88		87
…		…
91		90
92	/* If space is currently not blocked by anything, no need to	91	/* If space is currently not blocked by anything, no need to
93	* go further. Not true for players - all sorts of special	92	* go further. Not true for players - all sorts of special
94	* things we need to do for players.	93	* things we need to do for players.
95	*/	94	*/
96	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	95	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
97	return 0;	96	return 0;
98		97
99	/* 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
100	* 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
101	* 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
…		…
111	/* 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
112	* 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
113	* true. If we get through the entire stack, that must mean	112	* true. If we get through the entire stack, that must mean
114	* ob is blocking it, so return 0.	113	* ob is blocking it, so return 0.
115	*/	114	*/
116	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	115	for (object *tmp = ms.top; tmp; tmp = tmp->below)
117	{	116	{
118	if (OB_MOVE_BLOCK (ob, tmp))	117	if (OB_MOVE_BLOCK (ob, tmp))
119	{	118	{
120	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))	119	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
121	if (RESULT_INT (0))	120	if (RESULT_INT (0))
…		…
145	return 1; // unconditional block	144	return 1; // unconditional block
146		145
147	} else {	146	} else {
148	// space does not block the ob, directly, but	147	// space does not block the ob, directly, but
149	// anything alive that is not a door still	148	// anything alive that is not a door still
150	// blocks anything but wizards.	149	// blocks anything
151		150
152	if (tmp->flag [FLAG_ALIVE]	151	if (tmp->flag [FLAG_ALIVE]
153	&& tmp->head_ () != ob
154	&& tmp != ob
155	&& tmp->type != DOOR	152	&& tmp->type != DOOR
156	&& !tmp->flag [FLAG_WIZPASS])	153	&& tmp->head_ () != ob) //TODO: maybe move these check up?
157	return 1;	154	return 1;
158	}	155	}
159	}	156	}
160		157
161	return 0;	158	return 0;
162	}	159	}
163		160
164	/*	161	/*
165	* 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
166	* 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,
167	* just calling get_map_blocked and checking that against movement type	164	* just calling get_map_blocked and checking that against movement type
168	* 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
169	* object and makes sure they can be inserted.	166	* object and makes sure they can be inserted.
170	*	167	*
…		…
217	}	214	}
218		215
219	return 0;	216	return 0;
220	}	217	}
221		218
222	/* When the map is loaded, load_object does not actually insert objects
223	* into inventory, but just links them. What this does is go through
224	* and insert them properly.
225	* The object 'container' is the object that contains the inventory.
226	* This is needed so that we can update the containers weight.
227	*/
228	static void
229	fix_container (object *container)
230	{
231	object tmp = container->inv, next;
232
233	container->inv = 0;
234	while (tmp)
235	{
236	next = tmp->below;
237	if (tmp->inv)
238	fix_container (tmp);
239
240	insert_ob_in_ob (tmp, container);
241	tmp = next;
242	}
243
244	// go through and calculate what all the containers are carrying.
245	//TODO: remove
246	container->update_weight ();
247	}
248
249	//-GPL	219	//-GPL
250		220
251	void	221	void
252	maptile::set_object_flag (int flag, int value)	222	maptile::set_object_flag (int flag, int value)
253	{	223	{
…		…
268	set_object_flag (FLAG_OBJ_ORIGINAL);	238	set_object_flag (FLAG_OBJ_ORIGINAL);
269		239
270	for (mapspace *ms = spaces + size (); ms-- > spaces; )	240	for (mapspace *ms = spaces + size (); ms-- > spaces; )
271	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	241	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
272	INVOKE_OBJECT (RESET, tmp);	242	INVOKE_OBJECT (RESET, tmp);
		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
273	}	256	}
274		257
275	//+GPL	258	//+GPL
276		259
277	/* 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
…		…
328	case KW_arch:	311	case KW_arch:
329	if (object *op = object::read (f, this))	312	if (object *op = object::read (f, this))
330	{	313	{
331	// TODO: why?	314	// TODO: why?
332	if (op->inv)	315	if (op->inv)
		316	{
		317	op->carrying = 0;
333	op->update_weight ();	318	op->update_weight ();
		319	}
334		320
335	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))	321	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
336	{	322	{
337	// we insert manually because	323	// we insert manually because
338	// a) its way faster	324	// a) its way faster
…		…
375	}	361	}
376		362
377	void	363	void
378	maptile::activate ()	364	maptile::activate ()
379	{	365	{
380	if (spaces)	366	if (in_memory != MAP_INACTIVE)
		367	return;
		368
381	for (mapspace *ms = spaces + size (); ms-- > spaces; )	369	for (mapspace *ms = spaces + size (); ms-- > spaces; )
382	for (object *op = ms->bot; op; op = op->above)	370	for (object *op = ms->bot; op; op = op->above)
383	op->activate_recursive ();	371	op->activate_recursive ();
		372
		373	in_memory = MAP_ACTIVE;
384	}	374	}
385		375
386	void	376	void
387	maptile::deactivate ()	377	maptile::deactivate ()
388	{	378	{
389	if (spaces)	379	if (in_memory != MAP_ACTIVE)
		380	return;
		381
390	for (mapspace *ms = spaces + size (); ms-- > spaces; )	382	for (mapspace *ms = spaces + size (); ms-- > spaces; )
391	for (object *op = ms->bot; op; op = op->above)	383	for (object *op = ms->bot; op; op = op->above)
392	op->deactivate_recursive ();	384	op->deactivate_recursive ();
		385
		386	in_memory = MAP_INACTIVE;
393	}	387	}
394		388
395	bool	389	bool
396	maptile::_save_objects (object_freezer &f, int flags)	390	maptile::_save_objects (object_freezer &f, int flags)
397	{	391	{
…		…
438	return false;	432	return false;
439		433
440	return freezer.save (path);	434	return freezer.save (path);
441	}	435	}
442		436
443	maptile::maptile ()	437	void
		438	maptile::init ()
444	{	439	{
445	in_memory = MAP_SWAPPED;	440	in_memory = MAP_SWAPPED;
446		441
447	/* The maps used to pick up default x and y values from the	442	/* The maps used to pick up default x and y values from the
448	* map archetype. Mimic that behaviour.	443	* map archetype. Mimic that behaviour.
449	*/	444	*/
450	width = 16;	445	width = 16;
451	height = 16;	446	height = 16;
452	timeout = 300;	447	timeout = 300;
453	max_nrof = 1000; // 1000 items of anything	448	max_items = MAX_ITEM_PER_ACTION;
454	max_volume = 2000000; // 2m³	449	max_volume = 2000000; // 2m³
455	}
456
457	maptile::maptile (int w, int h)
458	{
459	in_memory = MAP_SWAPPED;
460
461	width = w;
462	height = h;
463	reset_timeout = 0;	450	reset_timeout = 0;
464	timeout = 300;
465	enter_x = 0;	451	enter_x = 0;
466	enter_y = 0;	452	enter_y = 0;
		453	}
		454
		455	maptile::maptile ()
		456	{
		457	init ();
		458	}
		459
		460	maptile::maptile (int w, int h)
		461	{
		462	init ();
		463
		464	width = w;
		465	height = h;
467		466
468	alloc ();	467	alloc ();
469	}	468	}
470		469
471	/*	470	/*
…		…
571	* the map (or something equivilent) into output_string. */	570	* the map (or something equivilent) into output_string. */
572	static const char *	571	static const char *
573	print_shop_string (maptile *m)	572	print_shop_string (maptile *m)
574	{	573	{
575	static dynbuf_text buf; buf.clear ();	574	static dynbuf_text buf; buf.clear ();
		575	bool first = true;
576		576
577	for (int i = 0; i < m->shopitems[0].index; i++)	577	for (int i = 0; i < m->shopitems[0].index; i++)
578	{	578	{
		579	if (!first)
		580	buf << ';';
		581
		582	first = false;
		583
579	if (m->shopitems[i].typenum)	584	if (m->shopitems[i].typenum)
580	{	585	{
581	if (m->shopitems[i].strength)	586	if (m->shopitems[i].strength)
582	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	587	buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
583	else	588	else
584	buf.printf ("%s;", m->shopitems[i].name);	589	buf.printf ("%s", m->shopitems[i].name);
585	}	590	}
586	else	591	else
587	{	592	{
588	if (m->shopitems[i].strength)	593	if (m->shopitems[i].strength)
589	buf.printf ("*:%d;", m->shopitems[i].strength);	594	buf.printf ("*:%d", m->shopitems[i].strength);
590	else	595	else
591	buf.printf ("*");	596	buf.printf ("*");
592	}	597	}
593	}	598	}
594		599
…		…
617	{	622	{
618	case KW_msg:	623	case KW_msg:
619	thawer.get_ml (KW_endmsg, msg);	624	thawer.get_ml (KW_endmsg, msg);
620	break;	625	break;
621		626
622	case KW_lore: // CF+ extension	627	case KW_lore: // deliantra extension
623	thawer.get_ml (KW_endlore, maplore);	628	thawer.get_ml (KW_endlore, maplore);
624	break;	629	break;
625		630
626	case KW_maplore:	631	case KW_maplore:
627	thawer.get_ml (KW_endmaplore, maplore);	632	thawer.get_ml (KW_endmaplore, maplore);
…		…
644	case KW_shopgreed: thawer.get (shopgreed); break;	649	case KW_shopgreed: thawer.get (shopgreed); break;
645	case KW_shopmin: thawer.get (shopmin); break;	650	case KW_shopmin: thawer.get (shopmin); break;
646	case KW_shopmax: thawer.get (shopmax); break;	651	case KW_shopmax: thawer.get (shopmax); break;
647	case KW_shoprace: thawer.get (shoprace); break;	652	case KW_shoprace: thawer.get (shoprace); break;
648	case KW_outdoor: thawer.get (outdoor); break;	653	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		654
656	case KW_per_player: thawer.get (per_player); break;	655	case KW_per_player: thawer.get (per_player); break;
657	case KW_per_party: thawer.get (per_party); break;	656	case KW_per_party: thawer.get (per_party); break;
658	case KW_no_reset: thawer.get (no_reset); break;	657	case KW_no_reset: thawer.get (no_reset); break;
659	case KW_no_drop: thawer.get (no_drop); break;	658	case KW_no_drop: thawer.get (no_drop); break;
660		659
661	case KW_region: default_region = region::find (thawer.get_str ()); break;	660	case KW_region: thawer.get (default_region); break;
662	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	661	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
663		662
664	// old names new names	663	// old names new names
665	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;	664	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
666	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;	665	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
…		…
674		673
675	case KW_tile_path_1: thawer.get (tile_path [0]); break;	674	case KW_tile_path_1: thawer.get (tile_path [0]); break;
676	case KW_tile_path_2: thawer.get (tile_path [1]); break;	675	case KW_tile_path_2: thawer.get (tile_path [1]); break;
677	case KW_tile_path_3: thawer.get (tile_path [2]); break;	676	case KW_tile_path_3: thawer.get (tile_path [2]); break;
678	case KW_tile_path_4: thawer.get (tile_path [3]); break;	677	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		678	case KW_tile_path_5: thawer.get (tile_path [4]); break;
		679	case KW_tile_path_6: thawer.get (tile_path [5]); break;
679		680
680	case KW_ERROR:	681	case KW_ERROR:
681	set_key_text (thawer.kw_str, thawer.value);	682	set_key_text (thawer.kw_str, thawer.value);
682	break;	683	break;
683		684
684	case KW_end:	685	case KW_end:
685	thawer.next ();	686	thawer.next ();
686	return true;	687	return true;
687		688
688	default:	689	default:
689	if (!thawer.parse_error ("map", 0))	690	if (!thawer.parse_error ("map"))
690	return false;	691	return false;
691	break;	692	break;
692	}	693	}
693		694
694	thawer.next ();	695	thawer.next ();
…		…
712	int unique = 0;	713	int unique = 0;
713	for (object *op = spaces [i].bot; op; )	714	for (object *op = spaces [i].bot; op; )
714	{	715	{
715	object *above = op->above;	716	object *above = op->above;
716		717
717	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	718	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
718	unique = 1;	719	unique = 1;
719		720
720	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	721	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
721	op->destroy ();	722	op->destroy ();
722		723
723	op = above;	724	op = above;
724	}	725	}
725	}	726	}
…		…
728	//-GPL	729	//-GPL
729		730
730	bool	731	bool
731	maptile::_save_header (object_freezer &freezer)	732	maptile::_save_header (object_freezer &freezer)
732	{	733	{
733	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	734	#define MAP_OUT(k) freezer.put (KW(k), k)
734	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	735	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
735		736
736	MAP_OUT2 (arch, "map");	737	MAP_OUT2 (arch, CS(map));
737		738
738	if (name) MAP_OUT (name);	739	if (name) MAP_OUT (name);
739	MAP_OUT (swap_time);	740	MAP_OUT (swap_time);
740	MAP_OUT (reset_time);	741	MAP_OUT (reset_time);
741	MAP_OUT (reset_timeout);	742	MAP_OUT (reset_timeout);
…		…
749	MAP_OUT (shopgreed);	750	MAP_OUT (shopgreed);
750	MAP_OUT (shopmin);	751	MAP_OUT (shopmin);
751	MAP_OUT (shopmax);	752	MAP_OUT (shopmax);
752	if (shoprace) MAP_OUT (shoprace);	753	if (shoprace) MAP_OUT (shoprace);
753		754
754	MAP_OUT (darkness);
755	MAP_OUT (width);	755	MAP_OUT (width);
756	MAP_OUT (height);	756	MAP_OUT (height);
757	MAP_OUT (enter_x);	757	MAP_OUT (enter_x);
758	MAP_OUT (enter_y);	758	MAP_OUT (enter_y);
759		759	MAP_OUT (darkness);
760	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
761	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
762
763	MAP_OUT (outdoor);	760	MAP_OUT (outdoor);
764	MAP_OUT (temp);	761
765	MAP_OUT (pressure);	762	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
766	MAP_OUT (humid);	763	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
767	MAP_OUT (windspeed);
768	MAP_OUT (winddir);
769	MAP_OUT (sky);
770		764
771	MAP_OUT (per_player);	765	MAP_OUT (per_player);
772	MAP_OUT (per_party);	766	MAP_OUT (per_party);
773		767
774	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	768	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
775	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	769	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
776	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	770	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
777	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	771	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
		772	if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
		773	if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
778		774
779	freezer.put (this);	775	freezer.put (this);
780	freezer.put (KW_end);	776	freezer.put (KW(end));
781		777
782	return true;	778	return true;
783	}	779	}
784		780
785	bool	781	bool
…		…
839	msg = 0;	835	msg = 0;
840	maplore = 0;	836	maplore = 0;
841	shoprace = 0;	837	shoprace = 0;
842	delete [] shopitems, shopitems = 0;	838	delete [] shopitems, shopitems = 0;
843		839
844	for (int i = 0; i < 4; i++)	840	for (int i = 0; i < TILE_NUM; i++)
845	tile_path [i] = 0;	841	tile_path [i] = 0;
846	}	842	}
847		843
848	maptile::~maptile ()	844	maptile::~maptile ()
849	{	845	{
…		…
870		866
871	clear ();	867	clear ();
872	}	868	}
873		869
874	/* decay and destroy perishable items in a map */	870	/* decay and destroy perishable items in a map */
		871	// TODO: should be done regularly, not on map load?
875	void	872	void
876	maptile::do_decay_objects ()	873	maptile::do_decay_objects ()
877	{	874	{
878	if (!spaces)	875	if (!spaces)
879	return;	876	return;
…		…
881	for (mapspace *ms = spaces + size (); ms-- > spaces; )	878	for (mapspace *ms = spaces + size (); ms-- > spaces; )
882	for (object above, op = ms->bot; op; op = above)	879	for (object above, op = ms->bot; op; op = above)
883	{	880	{
884	above = op->above;	881	above = op->above;
885		882
		883	// do not decay anything above unique floor tiles (yet :)
		884	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
		885	break;
		886
886	bool destroy = 0;	887	bool destroy = 0;
887		888
888	// do not decay anything above unique floor tiles (yet :)	889	if (op->flag [FLAG_IS_FLOOR]
889	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	890	\|\| op->flag [FLAG_OBJ_ORIGINAL]
890	break;	891	\|\| op->flag [FLAG_UNIQUE]
891		892	\|\| op->flag [FLAG_OVERLAY_FLOOR]
892	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	893	\|\| 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 ())	894	\|\| op->is_alive ())
898	; // do not decay	895	; // do not decay
899	else if (op->is_weapon ())	896	else if (op->is_weapon ())
900	{	897	{
901	op->stats.dam--;	898	op->stats.dam--;
…		…
926	\|\| mat & M_LIQUID	923	\|\| mat & M_LIQUID
927	\|\| (mat & M_IRON && rndm (1, 5) == 1)	924	\|\| (mat & M_IRON && rndm (1, 5) == 1)
928	\|\| (mat & M_GLASS && rndm (1, 2) == 1)	925	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
929	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)	926	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
930	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)	927	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
931	\|\| (mat & M_ICE && temp > 32))	928	//\|\| (mat & M_ICE && temp > 32)
		929	)
932	destroy = 1;	930	destroy = 1;
933	}	931	}
934		932
935	/* adjust overall chance below */	933	/* adjust overall chance below */
936	if (destroy && rndm (0, 1))	934	if (destroy && rndm (0, 1))
…		…
956	sint64 total_exp = 0;	954	sint64 total_exp = 0;
957		955
958	for (mapspace *ms = spaces + size (); ms-- > spaces; )	956	for (mapspace *ms = spaces + size (); ms-- > spaces; )
959	for (object *op = ms->bot; op; op = op->above)	957	for (object *op = ms->bot; op; op = op->above)
960	{	958	{
961	if (QUERY_FLAG (op, FLAG_MONSTER))	959	if (op->flag [FLAG_MONSTER])
962	{	960	{
963	total_exp += op->stats.exp;	961	total_exp += op->stats.exp;
964	monster_cnt++;	962	monster_cnt++;
965	}	963	}
966		964
967	if (QUERY_FLAG (op, FLAG_GENERATOR))	965	if (op->flag [FLAG_GENERATOR])
968	{	966	{
969	total_exp += op->stats.exp;	967	total_exp += op->stats.exp;
970		968
971	if (archetype *at = op->other_arch)	969	if (archetype *at = op->other_arch)
972	{	970	{
…		…
1027	*/	1025	*/
1028	void	1026	void
1029	mapspace::update_ ()	1027	mapspace::update_ ()
1030	{	1028	{
1031	object *last = 0;	1029	object *last = 0;
1032	uint8 flags = P_UPTODATE, anywhere = 0;	1030	uint8 flags = P_UPTODATE;
1033	sint8 light = 0;	1031	sint8 light = 0;
1034	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1032	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
		1033	uint64_t volume = 0;
		1034	uint32_t items = 0;
		1035	object *anywhere = 0;
		1036	uint8_t middle_visibility = 0;
1035		1037
1036	//object *middle = 0;	1038	//object *middle = 0;
1037	//object *top = 0;	1039	//object *top = 0;
1038	//object *floor = 0;	1040	//object *floor = 0;
1039	// this seems to generate better code than using locals, above	1041	// this seems to generate better code than using locals, above
1040	object *&top = faces_obj[0] = 0;	1042	object *&top = faces_obj[0] = 0;
1041	object *&middle = faces_obj[1] = 0;	1043	object *&middle = faces_obj[1] = 0;
1042	object *&floor = faces_obj[2] = 0;	1044	object *&floor = faces_obj[2] = 0;
		1045
		1046	object::flags_t allflags; // all flags of all objects or'ed together
1043		1047
1044	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)	1048	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1045	{	1049	{
1046	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)	1050	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1047	light += tmp->glow_radius;	1051	light += tmp->glow_radius;
…		…
1052	* 3 times each time the player moves, because many of the	1056	* 3 times each time the player moves, because many of the
1053	* functions the move_player calls eventualy call this.	1057	* functions the move_player calls eventualy call this.
1054	*	1058	*
1055	* Always put the player down for drawing.	1059	* Always put the player down for drawing.
1056	*/	1060	*/
1057	if (!tmp->invisible)	1061	if (expect_true (!tmp->invisible))
1058	{	1062	{
1059	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1063	if (expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))
1060	top = tmp;	1064	top = tmp;
1061	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1065	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1062	{	1066	{
1063	/* If we got a floor, that means middle and top were below it,	1067	/* If we got a floor, that means middle and top were below it,
1064	* so should not be visible, so we clear them.	1068	* so should not be visible, so we clear them.
1065	*/	1069	*/
1066	middle = 0;	1070	middle = 0;
1067	top = 0;	1071	top = 0;
1068	floor = tmp;	1072	floor = tmp;
		1073	volume = 0;
		1074	items = 0;
1069	}	1075	}
1070	/* Flag anywhere have high priority */	1076	else
1071	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1072	{	1077	{
		1078	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
		1079	{
		1080	++items;
		1081	volume += tmp->volume ();
		1082	}
		1083
		1084	/* Flag anywhere have high priority */
		1085	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
		1086	anywhere = tmp;
		1087
		1088	/* Find the highest visible face around. If equal
		1089	* visibilities, we still want the one nearer to the
		1090	* top
		1091	*/
		1092	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
		1093	{
		1094	middle_visibility = ::faces [tmp->face].visibility;
1073	middle = tmp;	1095	middle = tmp;
1074	anywhere = 1;	1096	}
1075	}	1097	}
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	}	1098	}
1090		1099
1091	move_slow \|= tmp->move_slow;	1100	move_slow \|= tmp->move_slow;
1092	move_block \|= tmp->move_block;	1101	move_block \|= tmp->move_block;
1093	move_on \|= tmp->move_on;	1102	move_on \|= tmp->move_on;
1094	move_off \|= tmp->move_off;	1103	move_off \|= tmp->move_off;
1095	move_allow \|= tmp->move_allow;	1104	move_allow \|= tmp->move_allow;
1096		1105
1097	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags \|= P_BLOCKSVIEW;	1106	allflags \|= tmp->flag;
1098	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags \|= P_NO_MAGIC;	1107
1099	if (tmp->type == PLAYER) flags \|= P_PLAYER;	1108	if (tmp->type == PLAYER) flags \|= P_PLAYER;
1100	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1109	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	}	1110	}
		1111
		1112	// FLAG_SEE_ANYWHERE takes precedence
		1113	if (anywhere)
		1114	middle = anywhere;
		1115
		1116	// ORing all flags together and checking them here is much faster
		1117	if (allflags [FLAG_BLOCKSVIEW]) flags \|= P_BLOCKSVIEW;
		1118	if (allflags [FLAG_NO_MAGIC] ) flags \|= P_NO_MAGIC;
		1119	if (allflags [FLAG_ALIVE] ) flags \|= P_IS_ALIVE;
		1120	if (allflags [FLAG_DAMNED] ) flags \|= P_NO_CLERIC;
1104		1121
1105	this->light = min (light, MAX_LIGHT_RADIUS);	1122	this->light = min (light, MAX_LIGHT_RADIUS);
1106	this->flags_ = flags;	1123	this->flags_ = flags;
1107	this->move_block = move_block & ~move_allow;	1124	this->move_block = move_block & ~move_allow;
1108	this->move_on = move_on;	1125	this->move_on = move_on;
1109	this->move_off = move_off;	1126	this->move_off = move_off;
1110	this->move_slow = move_slow;	1127	this->move_slow = move_slow;
		1128	this->volume_ = (volume + 1023) / 1024;
		1129	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1111		1130
1112	/* At this point, we have a floor face (if there is a floor),	1131	/* 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	1132	* and the floor is set - we are not going to touch it at
1114	* this point.	1133	* this point.
1115	* middle contains the highest visibility face.	1134	* middle contains the highest visibility face.
…		…
1133	*/	1152	*/
1134		1153
1135	for (object *tmp = last; tmp; tmp = tmp->below)	1154	for (object *tmp = last; tmp; tmp = tmp->below)
1136	{	1155	{
1137	/* Once we get to a floor, stop, since we already have a floor object */	1156	/* Once we get to a floor, stop, since we already have a floor object */
1138	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1157	if (tmp->flag [FLAG_IS_FLOOR])
1139	break;	1158	break;
1140		1159
1141	/* If two top faces are already set, quit processing */	1160	/* If two top faces are already set, quit processing */
1142	if (top && middle)	1161	if (top && middle)
1143	break;	1162	break;
…		…
1181	faces_obj [1] = middle;	1200	faces_obj [1] = middle;
1182	faces_obj [2] = floor;	1201	faces_obj [2] = floor;
1183	#endif	1202	#endif
1184	}	1203	}
1185		1204
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 *	1205	maptile *
1198	maptile::tile_available (int dir, bool load)	1206	maptile::tile_available (int dir, bool load)
1199	{	1207	{
1200	if (tile_path[dir])	1208	if (tile_path[dir])
1201	{	1209	{
		1210	// map is there and we don't need to load it OR it's loaded => return what we have
1202	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1211	if (tile_map[dir] && (!load \|\| tile_map[dir]->linkable ()))
1203	return tile_map[dir];	1212	return tile_map[dir];
1204		1213
		1214	// well, try to locate it then, if possible - maybe it's there already
1205	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))	1215	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1206	return tile_map[dir];	1216	return tile_map[dir];
1207	}	1217	}
1208		1218
1209	return 0;	1219	return 0;
…		…
1321	/**	1331	/**
1322	* Return whether map2 is adjacent to map1. If so, store the distance from	1332	* Return whether map2 is adjacent to map1. If so, store the distance from
1323	* map1 to map2 in dx/dy.	1333	* map1 to map2 in dx/dy.
1324	*/	1334	*/
1325	int	1335	int
1326	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1336	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1327	{	1337	{
1328	if (!map1 \|\| !map2)	1338	if (!map1 \|\| !map2)
1329	return 0;	1339	return 0;
1330		1340
1331	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1341	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1333	if (map1 == map2)	1343	if (map1 == map2)
1334	{	1344	{
1335	*dx = 0;	1345	*dx = 0;
1336	*dy = 0;	1346	*dy = 0;
1337	}	1347	}
1338	else if (map1->tile_map[0] == map2)	1348	else if (map1->tile_available (TILE_NORTH, false) == map2)
1339	{ /* up */	1349	{
1340	*dx = 0;	1350	*dx = 0;
1341	*dy = -map2->height;	1351	*dy = -map2->height;
1342	}	1352	}
1343	else if (map1->tile_map[1] == map2)	1353	else if (map1->tile_available (TILE_EAST , false) == map2)
1344	{ /* right */	1354	{
1345	*dx = map1->width;	1355	*dx = map1->width;
1346	*dy = 0;	1356	*dy = 0;
1347	}	1357	}
1348	else if (map1->tile_map[2] == map2)	1358	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1349	{ /* down */	1359	{
1350	*dx = 0;	1360	*dx = 0;
1351	*dy = map1->height;	1361	*dy = map1->height;
1352	}	1362	}
1353	else if (map1->tile_map[3] == map2)	1363	else if (map1->tile_available (TILE_WEST , false) == map2)
1354	{ /* left */	1364	{
1355	*dx = -map2->width;	1365	*dx = -map2->width;
1356	*dy = 0;	1366	*dy = 0;
1357	}	1367	}
1358	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1368	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1359	{ /* up right */	1369	{ /* up right */
1360	*dx = map1->tile_map[0]->width;	1370	*dx = +map1->tile_map[TILE_NORTH]->width;
1361	*dy = -map1->tile_map[0]->height;	1371	*dy = -map1->tile_map[TILE_NORTH]->height;
1362	}	1372	}
1363	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1373	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1364	{ /* up left */	1374	{ /* up left */
1365	*dx = -map2->width;	1375	*dx = -map2->width;
1366	*dy = -map1->tile_map[0]->height;	1376	*dy = -map1->tile_map[TILE_NORTH]->height;
1367	}	1377	}
1368	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1378	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1369	{ /* right up */	1379	{ /* right up */
1370	*dx = map1->width;	1380	*dx = +map1->width;
1371	*dy = -map2->height;	1381	*dy = -map2->height;
1372	}	1382	}
1373	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1383	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1374	{ /* right down */	1384	{ /* right down */
1375	*dx = map1->width;	1385	*dx = +map1->width;
1376	*dy = map1->tile_map[1]->height;	1386	*dy = +map1->tile_map[TILE_EAST]->height;
1377	}	1387	}
1378	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1388	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1379	{ /* down right */	1389	{ /* down right */
1380	*dx = map1->tile_map[2]->width;	1390	*dx = +map1->tile_map[TILE_SOUTH]->width;
1381	*dy = map1->height;	1391	*dy = +map1->height;
1382	}	1392	}
1383	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1393	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1384	{ /* down left */	1394	{ /* down left */
1385	*dx = -map2->width;	1395	*dx = -map2->width;
1386	*dy = map1->height;	1396	*dy = +map1->height;
1387	}	1397	}
1388	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1398	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1389	{ /* left up */	1399	{ /* left up */
1390	*dx = -map1->tile_map[3]->width;	1400	*dx = -map1->tile_map[TILE_WEST]->width;
1391	*dy = -map2->height;	1401	*dy = -map2->height;
1392	}	1402	}
1393	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1403	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1394	{ /* left down */	1404	{ /* left down */
1395	*dx = -map1->tile_map[3]->width;	1405	*dx = -map1->tile_map[TILE_WEST]->width;
1396	*dy = map1->tile_map[3]->height;	1406	*dy = +map1->tile_map[TILE_WEST]->height;
1397	}	1407	}
1398	else	1408	else
1399	return 0;	1409	return 0;
1400		1410
1401	return 1;	1411	return 1;
…		…
1437	*	1447	*
1438	* currently, the only flag supported (0x1) is don't translate for	1448	* currently, the only flag supported (0x1) is don't translate for
1439	* closest body part of 'op1'	1449	* closest body part of 'op1'
1440	*/	1450	*/
1441	void	1451	void
1442	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1452	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1443	{	1453	{
1444	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1454	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1445	{	1455	{
1446	/* be conservative and fill in _some_ data */	1456	/* be conservative and fill in _some_ data */
1447	retval->distance = 10000;	1457	retval->distance = 10000;
1448	retval->distance_x = 10000;	1458	retval->distance_x = 10000;
1449	retval->distance_y = 10000;	1459	retval->distance_y = 10000;
1450	retval->direction = 0;	1460	retval->direction = 0;
1451	retval->part = 0;	1461	retval->part = 0;
1452	}	1462	}
1453	else	1463	else
1454	{	1464	{
1455	object *best;
1456
1457	retval->distance_x += op2->x - op1->x;	1465	retval->distance_x += op2->x - op1->x;
1458	retval->distance_y += op2->y - op1->y;	1466	retval->distance_y += op2->y - op1->y;
1459		1467
1460	best = op1;	1468	object *best = op1;
		1469
1461	/* If this is multipart, find the closest part now */	1470	/* If this is multipart, find the closest part now */
1462	if (!(flags & 0x1) && op1->more)	1471	if (!(flags & 1) && op1->more)
1463	{	1472	{
1464	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1473	int best_distance = idistance (retval->distance_x, retval->distance_y);
1465		1474
1466	/* we just take the offset of the piece to head to figure	1475	/* we just take the offset of the piece to head to figure
1467	* distance instead of doing all that work above again	1476	* distance instead of doing all that work above again
1468	* since the distance fields we set above are positive in the	1477	* since the distance fields we set above are positive in the
1469	* same axis as is used for multipart objects, the simply arithmetic	1478	* same axis as is used for multipart objects, the simply arithmetic
1470	* below works.	1479	* below works.
1471	*/	1480	*/
1472	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1481	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1473	{	1482	{
1474	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1483	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1475	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1484
1476	if (tmpi < best_distance)	1485	if (tmpi < best_distance)
1477	{	1486	{
1478	best_distance = tmpi;	1487	best_distance = tmpi;
1479	best = tmp;	1488	best = tmp;
1480	}	1489	}
1481	}	1490	}
1482		1491
1483	if (best != op1)	1492	if (best != op1)
1484	{	1493	{
1485	retval->distance_x += op1->x - best->x;	1494	retval->distance_x += op1->x - best->x;
1486	retval->distance_y += op1->y - best->y;	1495	retval->distance_y += op1->y - best->y;
1487	}	1496	}
1488	}	1497	}
1489		1498
1490	retval->part = best;	1499	retval->part = best;
1491	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1500	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1492	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1501	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1493	}	1502	}
1494	}	1503	}
1495		1504
1496	/* this is basically the same as get_rangevector above, but instead of	1505	/* this is basically the same as get_rangevector above, but instead of
1497	* the first parameter being an object, it instead is the map	1506	* the first parameter being an object, it instead is the map
…		…
1502	* be more consistant with the above function and also in case they are needed	1511	* be more consistant with the above function and also in case they are needed
1503	* for something in the future. Also, since no object is pasted, the best	1512	* for something in the future. Also, since no object is pasted, the best
1504	* field of the rv_vector is set to NULL.	1513	* field of the rv_vector is set to NULL.
1505	*/	1514	*/
1506	void	1515	void
1507	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1516	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1508	{	1517	{
1509	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1518	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1510	{	1519	{
1511	/* be conservative and fill in _some_ data */	1520	/* be conservative and fill in _some_ data */
1512	retval->distance = 100000;	1521	retval->distance = 100000;
1513	retval->distance_x = 32767;	1522	retval->distance_x = 32767;
1514	retval->distance_y = 32767;	1523	retval->distance_y = 32767;
1515	retval->direction = 0;	1524	retval->direction = 0;
1516	retval->part = 0;	1525	retval->part = 0;
1517	}	1526	}
1518	else	1527	else
1519	{	1528	{
1520	retval->distance_x += op2->x - x;	1529	retval->distance_x += op2->x - x;
1521	retval->distance_y += op2->y - y;	1530	retval->distance_y += op2->y - y;
1522		1531
1523	retval->part = 0;	1532	retval->part = 0;
1524	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1533	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1525	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1534	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1526	}	1535	}
1527	}	1536	}
1528		1537
1529	/* 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
1530	* (as related to map tiling). Note that this looks for a path from	1539	* (as related to map tiling). Note that this looks for a path from
…		…
1580	*/	1589	*/
1581	for (int i = 1000; --i;)	1590	for (int i = 1000; --i;)
1582	{	1591	{
1583	object *pick = at (gen (width), gen (height)).bot;	1592	object *pick = at (gen (width), gen (height)).bot;
1584		1593
1585	// do not prefer big monsters just because they are big.	1594	// must be head: do not prefer big monsters just because they are big.
1586	if (pick && pick->is_head ())	1595	if (pick && pick->is_head ())
1587	return pick->head_ ();	1596	return pick;
1588	}	1597	}
1589		1598
1590	// instead of crashing in the unlikely(?) case, try to return something	1599	// instead of crashing in the unlikely(?) case, try to return something
1591	return archetype::find ("bug");	1600	return archetype::find (shstr_bug);
1592	}	1601	}
1593		1602
1594	//-GPL	1603	//-GPL
1595		1604
1596	void	1605	void
…		…
1626	if (distance <= MAX_SOUND_DISTANCE)	1635	if (distance <= MAX_SOUND_DISTANCE)
1627	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1636	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1628	}	1637	}
1629	}	1638	}
1630		1639
		1640	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1641
1631	static void	1642	static void
1632	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1643	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1633	{	1644	{
1634	// clip to map to the left	1645	// clip to map to the left
1635	if (x0 < 0)	1646	if (x0 < 0)
1636	{	1647	{
1637	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1648	if (maptile *tile = m->tile_available (TILE_WEST, 1))
1638	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);	1649	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1639		1650
1640	if (x1 < 0) // entirely to the left	1651	if (x1 < 0) // entirely to the left
1641	return;	1652	return;
1642		1653
…		…
1644	}	1655	}
1645		1656
1646	// clip to map to the right	1657	// clip to map to the right
1647	if (x1 > m->width)	1658	if (x1 > m->width)
1648	{	1659	{
1649	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1660	if (maptile *tile = m->tile_available (TILE_EAST, 1))
1650	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);	1661	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1651		1662
1652	if (x0 > m->width) // entirely to the right	1663	if (x0 > m->width) // entirely to the right
1653	return;	1664	return;
1654		1665
…		…
1656	}	1667	}
1657		1668
1658	// clip to map above	1669	// clip to map above
1659	if (y0 < 0)	1670	if (y0 < 0)
1660	{	1671	{
1661	if (maptile *tile = m->tile_available (TILE_UP, 1))	1672	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1662	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);	1673	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1663		1674
1664	if (y1 < 0) // entirely above	1675	if (y1 < 0) // entirely above
1665	return;	1676	return;
1666		1677
…		…
1668	}	1679	}
1669		1680
1670	// clip to map below	1681	// clip to map below
1671	if (y1 > m->height)	1682	if (y1 > m->height)
1672	{	1683	{
1673	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1684	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1674	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);	1685	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1675		1686
1676	if (y0 > m->height) // entirely below	1687	if (y0 > m->height) // entirely below
1677	return;	1688	return;
1678		1689
…		…
1690	r->dx = dx;	1701	r->dx = dx;
1691	r->dy = dy;	1702	r->dy = dy;
1692	}	1703	}
1693		1704
1694	maprect *	1705	maprect *
1695	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1706	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1696	{	1707	{
1697	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1698	buf.clear ();	1708	buf.clear ();
1699		1709
1700	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1710	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1701		1711
1702	// add end marker	1712	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.168 by root, Fri Nov 6 13:03:34 2009 UTC vs. Revision 1.204 by root, Wed May 4 07:36:40 2011 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.168 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.204 by root, Wed May 4 07:36:40 2011 UTC