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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.177 by root, Wed Nov 11 23:27:56 2009 UTC vs.
Revision 1.218 by root, Mon Oct 29 23:55:52 2012 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,2012 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.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the Affero GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	19	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
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	*
…		…
314	case KW_arch:	311	case KW_arch:
315	if (object *op = object::read (f, this))	312	if (object *op = object::read (f, this))
316	{	313	{
317	// TODO: why?	314	// TODO: why?
318	if (op->inv)	315	if (op->inv)
		316	{
		317	op->carrying = 0;
319	op->update_weight ();	318	op->update_weight ();
		319	}
320		320
321	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))
322	{	322	{
323	// we insert manually because	323	// we insert manually because
324	// a) its way faster	324	// a) its way faster
…		…
361	}	361	}
362		362
363	void	363	void
364	maptile::activate ()	364	maptile::activate ()
365	{	365	{
366	if (spaces)	366	if (state != MAP_INACTIVE)
		367	return;
		368
367	for (mapspace *ms = spaces + size (); ms-- > spaces; )	369	for (mapspace *ms = spaces + size (); ms-- > spaces; )
368	for (object *op = ms->bot; op; op = op->above)	370	for (object *op = ms->bot; op; op = op->above)
369	op->activate_recursive ();	371	op->activate_recursive ();
		372
		373	state = MAP_ACTIVE;
		374
		375	activate_physics ();
370	}	376	}
371		377
372	void	378	void
373	maptile::deactivate ()	379	maptile::deactivate ()
374	{	380	{
375	if (spaces)	381	if (state != MAP_ACTIVE)
		382	return;
		383
376	for (mapspace *ms = spaces + size (); ms-- > spaces; )	384	for (mapspace *ms = spaces + size (); ms-- > spaces; )
377	for (object *op = ms->bot; op; op = op->above)	385	for (object *op = ms->bot; op; op = op->above)
378	op->deactivate_recursive ();	386	op->deactivate_recursive ();
		387
		388	state = MAP_INACTIVE;
379	}	389	}
380		390
381	bool	391	bool
382	maptile::_save_objects (object_freezer &f, int flags)	392	maptile::_save_objects (object_freezer &f, int flags)
383	{	393	{
…		…
424	return false;	434	return false;
425		435
426	return freezer.save (path);	436	return freezer.save (path);
427	}	437	}
428		438
429	maptile::maptile ()	439	void
		440	maptile::init ()
430	{	441	{
431	in_memory = MAP_SWAPPED;	442	state = MAP_SWAPPED;
432		443
433	/* 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
434	* map archetype. Mimic that behaviour.	445	* map archetype. Mimic that behaviour.
435	*/	446	*/
436	width = 16;	447	width = 16;
437	height = 16;	448	height = 16;
438	timeout = 300;	449	timeout = 300;
439	max_items = MAX_ITEM_PER_ACTION;	450	max_items = MAX_ITEM_PER_ACTION;
440	max_volume = 2000000; // 2m³	451	max_volume = 2000000; // 2m³
441	}
442
443	maptile::maptile (int w, int h)
444	{
445	in_memory = MAP_SWAPPED;
446
447	width = w;
448	height = h;
449	reset_timeout = 0;	452	reset_timeout = 0;
450	timeout = 300;
451	enter_x = 0;	453	enter_x = 0;
452	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;
453		468
454	alloc ();	469	alloc ();
455	}	470	}
456		471
457	/*	472	/*
…		…
528	*q = '\0';	543	*q = '\0';
529		544
530	current_type = get_typedata_by_name (p);	545	current_type = get_typedata_by_name (p);
531	if (current_type)	546	if (current_type)
532	{	547	{
533	items[i].name = current_type->name;	548	items[i].name = current_type->name;
534	items[i].typenum = current_type->number;	549	items[i].typenum = current_type->number;
535	items[i].name_pl = current_type->name_pl;	550	items[i].name_pl = current_type->name_pl;
536	}	551	}
537	else	552	else
538	{ /* oh uh, something's wrong, let's free up this one, and try	553	{ /* oh uh, something's wrong, let's free up this one, and try
…		…
557	* the map (or something equivilent) into output_string. */	572	* the map (or something equivilent) into output_string. */
558	static const char *	573	static const char *
559	print_shop_string (maptile *m)	574	print_shop_string (maptile *m)
560	{	575	{
561	static dynbuf_text buf; buf.clear ();	576	static dynbuf_text buf; buf.clear ();
		577	bool first = true;
562		578
563	for (int i = 0; i < m->shopitems[0].index; i++)	579	for (int i = 0; i < m->shopitems[0].index; i++)
564	{	580	{
		581	if (!first)
		582	buf << ';';
		583
		584	first = false;
		585
565	if (m->shopitems[i].typenum)	586	if (m->shopitems[i].typenum)
566	{	587	{
567	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
568	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);
569	else	590	else
570	buf.printf ("%s;", m->shopitems[i].name);	591	buf.printf ("%s", m->shopitems[i].name);
571	}	592	}
572	else	593	else
573	{	594	{
574	if (m->shopitems[i].strength)	595	if (m->shopitems[i].strength)
575	buf.printf ("*:%d;", m->shopitems[i].strength);	596	buf.printf ("*:%d", m->shopitems[i].strength);
576	else	597	else
577	buf.printf ("*");	598	buf.printf ("*");
578	}	599	}
579	}	600	}
580		601
…		…
603	{	624	{
604	case KW_msg:	625	case KW_msg:
605	thawer.get_ml (KW_endmsg, msg);	626	thawer.get_ml (KW_endmsg, msg);
606	break;	627	break;
607		628
608	case KW_lore: // CF+ extension	629	case KW_lore: // deliantra extension
609	thawer.get_ml (KW_endlore, maplore);	630	thawer.get_ml (KW_endlore, maplore);
610	break;	631	break;
611		632
612	case KW_maplore:	633	case KW_maplore:
613	thawer.get_ml (KW_endmaplore, maplore);	634	thawer.get_ml (KW_endmaplore, maplore);
…		…
630	case KW_shopgreed: thawer.get (shopgreed); break;	651	case KW_shopgreed: thawer.get (shopgreed); break;
631	case KW_shopmin: thawer.get (shopmin); break;	652	case KW_shopmin: thawer.get (shopmin); break;
632	case KW_shopmax: thawer.get (shopmax); break;	653	case KW_shopmax: thawer.get (shopmax); break;
633	case KW_shoprace: thawer.get (shoprace); break;	654	case KW_shoprace: thawer.get (shoprace); break;
634	case KW_outdoor: thawer.get (outdoor); break;	655	case KW_outdoor: thawer.get (outdoor); break;
635	case KW_temp: thawer.get (temp); break;
636	case KW_pressure: thawer.get (pressure); break;
637	case KW_humid: thawer.get (humid); break;
638	case KW_windspeed: thawer.get (windspeed); break;
639	case KW_winddir: thawer.get (winddir); break;
640	case KW_sky: thawer.get (sky); break;
641		656
642	case KW_per_player: thawer.get (per_player); break;	657	case KW_per_player: thawer.get (per_player); break;
643	case KW_per_party: thawer.get (per_party); break;	658	case KW_per_party: thawer.get (per_party); break;
644	case KW_no_reset: thawer.get (no_reset); break;	659	case KW_no_reset: thawer.get (no_reset); break;
645	case KW_no_drop: thawer.get (no_drop); break;	660	case KW_no_drop: thawer.get (no_drop); break;
646		661
647	case KW_region: default_region = region::find (thawer.get_str ()); break;	662	case KW_region: thawer.get (default_region); break;
648	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
649		664
650	// old names new names	665	// old names new names
651	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;
652	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;
…		…
656	case KW_value: case KW_swap_time: thawer.get (timeout); break;	671	case KW_value: case KW_swap_time: thawer.get (timeout); break;
657	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;	672	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
658	case KW_invisible: case KW_darkness: thawer.get (darkness); break;	673	case KW_invisible: case KW_darkness: thawer.get (darkness); break;
659	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;	674	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
660		675
661	case KW_tile_path_1: thawer.get (tile_path [0]); break;	676	case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
662	case KW_tile_path_2: thawer.get (tile_path [1]); break;	677	case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
663	case KW_tile_path_3: thawer.get (tile_path [2]); break;	678	case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
664	case KW_tile_path_4: thawer.get (tile_path [3]); break;	679	case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
		680	case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
		681	case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
665		682
666	case KW_ERROR:	683	case KW_ERROR:
667	set_key_text (thawer.kw_str, thawer.value);	684	set_key_text (thawer.kw_str, thawer.value);
668	break;	685	break;
669		686
670	case KW_end:	687	case KW_end:
671	thawer.next ();	688	thawer.next ();
672	return true;	689	return true;
673		690
674	default:	691	default:
675	if (!thawer.parse_error ("map", 0))	692	if (!thawer.parse_error ("map"))
676	return false;	693	return false;
677	break;	694	break;
678	}	695	}
679		696
680	thawer.next ();	697	thawer.next ();
…		…
698	int unique = 0;	715	int unique = 0;
699	for (object *op = spaces [i].bot; op; )	716	for (object *op = spaces [i].bot; op; )
700	{	717	{
701	object *above = op->above;	718	object *above = op->above;
702		719
703	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	720	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
704	unique = 1;	721	unique = 1;
705		722
706	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	723	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
707	op->destroy ();	724	op->destroy ();
708		725
709	op = above;	726	op = above;
710	}	727	}
711	}	728	}
…		…
735	MAP_OUT (shopgreed);	752	MAP_OUT (shopgreed);
736	MAP_OUT (shopmin);	753	MAP_OUT (shopmin);
737	MAP_OUT (shopmax);	754	MAP_OUT (shopmax);
738	if (shoprace) MAP_OUT (shoprace);	755	if (shoprace) MAP_OUT (shoprace);
739		756
740	MAP_OUT (darkness);
741	MAP_OUT (width);	757	MAP_OUT (width);
742	MAP_OUT (height);	758	MAP_OUT (height);
743	MAP_OUT (enter_x);	759	MAP_OUT (enter_x);
744	MAP_OUT (enter_y);	760	MAP_OUT (enter_y);
		761	MAP_OUT (darkness);
		762	MAP_OUT (outdoor);
745		763
746	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);	764	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
747	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);	765	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
748		766
749	MAP_OUT (outdoor);
750	MAP_OUT (temp);
751	MAP_OUT (pressure);
752	MAP_OUT (humid);
753	MAP_OUT (windspeed);
754	MAP_OUT (winddir);
755	MAP_OUT (sky);
756
757	MAP_OUT (per_player);	767	MAP_OUT (per_player);
758	MAP_OUT (per_party);	768	MAP_OUT (per_party);
759		769
760	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	770	if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
761	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	771	if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
762	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	772	if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
763	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	773	if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
		774	if (tile_path [TILE_UP ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP ]);
		775	if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
764		776
765	freezer.put (this);	777	freezer.put (this);
766	freezer.put (KW(end));	778	freezer.put (KW(end));
767		779
768	return true;	780	return true;
…		…
825	msg = 0;	837	msg = 0;
826	maplore = 0;	838	maplore = 0;
827	shoprace = 0;	839	shoprace = 0;
828	delete [] shopitems, shopitems = 0;	840	delete [] shopitems, shopitems = 0;
829		841
830	for (int i = 0; i < 4; i++)	842	for (int i = 0; i < array_length (tile_path); i++)
831	tile_path [i] = 0;	843	tile_path [i] = 0;
832	}	844	}
833		845
834	maptile::~maptile ()	846	maptile::~maptile ()
835	{	847	{
…		…
842	/* 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
843	* are pointing at this one for tiling information. Since	855	* are pointing at this one for tiling information. Since
844	* 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
845	* maps this map tiles with and clears those.	857	* maps this map tiles with and clears those.
846	*/	858	*/
847	for (int i = 0; i < 4; i++)	859	for (int i = 0; i < array_length (tile_path); i++)
848	if (tile_map[i] == m)	860	if (tile_map[i] == m)
849	tile_map[i] = 0;	861	tile_map[i] = 0;
850	}	862	}
851		863
852	void	864	void
…		…
856		868
857	clear ();	869	clear ();
858	}	870	}
859		871
860	/* 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?
861	void	874	void
862	maptile::do_decay_objects ()	875	maptile::do_decay_objects ()
863	{	876	{
864	if (!spaces)	877	if (!spaces)
865	return;	878	return;
…		…
867	for (mapspace *ms = spaces + size (); ms-- > spaces; )	880	for (mapspace *ms = spaces + size (); ms-- > spaces; )
868	for (object above, op = ms->bot; op; op = above)	881	for (object above, op = ms->bot; op; op = above)
869	{	882	{
870	above = op->above;	883	above = op->above;
871		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
872	bool destroy = 0;	889	bool destroy = 0;
873		890
874	// do not decay anything above unique floor tiles (yet :)	891	if (op->flag [FLAG_IS_FLOOR]
875	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	892	\|\| op->flag [FLAG_OBJ_ORIGINAL]
876	break;	893	\|\| op->flag [FLAG_UNIQUE]
877		894	\|\| op->flag [FLAG_OVERLAY_FLOOR]
878	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	895	\|\| op->flag [FLAG_UNPAID]
879	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
880	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
881	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
882	\|\| QUERY_FLAG (op, FLAG_UNPAID)
883	\|\| op->is_alive ())	896	\|\| op->is_alive ())
884	; // do not decay	897	; // do not decay
885	else if (op->is_weapon ())	898	else if (op->is_weapon ())
886	{	899	{
887	op->stats.dam--;	900	op->stats.dam--;
…		…
912	\|\| mat & M_LIQUID	925	\|\| mat & M_LIQUID
913	\|\| (mat & M_IRON && rndm (1, 5) == 1)	926	\|\| (mat & M_IRON && rndm (1, 5) == 1)
914	\|\| (mat & M_GLASS && rndm (1, 2) == 1)	927	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
915	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)	928	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
916	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)	929	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
917	\|\| (mat & M_ICE && temp > 32))	930	//\|\| (mat & M_ICE && temp > 32)
		931	)
918	destroy = 1;	932	destroy = 1;
919	}	933	}
920		934
921	/* adjust overall chance below */	935	/* adjust overall chance below */
922	if (destroy && rndm (0, 1))	936	if (destroy && rndm (0, 1))
…		…
942	sint64 total_exp = 0;	956	sint64 total_exp = 0;
943		957
944	for (mapspace *ms = spaces + size (); ms-- > spaces; )	958	for (mapspace *ms = spaces + size (); ms-- > spaces; )
945	for (object *op = ms->bot; op; op = op->above)	959	for (object *op = ms->bot; op; op = op->above)
946	{	960	{
947	if (QUERY_FLAG (op, FLAG_MONSTER))	961	if (op->flag [FLAG_MONSTER])
948	{	962	{
949	total_exp += op->stats.exp;	963	total_exp += op->stats.exp;
950	monster_cnt++;	964	monster_cnt++;
951	}	965	}
952		966
953	if (QUERY_FLAG (op, FLAG_GENERATOR))	967	if (op->flag [FLAG_GENERATOR])
954	{	968	{
955	total_exp += op->stats.exp;	969	total_exp += op->stats.exp;
956		970
957	if (archetype *at = op->other_arch)	971	if (archetype *at = op->other_arch)
958	{	972	{
…		…
1140	*/	1154	*/
1141		1155
1142	for (object *tmp = last; tmp; tmp = tmp->below)	1156	for (object *tmp = last; tmp; tmp = tmp->below)
1143	{	1157	{
1144	/* 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 */
1145	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1159	if (tmp->flag [FLAG_IS_FLOOR])
1146	break;	1160	break;
1147		1161
1148	/* If two top faces are already set, quit processing */	1162	/* If two top faces are already set, quit processing */
1149	if (top && middle)	1163	if (top && middle)
1150	break;	1164	break;
…		…
1181	middle = 0;	1195	middle = 0;
1182		1196
1183	if (top == middle)	1197	if (top == middle)
1184	middle = 0;	1198	middle = 0;
1185		1199
		1200	// set lower map transparent floor flag if applicable
		1201	if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
		1202	{
		1203	floor->set_anim_frame (0);
		1204
		1205	if (maptile *m = floor->map->tile_map [TILE_DOWN])
		1206	{
		1207	mapspace &ms = m->at (floor->x, floor->y);
		1208	ms.update ();
		1209
		1210	if (object *floor2 = ms.faces_obj [2])
		1211	if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
		1212	{
		1213	floor->set_anim_frame (1);
		1214	top = floor;
		1215	middle = ms.faces_obj [0];
		1216	floor = floor2;
		1217	}
		1218
		1219	ms.pflags \|= PF_VIS_UP;
		1220	}
		1221	}
		1222
1186	#if 0	1223	#if 0
1187	faces_obj [0] = top;	1224	faces_obj [0] = top;
1188	faces_obj [1] = middle;	1225	faces_obj [1] = middle;
1189	faces_obj [2] = floor;	1226	faces_obj [2] = floor;
1190	#endif	1227	#endif
1191	}	1228	}
1192		1229
		1230	void
		1231	mapspace::update_up ()
		1232	{
		1233	// invalidate up
		1234	if (!(pflags & PF_VIS_UP))
		1235	return;
		1236
		1237	pflags &= ~PF_VIS_UP;
		1238
		1239	if (bot)
		1240	if (maptile *m = bot->map->tile_map [TILE_UP])
		1241	m->at (bot->x, bot->y).invalidate ();
		1242	}
		1243
1193	maptile *	1244	maptile *
1194	maptile::tile_available (int dir, bool load)	1245	maptile::tile_available (int dir, bool load)
1195	{	1246	{
		1247	// map is there and we don't need to load it OR it's loaded => return what we have
		1248	if (tile_map [dir] && (!load \|\| tile_map [dir]->linkable ()))
		1249	return tile_map [dir];
		1250
1196	if (tile_path[dir])	1251	if (tile_path [dir])
1197	{	1252	{
1198	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1253	// well, try to locate it then, if possible - maybe it's there already
		1254	// this is the ONLY place in the server that links maps with each other,
		1255	// so any kind of inter-map stuff has to be initiated here.
		1256	if (maptile *m = find_async (tile_path [dir], this, load))
		1257	{
		1258	bool mismatch = false;
		1259
		1260	if (dir == TILE_NORTH \|\| dir == TILE_SOUTH \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1261	if (width != m->width)
		1262	mismatch = true;
		1263
		1264	if (dir == TILE_EAST \|\| dir == TILE_WEST \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1265	if (height != m->height)
		1266	mismatch = true;
		1267
		1268	if (mismatch)
		1269	{
		1270	LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
		1271	dir, &path, &m->path);
		1272	m = 0;
		1273	}
		1274	else if (0)//D
		1275	{
		1276	// as an optimisation, link us against the other map if the other map
		1277	// has us as neighbour, which is very common, but not guaranteed.
		1278	int dir2 = REVERSE_TILE_DIR (dir);
		1279
		1280	if (m->tile_path [dir2] == path)
		1281	m->tile_map [dir2] = this;
		1282	}
		1283
		1284
1199	return tile_map[dir];	1285	return tile_map [dir] = m;
1200		1286	}
1201	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1202	return tile_map[dir];
1203	}	1287	}
1204		1288
1205	return 0;	1289	return 0;
1206	}	1290	}
1207		1291
…		…
1223	if (!m)	1307	if (!m)
1224	return 0;	1308	return 0;
1225		1309
1226	if (x < 0)	1310	if (x < 0)
1227	{	1311	{
1228	if (!m->tile_available (3))	1312	if (!m->tile_available (TILE_WEST))
1229	return 1;	1313	return 1;
1230		1314
1231	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1315	return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1232	}	1316	}
1233		1317
1234	if (x >= m->width)	1318	if (x >= m->width)
1235	{	1319	{
1236	if (!m->tile_available (1))	1320	if (!m->tile_available (TILE_EAST))
1237	return 1;	1321	return 1;
1238		1322
1239	return out_of_map (m->tile_map[1], x - m->width, y);	1323	return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1240	}	1324	}
1241		1325
1242	if (y < 0)	1326	if (y < 0)
1243	{	1327	{
1244	if (!m->tile_available (0))	1328	if (!m->tile_available (TILE_NORTH))
1245	return 1;	1329	return 1;
1246		1330
1247	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1331	return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1248	}	1332	}
1249		1333
1250	if (y >= m->height)	1334	if (y >= m->height)
1251	{	1335	{
1252	if (!m->tile_available (2))	1336	if (!m->tile_available (TILE_SOUTH))
1253	return 1;	1337	return 1;
1254		1338
1255	return out_of_map (m->tile_map[2], x, y - m->height);	1339	return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1256	}	1340	}
1257		1341
1258	/* Simple case - coordinates are within this local	1342	/* Simple case - coordinates are within this local
1259	* map.	1343	* map.
1260	*/	1344	*/
…		…
1272	maptile *	1356	maptile *
1273	maptile::xy_find (sint16 &x, sint16 &y)	1357	maptile::xy_find (sint16 &x, sint16 &y)
1274	{	1358	{
1275	if (x < 0)	1359	if (x < 0)
1276	{	1360	{
1277	if (!tile_available (3))	1361	if (!tile_available (TILE_WEST))
1278	return 0;	1362	return 0;
1279		1363
1280	x += tile_map[3]->width;	1364	x += tile_map [TILE_WEST]->width;
1281	return tile_map[3]->xy_find (x, y);	1365	return tile_map [TILE_WEST]->xy_find (x, y);
1282	}	1366	}
1283		1367
1284	if (x >= width)	1368	if (x >= width)
1285	{	1369	{
1286	if (!tile_available (1))	1370	if (!tile_available (TILE_EAST))
1287	return 0;	1371	return 0;
1288		1372
1289	x -= width;	1373	x -= width;
1290	return tile_map[1]->xy_find (x, y);	1374	return tile_map [TILE_EAST]->xy_find (x, y);
1291	}	1375	}
1292		1376
1293	if (y < 0)	1377	if (y < 0)
1294	{	1378	{
1295	if (!tile_available (0))	1379	if (!tile_available (TILE_NORTH))
1296	return 0;	1380	return 0;
1297		1381
1298	y += tile_map[0]->height;	1382	y += tile_map [TILE_NORTH]->height;
1299	return tile_map[0]->xy_find (x, y);	1383	return tile_map [TILE_NORTH]->xy_find (x, y);
1300	}	1384	}
1301		1385
1302	if (y >= height)	1386	if (y >= height)
1303	{	1387	{
1304	if (!tile_available (2))	1388	if (!tile_available (TILE_SOUTH))
1305	return 0;	1389	return 0;
1306		1390
1307	y -= height;	1391	y -= height;
1308	return tile_map[2]->xy_find (x, y);	1392	return tile_map [TILE_SOUTH]->xy_find (x, y);
1309	}	1393	}
1310		1394
1311	/* Simple case - coordinates are within this local	1395	/* Simple case - coordinates are within this local
1312	* map.	1396	* map.
1313	*/	1397	*/
…		…
1317	/**	1401	/**
1318	* Return whether map2 is adjacent to map1. If so, store the distance from	1402	* Return whether map2 is adjacent to map1. If so, store the distance from
1319	* map1 to map2 in dx/dy.	1403	* map1 to map2 in dx/dy.
1320	*/	1404	*/
1321	int	1405	int
1322	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1406	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1323	{	1407	{
1324	if (!map1 \|\| !map2)	1408	if (!map1 \|\| !map2)
1325	return 0;	1409	return 0;
1326		1410
1327	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1411	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1329	if (map1 == map2)	1413	if (map1 == map2)
1330	{	1414	{
1331	*dx = 0;	1415	*dx = 0;
1332	*dy = 0;	1416	*dy = 0;
1333	}	1417	}
1334	else if (map1->tile_map[0] == map2)	1418	else if (map1->tile_available (TILE_NORTH, false) == map2)
1335	{ /* up */	1419	{
1336	*dx = 0;	1420	*dx = 0;
1337	*dy = -map2->height;	1421	*dy = -map2->height;
1338	}	1422	}
1339	else if (map1->tile_map[1] == map2)	1423	else if (map1->tile_available (TILE_EAST , false) == map2)
1340	{ /* right */	1424	{
1341	*dx = map1->width;	1425	*dx = map1->width;
1342	*dy = 0;	1426	*dy = 0;
1343	}	1427	}
1344	else if (map1->tile_map[2] == map2)	1428	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1345	{ /* down */	1429	{
1346	*dx = 0;	1430	*dx = 0;
1347	*dy = map1->height;	1431	*dy = map1->height;
1348	}	1432	}
1349	else if (map1->tile_map[3] == map2)	1433	else if (map1->tile_available (TILE_WEST , false) == map2)
1350	{ /* left */	1434	{
1351	*dx = -map2->width;	1435	*dx = -map2->width;
1352	*dy = 0;	1436	*dy = 0;
1353	}	1437	}
1354	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1438	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1355	{ /* up right */	1439	{ /* up right */
1356	*dx = map1->tile_map[0]->width;	1440	*dx = +map1->tile_map[TILE_NORTH]->width;
1357	*dy = -map1->tile_map[0]->height;	1441	*dy = -map1->tile_map[TILE_NORTH]->height;
1358	}	1442	}
1359	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1443	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1360	{ /* up left */	1444	{ /* up left */
1361	*dx = -map2->width;	1445	*dx = -map2->width;
1362	*dy = -map1->tile_map[0]->height;	1446	*dy = -map1->tile_map[TILE_NORTH]->height;
1363	}	1447	}
1364	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1448	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1365	{ /* right up */	1449	{ /* right up */
1366	*dx = map1->width;	1450	*dx = +map1->width;
1367	*dy = -map2->height;	1451	*dy = -map2->height;
1368	}	1452	}
1369	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1453	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1370	{ /* right down */	1454	{ /* right down */
1371	*dx = map1->width;	1455	*dx = +map1->width;
1372	*dy = map1->tile_map[1]->height;	1456	*dy = +map1->tile_map[TILE_EAST]->height;
1373	}	1457	}
1374	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1458	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1375	{ /* down right */	1459	{ /* down right */
1376	*dx = map1->tile_map[2]->width;	1460	*dx = +map1->tile_map[TILE_SOUTH]->width;
1377	*dy = map1->height;	1461	*dy = +map1->height;
1378	}	1462	}
1379	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1463	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1380	{ /* down left */	1464	{ /* down left */
1381	*dx = -map2->width;	1465	*dx = -map2->width;
1382	*dy = map1->height;	1466	*dy = +map1->height;
1383	}	1467	}
1384	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1468	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1385	{ /* left up */	1469	{ /* left up */
1386	*dx = -map1->tile_map[3]->width;	1470	*dx = -map1->tile_map[TILE_WEST]->width;
1387	*dy = -map2->height;	1471	*dy = -map2->height;
1388	}	1472	}
1389	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1473	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1390	{ /* left down */	1474	{ /* left down */
1391	*dx = -map1->tile_map[3]->width;	1475	*dx = -map1->tile_map[TILE_WEST]->width;
1392	*dy = map1->tile_map[3]->height;	1476	*dy = +map1->tile_map[TILE_WEST]->height;
1393	}	1477	}
1394	else	1478	else
1395	return 0;	1479	return 0;
1396		1480
1397	return 1;	1481	return 1;
…		…
1420	* so you just can not look the the map coordinates and get the	1504	* so you just can not look the the map coordinates and get the
1421	* righte value. distance_x/y are distance away, which	1505	* righte value. distance_x/y are distance away, which
1422	* can be negative. direction is the crossfire direction scheme	1506	* can be negative. direction is the crossfire direction scheme
1423	* that the creature should head. part is the part of the	1507	* that the creature should head. part is the part of the
1424	* monster that is closest.	1508	* monster that is closest.
1425	*	1509	*
1426	* get_rangevector looks at op1 and op2, and fills in the	1510	* get_rangevector looks at op1 and op2, and fills in the
1427	* structure for op1 to get to op2.	1511	* structure for op1 to get to op2.
1428	* We already trust that the caller has verified that the	1512	* We already trust that the caller has verified that the
1429	* two objects are at least on adjacent maps. If not,	1513	* two objects are at least on adjacent maps. If not,
1430	* results are not likely to be what is desired.	1514	* results are not likely to be what is desired.
…		…
1433	*	1517	*
1434	* currently, the only flag supported (0x1) is don't translate for	1518	* currently, the only flag supported (0x1) is don't translate for
1435	* closest body part of 'op1'	1519	* closest body part of 'op1'
1436	*/	1520	*/
1437	void	1521	void
1438	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1522	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1439	{	1523	{
1440	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1524	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1441	{	1525	{
1442	/* be conservative and fill in _some_ data */	1526	/* be conservative and fill in _some_ data */
1443	retval->distance = 10000;	1527	retval->distance = 10000;
1444	retval->distance_x = 10000;	1528	retval->distance_x = 10000;
1445	retval->distance_y = 10000;	1529	retval->distance_y = 10000;
1446	retval->direction = 0;	1530	retval->direction = 0;
1447	retval->part = 0;	1531	retval->part = 0;
1448	}	1532	}
1449	else	1533	else
1450	{	1534	{
1451	object *best;
1452
1453	retval->distance_x += op2->x - op1->x;	1535	retval->distance_x += op2->x - op1->x;
1454	retval->distance_y += op2->y - op1->y;	1536	retval->distance_y += op2->y - op1->y;
1455		1537
1456	best = op1;	1538	object *best = op1;
		1539
1457	/* If this is multipart, find the closest part now */	1540	/* If this is multipart, find the closest part now */
1458	if (!(flags & 0x1) && op1->more)	1541	if (!(flags & 1) && op1->more)
1459	{	1542	{
1460	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1543	int best_distance = idistance (retval->distance_x, retval->distance_y);
1461		1544
1462	/* we just take the offset of the piece to head to figure	1545	/* we just take the offset of the piece to head to figure
1463	* distance instead of doing all that work above again	1546	* distance instead of doing all that work above again
1464	* since the distance fields we set above are positive in the	1547	* since the distance fields we set above are positive in the
1465	* same axis as is used for multipart objects, the simply arithmetic	1548	* same axis as is used for multipart objects, the simply arithmetic
1466	* below works.	1549	* below works.
1467	*/	1550	*/
1468	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1551	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1469	{	1552	{
1470	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1553	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1471	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1554
1472	if (tmpi < best_distance)	1555	if (tmpi < best_distance)
1473	{	1556	{
1474	best_distance = tmpi;	1557	best_distance = tmpi;
1475	best = tmp;	1558	best = tmp;
1476	}	1559	}
1477	}	1560	}
1478		1561
1479	if (best != op1)	1562	if (best != op1)
1480	{	1563	{
1481	retval->distance_x += op1->x - best->x;	1564	retval->distance_x += op1->x - best->x;
1482	retval->distance_y += op1->y - best->y;	1565	retval->distance_y += op1->y - best->y;
1483	}	1566	}
1484	}	1567	}
1485		1568
1486	retval->part = best;	1569	retval->part = best;
1487	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1570	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1488	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1571	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1489	}	1572	}
1490	}	1573	}
1491		1574
1492	/* this is basically the same as get_rangevector above, but instead of	1575	/* this is basically the same as get_rangevector above, but instead of
1493	* the first parameter being an object, it instead is the map	1576	* the first parameter being an object, it instead is the map
…		…
1498	* be more consistant with the above function and also in case they are needed	1581	* be more consistant with the above function and also in case they are needed
1499	* for something in the future. Also, since no object is pasted, the best	1582	* for something in the future. Also, since no object is pasted, the best
1500	* field of the rv_vector is set to NULL.	1583	* field of the rv_vector is set to NULL.
1501	*/	1584	*/
1502	void	1585	void
1503	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1586	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1504	{	1587	{
1505	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1588	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1506	{	1589	{
1507	/* be conservative and fill in _some_ data */	1590	/* be conservative and fill in _some_ data */
1508	retval->distance = 100000;	1591	retval->distance = 100000;
1509	retval->distance_x = 32767;	1592	retval->distance_x = 32767;
1510	retval->distance_y = 32767;	1593	retval->distance_y = 32767;
1511	retval->direction = 0;	1594	retval->direction = 0;
1512	retval->part = 0;	1595	retval->part = 0;
1513	}	1596	}
1514	else	1597	else
1515	{	1598	{
1516	retval->distance_x += op2->x - x;	1599	retval->distance_x += op2->x - x;
1517	retval->distance_y += op2->y - y;	1600	retval->distance_y += op2->y - y;
1518		1601
1519	retval->part = 0;	1602	retval->part = 0;
1520	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1603	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1521	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1604	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1522	}	1605	}
1523	}	1606	}
1524		1607
1525	/* Returns true of op1 and op2 are effectively on the same map	1608	/* Returns true of op1 and op2 are effectively on the same map
1526	* (as related to map tiling). Note that this looks for a path from	1609	* (as related to map tiling). Note that this looks for a path from
…		…
1576	*/	1659	*/
1577	for (int i = 1000; --i;)	1660	for (int i = 1000; --i;)
1578	{	1661	{
1579	object *pick = at (gen (width), gen (height)).bot;	1662	object *pick = at (gen (width), gen (height)).bot;
1580		1663
1581	// do not prefer big monsters just because they are big.	1664	// must be head: do not prefer big monsters just because they are big.
1582	if (pick && pick->is_head ())	1665	if (pick && pick->is_head ())
1583	return pick->head_ ();	1666	return pick;
1584	}	1667	}
1585		1668
1586	// instead of crashing in the unlikely(?) case, try to return something	1669	// instead of crashing in the unlikely(?) case, try to return something
1587	return archetype::find (shstr_bug);	1670	return archetype::find (shstr_bug);
1588	}	1671	}
…		…
1622	if (distance <= MAX_SOUND_DISTANCE)	1705	if (distance <= MAX_SOUND_DISTANCE)
1623	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1706	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1624	}	1707	}
1625	}	1708	}
1626		1709
		1710	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1711
1627	static void	1712	static void
1628	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1713	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1629	{	1714	{
1630	// clip to map to the left	1715	// clip to map to the left
1631	if (x0 < 0)	1716	if (x0 < 0)
1632	{	1717	{
1633	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1718	if (maptile *tile = m->tile_available (TILE_WEST, 1))
1634	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);	1719	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1635		1720
1636	if (x1 < 0) // entirely to the left	1721	if (x1 < 0) // entirely to the left
1637	return;	1722	return;
1638		1723
…		…
1640	}	1725	}
1641		1726
1642	// clip to map to the right	1727	// clip to map to the right
1643	if (x1 > m->width)	1728	if (x1 > m->width)
1644	{	1729	{
1645	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1730	if (maptile *tile = m->tile_available (TILE_EAST, 1))
1646	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);	1731	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1647		1732
1648	if (x0 > m->width) // entirely to the right	1733	if (x0 >= m->width) // entirely to the right
1649	return;	1734	return;
1650		1735
1651	x1 = m->width;	1736	x1 = m->width;
1652	}	1737	}
1653		1738
1654	// clip to map above	1739	// clip to map to the north
1655	if (y0 < 0)	1740	if (y0 < 0)
1656	{	1741	{
1657	if (maptile *tile = m->tile_available (TILE_UP, 1))	1742	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1658	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);	1743	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1659		1744
1660	if (y1 < 0) // entirely above	1745	if (y1 < 0) // entirely to the north
1661	return;	1746	return;
1662		1747
1663	y0 = 0;	1748	y0 = 0;
1664	}	1749	}
1665		1750
1666	// clip to map below	1751	// clip to map to the south
1667	if (y1 > m->height)	1752	if (y1 > m->height)
1668	{	1753	{
1669	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1754	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1670	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);	1755	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1671		1756
1672	if (y0 > m->height) // entirely below	1757	if (y0 >= m->height) // entirely to the south
1673	return;	1758	return;
1674		1759
1675	y1 = m->height;	1760	y1 = m->height;
1676	}	1761	}
1677		1762
…		…
1686	r->dx = dx;	1771	r->dx = dx;
1687	r->dy = dy;	1772	r->dy = dy;
1688	}	1773	}
1689		1774
1690	maprect *	1775	maprect *
1691	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1776	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1692	{	1777	{
1693	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1694	buf.clear ();	1778	buf.clear ();
1695		1779
1696	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1780	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1697		1781
1698	// add end marker	1782	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.177 by root, Wed Nov 11 23:27:56 2009 UTC vs. Revision 1.218 by root, Mon Oct 29 23:55:52 2012 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.177 by root, Wed Nov 11 23:27:56 2009 UTC vs.
Revision 1.218 by root, Mon Oct 29 23:55:52 2012 UTC