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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.175 by root, Tue Nov 10 05:06:02 2009 UTC vs.
Revision 1.210 by root, Sat May 7 13:25:02 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	*
…		…
243	for (mapspace *ms = spaces + size (); ms-- > spaces; )	240	for (mapspace *ms = spaces + size (); ms-- > spaces; )
244	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	241	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
245	INVOKE_OBJECT (RESET, tmp);	242	INVOKE_OBJECT (RESET, tmp);
246	}	243	}
247		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
		256	}
		257
248	//+GPL	258	//+GPL
249		259
250	/* 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
251	* for objects whose arch says they are multipart yet according to the	261	* for objects whose arch says they are multipart yet according to the
252	* info we have, they only have the head (as would be expected when	262	* info we have, they only have the head (as would be expected when
…		…
301	case KW_arch:	311	case KW_arch:
302	if (object *op = object::read (f, this))	312	if (object *op = object::read (f, this))
303	{	313	{
304	// TODO: why?	314	// TODO: why?
305	if (op->inv)	315	if (op->inv)
		316	{
		317	op->carrying = 0;
306	op->update_weight ();	318	op->update_weight ();
		319	}
307		320
308	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))
309	{	322	{
310	// we insert manually because	323	// we insert manually because
311	// a) its way faster	324	// a) its way faster
…		…
348	}	361	}
349		362
350	void	363	void
351	maptile::activate ()	364	maptile::activate ()
352	{	365	{
353	if (spaces)	366	if (state != MAP_INACTIVE)
		367	return;
		368
354	for (mapspace *ms = spaces + size (); ms-- > spaces; )	369	for (mapspace *ms = spaces + size (); ms-- > spaces; )
355	for (object *op = ms->bot; op; op = op->above)	370	for (object *op = ms->bot; op; op = op->above)
356	op->activate_recursive ();	371	op->activate_recursive ();
		372
		373	state = MAP_ACTIVE;
		374
		375	activate_physics ();
357	}	376	}
358		377
359	void	378	void
360	maptile::deactivate ()	379	maptile::deactivate ()
361	{	380	{
362	if (spaces)	381	if (state != MAP_ACTIVE)
		382	return;
		383
363	for (mapspace *ms = spaces + size (); ms-- > spaces; )	384	for (mapspace *ms = spaces + size (); ms-- > spaces; )
364	for (object *op = ms->bot; op; op = op->above)	385	for (object *op = ms->bot; op; op = op->above)
365	op->deactivate_recursive ();	386	op->deactivate_recursive ();
		387
		388	state = MAP_INACTIVE;
366	}	389	}
367		390
368	bool	391	bool
369	maptile::_save_objects (object_freezer &f, int flags)	392	maptile::_save_objects (object_freezer &f, int flags)
370	{	393	{
…		…
411	return false;	434	return false;
412		435
413	return freezer.save (path);	436	return freezer.save (path);
414	}	437	}
415		438
416	maptile::maptile ()	439	void
		440	maptile::init ()
417	{	441	{
418	in_memory = MAP_SWAPPED;	442	state = MAP_SWAPPED;
419		443
420	/* 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
421	* map archetype. Mimic that behaviour.	445	* map archetype. Mimic that behaviour.
422	*/	446	*/
423	width = 16;	447	width = 16;
424	height = 16;	448	height = 16;
425	timeout = 300;	449	timeout = 300;
426	max_items = MAX_ITEM_PER_ACTION;	450	max_items = MAX_ITEM_PER_ACTION;
427	max_volume = 2000000; // 2m³	451	max_volume = 2000000; // 2m³
428	}
429
430	maptile::maptile (int w, int h)
431	{
432	in_memory = MAP_SWAPPED;
433
434	width = w;
435	height = h;
436	reset_timeout = 0;	452	reset_timeout = 0;
437	timeout = 300;
438	enter_x = 0;	453	enter_x = 0;
439	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;
440		468
441	alloc ();	469	alloc ();
442	}	470	}
443		471
444	/*	472	/*
…		…
544	* the map (or something equivilent) into output_string. */	572	* the map (or something equivilent) into output_string. */
545	static const char *	573	static const char *
546	print_shop_string (maptile *m)	574	print_shop_string (maptile *m)
547	{	575	{
548	static dynbuf_text buf; buf.clear ();	576	static dynbuf_text buf; buf.clear ();
		577	bool first = true;
549		578
550	for (int i = 0; i < m->shopitems[0].index; i++)	579	for (int i = 0; i < m->shopitems[0].index; i++)
551	{	580	{
		581	if (!first)
		582	buf << ';';
		583
		584	first = false;
		585
552	if (m->shopitems[i].typenum)	586	if (m->shopitems[i].typenum)
553	{	587	{
554	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
555	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);
556	else	590	else
557	buf.printf ("%s;", m->shopitems[i].name);	591	buf.printf ("%s", m->shopitems[i].name);
558	}	592	}
559	else	593	else
560	{	594	{
561	if (m->shopitems[i].strength)	595	if (m->shopitems[i].strength)
562	buf.printf ("*:%d;", m->shopitems[i].strength);	596	buf.printf ("*:%d", m->shopitems[i].strength);
563	else	597	else
564	buf.printf ("*");	598	buf.printf ("*");
565	}	599	}
566	}	600	}
567		601
…		…
590	{	624	{
591	case KW_msg:	625	case KW_msg:
592	thawer.get_ml (KW_endmsg, msg);	626	thawer.get_ml (KW_endmsg, msg);
593	break;	627	break;
594		628
595	case KW_lore: // CF+ extension	629	case KW_lore: // deliantra extension
596	thawer.get_ml (KW_endlore, maplore);	630	thawer.get_ml (KW_endlore, maplore);
597	break;	631	break;
598		632
599	case KW_maplore:	633	case KW_maplore:
600	thawer.get_ml (KW_endmaplore, maplore);	634	thawer.get_ml (KW_endmaplore, maplore);
…		…
617	case KW_shopgreed: thawer.get (shopgreed); break;	651	case KW_shopgreed: thawer.get (shopgreed); break;
618	case KW_shopmin: thawer.get (shopmin); break;	652	case KW_shopmin: thawer.get (shopmin); break;
619	case KW_shopmax: thawer.get (shopmax); break;	653	case KW_shopmax: thawer.get (shopmax); break;
620	case KW_shoprace: thawer.get (shoprace); break;	654	case KW_shoprace: thawer.get (shoprace); break;
621	case KW_outdoor: thawer.get (outdoor); break;	655	case KW_outdoor: thawer.get (outdoor); break;
622	case KW_temp: thawer.get (temp); break;
623	case KW_pressure: thawer.get (pressure); break;
624	case KW_humid: thawer.get (humid); break;
625	case KW_windspeed: thawer.get (windspeed); break;
626	case KW_winddir: thawer.get (winddir); break;
627	case KW_sky: thawer.get (sky); break;
628		656
629	case KW_per_player: thawer.get (per_player); break;	657	case KW_per_player: thawer.get (per_player); break;
630	case KW_per_party: thawer.get (per_party); break;	658	case KW_per_party: thawer.get (per_party); break;
631	case KW_no_reset: thawer.get (no_reset); break;	659	case KW_no_reset: thawer.get (no_reset); break;
632	case KW_no_drop: thawer.get (no_drop); break;	660	case KW_no_drop: thawer.get (no_drop); break;
633		661
634	case KW_region: default_region = region::find (thawer.get_str ()); break;	662	case KW_region: thawer.get (default_region); break;
635	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
636		664
637	// old names new names	665	// old names new names
638	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;
639	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;
…		…
647		675
648	case KW_tile_path_1: thawer.get (tile_path [0]); break;	676	case KW_tile_path_1: thawer.get (tile_path [0]); break;
649	case KW_tile_path_2: thawer.get (tile_path [1]); break;	677	case KW_tile_path_2: thawer.get (tile_path [1]); break;
650	case KW_tile_path_3: thawer.get (tile_path [2]); break;	678	case KW_tile_path_3: thawer.get (tile_path [2]); break;
651	case KW_tile_path_4: thawer.get (tile_path [3]); break;	679	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		680	case KW_tile_path_5: thawer.get (tile_path [4]); break;
		681	case KW_tile_path_6: thawer.get (tile_path [5]); break;
652		682
653	case KW_ERROR:	683	case KW_ERROR:
654	set_key_text (thawer.kw_str, thawer.value);	684	set_key_text (thawer.kw_str, thawer.value);
655	break;	685	break;
656		686
657	case KW_end:	687	case KW_end:
658	thawer.next ();	688	thawer.next ();
659	return true;	689	return true;
660		690
661	default:	691	default:
662	if (!thawer.parse_error ("map", 0))	692	if (!thawer.parse_error ("map"))
663	return false;	693	return false;
664	break;	694	break;
665	}	695	}
666		696
667	thawer.next ();	697	thawer.next ();
…		…
685	int unique = 0;	715	int unique = 0;
686	for (object *op = spaces [i].bot; op; )	716	for (object *op = spaces [i].bot; op; )
687	{	717	{
688	object *above = op->above;	718	object *above = op->above;
689		719
690	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	720	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
691	unique = 1;	721	unique = 1;
692		722
693	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	723	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
694	op->destroy ();	724	op->destroy ();
695		725
696	op = above;	726	op = above;
697	}	727	}
698	}	728	}
…		…
701	//-GPL	731	//-GPL
702		732
703	bool	733	bool
704	maptile::_save_header (object_freezer &freezer)	734	maptile::_save_header (object_freezer &freezer)
705	{	735	{
706	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	736	#define MAP_OUT(k) freezer.put (KW(k), k)
707	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	737	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
708		738
709	MAP_OUT2 (arch, "map");	739	MAP_OUT2 (arch, CS(map));
710		740
711	if (name) MAP_OUT (name);	741	if (name) MAP_OUT (name);
712	MAP_OUT (swap_time);	742	MAP_OUT (swap_time);
713	MAP_OUT (reset_time);	743	MAP_OUT (reset_time);
714	MAP_OUT (reset_timeout);	744	MAP_OUT (reset_timeout);
…		…
722	MAP_OUT (shopgreed);	752	MAP_OUT (shopgreed);
723	MAP_OUT (shopmin);	753	MAP_OUT (shopmin);
724	MAP_OUT (shopmax);	754	MAP_OUT (shopmax);
725	if (shoprace) MAP_OUT (shoprace);	755	if (shoprace) MAP_OUT (shoprace);
726		756
727	MAP_OUT (darkness);
728	MAP_OUT (width);	757	MAP_OUT (width);
729	MAP_OUT (height);	758	MAP_OUT (height);
730	MAP_OUT (enter_x);	759	MAP_OUT (enter_x);
731	MAP_OUT (enter_y);	760	MAP_OUT (enter_y);
732		761	MAP_OUT (darkness);
733	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
734	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
735
736	MAP_OUT (outdoor);	762	MAP_OUT (outdoor);
737	MAP_OUT (temp);	763
738	MAP_OUT (pressure);	764	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
739	MAP_OUT (humid);	765	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
740	MAP_OUT (windspeed);
741	MAP_OUT (winddir);
742	MAP_OUT (sky);
743		766
744	MAP_OUT (per_player);	767	MAP_OUT (per_player);
745	MAP_OUT (per_party);	768	MAP_OUT (per_party);
746		769
747	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	770	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
748	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	771	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
749	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	772	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
750	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	773	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
		774	if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
		775	if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
751		776
752	freezer.put (this);	777	freezer.put (this);
753	freezer.put (KW_end);	778	freezer.put (KW(end));
754		779
755	return true;	780	return true;
756	}	781	}
757		782
758	bool	783	bool
…		…
812	msg = 0;	837	msg = 0;
813	maplore = 0;	838	maplore = 0;
814	shoprace = 0;	839	shoprace = 0;
815	delete [] shopitems, shopitems = 0;	840	delete [] shopitems, shopitems = 0;
816		841
817	for (int i = 0; i < 4; i++)	842	for (int i = 0; i < array_length (tile_path); i++)
818	tile_path [i] = 0;	843	tile_path [i] = 0;
819	}	844	}
820		845
821	maptile::~maptile ()	846	maptile::~maptile ()
822	{	847	{
…		…
829	/* 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
830	* are pointing at this one for tiling information. Since	855	* are pointing at this one for tiling information. Since
831	* 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
832	* maps this map tiles with and clears those.	857	* maps this map tiles with and clears those.
833	*/	858	*/
834	for (int i = 0; i < 4; i++)	859	for (int i = 0; i < array_length (tile_path); i++)
835	if (tile_map[i] == m)	860	if (tile_map[i] == m)
836	tile_map[i] = 0;	861	tile_map[i] = 0;
837	}	862	}
838		863
839	void	864	void
…		…
843		868
844	clear ();	869	clear ();
845	}	870	}
846		871
847	/* 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?
848	void	874	void
849	maptile::do_decay_objects ()	875	maptile::do_decay_objects ()
850	{	876	{
851	if (!spaces)	877	if (!spaces)
852	return;	878	return;
…		…
854	for (mapspace *ms = spaces + size (); ms-- > spaces; )	880	for (mapspace *ms = spaces + size (); ms-- > spaces; )
855	for (object above, op = ms->bot; op; op = above)	881	for (object above, op = ms->bot; op; op = above)
856	{	882	{
857	above = op->above;	883	above = op->above;
858		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
859	bool destroy = 0;	889	bool destroy = 0;
860		890
861	// do not decay anything above unique floor tiles (yet :)	891	if (op->flag [FLAG_IS_FLOOR]
862	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	892	\|\| op->flag [FLAG_OBJ_ORIGINAL]
863	break;	893	\|\| op->flag [FLAG_UNIQUE]
864		894	\|\| op->flag [FLAG_OVERLAY_FLOOR]
865	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	895	\|\| op->flag [FLAG_UNPAID]
866	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
867	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
868	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
869	\|\| QUERY_FLAG (op, FLAG_UNPAID)
870	\|\| op->is_alive ())	896	\|\| op->is_alive ())
871	; // do not decay	897	; // do not decay
872	else if (op->is_weapon ())	898	else if (op->is_weapon ())
873	{	899	{
874	op->stats.dam--;	900	op->stats.dam--;
…		…
899	\|\| mat & M_LIQUID	925	\|\| mat & M_LIQUID
900	\|\| (mat & M_IRON && rndm (1, 5) == 1)	926	\|\| (mat & M_IRON && rndm (1, 5) == 1)
901	\|\| (mat & M_GLASS && rndm (1, 2) == 1)	927	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
902	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)	928	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
903	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)	929	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
904	\|\| (mat & M_ICE && temp > 32))	930	//\|\| (mat & M_ICE && temp > 32)
		931	)
905	destroy = 1;	932	destroy = 1;
906	}	933	}
907		934
908	/* adjust overall chance below */	935	/* adjust overall chance below */
909	if (destroy && rndm (0, 1))	936	if (destroy && rndm (0, 1))
…		…
929	sint64 total_exp = 0;	956	sint64 total_exp = 0;
930		957
931	for (mapspace *ms = spaces + size (); ms-- > spaces; )	958	for (mapspace *ms = spaces + size (); ms-- > spaces; )
932	for (object *op = ms->bot; op; op = op->above)	959	for (object *op = ms->bot; op; op = op->above)
933	{	960	{
934	if (QUERY_FLAG (op, FLAG_MONSTER))	961	if (op->flag [FLAG_MONSTER])
935	{	962	{
936	total_exp += op->stats.exp;	963	total_exp += op->stats.exp;
937	monster_cnt++;	964	monster_cnt++;
938	}	965	}
939		966
940	if (QUERY_FLAG (op, FLAG_GENERATOR))	967	if (op->flag [FLAG_GENERATOR])
941	{	968	{
942	total_exp += op->stats.exp;	969	total_exp += op->stats.exp;
943		970
944	if (archetype *at = op->other_arch)	971	if (archetype *at = op->other_arch)
945	{	972	{
…		…
1127	*/	1154	*/
1128		1155
1129	for (object *tmp = last; tmp; tmp = tmp->below)	1156	for (object *tmp = last; tmp; tmp = tmp->below)
1130	{	1157	{
1131	/* 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 */
1132	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1159	if (tmp->flag [FLAG_IS_FLOOR])
1133	break;	1160	break;
1134		1161
1135	/* If two top faces are already set, quit processing */	1162	/* If two top faces are already set, quit processing */
1136	if (top && middle)	1163	if (top && middle)
1137	break;	1164	break;
…		…
1168	middle = 0;	1195	middle = 0;
1169		1196
1170	if (top == middle)	1197	if (top == middle)
1171	middle = 0;	1198	middle = 0;
1172		1199
		1200	// dire hack to handle "transparent" floors - currently only open_space
		1201	if (floor && floor->arch->archname == shstr_quad_open_space)
		1202	{
		1203	floor->set_anim_frame (0);
		1204
		1205	if (maptile *m = floor->map->tile_map [TILE_DOWN])
		1206	{
		1207	// mirror the floor - very unreliable because usually outdated,
		1208	// but somewhta works because floors do not change often :/
		1209	middle = floor;
		1210
		1211	mapspace &ms = m->at (floor->x, floor->y);
		1212
		1213	ms.update ();
		1214
		1215	if (object *floor2 = ms.faces_obj [2])
		1216	if (floor2->arch->archname != shstr_quad_open_space && !middle)
		1217	{
		1218	floor->set_anim_frame (1);
		1219	middle = floor;
		1220	floor = floor2;
		1221	}
		1222	}
		1223	}
		1224
1173	#if 0	1225	#if 0
1174	faces_obj [0] = top;	1226	faces_obj [0] = top;
1175	faces_obj [1] = middle;	1227	faces_obj [1] = middle;
1176	faces_obj [2] = floor;	1228	faces_obj [2] = floor;
1177	#endif	1229	#endif
…		…
1180	maptile *	1232	maptile *
1181	maptile::tile_available (int dir, bool load)	1233	maptile::tile_available (int dir, bool load)
1182	{	1234	{
1183	if (tile_path[dir])	1235	if (tile_path[dir])
1184	{	1236	{
		1237	// map is there and we don't need to load it OR it's loaded => return what we have
1185	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1238	if (tile_map[dir] && (!load \|\| tile_map[dir]->linkable ()))
1186	return tile_map[dir];	1239	return tile_map[dir];
1187		1240
		1241	// well, try to locate it then, if possible - maybe it's there already
1188	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))	1242	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1189	return tile_map[dir];	1243	return tile_map[dir];
1190	}	1244	}
1191		1245
1192	return 0;	1246	return 0;
…		…
1304	/**	1358	/**
1305	* Return whether map2 is adjacent to map1. If so, store the distance from	1359	* Return whether map2 is adjacent to map1. If so, store the distance from
1306	* map1 to map2 in dx/dy.	1360	* map1 to map2 in dx/dy.
1307	*/	1361	*/
1308	int	1362	int
1309	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1363	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1310	{	1364	{
1311	if (!map1 \|\| !map2)	1365	if (!map1 \|\| !map2)
1312	return 0;	1366	return 0;
1313		1367
1314	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1368	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1316	if (map1 == map2)	1370	if (map1 == map2)
1317	{	1371	{
1318	*dx = 0;	1372	*dx = 0;
1319	*dy = 0;	1373	*dy = 0;
1320	}	1374	}
1321	else if (map1->tile_map[0] == map2)	1375	else if (map1->tile_available (TILE_NORTH, false) == map2)
1322	{ /* up */	1376	{
1323	*dx = 0;	1377	*dx = 0;
1324	*dy = -map2->height;	1378	*dy = -map2->height;
1325	}	1379	}
1326	else if (map1->tile_map[1] == map2)	1380	else if (map1->tile_available (TILE_EAST , false) == map2)
1327	{ /* right */	1381	{
1328	*dx = map1->width;	1382	*dx = map1->width;
1329	*dy = 0;	1383	*dy = 0;
1330	}	1384	}
1331	else if (map1->tile_map[2] == map2)	1385	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1332	{ /* down */	1386	{
1333	*dx = 0;	1387	*dx = 0;
1334	*dy = map1->height;	1388	*dy = map1->height;
1335	}	1389	}
1336	else if (map1->tile_map[3] == map2)	1390	else if (map1->tile_available (TILE_WEST , false) == map2)
1337	{ /* left */	1391	{
1338	*dx = -map2->width;	1392	*dx = -map2->width;
1339	*dy = 0;	1393	*dy = 0;
1340	}	1394	}
1341	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1395	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1342	{ /* up right */	1396	{ /* up right */
1343	*dx = map1->tile_map[0]->width;	1397	*dx = +map1->tile_map[TILE_NORTH]->width;
1344	*dy = -map1->tile_map[0]->height;	1398	*dy = -map1->tile_map[TILE_NORTH]->height;
1345	}	1399	}
1346	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1400	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1347	{ /* up left */	1401	{ /* up left */
1348	*dx = -map2->width;	1402	*dx = -map2->width;
1349	*dy = -map1->tile_map[0]->height;	1403	*dy = -map1->tile_map[TILE_NORTH]->height;
1350	}	1404	}
1351	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1405	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1352	{ /* right up */	1406	{ /* right up */
1353	*dx = map1->width;	1407	*dx = +map1->width;
1354	*dy = -map2->height;	1408	*dy = -map2->height;
1355	}	1409	}
1356	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1410	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1357	{ /* right down */	1411	{ /* right down */
1358	*dx = map1->width;	1412	*dx = +map1->width;
1359	*dy = map1->tile_map[1]->height;	1413	*dy = +map1->tile_map[TILE_EAST]->height;
1360	}	1414	}
1361	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1415	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1362	{ /* down right */	1416	{ /* down right */
1363	*dx = map1->tile_map[2]->width;	1417	*dx = +map1->tile_map[TILE_SOUTH]->width;
1364	*dy = map1->height;	1418	*dy = +map1->height;
1365	}	1419	}
1366	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1420	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1367	{ /* down left */	1421	{ /* down left */
1368	*dx = -map2->width;	1422	*dx = -map2->width;
1369	*dy = map1->height;	1423	*dy = +map1->height;
1370	}	1424	}
1371	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1425	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1372	{ /* left up */	1426	{ /* left up */
1373	*dx = -map1->tile_map[3]->width;	1427	*dx = -map1->tile_map[TILE_WEST]->width;
1374	*dy = -map2->height;	1428	*dy = -map2->height;
1375	}	1429	}
1376	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1430	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1377	{ /* left down */	1431	{ /* left down */
1378	*dx = -map1->tile_map[3]->width;	1432	*dx = -map1->tile_map[TILE_WEST]->width;
1379	*dy = map1->tile_map[3]->height;	1433	*dy = +map1->tile_map[TILE_WEST]->height;
1380	}	1434	}
1381	else	1435	else
1382	return 0;	1436	return 0;
1383		1437
1384	return 1;	1438	return 1;
…		…
1420	*	1474	*
1421	* currently, the only flag supported (0x1) is don't translate for	1475	* currently, the only flag supported (0x1) is don't translate for
1422	* closest body part of 'op1'	1476	* closest body part of 'op1'
1423	*/	1477	*/
1424	void	1478	void
1425	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1479	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1426	{	1480	{
1427	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1481	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1428	{	1482	{
1429	/* be conservative and fill in _some_ data */	1483	/* be conservative and fill in _some_ data */
1430	retval->distance = 10000;	1484	retval->distance = 10000;
1431	retval->distance_x = 10000;	1485	retval->distance_x = 10000;
1432	retval->distance_y = 10000;	1486	retval->distance_y = 10000;
1433	retval->direction = 0;	1487	retval->direction = 0;
1434	retval->part = 0;	1488	retval->part = 0;
1435	}	1489	}
1436	else	1490	else
1437	{	1491	{
1438	object *best;
1439
1440	retval->distance_x += op2->x - op1->x;	1492	retval->distance_x += op2->x - op1->x;
1441	retval->distance_y += op2->y - op1->y;	1493	retval->distance_y += op2->y - op1->y;
1442		1494
1443	best = op1;	1495	object *best = op1;
		1496
1444	/* If this is multipart, find the closest part now */	1497	/* If this is multipart, find the closest part now */
1445	if (!(flags & 0x1) && op1->more)	1498	if (!(flags & 1) && op1->more)
1446	{	1499	{
1447	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1500	int best_distance = idistance (retval->distance_x, retval->distance_y);
1448		1501
1449	/* we just take the offset of the piece to head to figure	1502	/* we just take the offset of the piece to head to figure
1450	* distance instead of doing all that work above again	1503	* distance instead of doing all that work above again
1451	* since the distance fields we set above are positive in the	1504	* since the distance fields we set above are positive in the
1452	* same axis as is used for multipart objects, the simply arithmetic	1505	* same axis as is used for multipart objects, the simply arithmetic
1453	* below works.	1506	* below works.
1454	*/	1507	*/
1455	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1508	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1456	{	1509	{
1457	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1510	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1458	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1511
1459	if (tmpi < best_distance)	1512	if (tmpi < best_distance)
1460	{	1513	{
1461	best_distance = tmpi;	1514	best_distance = tmpi;
1462	best = tmp;	1515	best = tmp;
1463	}	1516	}
1464	}	1517	}
1465		1518
1466	if (best != op1)	1519	if (best != op1)
1467	{	1520	{
1468	retval->distance_x += op1->x - best->x;	1521	retval->distance_x += op1->x - best->x;
1469	retval->distance_y += op1->y - best->y;	1522	retval->distance_y += op1->y - best->y;
1470	}	1523	}
1471	}	1524	}
1472		1525
1473	retval->part = best;	1526	retval->part = best;
1474	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1527	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1475	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1528	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1476	}	1529	}
1477	}	1530	}
1478		1531
1479	/* this is basically the same as get_rangevector above, but instead of	1532	/* this is basically the same as get_rangevector above, but instead of
1480	* the first parameter being an object, it instead is the map	1533	* the first parameter being an object, it instead is the map
…		…
1485	* be more consistant with the above function and also in case they are needed	1538	* be more consistant with the above function and also in case they are needed
1486	* for something in the future. Also, since no object is pasted, the best	1539	* for something in the future. Also, since no object is pasted, the best
1487	* field of the rv_vector is set to NULL.	1540	* field of the rv_vector is set to NULL.
1488	*/	1541	*/
1489	void	1542	void
1490	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1543	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1491	{	1544	{
1492	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1545	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1493	{	1546	{
1494	/* be conservative and fill in _some_ data */	1547	/* be conservative and fill in _some_ data */
1495	retval->distance = 100000;	1548	retval->distance = 100000;
1496	retval->distance_x = 32767;	1549	retval->distance_x = 32767;
1497	retval->distance_y = 32767;	1550	retval->distance_y = 32767;
1498	retval->direction = 0;	1551	retval->direction = 0;
1499	retval->part = 0;	1552	retval->part = 0;
1500	}	1553	}
1501	else	1554	else
1502	{	1555	{
1503	retval->distance_x += op2->x - x;	1556	retval->distance_x += op2->x - x;
1504	retval->distance_y += op2->y - y;	1557	retval->distance_y += op2->y - y;
1505		1558
1506	retval->part = 0;	1559	retval->part = 0;
1507	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1560	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1508	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1561	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1509	}	1562	}
1510	}	1563	}
1511		1564
1512	/* Returns true of op1 and op2 are effectively on the same map	1565	/* Returns true of op1 and op2 are effectively on the same map
1513	* (as related to map tiling). Note that this looks for a path from	1566	* (as related to map tiling). Note that this looks for a path from
…		…
1563	*/	1616	*/
1564	for (int i = 1000; --i;)	1617	for (int i = 1000; --i;)
1565	{	1618	{
1566	object *pick = at (gen (width), gen (height)).bot;	1619	object *pick = at (gen (width), gen (height)).bot;
1567		1620
1568	// do not prefer big monsters just because they are big.	1621	// must be head: do not prefer big monsters just because they are big.
1569	if (pick && pick->is_head ())	1622	if (pick && pick->is_head ())
1570	return pick->head_ ();	1623	return pick;
1571	}	1624	}
1572		1625
1573	// instead of crashing in the unlikely(?) case, try to return something	1626	// instead of crashing in the unlikely(?) case, try to return something
1574	return archetype::find (shstr_bug);	1627	return archetype::find (shstr_bug);
1575	}	1628	}
…		…
1609	if (distance <= MAX_SOUND_DISTANCE)	1662	if (distance <= MAX_SOUND_DISTANCE)
1610	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1663	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1611	}	1664	}
1612	}	1665	}
1613		1666
		1667	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1668
1614	static void	1669	static void
1615	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1670	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1616	{	1671	{
1617	// clip to map to the left	1672	// clip to map to the left
1618	if (x0 < 0)	1673	if (x0 < 0)
1619	{	1674	{
1620	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1675	if (maptile *tile = m->tile_available (TILE_WEST, 1))
1621	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);	1676	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1622		1677
1623	if (x1 < 0) // entirely to the left	1678	if (x1 < 0) // entirely to the left
1624	return;	1679	return;
1625		1680
…		…
1627	}	1682	}
1628		1683
1629	// clip to map to the right	1684	// clip to map to the right
1630	if (x1 > m->width)	1685	if (x1 > m->width)
1631	{	1686	{
1632	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1687	if (maptile *tile = m->tile_available (TILE_EAST, 1))
1633	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);	1688	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1634		1689
1635	if (x0 > m->width) // entirely to the right	1690	if (x0 > m->width) // entirely to the right
1636	return;	1691	return;
1637		1692
…		…
1639	}	1694	}
1640		1695
1641	// clip to map above	1696	// clip to map above
1642	if (y0 < 0)	1697	if (y0 < 0)
1643	{	1698	{
1644	if (maptile *tile = m->tile_available (TILE_UP, 1))	1699	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1645	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);	1700	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1646		1701
1647	if (y1 < 0) // entirely above	1702	if (y1 < 0) // entirely above
1648	return;	1703	return;
1649		1704
…		…
1651	}	1706	}
1652		1707
1653	// clip to map below	1708	// clip to map below
1654	if (y1 > m->height)	1709	if (y1 > m->height)
1655	{	1710	{
1656	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1711	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1657	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);	1712	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1658		1713
1659	if (y0 > m->height) // entirely below	1714	if (y0 > m->height) // entirely below
1660	return;	1715	return;
1661		1716
…		…
1673	r->dx = dx;	1728	r->dx = dx;
1674	r->dy = dy;	1729	r->dy = dy;
1675	}	1730	}
1676		1731
1677	maprect *	1732	maprect *
1678	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1733	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1679	{	1734	{
1680	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1681	buf.clear ();	1735	buf.clear ();
1682		1736
1683	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1737	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1684		1738
1685	// add end marker	1739	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.175 by root, Tue Nov 10 05:06:02 2009 UTC vs. Revision 1.210 by root, Sat May 7 13:25:02 2011 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.175 by root, Tue Nov 10 05:06:02 2009 UTC vs.
Revision 1.210 by root, Sat May 7 13:25:02 2011 UTC