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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.172 by root, Sun Nov 8 20:55:39 2009 UTC vs.
Revision 1.208 by root, Sat May 7 10:50:35 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 (state != 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	state = MAP_ACTIVE;
		374
		375	activate_physics ();
384	}	376	}
385		377
386	void	378	void
387	maptile::deactivate ()	379	maptile::deactivate ()
388	{	380	{
389	if (spaces)	381	if (state != MAP_ACTIVE)
		382	return;
		383
390	for (mapspace *ms = spaces + size (); ms-- > spaces; )	384	for (mapspace *ms = spaces + size (); ms-- > spaces; )
391	for (object *op = ms->bot; op; op = op->above)	385	for (object *op = ms->bot; op; op = op->above)
392	op->deactivate_recursive ();	386	op->deactivate_recursive ();
		387
		388	state = MAP_INACTIVE;
393	}	389	}
394		390
395	bool	391	bool
396	maptile::_save_objects (object_freezer &f, int flags)	392	maptile::_save_objects (object_freezer &f, int flags)
397	{	393	{
…		…
438	return false;	434	return false;
439		435
440	return freezer.save (path);	436	return freezer.save (path);
441	}	437	}
442		438
443	maptile::maptile ()	439	void
		440	maptile::init ()
444	{	441	{
445	in_memory = MAP_SWAPPED;	442	state = MAP_SWAPPED;
446		443
447	/* The maps used to pick up default x and y values from the	444	/* The maps used to pick up default x and y values from the
448	* map archetype. Mimic that behaviour.	445	* map archetype. Mimic that behaviour.
449	*/	446	*/
450	width = 16;	447	width = 16;
451	height = 16;	448	height = 16;
452	timeout = 300;	449	timeout = 300;
453	max_nrof = 1000; // 1000 items of anything
454	max_items = MAX_ITEM_PER_ACTION;	450	max_items = MAX_ITEM_PER_ACTION;
455	max_volume = 2000000; // 2m³	451	max_volume = 2000000; // 2m³
456	}
457
458	maptile::maptile (int w, int h)
459	{
460	in_memory = MAP_SWAPPED;
461
462	width = w;
463	height = h;
464	reset_timeout = 0;	452	reset_timeout = 0;
465	timeout = 300;
466	enter_x = 0;	453	enter_x = 0;
467	enter_y = 0;	454	enter_y = 0;
		455	}
		456
		457	maptile::maptile ()
		458	{
		459	init ();
		460	}
		461
		462	maptile::maptile (int w, int h)
		463	{
		464	init ();
		465
		466	width = w;
		467	height = h;
468		468
469	alloc ();	469	alloc ();
470	}	470	}
471		471
472	/*	472	/*
…		…
572	* the map (or something equivilent) into output_string. */	572	* the map (or something equivilent) into output_string. */
573	static const char *	573	static const char *
574	print_shop_string (maptile *m)	574	print_shop_string (maptile *m)
575	{	575	{
576	static dynbuf_text buf; buf.clear ();	576	static dynbuf_text buf; buf.clear ();
		577	bool first = true;
577		578
578	for (int i = 0; i < m->shopitems[0].index; i++)	579	for (int i = 0; i < m->shopitems[0].index; i++)
579	{	580	{
		581	if (!first)
		582	buf << ';';
		583
		584	first = false;
		585
580	if (m->shopitems[i].typenum)	586	if (m->shopitems[i].typenum)
581	{	587	{
582	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
583	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	589	buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
584	else	590	else
585	buf.printf ("%s;", m->shopitems[i].name);	591	buf.printf ("%s", m->shopitems[i].name);
586	}	592	}
587	else	593	else
588	{	594	{
589	if (m->shopitems[i].strength)	595	if (m->shopitems[i].strength)
590	buf.printf ("*:%d;", m->shopitems[i].strength);	596	buf.printf ("*:%d", m->shopitems[i].strength);
591	else	597	else
592	buf.printf ("*");	598	buf.printf ("*");
593	}	599	}
594	}	600	}
595		601
…		…
618	{	624	{
619	case KW_msg:	625	case KW_msg:
620	thawer.get_ml (KW_endmsg, msg);	626	thawer.get_ml (KW_endmsg, msg);
621	break;	627	break;
622		628
623	case KW_lore: // CF+ extension	629	case KW_lore: // deliantra extension
624	thawer.get_ml (KW_endlore, maplore);	630	thawer.get_ml (KW_endlore, maplore);
625	break;	631	break;
626		632
627	case KW_maplore:	633	case KW_maplore:
628	thawer.get_ml (KW_endmaplore, maplore);	634	thawer.get_ml (KW_endmaplore, maplore);
…		…
645	case KW_shopgreed: thawer.get (shopgreed); break;	651	case KW_shopgreed: thawer.get (shopgreed); break;
646	case KW_shopmin: thawer.get (shopmin); break;	652	case KW_shopmin: thawer.get (shopmin); break;
647	case KW_shopmax: thawer.get (shopmax); break;	653	case KW_shopmax: thawer.get (shopmax); break;
648	case KW_shoprace: thawer.get (shoprace); break;	654	case KW_shoprace: thawer.get (shoprace); break;
649	case KW_outdoor: thawer.get (outdoor); break;	655	case KW_outdoor: thawer.get (outdoor); break;
650	case KW_temp: thawer.get (temp); break;
651	case KW_pressure: thawer.get (pressure); break;
652	case KW_humid: thawer.get (humid); break;
653	case KW_windspeed: thawer.get (windspeed); break;
654	case KW_winddir: thawer.get (winddir); break;
655	case KW_sky: thawer.get (sky); break;
656		656
657	case KW_per_player: thawer.get (per_player); break;	657	case KW_per_player: thawer.get (per_player); break;
658	case KW_per_party: thawer.get (per_party); break;	658	case KW_per_party: thawer.get (per_party); break;
659	case KW_no_reset: thawer.get (no_reset); break;	659	case KW_no_reset: thawer.get (no_reset); break;
660	case KW_no_drop: thawer.get (no_drop); break;	660	case KW_no_drop: thawer.get (no_drop); break;
661		661
662	case KW_region: default_region = region::find (thawer.get_str ()); break;	662	case KW_region: thawer.get (default_region); break;
663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
664		664
665	// old names new names	665	// old names new names
666	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;	666	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
667	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;	667	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
…		…
675		675
676	case KW_tile_path_1: thawer.get (tile_path [0]); break;	676	case KW_tile_path_1: thawer.get (tile_path [0]); break;
677	case KW_tile_path_2: thawer.get (tile_path [1]); break;	677	case KW_tile_path_2: thawer.get (tile_path [1]); break;
678	case KW_tile_path_3: thawer.get (tile_path [2]); break;	678	case KW_tile_path_3: thawer.get (tile_path [2]); break;
679	case KW_tile_path_4: thawer.get (tile_path [3]); break;	679	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		680	case KW_tile_path_5: thawer.get (tile_path [4]); break;
		681	case KW_tile_path_6: thawer.get (tile_path [5]); break;
680		682
681	case KW_ERROR:	683	case KW_ERROR:
682	set_key_text (thawer.kw_str, thawer.value);	684	set_key_text (thawer.kw_str, thawer.value);
683	break;	685	break;
684		686
685	case KW_end:	687	case KW_end:
686	thawer.next ();	688	thawer.next ();
687	return true;	689	return true;
688		690
689	default:	691	default:
690	if (!thawer.parse_error ("map", 0))	692	if (!thawer.parse_error ("map"))
691	return false;	693	return false;
692	break;	694	break;
693	}	695	}
694		696
695	thawer.next ();	697	thawer.next ();
…		…
713	int unique = 0;	715	int unique = 0;
714	for (object *op = spaces [i].bot; op; )	716	for (object *op = spaces [i].bot; op; )
715	{	717	{
716	object *above = op->above;	718	object *above = op->above;
717		719
718	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	720	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
719	unique = 1;	721	unique = 1;
720		722
721	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	723	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
722	op->destroy ();	724	op->destroy ();
723		725
724	op = above;	726	op = above;
725	}	727	}
726	}	728	}
…		…
729	//-GPL	731	//-GPL
730		732
731	bool	733	bool
732	maptile::_save_header (object_freezer &freezer)	734	maptile::_save_header (object_freezer &freezer)
733	{	735	{
734	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	736	#define MAP_OUT(k) freezer.put (KW(k), k)
735	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	737	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
736		738
737	MAP_OUT2 (arch, "map");	739	MAP_OUT2 (arch, CS(map));
738		740
739	if (name) MAP_OUT (name);	741	if (name) MAP_OUT (name);
740	MAP_OUT (swap_time);	742	MAP_OUT (swap_time);
741	MAP_OUT (reset_time);	743	MAP_OUT (reset_time);
742	MAP_OUT (reset_timeout);	744	MAP_OUT (reset_timeout);
…		…
750	MAP_OUT (shopgreed);	752	MAP_OUT (shopgreed);
751	MAP_OUT (shopmin);	753	MAP_OUT (shopmin);
752	MAP_OUT (shopmax);	754	MAP_OUT (shopmax);
753	if (shoprace) MAP_OUT (shoprace);	755	if (shoprace) MAP_OUT (shoprace);
754		756
755	MAP_OUT (darkness);
756	MAP_OUT (width);	757	MAP_OUT (width);
757	MAP_OUT (height);	758	MAP_OUT (height);
758	MAP_OUT (enter_x);	759	MAP_OUT (enter_x);
759	MAP_OUT (enter_y);	760	MAP_OUT (enter_y);
760		761	MAP_OUT (darkness);
761	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
762	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
763
764	MAP_OUT (outdoor);	762	MAP_OUT (outdoor);
765	MAP_OUT (temp);	763
766	MAP_OUT (pressure);	764	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
767	MAP_OUT (humid);	765	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
768	MAP_OUT (windspeed);
769	MAP_OUT (winddir);
770	MAP_OUT (sky);
771		766
772	MAP_OUT (per_player);	767	MAP_OUT (per_player);
773	MAP_OUT (per_party);	768	MAP_OUT (per_party);
774		769
775	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	770	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
776	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	771	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
777	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	772	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
778	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	773	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
		774	if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
		775	if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
779		776
780	freezer.put (this);	777	freezer.put (this);
781	freezer.put (KW_end);	778	freezer.put (KW(end));
782		779
783	return true;	780	return true;
784	}	781	}
785		782
786	bool	783	bool
…		…
840	msg = 0;	837	msg = 0;
841	maplore = 0;	838	maplore = 0;
842	shoprace = 0;	839	shoprace = 0;
843	delete [] shopitems, shopitems = 0;	840	delete [] shopitems, shopitems = 0;
844		841
845	for (int i = 0; i < 4; i++)	842	for (int i = 0; i < array_length (tile_path); i++)
846	tile_path [i] = 0;	843	tile_path [i] = 0;
847	}	844	}
848		845
849	maptile::~maptile ()	846	maptile::~maptile ()
850	{	847	{
…		…
857	/* We need to look through all the maps and see if any maps	854	/* We need to look through all the maps and see if any maps
858	* are pointing at this one for tiling information. Since	855	* are pointing at this one for tiling information. Since
859	* tiling can be asymetric, we just can not look to see which	856	* tiling can be asymetric, we just can not look to see which
860	* maps this map tiles with and clears those.	857	* maps this map tiles with and clears those.
861	*/	858	*/
862	for (int i = 0; i < 4; i++)	859	for (int i = 0; i < array_length (tile_path); i++)
863	if (tile_map[i] == m)	860	if (tile_map[i] == m)
864	tile_map[i] = 0;	861	tile_map[i] = 0;
865	}	862	}
866		863
867	void	864	void
…		…
871		868
872	clear ();	869	clear ();
873	}	870	}
874		871
875	/* decay and destroy perishable items in a map */	872	/* decay and destroy perishable items in a map */
		873	// TODO: should be done regularly, not on map load?
876	void	874	void
877	maptile::do_decay_objects ()	875	maptile::do_decay_objects ()
878	{	876	{
879	if (!spaces)	877	if (!spaces)
880	return;	878	return;
…		…
882	for (mapspace *ms = spaces + size (); ms-- > spaces; )	880	for (mapspace *ms = spaces + size (); ms-- > spaces; )
883	for (object above, op = ms->bot; op; op = above)	881	for (object above, op = ms->bot; op; op = above)
884	{	882	{
885	above = op->above;	883	above = op->above;
886		884
		885	// do not decay anything above unique floor tiles (yet :)
		886	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
		887	break;
		888
887	bool destroy = 0;	889	bool destroy = 0;
888		890
889	// do not decay anything above unique floor tiles (yet :)	891	if (op->flag [FLAG_IS_FLOOR]
890	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	892	\|\| op->flag [FLAG_OBJ_ORIGINAL]
891	break;	893	\|\| op->flag [FLAG_UNIQUE]
892		894	\|\| op->flag [FLAG_OVERLAY_FLOOR]
893	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	895	\|\| op->flag [FLAG_UNPAID]
894	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
895	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
896	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897	\|\| QUERY_FLAG (op, FLAG_UNPAID)
898	\|\| op->is_alive ())	896	\|\| op->is_alive ())
899	; // do not decay	897	; // do not decay
900	else if (op->is_weapon ())	898	else if (op->is_weapon ())
901	{	899	{
902	op->stats.dam--;	900	op->stats.dam--;
…		…
927	\|\| mat & M_LIQUID	925	\|\| mat & M_LIQUID
928	\|\| (mat & M_IRON && rndm (1, 5) == 1)	926	\|\| (mat & M_IRON && rndm (1, 5) == 1)
929	\|\| (mat & M_GLASS && rndm (1, 2) == 1)	927	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
930	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)	928	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
931	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)	929	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
932	\|\| (mat & M_ICE && temp > 32))	930	//\|\| (mat & M_ICE && temp > 32)
		931	)
933	destroy = 1;	932	destroy = 1;
934	}	933	}
935		934
936	/* adjust overall chance below */	935	/* adjust overall chance below */
937	if (destroy && rndm (0, 1))	936	if (destroy && rndm (0, 1))
…		…
957	sint64 total_exp = 0;	956	sint64 total_exp = 0;
958		957
959	for (mapspace *ms = spaces + size (); ms-- > spaces; )	958	for (mapspace *ms = spaces + size (); ms-- > spaces; )
960	for (object *op = ms->bot; op; op = op->above)	959	for (object *op = ms->bot; op; op = op->above)
961	{	960	{
962	if (QUERY_FLAG (op, FLAG_MONSTER))	961	if (op->flag [FLAG_MONSTER])
963	{	962	{
964	total_exp += op->stats.exp;	963	total_exp += op->stats.exp;
965	monster_cnt++;	964	monster_cnt++;
966	}	965	}
967		966
968	if (QUERY_FLAG (op, FLAG_GENERATOR))	967	if (op->flag [FLAG_GENERATOR])
969	{	968	{
970	total_exp += op->stats.exp;	969	total_exp += op->stats.exp;
971		970
972	if (archetype *at = op->other_arch)	971	if (archetype *at = op->other_arch)
973	{	972	{
…		…
1034	sint8 light = 0;	1033	sint8 light = 0;
1035	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1034	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1036	uint64_t volume = 0;	1035	uint64_t volume = 0;
1037	uint32_t items = 0;	1036	uint32_t items = 0;
1038	object *anywhere = 0;	1037	object *anywhere = 0;
		1038	uint8_t middle_visibility = 0;
1039		1039
1040	//object *middle = 0;	1040	//object *middle = 0;
1041	//object *top = 0;	1041	//object *top = 0;
1042	//object *floor = 0;	1042	//object *floor = 0;
1043	// this seems to generate better code than using locals, above	1043	// this seems to generate better code than using locals, above
…		…
1060	*	1060	*
1061	* Always put the player down for drawing.	1061	* Always put the player down for drawing.
1062	*/	1062	*/
1063	if (expect_true (!tmp->invisible))	1063	if (expect_true (!tmp->invisible))
1064	{	1064	{
1065	if (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER])	1065	if (expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))
1066	top = tmp;	1066	top = tmp;
		1067	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
		1068	{
		1069	/* If we got a floor, that means middle and top were below it,
		1070	* so should not be visible, so we clear them.
		1071	*/
		1072	middle = 0;
		1073	top = 0;
		1074	floor = tmp;
		1075	volume = 0;
		1076	items = 0;
		1077	}
1067	else	1078	else
1068	{	1079	{
1069	if (expect_false (tmp->flag [FLAG_IS_FLOOR]))	1080	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1070	{	1081	{
1071	/* If we got a floor, that means middle and top were below it,
1072	* so should not be visible, so we clear them.
1073	*/
1074	middle = 0;
1075	top = 0;
1076	floor = tmp;
1077	volume = 0;
1078	items = 0;	1082	++items;
		1083	volume += tmp->volume ();
1079	}	1084	}
		1085
		1086	/* Flag anywhere have high priority */
		1087	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
		1088	anywhere = tmp;
		1089
		1090	/* Find the highest visible face around. If equal
		1091	* visibilities, we still want the one nearer to the
		1092	* top
1080	else	1093	*/
		1094	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1081	{	1095	{
1082	if (expect_true (!tmp->flag [FLAG_NO_PICK]))	1096	middle_visibility = ::faces [tmp->face].visibility;
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	middle = tmp;
1097	}	1098	}
1098	}	1099	}
1099	}	1100	}
1100		1101
1101	move_slow \|= tmp->move_slow;	1102	move_slow \|= tmp->move_slow;
…		…
1153	*/	1154	*/
1154		1155
1155	for (object *tmp = last; tmp; tmp = tmp->below)	1156	for (object *tmp = last; tmp; tmp = tmp->below)
1156	{	1157	{
1157	/* Once we get to a floor, stop, since we already have a floor object */	1158	/* Once we get to a floor, stop, since we already have a floor object */
1158	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1159	if (tmp->flag [FLAG_IS_FLOOR])
1159	break;	1160	break;
1160		1161
1161	/* If two top faces are already set, quit processing */	1162	/* If two top faces are already set, quit processing */
1162	if (top && middle)	1163	if (top && middle)
1163	break;	1164	break;
…		…
1206	maptile *	1207	maptile *
1207	maptile::tile_available (int dir, bool load)	1208	maptile::tile_available (int dir, bool load)
1208	{	1209	{
1209	if (tile_path[dir])	1210	if (tile_path[dir])
1210	{	1211	{
		1212	// map is there and we don't need to load it OR it's loaded => return what we have
1211	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1213	if (tile_map[dir] && (!load \|\| tile_map[dir]->linkable ()))
1212	return tile_map[dir];	1214	return tile_map[dir];
1213		1215
		1216	// well, try to locate it then, if possible - maybe it's there already
1214	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))	1217	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1215	return tile_map[dir];	1218	return tile_map[dir];
1216	}	1219	}
1217		1220
1218	return 0;	1221	return 0;
…		…
1330	/**	1333	/**
1331	* Return whether map2 is adjacent to map1. If so, store the distance from	1334	* Return whether map2 is adjacent to map1. If so, store the distance from
1332	* map1 to map2 in dx/dy.	1335	* map1 to map2 in dx/dy.
1333	*/	1336	*/
1334	int	1337	int
1335	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1338	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1336	{	1339	{
1337	if (!map1 \|\| !map2)	1340	if (!map1 \|\| !map2)
1338	return 0;	1341	return 0;
1339		1342
1340	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1343	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1342	if (map1 == map2)	1345	if (map1 == map2)
1343	{	1346	{
1344	*dx = 0;	1347	*dx = 0;
1345	*dy = 0;	1348	*dy = 0;
1346	}	1349	}
1347	else if (map1->tile_map[0] == map2)	1350	else if (map1->tile_available (TILE_NORTH, false) == map2)
1348	{ /* up */	1351	{
1349	*dx = 0;	1352	*dx = 0;
1350	*dy = -map2->height;	1353	*dy = -map2->height;
1351	}	1354	}
1352	else if (map1->tile_map[1] == map2)	1355	else if (map1->tile_available (TILE_EAST , false) == map2)
1353	{ /* right */	1356	{
1354	*dx = map1->width;	1357	*dx = map1->width;
1355	*dy = 0;	1358	*dy = 0;
1356	}	1359	}
1357	else if (map1->tile_map[2] == map2)	1360	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1358	{ /* down */	1361	{
1359	*dx = 0;	1362	*dx = 0;
1360	*dy = map1->height;	1363	*dy = map1->height;
1361	}	1364	}
1362	else if (map1->tile_map[3] == map2)	1365	else if (map1->tile_available (TILE_WEST , false) == map2)
1363	{ /* left */	1366	{
1364	*dx = -map2->width;	1367	*dx = -map2->width;
1365	*dy = 0;	1368	*dy = 0;
1366	}	1369	}
1367	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1370	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1368	{ /* up right */	1371	{ /* up right */
1369	*dx = map1->tile_map[0]->width;	1372	*dx = +map1->tile_map[TILE_NORTH]->width;
1370	*dy = -map1->tile_map[0]->height;	1373	*dy = -map1->tile_map[TILE_NORTH]->height;
1371	}	1374	}
1372	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1375	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1373	{ /* up left */	1376	{ /* up left */
1374	*dx = -map2->width;	1377	*dx = -map2->width;
1375	*dy = -map1->tile_map[0]->height;	1378	*dy = -map1->tile_map[TILE_NORTH]->height;
1376	}	1379	}
1377	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1380	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1378	{ /* right up */	1381	{ /* right up */
1379	*dx = map1->width;	1382	*dx = +map1->width;
1380	*dy = -map2->height;	1383	*dy = -map2->height;
1381	}	1384	}
1382	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1385	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1383	{ /* right down */	1386	{ /* right down */
1384	*dx = map1->width;	1387	*dx = +map1->width;
1385	*dy = map1->tile_map[1]->height;	1388	*dy = +map1->tile_map[TILE_EAST]->height;
1386	}	1389	}
1387	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1390	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1388	{ /* down right */	1391	{ /* down right */
1389	*dx = map1->tile_map[2]->width;	1392	*dx = +map1->tile_map[TILE_SOUTH]->width;
1390	*dy = map1->height;	1393	*dy = +map1->height;
1391	}	1394	}
1392	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1395	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1393	{ /* down left */	1396	{ /* down left */
1394	*dx = -map2->width;	1397	*dx = -map2->width;
1395	*dy = map1->height;	1398	*dy = +map1->height;
1396	}	1399	}
1397	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1400	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1398	{ /* left up */	1401	{ /* left up */
1399	*dx = -map1->tile_map[3]->width;	1402	*dx = -map1->tile_map[TILE_WEST]->width;
1400	*dy = -map2->height;	1403	*dy = -map2->height;
1401	}	1404	}
1402	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1405	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1403	{ /* left down */	1406	{ /* left down */
1404	*dx = -map1->tile_map[3]->width;	1407	*dx = -map1->tile_map[TILE_WEST]->width;
1405	*dy = map1->tile_map[3]->height;	1408	*dy = +map1->tile_map[TILE_WEST]->height;
1406	}	1409	}
1407	else	1410	else
1408	return 0;	1411	return 0;
1409		1412
1410	return 1;	1413	return 1;
…		…
1446	*	1449	*
1447	* currently, the only flag supported (0x1) is don't translate for	1450	* currently, the only flag supported (0x1) is don't translate for
1448	* closest body part of 'op1'	1451	* closest body part of 'op1'
1449	*/	1452	*/
1450	void	1453	void
1451	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1454	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1452	{	1455	{
1453	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1456	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1454	{	1457	{
1455	/* be conservative and fill in _some_ data */	1458	/* be conservative and fill in _some_ data */
1456	retval->distance = 10000;	1459	retval->distance = 10000;
1457	retval->distance_x = 10000;	1460	retval->distance_x = 10000;
1458	retval->distance_y = 10000;	1461	retval->distance_y = 10000;
1459	retval->direction = 0;	1462	retval->direction = 0;
1460	retval->part = 0;	1463	retval->part = 0;
1461	}	1464	}
1462	else	1465	else
1463	{	1466	{
1464	object *best;
1465
1466	retval->distance_x += op2->x - op1->x;	1467	retval->distance_x += op2->x - op1->x;
1467	retval->distance_y += op2->y - op1->y;	1468	retval->distance_y += op2->y - op1->y;
1468		1469
1469	best = op1;	1470	object *best = op1;
		1471
1470	/* If this is multipart, find the closest part now */	1472	/* If this is multipart, find the closest part now */
1471	if (!(flags & 0x1) && op1->more)	1473	if (!(flags & 1) && op1->more)
1472	{	1474	{
1473	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1475	int best_distance = idistance (retval->distance_x, retval->distance_y);
1474		1476
1475	/* we just take the offset of the piece to head to figure	1477	/* we just take the offset of the piece to head to figure
1476	* distance instead of doing all that work above again	1478	* distance instead of doing all that work above again
1477	* since the distance fields we set above are positive in the	1479	* since the distance fields we set above are positive in the
1478	* same axis as is used for multipart objects, the simply arithmetic	1480	* same axis as is used for multipart objects, the simply arithmetic
1479	* below works.	1481	* below works.
1480	*/	1482	*/
1481	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1483	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1482	{	1484	{
1483	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1485	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1484	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1486
1485	if (tmpi < best_distance)	1487	if (tmpi < best_distance)
1486	{	1488	{
1487	best_distance = tmpi;	1489	best_distance = tmpi;
1488	best = tmp;	1490	best = tmp;
1489	}	1491	}
1490	}	1492	}
1491		1493
1492	if (best != op1)	1494	if (best != op1)
1493	{	1495	{
1494	retval->distance_x += op1->x - best->x;	1496	retval->distance_x += op1->x - best->x;
1495	retval->distance_y += op1->y - best->y;	1497	retval->distance_y += op1->y - best->y;
1496	}	1498	}
1497	}	1499	}
1498		1500
1499	retval->part = best;	1501	retval->part = best;
1500	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1502	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1501	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1503	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1502	}	1504	}
1503	}	1505	}
1504		1506
1505	/* this is basically the same as get_rangevector above, but instead of	1507	/* this is basically the same as get_rangevector above, but instead of
1506	* the first parameter being an object, it instead is the map	1508	* the first parameter being an object, it instead is the map
…		…
1511	* be more consistant with the above function and also in case they are needed	1513	* be more consistant with the above function and also in case they are needed
1512	* for something in the future. Also, since no object is pasted, the best	1514	* for something in the future. Also, since no object is pasted, the best
1513	* field of the rv_vector is set to NULL.	1515	* field of the rv_vector is set to NULL.
1514	*/	1516	*/
1515	void	1517	void
1516	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1518	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1517	{	1519	{
1518	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1520	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1519	{	1521	{
1520	/* be conservative and fill in _some_ data */	1522	/* be conservative and fill in _some_ data */
1521	retval->distance = 100000;	1523	retval->distance = 100000;
1522	retval->distance_x = 32767;	1524	retval->distance_x = 32767;
1523	retval->distance_y = 32767;	1525	retval->distance_y = 32767;
1524	retval->direction = 0;	1526	retval->direction = 0;
1525	retval->part = 0;	1527	retval->part = 0;
1526	}	1528	}
1527	else	1529	else
1528	{	1530	{
1529	retval->distance_x += op2->x - x;	1531	retval->distance_x += op2->x - x;
1530	retval->distance_y += op2->y - y;	1532	retval->distance_y += op2->y - y;
1531		1533
1532	retval->part = 0;	1534	retval->part = 0;
1533	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1535	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1534	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1536	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1535	}	1537	}
1536	}	1538	}
1537		1539
1538	/* Returns true of op1 and op2 are effectively on the same map	1540	/* Returns true of op1 and op2 are effectively on the same map
1539	* (as related to map tiling). Note that this looks for a path from	1541	* (as related to map tiling). Note that this looks for a path from
…		…
1589	*/	1591	*/
1590	for (int i = 1000; --i;)	1592	for (int i = 1000; --i;)
1591	{	1593	{
1592	object *pick = at (gen (width), gen (height)).bot;	1594	object *pick = at (gen (width), gen (height)).bot;
1593		1595
1594	// do not prefer big monsters just because they are big.	1596	// must be head: do not prefer big monsters just because they are big.
1595	if (pick && pick->is_head ())	1597	if (pick && pick->is_head ())
1596	return pick->head_ ();	1598	return pick;
1597	}	1599	}
1598		1600
1599	// instead of crashing in the unlikely(?) case, try to return something	1601	// instead of crashing in the unlikely(?) case, try to return something
1600	return archetype::find (shstr_bug);	1602	return archetype::find (shstr_bug);
1601	}	1603	}
…		…
1635	if (distance <= MAX_SOUND_DISTANCE)	1637	if (distance <= MAX_SOUND_DISTANCE)
1636	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1638	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1637	}	1639	}
1638	}	1640	}
1639		1641
		1642	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1643
1640	static void	1644	static void
1641	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1645	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1642	{	1646	{
1643	// clip to map to the left	1647	// clip to map to the left
1644	if (x0 < 0)	1648	if (x0 < 0)
1645	{	1649	{
1646	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1650	if (maptile *tile = m->tile_available (TILE_WEST, 1))
1647	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);	1651	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1648		1652
1649	if (x1 < 0) // entirely to the left	1653	if (x1 < 0) // entirely to the left
1650	return;	1654	return;
1651		1655
…		…
1653	}	1657	}
1654		1658
1655	// clip to map to the right	1659	// clip to map to the right
1656	if (x1 > m->width)	1660	if (x1 > m->width)
1657	{	1661	{
1658	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1662	if (maptile *tile = m->tile_available (TILE_EAST, 1))
1659	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);	1663	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1660		1664
1661	if (x0 > m->width) // entirely to the right	1665	if (x0 > m->width) // entirely to the right
1662	return;	1666	return;
1663		1667
…		…
1665	}	1669	}
1666		1670
1667	// clip to map above	1671	// clip to map above
1668	if (y0 < 0)	1672	if (y0 < 0)
1669	{	1673	{
1670	if (maptile *tile = m->tile_available (TILE_UP, 1))	1674	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1671	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);	1675	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1672		1676
1673	if (y1 < 0) // entirely above	1677	if (y1 < 0) // entirely above
1674	return;	1678	return;
1675		1679
…		…
1677	}	1681	}
1678		1682
1679	// clip to map below	1683	// clip to map below
1680	if (y1 > m->height)	1684	if (y1 > m->height)
1681	{	1685	{
1682	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1686	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1683	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);	1687	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1684		1688
1685	if (y0 > m->height) // entirely below	1689	if (y0 > m->height) // entirely below
1686	return;	1690	return;
1687		1691
…		…
1699	r->dx = dx;	1703	r->dx = dx;
1700	r->dy = dy;	1704	r->dy = dy;
1701	}	1705	}
1702		1706
1703	maprect *	1707	maprect *
1704	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1708	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1705	{	1709	{
1706	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1707	buf.clear ();	1710	buf.clear ();
1708		1711
1709	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1712	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1710		1713
1711	// add end marker	1714	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.172 by root, Sun Nov 8 20:55:39 2009 UTC vs. Revision 1.208 by root, Sat May 7 10:50:35 2011 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.172 by root, Sun Nov 8 20:55:39 2009 UTC vs.
Revision 1.208 by root, Sat May 7 10:50:35 2011 UTC