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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.174 by root, Tue Nov 10 05:05:22 2009 UTC vs.
Revision 1.216 by root, Sun May 8 21:51:26 2011 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* option) any later version.
23	*/	23	*/
24		24
25	#include <unistd.h>	25	#include <unistd.h>
26		26
27	#include "global.h"	27	#include "global.h"
28	#include "loader.h"
29	#include "path.h"	28	#include "path.h"
30		29
31	//+GPL	30	//+GPL
32		31
33	sint8 maptile::outdoor_darkness;	32	sint8 maptile::outdoor_darkness;
…		…
78	/* Make sure the coordinates are valid - they should be, as caller should	77	/* Make sure the coordinates are valid - they should be, as caller should
79	* have already checked this.	78	* have already checked this.
80	*/	79	*/
81	if (OUT_OF_REAL_MAP (m, sx, sy))	80	if (OUT_OF_REAL_MAP (m, sx, sy))
82	{	81	{
83	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	82	LOG (llevError \| logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
84	return 1;	83	return 1;
85	}	84	}
86		85
87	mapspace &ms = m->at (sx, sy);	86	mapspace &ms = m->at (sx, sy);
88		87
…		…
91		90
92	/* If space is currently not blocked by anything, no need to	91	/* If space is currently not blocked by anything, no need to
93	* go further. Not true for players - all sorts of special	92	* go further. Not true for players - all sorts of special
94	* things we need to do for players.	93	* things we need to do for players.
95	*/	94	*/
96	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	95	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
97	return 0;	96	return 0;
98		97
99	/* if there isn't anything alive on this space, and this space isn't	98	/* if there isn't anything alive on this space, and this space isn't
100	* otherwise blocked, we can return now. Only if there is a living	99	* otherwise blocked, we can return now. Only if there is a living
101	* creature do we need to investigate if it is part of this creature	100	* creature do we need to investigate if it is part of this creature
…		…
111	/* We basically go through the stack of objects, and if there is	110	/* We basically go through the stack of objects, and if there is
112	* some other object that has NO_PASS or FLAG_ALIVE set, return	111	* some other object that has NO_PASS or FLAG_ALIVE set, return
113	* true. If we get through the entire stack, that must mean	112	* true. If we get through the entire stack, that must mean
114	* ob is blocking it, so return 0.	113	* ob is blocking it, so return 0.
115	*/	114	*/
116	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	115	for (object *tmp = ms.top; tmp; tmp = tmp->below)
117	{	116	{
118	if (OB_MOVE_BLOCK (ob, tmp))	117	if (OB_MOVE_BLOCK (ob, tmp))
119	{	118	{
120	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))	119	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
121	if (RESULT_INT (0))	120	if (RESULT_INT (0))
…		…
145	return 1; // unconditional block	144	return 1; // unconditional block
146		145
147	} else {	146	} else {
148	// space does not block the ob, directly, but	147	// space does not block the ob, directly, but
149	// anything alive that is not a door still	148	// anything alive that is not a door still
150	// blocks anything but wizards.	149	// blocks anything
151		150
152	if (tmp->flag [FLAG_ALIVE]	151	if (tmp->flag [FLAG_ALIVE]
153	&& tmp->head_ () != ob
154	&& tmp != ob
155	&& tmp->type != DOOR	152	&& tmp->type != DOOR
156	&& !tmp->flag [FLAG_WIZPASS])	153	&& tmp->head_ () != ob) //TODO: maybe move these check up?
157	return 1;	154	return 1;
158	}	155	}
159	}	156	}
160		157
161	return 0;	158	return 0;
162	}	159	}
163		160
164	/*	161	/*
165	* Returns qthe blocking object if the given object can't fit in the given	162	* Returns the blocking object if the given object can't fit in the given
166	* spot. This is meant for multi space objects - for single space objecs,	163	* spot. This is meant for multi space objects - for single space objecs,
167	* just calling get_map_blocked and checking that against movement type	164	* just calling get_map_blocked and checking that against movement type
168	* of object. This function goes through all the parts of the multipart	165	* of object. This function goes through all the parts of the multipart
169	* object and makes sure they can be inserted.	166	* object and makes sure they can be inserted.
170	*	167	*
…		…
217	}	214	}
218		215
219	return 0;	216	return 0;
220	}	217	}
221		218
222	/* When the map is loaded, load_object does not actually insert objects
223	* into inventory, but just links them. What this does is go through
224	* and insert them properly.
225	* The object 'container' is the object that contains the inventory.
226	* This is needed so that we can update the containers weight.
227	*/
228	static void
229	fix_container (object *container)
230	{
231	object tmp = container->inv, next;
232
233	container->inv = 0;
234	while (tmp)
235	{
236	next = tmp->below;
237	if (tmp->inv)
238	fix_container (tmp);
239
240	insert_ob_in_ob (tmp, container);
241	tmp = next;
242	}
243
244	// go through and calculate what all the containers are carrying.
245	//TODO: remove
246	container->update_weight ();
247	}
248
249	//-GPL	219	//-GPL
250		220
251	void	221	void
252	maptile::set_object_flag (int flag, int value)	222	maptile::set_object_flag (int flag, int value)
253	{	223	{
…		…
268	set_object_flag (FLAG_OBJ_ORIGINAL);	238	set_object_flag (FLAG_OBJ_ORIGINAL);
269		239
270	for (mapspace *ms = spaces + size (); ms-- > spaces; )	240	for (mapspace *ms = spaces + size (); ms-- > spaces; )
271	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	241	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
272	INVOKE_OBJECT (RESET, tmp);	242	INVOKE_OBJECT (RESET, tmp);
		243	}
		244
		245	void
		246	maptile::post_load ()
		247	{
		248	#if 0
		249	if (!spaces)
		250	return;
		251
		252	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		253	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		254	; // nop
		255	#endif
273	}	256	}
274		257
275	//+GPL	258	//+GPL
276		259
277	/* link_multipart_objects go through all the objects on the map looking	260	/* link_multipart_objects go through all the objects on the map looking
…		…
328	case KW_arch:	311	case KW_arch:
329	if (object *op = object::read (f, this))	312	if (object *op = object::read (f, this))
330	{	313	{
331	// TODO: why?	314	// TODO: why?
332	if (op->inv)	315	if (op->inv)
		316	{
		317	op->carrying = 0;
333	op->update_weight ();	318	op->update_weight ();
		319	}
334		320
335	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))	321	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
336	{	322	{
337	// we insert manually because	323	// we insert manually because
338	// a) its way faster	324	// a) its way faster
…		…
375	}	361	}
376		362
377	void	363	void
378	maptile::activate ()	364	maptile::activate ()
379	{	365	{
380	if (spaces)	366	if (state != MAP_INACTIVE)
		367	return;
		368
381	for (mapspace *ms = spaces + size (); ms-- > spaces; )	369	for (mapspace *ms = spaces + size (); ms-- > spaces; )
382	for (object *op = ms->bot; op; op = op->above)	370	for (object *op = ms->bot; op; op = op->above)
383	op->activate_recursive ();	371	op->activate_recursive ();
		372
		373	state = MAP_ACTIVE;
		374
		375	activate_physics ();
384	}	376	}
385		377
386	void	378	void
387	maptile::deactivate ()	379	maptile::deactivate ()
388	{	380	{
389	if (spaces)	381	if (state != MAP_ACTIVE)
		382	return;
		383
390	for (mapspace *ms = spaces + size (); ms-- > spaces; )	384	for (mapspace *ms = spaces + size (); ms-- > spaces; )
391	for (object *op = ms->bot; op; op = op->above)	385	for (object *op = ms->bot; op; op = op->above)
392	op->deactivate_recursive ();	386	op->deactivate_recursive ();
		387
		388	state = MAP_INACTIVE;
393	}	389	}
394		390
395	bool	391	bool
396	maptile::_save_objects (object_freezer &f, int flags)	392	maptile::_save_objects (object_freezer &f, int flags)
397	{	393	{
…		…
438	return false;	434	return false;
439		435
440	return freezer.save (path);	436	return freezer.save (path);
441	}	437	}
442		438
443	maptile::maptile ()	439	void
		440	maptile::init ()
444	{	441	{
445	in_memory = MAP_SWAPPED;	442	state = MAP_SWAPPED;
446		443
447	/* The maps used to pick up default x and y values from the	444	/* The maps used to pick up default x and y values from the
448	* map archetype. Mimic that behaviour.	445	* map archetype. Mimic that behaviour.
449	*/	446	*/
450	width = 16;	447	width = 16;
451	height = 16;	448	height = 16;
452	timeout = 300;	449	timeout = 300;
453	max_items = MAX_ITEM_PER_ACTION;	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	/*
…		…
542	*q = '\0';	543	*q = '\0';
543		544
544	current_type = get_typedata_by_name (p);	545	current_type = get_typedata_by_name (p);
545	if (current_type)	546	if (current_type)
546	{	547	{
547	items[i].name = current_type->name;	548	items[i].name = current_type->name;
548	items[i].typenum = current_type->number;	549	items[i].typenum = current_type->number;
549	items[i].name_pl = current_type->name_pl;	550	items[i].name_pl = current_type->name_pl;
550	}	551	}
551	else	552	else
552	{ /* 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
…		…
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	{
…		…
1154	*/	1154	*/
1155		1155
1156	for (object *tmp = last; tmp; tmp = tmp->below)	1156	for (object *tmp = last; tmp; tmp = tmp->below)
1157	{	1157	{
1158	/* 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 */
1159	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1159	if (tmp->flag [FLAG_IS_FLOOR])
1160	break;	1160	break;
1161		1161
1162	/* If two top faces are already set, quit processing */	1162	/* If two top faces are already set, quit processing */
1163	if (top && middle)	1163	if (top && middle)
1164	break;	1164	break;
…		…
1195	middle = 0;	1195	middle = 0;
1196		1196
1197	if (top == middle)	1197	if (top == middle)
1198	middle = 0;	1198	middle = 0;
1199		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
1200	#if 0	1223	#if 0
1201	faces_obj [0] = top;	1224	faces_obj [0] = top;
1202	faces_obj [1] = middle;	1225	faces_obj [1] = middle;
1203	faces_obj [2] = floor;	1226	faces_obj [2] = floor;
1204	#endif	1227	#endif
1205	}	1228	}
1206		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
1207	maptile *	1244	maptile *
1208	maptile::tile_available (int dir, bool load)	1245	maptile::tile_available (int dir, bool load)
1209	{	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
1210	if (tile_path[dir])	1251	if (tile_path [dir])
1211	{	1252	{
1212	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
1213	return tile_map[dir];	1285	return tile_map [dir] = m;
1214		1286	}
1215	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1216	return tile_map[dir];
1217	}	1287	}
1218		1288
1219	return 0;	1289	return 0;
1220	}	1290	}
1221		1291
…		…
1237	if (!m)	1307	if (!m)
1238	return 0;	1308	return 0;
1239		1309
1240	if (x < 0)	1310	if (x < 0)
1241	{	1311	{
1242	if (!m->tile_available (3))	1312	if (!m->tile_available (TILE_WEST))
1243	return 1;	1313	return 1;
1244		1314
1245	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);
1246	}	1316	}
1247		1317
1248	if (x >= m->width)	1318	if (x >= m->width)
1249	{	1319	{
1250	if (!m->tile_available (1))	1320	if (!m->tile_available (TILE_EAST))
1251	return 1;	1321	return 1;
1252		1322
1253	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);
1254	}	1324	}
1255		1325
1256	if (y < 0)	1326	if (y < 0)
1257	{	1327	{
1258	if (!m->tile_available (0))	1328	if (!m->tile_available (TILE_NORTH))
1259	return 1;	1329	return 1;
1260		1330
1261	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);
1262	}	1332	}
1263		1333
1264	if (y >= m->height)	1334	if (y >= m->height)
1265	{	1335	{
1266	if (!m->tile_available (2))	1336	if (!m->tile_available (TILE_SOUTH))
1267	return 1;	1337	return 1;
1268		1338
1269	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);
1270	}	1340	}
1271		1341
1272	/* Simple case - coordinates are within this local	1342	/* Simple case - coordinates are within this local
1273	* map.	1343	* map.
1274	*/	1344	*/
…		…
1286	maptile *	1356	maptile *
1287	maptile::xy_find (sint16 &x, sint16 &y)	1357	maptile::xy_find (sint16 &x, sint16 &y)
1288	{	1358	{
1289	if (x < 0)	1359	if (x < 0)
1290	{	1360	{
1291	if (!tile_available (3))	1361	if (!tile_available (TILE_WEST))
1292	return 0;	1362	return 0;
1293		1363
1294	x += tile_map[3]->width;	1364	x += tile_map [TILE_WEST]->width;
1295	return tile_map[3]->xy_find (x, y);	1365	return tile_map [TILE_WEST]->xy_find (x, y);
1296	}	1366	}
1297		1367
1298	if (x >= width)	1368	if (x >= width)
1299	{	1369	{
1300	if (!tile_available (1))	1370	if (!tile_available (TILE_EAST))
1301	return 0;	1371	return 0;
1302		1372
1303	x -= width;	1373	x -= width;
1304	return tile_map[1]->xy_find (x, y);	1374	return tile_map [TILE_EAST]->xy_find (x, y);
1305	}	1375	}
1306		1376
1307	if (y < 0)	1377	if (y < 0)
1308	{	1378	{
1309	if (!tile_available (0))	1379	if (!tile_available (TILE_NORTH))
1310	return 0;	1380	return 0;
1311		1381
1312	y += tile_map[0]->height;	1382	y += tile_map [TILE_NORTH]->height;
1313	return tile_map[0]->xy_find (x, y);	1383	return tile_map [TILE_NORTH]->xy_find (x, y);
1314	}	1384	}
1315		1385
1316	if (y >= height)	1386	if (y >= height)
1317	{	1387	{
1318	if (!tile_available (2))	1388	if (!tile_available (TILE_SOUTH))
1319	return 0;	1389	return 0;
1320		1390
1321	y -= height;	1391	y -= height;
1322	return tile_map[2]->xy_find (x, y);	1392	return tile_map [TILE_SOUTH]->xy_find (x, y);
1323	}	1393	}
1324		1394
1325	/* Simple case - coordinates are within this local	1395	/* Simple case - coordinates are within this local
1326	* map.	1396	* map.
1327	*/	1397	*/
…		…
1331	/**	1401	/**
1332	* 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
1333	* map1 to map2 in dx/dy.	1403	* map1 to map2 in dx/dy.
1334	*/	1404	*/
1335	int	1405	int
1336	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1406	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1337	{	1407	{
1338	if (!map1 \|\| !map2)	1408	if (!map1 \|\| !map2)
1339	return 0;	1409	return 0;
1340		1410
1341	//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
…		…
1343	if (map1 == map2)	1413	if (map1 == map2)
1344	{	1414	{
1345	*dx = 0;	1415	*dx = 0;
1346	*dy = 0;	1416	*dy = 0;
1347	}	1417	}
1348	else if (map1->tile_map[0] == map2)	1418	else if (map1->tile_available (TILE_NORTH, false) == map2)
1349	{ /* up */	1419	{
1350	*dx = 0;	1420	*dx = 0;
1351	*dy = -map2->height;	1421	*dy = -map2->height;
1352	}	1422	}
1353	else if (map1->tile_map[1] == map2)	1423	else if (map1->tile_available (TILE_EAST , false) == map2)
1354	{ /* right */	1424	{
1355	*dx = map1->width;	1425	*dx = map1->width;
1356	*dy = 0;	1426	*dy = 0;
1357	}	1427	}
1358	else if (map1->tile_map[2] == map2)	1428	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1359	{ /* down */	1429	{
1360	*dx = 0;	1430	*dx = 0;
1361	*dy = map1->height;	1431	*dy = map1->height;
1362	}	1432	}
1363	else if (map1->tile_map[3] == map2)	1433	else if (map1->tile_available (TILE_WEST , false) == map2)
1364	{ /* left */	1434	{
1365	*dx = -map2->width;	1435	*dx = -map2->width;
1366	*dy = 0;	1436	*dy = 0;
1367	}	1437	}
1368	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)
1369	{ /* up right */	1439	{ /* up right */
1370	*dx = map1->tile_map[0]->width;	1440	*dx = +map1->tile_map[TILE_NORTH]->width;
1371	*dy = -map1->tile_map[0]->height;	1441	*dy = -map1->tile_map[TILE_NORTH]->height;
1372	}	1442	}
1373	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)
1374	{ /* up left */	1444	{ /* up left */
1375	*dx = -map2->width;	1445	*dx = -map2->width;
1376	*dy = -map1->tile_map[0]->height;	1446	*dy = -map1->tile_map[TILE_NORTH]->height;
1377	}	1447	}
1378	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)
1379	{ /* right up */	1449	{ /* right up */
1380	*dx = map1->width;	1450	*dx = +map1->width;
1381	*dy = -map2->height;	1451	*dy = -map2->height;
1382	}	1452	}
1383	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)
1384	{ /* right down */	1454	{ /* right down */
1385	*dx = map1->width;	1455	*dx = +map1->width;
1386	*dy = map1->tile_map[1]->height;	1456	*dy = +map1->tile_map[TILE_EAST]->height;
1387	}	1457	}
1388	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)
1389	{ /* down right */	1459	{ /* down right */
1390	*dx = map1->tile_map[2]->width;	1460	*dx = +map1->tile_map[TILE_SOUTH]->width;
1391	*dy = map1->height;	1461	*dy = +map1->height;
1392	}	1462	}
1393	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)
1394	{ /* down left */	1464	{ /* down left */
1395	*dx = -map2->width;	1465	*dx = -map2->width;
1396	*dy = map1->height;	1466	*dy = +map1->height;
1397	}	1467	}
1398	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)
1399	{ /* left up */	1469	{ /* left up */
1400	*dx = -map1->tile_map[3]->width;	1470	*dx = -map1->tile_map[TILE_WEST]->width;
1401	*dy = -map2->height;	1471	*dy = -map2->height;
1402	}	1472	}
1403	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)
1404	{ /* left down */	1474	{ /* left down */
1405	*dx = -map1->tile_map[3]->width;	1475	*dx = -map1->tile_map[TILE_WEST]->width;
1406	*dy = map1->tile_map[3]->height;	1476	*dy = +map1->tile_map[TILE_WEST]->height;
1407	}	1477	}
1408	else	1478	else
1409	return 0;	1479	return 0;
1410		1480
1411	return 1;	1481	return 1;
…		…
1447	*	1517	*
1448	* currently, the only flag supported (0x1) is don't translate for	1518	* currently, the only flag supported (0x1) is don't translate for
1449	* closest body part of 'op1'	1519	* closest body part of 'op1'
1450	*/	1520	*/
1451	void	1521	void
1452	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1522	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1453	{	1523	{
1454	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))
1455	{	1525	{
1456	/* be conservative and fill in _some_ data */	1526	/* be conservative and fill in _some_ data */
1457	retval->distance = 10000;	1527	retval->distance = 10000;
1458	retval->distance_x = 10000;	1528	retval->distance_x = 10000;
1459	retval->distance_y = 10000;	1529	retval->distance_y = 10000;
1460	retval->direction = 0;	1530	retval->direction = 0;
1461	retval->part = 0;	1531	retval->part = 0;
1462	}	1532	}
1463	else	1533	else
1464	{	1534	{
1465	object *best;
1466
1467	retval->distance_x += op2->x - op1->x;	1535	retval->distance_x += op2->x - op1->x;
1468	retval->distance_y += op2->y - op1->y;	1536	retval->distance_y += op2->y - op1->y;
1469		1537
1470	best = op1;	1538	object *best = op1;
		1539
1471	/* If this is multipart, find the closest part now */	1540	/* If this is multipart, find the closest part now */
1472	if (!(flags & 0x1) && op1->more)	1541	if (!(flags & 1) && op1->more)
1473	{	1542	{
1474	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);
1475		1544
1476	/* 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
1477	* distance instead of doing all that work above again	1546	* distance instead of doing all that work above again
1478	* since the distance fields we set above are positive in the	1547	* since the distance fields we set above are positive in the
1479	* same axis as is used for multipart objects, the simply arithmetic	1548	* same axis as is used for multipart objects, the simply arithmetic
1480	* below works.	1549	* below works.
1481	*/	1550	*/
1482	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1551	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1483	{	1552	{
1484	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);
1485	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1554
1486	if (tmpi < best_distance)	1555	if (tmpi < best_distance)
1487	{	1556	{
1488	best_distance = tmpi;	1557	best_distance = tmpi;
1489	best = tmp;	1558	best = tmp;
1490	}	1559	}
1491	}	1560	}
1492		1561
1493	if (best != op1)	1562	if (best != op1)
1494	{	1563	{
1495	retval->distance_x += op1->x - best->x;	1564	retval->distance_x += op1->x - best->x;
1496	retval->distance_y += op1->y - best->y;	1565	retval->distance_y += op1->y - best->y;
1497	}	1566	}
1498	}	1567	}
1499		1568
1500	retval->part = best;	1569	retval->part = best;
1501	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));
1502	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1571	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1503	}	1572	}
1504	}	1573	}
1505		1574
1506	/* 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
1507	* the first parameter being an object, it instead is the map	1576	* the first parameter being an object, it instead is the map
…		…
1512	* 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
1513	* 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
1514	* field of the rv_vector is set to NULL.	1583	* field of the rv_vector is set to NULL.
1515	*/	1584	*/
1516	void	1585	void
1517	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)
1518	{	1587	{
1519	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))
1520	{	1589	{
1521	/* be conservative and fill in _some_ data */	1590	/* be conservative and fill in _some_ data */
1522	retval->distance = 100000;	1591	retval->distance = 100000;
1523	retval->distance_x = 32767;	1592	retval->distance_x = 32767;
1524	retval->distance_y = 32767;	1593	retval->distance_y = 32767;
1525	retval->direction = 0;	1594	retval->direction = 0;
1526	retval->part = 0;	1595	retval->part = 0;
1527	}	1596	}
1528	else	1597	else
1529	{	1598	{
1530	retval->distance_x += op2->x - x;	1599	retval->distance_x += op2->x - x;
1531	retval->distance_y += op2->y - y;	1600	retval->distance_y += op2->y - y;
1532		1601
1533	retval->part = 0;	1602	retval->part = 0;
1534	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));
1535	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1604	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1536	}	1605	}
1537	}	1606	}
1538		1607
1539	/* 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
1540	* (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
…		…
1590	*/	1659	*/
1591	for (int i = 1000; --i;)	1660	for (int i = 1000; --i;)
1592	{	1661	{
1593	object *pick = at (gen (width), gen (height)).bot;	1662	object *pick = at (gen (width), gen (height)).bot;
1594		1663
1595	// do not prefer big monsters just because they are big.	1664	// must be head: do not prefer big monsters just because they are big.
1596	if (pick && pick->is_head ())	1665	if (pick && pick->is_head ())
1597	return pick->head_ ();	1666	return pick;
1598	}	1667	}
1599		1668
1600	// instead of crashing in the unlikely(?) case, try to return something	1669	// instead of crashing in the unlikely(?) case, try to return something
1601	return archetype::find (shstr_bug);	1670	return archetype::find (shstr_bug);
1602	}	1671	}
…		…
1636	if (distance <= MAX_SOUND_DISTANCE)	1705	if (distance <= MAX_SOUND_DISTANCE)
1637	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1706	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1638	}	1707	}
1639	}	1708	}
1640		1709
		1710	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1711
1641	static void	1712	static void
1642	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)
1643	{	1714	{
1644	// clip to map to the left	1715	// clip to map to the left
1645	if (x0 < 0)	1716	if (x0 < 0)
1646	{	1717	{
1647	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1718	if (maptile *tile = m->tile_available (TILE_WEST, 1))
1648	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);
1649		1720
1650	if (x1 < 0) // entirely to the left	1721	if (x1 < 0) // entirely to the left
1651	return;	1722	return;
1652		1723
…		…
1654	}	1725	}
1655		1726
1656	// clip to map to the right	1727	// clip to map to the right
1657	if (x1 > m->width)	1728	if (x1 > m->width)
1658	{	1729	{
1659	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1730	if (maptile *tile = m->tile_available (TILE_EAST, 1))
1660	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);
1661		1732
1662	if (x0 > m->width) // entirely to the right	1733	if (x0 >= m->width) // entirely to the right
1663	return;	1734	return;
1664		1735
1665	x1 = m->width;	1736	x1 = m->width;
1666	}	1737	}
1667		1738
1668	// clip to map above	1739	// clip to map to the north
1669	if (y0 < 0)	1740	if (y0 < 0)
1670	{	1741	{
1671	if (maptile *tile = m->tile_available (TILE_UP, 1))	1742	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1672	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);
1673		1744
1674	if (y1 < 0) // entirely above	1745	if (y1 < 0) // entirely to the north
1675	return;	1746	return;
1676		1747
1677	y0 = 0;	1748	y0 = 0;
1678	}	1749	}
1679		1750
1680	// clip to map below	1751	// clip to map to the south
1681	if (y1 > m->height)	1752	if (y1 > m->height)
1682	{	1753	{
1683	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1754	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1684	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);
1685		1756
1686	if (y0 > m->height) // entirely below	1757	if (y0 >= m->height) // entirely to the south
1687	return;	1758	return;
1688		1759
1689	y1 = m->height;	1760	y1 = m->height;
1690	}	1761	}
1691		1762
…		…
1700	r->dx = dx;	1771	r->dx = dx;
1701	r->dy = dy;	1772	r->dy = dy;
1702	}	1773	}
1703		1774
1704	maprect *	1775	maprect *
1705	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)
1706	{	1777	{
1707	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1708	buf.clear ();	1778	buf.clear ();
1709		1779
1710	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1780	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1711		1781
1712	// 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.174 by root, Tue Nov 10 05:05:22 2009 UTC vs. Revision 1.216 by root, Sun May 8 21:51:26 2011 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.174 by root, Tue Nov 10 05:05:22 2009 UTC vs.
Revision 1.216 by root, Sun May 8 21:51:26 2011 UTC