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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.167 by root, Thu Nov 5 15:43:21 2009 UTC vs.
Revision 1.215 by root, Sun May 8 12:40:41 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	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	450	max_items = MAX_ITEM_PER_ACTION;
454	max_volume = 2000000; // 2m³	451	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;	452	reset_timeout = 0;
464	timeout = 300;
465	enter_x = 0;	453	enter_x = 0;
466	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;
467		468
468	alloc ();	469	alloc ();
469	}	470	}
470		471
471	/*	472	/*
…		…
571	* the map (or something equivilent) into output_string. */	572	* the map (or something equivilent) into output_string. */
572	static const char *	573	static const char *
573	print_shop_string (maptile *m)	574	print_shop_string (maptile *m)
574	{	575	{
575	static dynbuf_text buf; buf.clear ();	576	static dynbuf_text buf; buf.clear ();
		577	bool first = true;
576		578
577	for (int i = 0; i < m->shopitems[0].index; i++)	579	for (int i = 0; i < m->shopitems[0].index; i++)
578	{	580	{
		581	if (!first)
		582	buf << ';';
		583
		584	first = false;
		585
579	if (m->shopitems[i].typenum)	586	if (m->shopitems[i].typenum)
580	{	587	{
581	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
582	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);
583	else	590	else
584	buf.printf ("%s;", m->shopitems[i].name);	591	buf.printf ("%s", m->shopitems[i].name);
585	}	592	}
586	else	593	else
587	{	594	{
588	if (m->shopitems[i].strength)	595	if (m->shopitems[i].strength)
589	buf.printf ("*:%d;", m->shopitems[i].strength);	596	buf.printf ("*:%d", m->shopitems[i].strength);
590	else	597	else
591	buf.printf ("*");	598	buf.printf ("*");
592	}	599	}
593	}	600	}
594		601
…		…
617	{	624	{
618	case KW_msg:	625	case KW_msg:
619	thawer.get_ml (KW_endmsg, msg);	626	thawer.get_ml (KW_endmsg, msg);
620	break;	627	break;
621		628
622	case KW_lore: // CF+ extension	629	case KW_lore: // deliantra extension
623	thawer.get_ml (KW_endlore, maplore);	630	thawer.get_ml (KW_endlore, maplore);
624	break;	631	break;
625		632
626	case KW_maplore:	633	case KW_maplore:
627	thawer.get_ml (KW_endmaplore, maplore);	634	thawer.get_ml (KW_endmaplore, maplore);
…		…
644	case KW_shopgreed: thawer.get (shopgreed); break;	651	case KW_shopgreed: thawer.get (shopgreed); break;
645	case KW_shopmin: thawer.get (shopmin); break;	652	case KW_shopmin: thawer.get (shopmin); break;
646	case KW_shopmax: thawer.get (shopmax); break;	653	case KW_shopmax: thawer.get (shopmax); break;
647	case KW_shoprace: thawer.get (shoprace); break;	654	case KW_shoprace: thawer.get (shoprace); break;
648	case KW_outdoor: thawer.get (outdoor); break;	655	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		656
656	case KW_per_player: thawer.get (per_player); break;	657	case KW_per_player: thawer.get (per_player); break;
657	case KW_per_party: thawer.get (per_party); break;	658	case KW_per_party: thawer.get (per_party); break;
658	case KW_no_reset: thawer.get (no_reset); break;	659	case KW_no_reset: thawer.get (no_reset); break;
659	case KW_no_drop: thawer.get (no_drop); break;	660	case KW_no_drop: thawer.get (no_drop); break;
660		661
661	case KW_region: default_region = region::find (thawer.get_str ()); break;	662	case KW_region: thawer.get (default_region); break;
662	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
663		664
664	// old names new names	665	// old names new names
665	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;
666	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;
…		…
670	case KW_value: case KW_swap_time: thawer.get (timeout); break;	671	case KW_value: case KW_swap_time: thawer.get (timeout); break;
671	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;
672	case KW_invisible: case KW_darkness: thawer.get (darkness); break;	673	case KW_invisible: case KW_darkness: thawer.get (darkness); break;
673	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;
674		675
675	case KW_tile_path_1: thawer.get (tile_path [0]); break;	676	case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
676	case KW_tile_path_2: thawer.get (tile_path [1]); break;	677	case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
677	case KW_tile_path_3: thawer.get (tile_path [2]); break;	678	case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
678	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;
679		682
680	case KW_ERROR:	683	case KW_ERROR:
681	set_key_text (thawer.kw_str, thawer.value);	684	set_key_text (thawer.kw_str, thawer.value);
682	break;	685	break;
683		686
684	case KW_end:	687	case KW_end:
685	thawer.next ();	688	thawer.next ();
686	return true;	689	return true;
687		690
688	default:	691	default:
689	if (!thawer.parse_error ("map", 0))	692	if (!thawer.parse_error ("map"))
690	return false;	693	return false;
691	break;	694	break;
692	}	695	}
693		696
694	thawer.next ();	697	thawer.next ();
…		…
712	int unique = 0;	715	int unique = 0;
713	for (object *op = spaces [i].bot; op; )	716	for (object *op = spaces [i].bot; op; )
714	{	717	{
715	object *above = op->above;	718	object *above = op->above;
716		719
717	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	720	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
718	unique = 1;	721	unique = 1;
719		722
720	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	723	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
721	op->destroy ();	724	op->destroy ();
722		725
723	op = above;	726	op = above;
724	}	727	}
725	}	728	}
…		…
728	//-GPL	731	//-GPL
729		732
730	bool	733	bool
731	maptile::_save_header (object_freezer &freezer)	734	maptile::_save_header (object_freezer &freezer)
732	{	735	{
733	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	736	#define MAP_OUT(k) freezer.put (KW(k), k)
734	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	737	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
735		738
736	MAP_OUT2 (arch, "map");	739	MAP_OUT2 (arch, CS(map));
737		740
738	if (name) MAP_OUT (name);	741	if (name) MAP_OUT (name);
739	MAP_OUT (swap_time);	742	MAP_OUT (swap_time);
740	MAP_OUT (reset_time);	743	MAP_OUT (reset_time);
741	MAP_OUT (reset_timeout);	744	MAP_OUT (reset_timeout);
…		…
749	MAP_OUT (shopgreed);	752	MAP_OUT (shopgreed);
750	MAP_OUT (shopmin);	753	MAP_OUT (shopmin);
751	MAP_OUT (shopmax);	754	MAP_OUT (shopmax);
752	if (shoprace) MAP_OUT (shoprace);	755	if (shoprace) MAP_OUT (shoprace);
753		756
754	MAP_OUT (darkness);
755	MAP_OUT (width);	757	MAP_OUT (width);
756	MAP_OUT (height);	758	MAP_OUT (height);
757	MAP_OUT (enter_x);	759	MAP_OUT (enter_x);
758	MAP_OUT (enter_y);	760	MAP_OUT (enter_y);
759		761	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);	762	MAP_OUT (outdoor);
764	MAP_OUT (temp);	763
765	MAP_OUT (pressure);	764	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
766	MAP_OUT (humid);	765	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
767	MAP_OUT (windspeed);
768	MAP_OUT (winddir);
769	MAP_OUT (sky);
770		766
771	MAP_OUT (per_player);	767	MAP_OUT (per_player);
772	MAP_OUT (per_party);	768	MAP_OUT (per_party);
773		769
774	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]);
775	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 ]);
776	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]);
777	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 ]);
778		776
779	freezer.put (this);	777	freezer.put (this);
780	freezer.put (KW_end);	778	freezer.put (KW(end));
781		779
782	return true;	780	return true;
783	}	781	}
784		782
785	bool	783	bool
…		…
839	msg = 0;	837	msg = 0;
840	maplore = 0;	838	maplore = 0;
841	shoprace = 0;	839	shoprace = 0;
842	delete [] shopitems, shopitems = 0;	840	delete [] shopitems, shopitems = 0;
843		841
844	for (int i = 0; i < 4; i++)	842	for (int i = 0; i < array_length (tile_path); i++)
845	tile_path [i] = 0;	843	tile_path [i] = 0;
846	}	844	}
847		845
848	maptile::~maptile ()	846	maptile::~maptile ()
849	{	847	{
…		…
856	/* 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
857	* are pointing at this one for tiling information. Since	855	* are pointing at this one for tiling information. Since
858	* 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
859	* maps this map tiles with and clears those.	857	* maps this map tiles with and clears those.
860	*/	858	*/
861	for (int i = 0; i < 4; i++)	859	for (int i = 0; i < array_length (tile_path); i++)
862	if (tile_map[i] == m)	860	if (tile_map[i] == m)
863	tile_map[i] = 0;	861	tile_map[i] = 0;
864	}	862	}
865		863
866	void	864	void
…		…
870		868
871	clear ();	869	clear ();
872	}	870	}
873		871
874	/* 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?
875	void	874	void
876	maptile::do_decay_objects ()	875	maptile::do_decay_objects ()
877	{	876	{
878	if (!spaces)	877	if (!spaces)
879	return;	878	return;
…		…
881	for (mapspace *ms = spaces + size (); ms-- > spaces; )	880	for (mapspace *ms = spaces + size (); ms-- > spaces; )
882	for (object above, op = ms->bot; op; op = above)	881	for (object above, op = ms->bot; op; op = above)
883	{	882	{
884	above = op->above;	883	above = op->above;
885		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
886	bool destroy = 0;	889	bool destroy = 0;
887		890
888	// do not decay anything above unique floor tiles (yet :)	891	if (op->flag [FLAG_IS_FLOOR]
889	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	892	\|\| op->flag [FLAG_OBJ_ORIGINAL]
890	break;	893	\|\| op->flag [FLAG_UNIQUE]
891		894	\|\| op->flag [FLAG_OVERLAY_FLOOR]
892	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	895	\|\| 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 ())	896	\|\| op->is_alive ())
898	; // do not decay	897	; // do not decay
899	else if (op->is_weapon ())	898	else if (op->is_weapon ())
900	{	899	{
901	op->stats.dam--;	900	op->stats.dam--;
…		…
926	\|\| mat & M_LIQUID	925	\|\| mat & M_LIQUID
927	\|\| (mat & M_IRON && rndm (1, 5) == 1)	926	\|\| (mat & M_IRON && rndm (1, 5) == 1)
928	\|\| (mat & M_GLASS && rndm (1, 2) == 1)	927	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
929	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)	928	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
930	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)	929	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
931	\|\| (mat & M_ICE && temp > 32))	930	//\|\| (mat & M_ICE && temp > 32)
		931	)
932	destroy = 1;	932	destroy = 1;
933	}	933	}
934		934
935	/* adjust overall chance below */	935	/* adjust overall chance below */
936	if (destroy && rndm (0, 1))	936	if (destroy && rndm (0, 1))
…		…
956	sint64 total_exp = 0;	956	sint64 total_exp = 0;
957		957
958	for (mapspace *ms = spaces + size (); ms-- > spaces; )	958	for (mapspace *ms = spaces + size (); ms-- > spaces; )
959	for (object *op = ms->bot; op; op = op->above)	959	for (object *op = ms->bot; op; op = op->above)
960	{	960	{
961	if (QUERY_FLAG (op, FLAG_MONSTER))	961	if (op->flag [FLAG_MONSTER])
962	{	962	{
963	total_exp += op->stats.exp;	963	total_exp += op->stats.exp;
964	monster_cnt++;	964	monster_cnt++;
965	}	965	}
966		966
967	if (QUERY_FLAG (op, FLAG_GENERATOR))	967	if (op->flag [FLAG_GENERATOR])
968	{	968	{
969	total_exp += op->stats.exp;	969	total_exp += op->stats.exp;
970		970
971	if (archetype *at = op->other_arch)	971	if (archetype *at = op->other_arch)
972	{	972	{
…		…
1027	*/	1027	*/
1028	void	1028	void
1029	mapspace::update_ ()	1029	mapspace::update_ ()
1030	{	1030	{
1031	object *last = 0;	1031	object *last = 0;
1032	uint8 flags = P_UPTODATE, anywhere = 0;	1032	uint8 flags = P_UPTODATE;
1033	sint8 light = 0;	1033	sint8 light = 0;
1034	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;
		1035	uint64_t volume = 0;
		1036	uint32_t items = 0;
		1037	object *anywhere = 0;
		1038	uint8_t middle_visibility = 0;
1035		1039
1036	//object *middle = 0;	1040	//object *middle = 0;
1037	//object *top = 0;	1041	//object *top = 0;
1038	//object *floor = 0;	1042	//object *floor = 0;
1039	// this seems to generate better code than using locals, above	1043	// this seems to generate better code than using locals, above
1040	object *&top = faces_obj[0] = 0;	1044	object *&top = faces_obj[0] = 0;
1041	object *&middle = faces_obj[1] = 0;	1045	object *&middle = faces_obj[1] = 0;
1042	object *&floor = faces_obj[2] = 0;	1046	object *&floor = faces_obj[2] = 0;
		1047
		1048	object::flags_t allflags; // all flags of all objects or'ed together
1043		1049
1044	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)	1050	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1045	{	1051	{
1046	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)	1052	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1047	light += tmp->glow_radius;	1053	light += tmp->glow_radius;
…		…
1052	* 3 times each time the player moves, because many of the	1058	* 3 times each time the player moves, because many of the
1053	* functions the move_player calls eventualy call this.	1059	* functions the move_player calls eventualy call this.
1054	*	1060	*
1055	* Always put the player down for drawing.	1061	* Always put the player down for drawing.
1056	*/	1062	*/
1057	if (!tmp->invisible)	1063	if (expect_true (!tmp->invisible))
1058	{	1064	{
1059	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1065	if (expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))
1060	top = tmp;	1066	top = tmp;
1061	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1067	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1062	{	1068	{
1063	/* If we got a floor, that means middle and top were below it,	1069	/* If we got a floor, that means middle and top were below it,
1064	* so should not be visible, so we clear them.	1070	* so should not be visible, so we clear them.
1065	*/	1071	*/
1066	middle = 0;	1072	middle = 0;
1067	top = 0;	1073	top = 0;
1068	floor = tmp;	1074	floor = tmp;
		1075	volume = 0;
		1076	items = 0;
1069	}	1077	}
1070	/* Flag anywhere have high priority */	1078	else
1071	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1072	{	1079	{
		1080	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
		1081	{
		1082	++items;
		1083	volume += tmp->volume ();
		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
		1093	*/
		1094	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
		1095	{
		1096	middle_visibility = ::faces [tmp->face].visibility;
1073	middle = tmp;	1097	middle = tmp;
1074	anywhere = 1;	1098	}
1075	}	1099	}
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	}	1100	}
1090		1101
1091	move_slow \|= tmp->move_slow;	1102	move_slow \|= tmp->move_slow;
1092	move_block \|= tmp->move_block;	1103	move_block \|= tmp->move_block;
1093	move_on \|= tmp->move_on;	1104	move_on \|= tmp->move_on;
1094	move_off \|= tmp->move_off;	1105	move_off \|= tmp->move_off;
1095	move_allow \|= tmp->move_allow;	1106	move_allow \|= tmp->move_allow;
1096		1107
1097	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags \|= P_BLOCKSVIEW;	1108	allflags \|= tmp->flag;
1098	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags \|= P_NO_MAGIC;	1109
1099	if (tmp->type == PLAYER) flags \|= P_PLAYER;	1110	if (tmp->type == PLAYER) flags \|= P_PLAYER;
1100	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1111	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	}	1112	}
		1113
		1114	// FLAG_SEE_ANYWHERE takes precedence
		1115	if (anywhere)
		1116	middle = anywhere;
		1117
		1118	// ORing all flags together and checking them here is much faster
		1119	if (allflags [FLAG_BLOCKSVIEW]) flags \|= P_BLOCKSVIEW;
		1120	if (allflags [FLAG_NO_MAGIC] ) flags \|= P_NO_MAGIC;
		1121	if (allflags [FLAG_ALIVE] ) flags \|= P_IS_ALIVE;
		1122	if (allflags [FLAG_DAMNED] ) flags \|= P_NO_CLERIC;
1104		1123
1105	this->light = min (light, MAX_LIGHT_RADIUS);	1124	this->light = min (light, MAX_LIGHT_RADIUS);
1106	this->flags_ = flags;	1125	this->flags_ = flags;
1107	this->move_block = move_block & ~move_allow;	1126	this->move_block = move_block & ~move_allow;
1108	this->move_on = move_on;	1127	this->move_on = move_on;
1109	this->move_off = move_off;	1128	this->move_off = move_off;
1110	this->move_slow = move_slow;	1129	this->move_slow = move_slow;
		1130	this->volume_ = (volume + 1023) / 1024;
		1131	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1111		1132
1112	/* At this point, we have a floor face (if there is a floor),	1133	/* 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	1134	* and the floor is set - we are not going to touch it at
1114	* this point.	1135	* this point.
1115	* middle contains the highest visibility face.	1136	* middle contains the highest visibility face.
…		…
1133	*/	1154	*/
1134		1155
1135	for (object *tmp = last; tmp; tmp = tmp->below)	1156	for (object *tmp = last; tmp; tmp = tmp->below)
1136	{	1157	{
1137	/* 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 */
1138	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1159	if (tmp->flag [FLAG_IS_FLOOR])
1139	break;	1160	break;
1140		1161
1141	/* If two top faces are already set, quit processing */	1162	/* If two top faces are already set, quit processing */
1142	if (top && middle)	1163	if (top && middle)
1143	break;	1164	break;
…		…
1174	middle = 0;	1195	middle = 0;
1175		1196
1176	if (top == middle)	1197	if (top == middle)
1177	middle = 0;	1198	middle = 0;
1178		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
1179	#if 0	1223	#if 0
1180	faces_obj [0] = top;	1224	faces_obj [0] = top;
1181	faces_obj [1] = middle;	1225	faces_obj [1] = middle;
1182	faces_obj [2] = floor;	1226	faces_obj [2] = floor;
1183	#endif	1227	#endif
1184	}	1228	}
1185		1229
1186	uint64	1230	void
1187	mapspace::volume () const	1231	mapspace::update_up ()
1188	{	1232	{
1189	uint64 vol = 0;	1233	// invalidate up
1190		1234	if (!(pflags & PF_VIS_UP))
1191	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1192	vol += op->volume ();
1193
1194	return vol;	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 ();
1195	}	1242	}
1196		1243
1197	maptile *	1244	maptile *
1198	maptile::tile_available (int dir, bool load)	1245	maptile::tile_available (int dir, bool load)
1199	{	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
1200	if (tile_path[dir])	1251	if (tile_path [dir])
1201	{	1252	{
1202	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
		1275	// as an optimisation, link us against the other map if the other map
		1276	// has us as neighbour, which is very common, but not guaranteed.
		1277	int dir2 = REVERSE_TILE_DIR (dir);
		1278
		1279	if (m->tile_path [dir2] == path)
		1280	m->tile_map [dir2] = this;
		1281
1203	return tile_map[dir];	1282	return tile_map [dir] = m;
1204		1283	}
1205	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1206	return tile_map[dir];
1207	}	1284	}
1208		1285
1209	return 0;	1286	return 0;
1210	}	1287	}
1211		1288
…		…
1227	if (!m)	1304	if (!m)
1228	return 0;	1305	return 0;
1229		1306
1230	if (x < 0)	1307	if (x < 0)
1231	{	1308	{
1232	if (!m->tile_available (3))	1309	if (!m->tile_available (TILE_WEST))
1233	return 1;	1310	return 1;
1234		1311
1235	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1312	return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1236	}	1313	}
1237		1314
1238	if (x >= m->width)	1315	if (x >= m->width)
1239	{	1316	{
1240	if (!m->tile_available (1))	1317	if (!m->tile_available (TILE_EAST))
1241	return 1;	1318	return 1;
1242		1319
1243	return out_of_map (m->tile_map[1], x - m->width, y);	1320	return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1244	}	1321	}
1245		1322
1246	if (y < 0)	1323	if (y < 0)
1247	{	1324	{
1248	if (!m->tile_available (0))	1325	if (!m->tile_available (TILE_NORTH))
1249	return 1;	1326	return 1;
1250		1327
1251	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1328	return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1252	}	1329	}
1253		1330
1254	if (y >= m->height)	1331	if (y >= m->height)
1255	{	1332	{
1256	if (!m->tile_available (2))	1333	if (!m->tile_available (TILE_SOUTH))
1257	return 1;	1334	return 1;
1258		1335
1259	return out_of_map (m->tile_map[2], x, y - m->height);	1336	return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1260	}	1337	}
1261		1338
1262	/* Simple case - coordinates are within this local	1339	/* Simple case - coordinates are within this local
1263	* map.	1340	* map.
1264	*/	1341	*/
…		…
1276	maptile *	1353	maptile *
1277	maptile::xy_find (sint16 &x, sint16 &y)	1354	maptile::xy_find (sint16 &x, sint16 &y)
1278	{	1355	{
1279	if (x < 0)	1356	if (x < 0)
1280	{	1357	{
1281	if (!tile_available (3))	1358	if (!tile_available (TILE_WEST))
1282	return 0;	1359	return 0;
1283		1360
1284	x += tile_map[3]->width;	1361	x += tile_map [TILE_WEST]->width;
1285	return tile_map[3]->xy_find (x, y);	1362	return tile_map [TILE_WEST]->xy_find (x, y);
1286	}	1363	}
1287		1364
1288	if (x >= width)	1365	if (x >= width)
1289	{	1366	{
1290	if (!tile_available (1))	1367	if (!tile_available (TILE_EAST))
1291	return 0;	1368	return 0;
1292		1369
1293	x -= width;	1370	x -= width;
1294	return tile_map[1]->xy_find (x, y);	1371	return tile_map [TILE_EAST]->xy_find (x, y);
1295	}	1372	}
1296		1373
1297	if (y < 0)	1374	if (y < 0)
1298	{	1375	{
1299	if (!tile_available (0))	1376	if (!tile_available (TILE_NORTH))
1300	return 0;	1377	return 0;
1301		1378
1302	y += tile_map[0]->height;	1379	y += tile_map [TILE_NORTH]->height;
1303	return tile_map[0]->xy_find (x, y);	1380	return tile_map [TILE_NORTH]->xy_find (x, y);
1304	}	1381	}
1305		1382
1306	if (y >= height)	1383	if (y >= height)
1307	{	1384	{
1308	if (!tile_available (2))	1385	if (!tile_available (TILE_SOUTH))
1309	return 0;	1386	return 0;
1310		1387
1311	y -= height;	1388	y -= height;
1312	return tile_map[2]->xy_find (x, y);	1389	return tile_map [TILE_SOUTH]->xy_find (x, y);
1313	}	1390	}
1314		1391
1315	/* Simple case - coordinates are within this local	1392	/* Simple case - coordinates are within this local
1316	* map.	1393	* map.
1317	*/	1394	*/
…		…
1321	/**	1398	/**
1322	* Return whether map2 is adjacent to map1. If so, store the distance from	1399	* Return whether map2 is adjacent to map1. If so, store the distance from
1323	* map1 to map2 in dx/dy.	1400	* map1 to map2 in dx/dy.
1324	*/	1401	*/
1325	int	1402	int
1326	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1403	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1327	{	1404	{
1328	if (!map1 \|\| !map2)	1405	if (!map1 \|\| !map2)
1329	return 0;	1406	return 0;
1330		1407
1331	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1408	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1333	if (map1 == map2)	1410	if (map1 == map2)
1334	{	1411	{
1335	*dx = 0;	1412	*dx = 0;
1336	*dy = 0;	1413	*dy = 0;
1337	}	1414	}
1338	else if (map1->tile_map[0] == map2)	1415	else if (map1->tile_available (TILE_NORTH, false) == map2)
1339	{ /* up */	1416	{
1340	*dx = 0;	1417	*dx = 0;
1341	*dy = -map2->height;	1418	*dy = -map2->height;
1342	}	1419	}
1343	else if (map1->tile_map[1] == map2)	1420	else if (map1->tile_available (TILE_EAST , false) == map2)
1344	{ /* right */	1421	{
1345	*dx = map1->width;	1422	*dx = map1->width;
1346	*dy = 0;	1423	*dy = 0;
1347	}	1424	}
1348	else if (map1->tile_map[2] == map2)	1425	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1349	{ /* down */	1426	{
1350	*dx = 0;	1427	*dx = 0;
1351	*dy = map1->height;	1428	*dy = map1->height;
1352	}	1429	}
1353	else if (map1->tile_map[3] == map2)	1430	else if (map1->tile_available (TILE_WEST , false) == map2)
1354	{ /* left */	1431	{
1355	*dx = -map2->width;	1432	*dx = -map2->width;
1356	*dy = 0;	1433	*dy = 0;
1357	}	1434	}
1358	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1435	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1359	{ /* up right */	1436	{ /* up right */
1360	*dx = map1->tile_map[0]->width;	1437	*dx = +map1->tile_map[TILE_NORTH]->width;
1361	*dy = -map1->tile_map[0]->height;	1438	*dy = -map1->tile_map[TILE_NORTH]->height;
1362	}	1439	}
1363	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1440	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1364	{ /* up left */	1441	{ /* up left */
1365	*dx = -map2->width;	1442	*dx = -map2->width;
1366	*dy = -map1->tile_map[0]->height;	1443	*dy = -map1->tile_map[TILE_NORTH]->height;
1367	}	1444	}
1368	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1445	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1369	{ /* right up */	1446	{ /* right up */
1370	*dx = map1->width;	1447	*dx = +map1->width;
1371	*dy = -map2->height;	1448	*dy = -map2->height;
1372	}	1449	}
1373	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1450	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1374	{ /* right down */	1451	{ /* right down */
1375	*dx = map1->width;	1452	*dx = +map1->width;
1376	*dy = map1->tile_map[1]->height;	1453	*dy = +map1->tile_map[TILE_EAST]->height;
1377	}	1454	}
1378	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1455	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1379	{ /* down right */	1456	{ /* down right */
1380	*dx = map1->tile_map[2]->width;	1457	*dx = +map1->tile_map[TILE_SOUTH]->width;
1381	*dy = map1->height;	1458	*dy = +map1->height;
1382	}	1459	}
1383	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1460	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1384	{ /* down left */	1461	{ /* down left */
1385	*dx = -map2->width;	1462	*dx = -map2->width;
1386	*dy = map1->height;	1463	*dy = +map1->height;
1387	}	1464	}
1388	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1465	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1389	{ /* left up */	1466	{ /* left up */
1390	*dx = -map1->tile_map[3]->width;	1467	*dx = -map1->tile_map[TILE_WEST]->width;
1391	*dy = -map2->height;	1468	*dy = -map2->height;
1392	}	1469	}
1393	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1470	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1394	{ /* left down */	1471	{ /* left down */
1395	*dx = -map1->tile_map[3]->width;	1472	*dx = -map1->tile_map[TILE_WEST]->width;
1396	*dy = map1->tile_map[3]->height;	1473	*dy = +map1->tile_map[TILE_WEST]->height;
1397	}	1474	}
1398	else	1475	else
1399	return 0;	1476	return 0;
1400		1477
1401	return 1;	1478	return 1;
…		…
1437	*	1514	*
1438	* currently, the only flag supported (0x1) is don't translate for	1515	* currently, the only flag supported (0x1) is don't translate for
1439	* closest body part of 'op1'	1516	* closest body part of 'op1'
1440	*/	1517	*/
1441	void	1518	void
1442	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1519	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1443	{	1520	{
1444	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1521	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1445	{	1522	{
1446	/* be conservative and fill in _some_ data */	1523	/* be conservative and fill in _some_ data */
1447	retval->distance = 10000;	1524	retval->distance = 10000;
1448	retval->distance_x = 10000;	1525	retval->distance_x = 10000;
1449	retval->distance_y = 10000;	1526	retval->distance_y = 10000;
1450	retval->direction = 0;	1527	retval->direction = 0;
1451	retval->part = 0;	1528	retval->part = 0;
1452	}	1529	}
1453	else	1530	else
1454	{	1531	{
1455	object *best;
1456
1457	retval->distance_x += op2->x - op1->x;	1532	retval->distance_x += op2->x - op1->x;
1458	retval->distance_y += op2->y - op1->y;	1533	retval->distance_y += op2->y - op1->y;
1459		1534
1460	best = op1;	1535	object *best = op1;
		1536
1461	/* If this is multipart, find the closest part now */	1537	/* If this is multipart, find the closest part now */
1462	if (!(flags & 0x1) && op1->more)	1538	if (!(flags & 1) && op1->more)
1463	{	1539	{
1464	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1540	int best_distance = idistance (retval->distance_x, retval->distance_y);
1465		1541
1466	/* we just take the offset of the piece to head to figure	1542	/* we just take the offset of the piece to head to figure
1467	* distance instead of doing all that work above again	1543	* distance instead of doing all that work above again
1468	* since the distance fields we set above are positive in the	1544	* since the distance fields we set above are positive in the
1469	* same axis as is used for multipart objects, the simply arithmetic	1545	* same axis as is used for multipart objects, the simply arithmetic
1470	* below works.	1546	* below works.
1471	*/	1547	*/
1472	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1548	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1473	{	1549	{
1474	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1550	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);	1551
1476	if (tmpi < best_distance)	1552	if (tmpi < best_distance)
1477	{	1553	{
1478	best_distance = tmpi;	1554	best_distance = tmpi;
1479	best = tmp;	1555	best = tmp;
1480	}	1556	}
1481	}	1557	}
1482		1558
1483	if (best != op1)	1559	if (best != op1)
1484	{	1560	{
1485	retval->distance_x += op1->x - best->x;	1561	retval->distance_x += op1->x - best->x;
1486	retval->distance_y += op1->y - best->y;	1562	retval->distance_y += op1->y - best->y;
1487	}	1563	}
1488	}	1564	}
1489		1565
1490	retval->part = best;	1566	retval->part = best;
1491	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1567	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1492	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1568	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1493	}	1569	}
1494	}	1570	}
1495		1571
1496	/* this is basically the same as get_rangevector above, but instead of	1572	/* this is basically the same as get_rangevector above, but instead of
1497	* the first parameter being an object, it instead is the map	1573	* 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	1578	* 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	1579	* for something in the future. Also, since no object is pasted, the best
1504	* field of the rv_vector is set to NULL.	1580	* field of the rv_vector is set to NULL.
1505	*/	1581	*/
1506	void	1582	void
1507	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1583	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1508	{	1584	{
1509	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1585	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1510	{	1586	{
1511	/* be conservative and fill in _some_ data */	1587	/* be conservative and fill in _some_ data */
1512	retval->distance = 100000;	1588	retval->distance = 100000;
1513	retval->distance_x = 32767;	1589	retval->distance_x = 32767;
1514	retval->distance_y = 32767;	1590	retval->distance_y = 32767;
1515	retval->direction = 0;	1591	retval->direction = 0;
1516	retval->part = 0;	1592	retval->part = 0;
1517	}	1593	}
1518	else	1594	else
1519	{	1595	{
1520	retval->distance_x += op2->x - x;	1596	retval->distance_x += op2->x - x;
1521	retval->distance_y += op2->y - y;	1597	retval->distance_y += op2->y - y;
1522		1598
1523	retval->part = 0;	1599	retval->part = 0;
1524	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1600	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1525	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1601	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1526	}	1602	}
1527	}	1603	}
1528		1604
1529	/* Returns true of op1 and op2 are effectively on the same map	1605	/* 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	1606	* (as related to map tiling). Note that this looks for a path from
…		…
1580	*/	1656	*/
1581	for (int i = 1000; --i;)	1657	for (int i = 1000; --i;)
1582	{	1658	{
1583	object *pick = at (gen (width), gen (height)).bot;	1659	object *pick = at (gen (width), gen (height)).bot;
1584		1660
1585	// do not prefer big monsters just because they are big.	1661	// must be head: do not prefer big monsters just because they are big.
1586	if (pick && pick->is_head ())	1662	if (pick && pick->is_head ())
1587	return pick->head_ ();	1663	return pick;
1588	}	1664	}
1589		1665
1590	// instead of crashing in the unlikely(?) case, try to return something	1666	// instead of crashing in the unlikely(?) case, try to return something
1591	return archetype::find ("bug");	1667	return archetype::find (shstr_bug);
1592	}	1668	}
1593		1669
1594	//-GPL	1670	//-GPL
1595		1671
1596	void	1672	void
…		…
1626	if (distance <= MAX_SOUND_DISTANCE)	1702	if (distance <= MAX_SOUND_DISTANCE)
1627	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1703	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1628	}	1704	}
1629	}	1705	}
1630		1706
		1707	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1708
1631	static void	1709	static void
1632	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1710	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1633	{	1711	{
1634	// clip to map to the left	1712	// clip to map to the left
1635	if (x0 < 0)	1713	if (x0 < 0)
1636	{	1714	{
1637	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1715	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);	1716	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1639		1717
1640	if (x1 < 0) // entirely to the left	1718	if (x1 < 0) // entirely to the left
1641	return;	1719	return;
1642		1720
…		…
1644	}	1722	}
1645		1723
1646	// clip to map to the right	1724	// clip to map to the right
1647	if (x1 > m->width)	1725	if (x1 > m->width)
1648	{	1726	{
1649	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1727	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);	1728	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1651		1729
1652	if (x0 > m->width) // entirely to the right	1730	if (x0 > m->width) // entirely to the right
1653	return;	1731	return;
1654		1732
…		…
1656	}	1734	}
1657		1735
1658	// clip to map above	1736	// clip to map above
1659	if (y0 < 0)	1737	if (y0 < 0)
1660	{	1738	{
1661	if (maptile *tile = m->tile_available (TILE_UP, 1))	1739	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);	1740	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1663		1741
1664	if (y1 < 0) // entirely above	1742	if (y1 < 0) // entirely above
1665	return;	1743	return;
1666		1744
…		…
1668	}	1746	}
1669		1747
1670	// clip to map below	1748	// clip to map below
1671	if (y1 > m->height)	1749	if (y1 > m->height)
1672	{	1750	{
1673	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1751	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);	1752	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1675		1753
1676	if (y0 > m->height) // entirely below	1754	if (y0 > m->height) // entirely below
1677	return;	1755	return;
1678		1756
…		…
1690	r->dx = dx;	1768	r->dx = dx;
1691	r->dy = dy;	1769	r->dy = dy;
1692	}	1770	}
1693		1771
1694	maprect *	1772	maprect *
1695	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1773	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1696	{	1774	{
1697	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1698	buf.clear ();	1775	buf.clear ();
1699		1776
1700	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1777	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1701		1778
1702	// add end marker	1779	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.167 by root, Thu Nov 5 15:43:21 2009 UTC vs. Revision 1.215 by root, Sun May 8 12:40:41 2011 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.167 by root, Thu Nov 5 15:43:21 2009 UTC vs.
Revision 1.215 by root, Sun May 8 12:40:41 2011 UTC