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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.178 by root, Sun Nov 29 09:41:27 2009 UTC vs.
Revision 1.206 by root, Wed May 4 16:12:15 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	*
…		…
314	case KW_arch:	311	case KW_arch:
315	if (object *op = object::read (f, this))	312	if (object *op = object::read (f, this))
316	{	313	{
317	// TODO: why?	314	// TODO: why?
318	if (op->inv)	315	if (op->inv)
		316	{
		317	op->carrying = 0;
319	op->update_weight ();	318	op->update_weight ();
		319	}
320		320
321	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))	321	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322	{	322	{
323	// we insert manually because	323	// we insert manually because
324	// a) its way faster	324	// a) its way faster
…		…
361	}	361	}
362		362
363	void	363	void
364	maptile::activate ()	364	maptile::activate ()
365	{	365	{
366	if (spaces)	366	if (state != MAP_INACTIVE)
		367	return;
		368
367	for (mapspace *ms = spaces + size (); ms-- > spaces; )	369	for (mapspace *ms = spaces + size (); ms-- > spaces; )
368	for (object *op = ms->bot; op; op = op->above)	370	for (object *op = ms->bot; op; op = op->above)
369	op->activate_recursive ();	371	op->activate_recursive ();
		372
		373	state = MAP_ACTIVE;
370	}	374	}
371		375
372	void	376	void
373	maptile::deactivate ()	377	maptile::deactivate ()
374	{	378	{
375	if (spaces)	379	if (state != MAP_ACTIVE)
		380	return;
		381
376	for (mapspace *ms = spaces + size (); ms-- > spaces; )	382	for (mapspace *ms = spaces + size (); ms-- > spaces; )
377	for (object *op = ms->bot; op; op = op->above)	383	for (object *op = ms->bot; op; op = op->above)
378	op->deactivate_recursive ();	384	op->deactivate_recursive ();
		385
		386	state = MAP_INACTIVE;
379	}	387	}
380		388
381	bool	389	bool
382	maptile::_save_objects (object_freezer &f, int flags)	390	maptile::_save_objects (object_freezer &f, int flags)
383	{	391	{
…		…
424	return false;	432	return false;
425		433
426	return freezer.save (path);	434	return freezer.save (path);
427	}	435	}
428		436
429	maptile::maptile ()	437	void
		438	maptile::init ()
430	{	439	{
431	in_memory = MAP_SWAPPED;	440	state = MAP_SWAPPED;
432		441
433	/* The maps used to pick up default x and y values from the	442	/* The maps used to pick up default x and y values from the
434	* map archetype. Mimic that behaviour.	443	* map archetype. Mimic that behaviour.
435	*/	444	*/
436	width = 16;	445	width = 16;
437	height = 16;	446	height = 16;
438	timeout = 300;	447	timeout = 300;
439	max_items = MAX_ITEM_PER_ACTION;	448	max_items = MAX_ITEM_PER_ACTION;
440	max_volume = 2000000; // 2m³	449	max_volume = 2000000; // 2m³
441	}
442
443	maptile::maptile (int w, int h)
444	{
445	in_memory = MAP_SWAPPED;
446
447	width = w;
448	height = h;
449	reset_timeout = 0;	450	reset_timeout = 0;
450	timeout = 300;
451	enter_x = 0;	451	enter_x = 0;
452	enter_y = 0;	452	enter_y = 0;
		453	}
		454
		455	maptile::maptile ()
		456	{
		457	init ();
		458	}
		459
		460	maptile::maptile (int w, int h)
		461	{
		462	init ();
		463
		464	width = w;
		465	height = h;
453		466
454	alloc ();	467	alloc ();
455	}	468	}
456		469
457	/*	470	/*
…		…
557	* the map (or something equivilent) into output_string. */	570	* the map (or something equivilent) into output_string. */
558	static const char *	571	static const char *
559	print_shop_string (maptile *m)	572	print_shop_string (maptile *m)
560	{	573	{
561	static dynbuf_text buf; buf.clear ();	574	static dynbuf_text buf; buf.clear ();
		575	bool first = true;
562		576
563	for (int i = 0; i < m->shopitems[0].index; i++)	577	for (int i = 0; i < m->shopitems[0].index; i++)
564	{	578	{
		579	if (!first)
		580	buf << ';';
		581
		582	first = false;
		583
565	if (m->shopitems[i].typenum)	584	if (m->shopitems[i].typenum)
566	{	585	{
567	if (m->shopitems[i].strength)	586	if (m->shopitems[i].strength)
568	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	587	buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
569	else	588	else
570	buf.printf ("%s;", m->shopitems[i].name);	589	buf.printf ("%s", m->shopitems[i].name);
571	}	590	}
572	else	591	else
573	{	592	{
574	if (m->shopitems[i].strength)	593	if (m->shopitems[i].strength)
575	buf.printf ("*:%d;", m->shopitems[i].strength);	594	buf.printf ("*:%d", m->shopitems[i].strength);
576	else	595	else
577	buf.printf ("*");	596	buf.printf ("*");
578	}	597	}
579	}	598	}
580		599
…		…
603	{	622	{
604	case KW_msg:	623	case KW_msg:
605	thawer.get_ml (KW_endmsg, msg);	624	thawer.get_ml (KW_endmsg, msg);
606	break;	625	break;
607		626
608	case KW_lore: // CF+ extension	627	case KW_lore: // deliantra extension
609	thawer.get_ml (KW_endlore, maplore);	628	thawer.get_ml (KW_endlore, maplore);
610	break;	629	break;
611		630
612	case KW_maplore:	631	case KW_maplore:
613	thawer.get_ml (KW_endmaplore, maplore);	632	thawer.get_ml (KW_endmaplore, maplore);
…		…
636	case KW_per_player: thawer.get (per_player); break;	655	case KW_per_player: thawer.get (per_player); break;
637	case KW_per_party: thawer.get (per_party); break;	656	case KW_per_party: thawer.get (per_party); break;
638	case KW_no_reset: thawer.get (no_reset); break;	657	case KW_no_reset: thawer.get (no_reset); break;
639	case KW_no_drop: thawer.get (no_drop); break;	658	case KW_no_drop: thawer.get (no_drop); break;
640		659
641	case KW_region: default_region = region::find (thawer.get_str ()); break;	660	case KW_region: thawer.get (default_region); break;
642	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	661	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
643		662
644	// old names new names	663	// old names new names
645	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;	664	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
646	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;	665	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
…		…
654		673
655	case KW_tile_path_1: thawer.get (tile_path [0]); break;	674	case KW_tile_path_1: thawer.get (tile_path [0]); break;
656	case KW_tile_path_2: thawer.get (tile_path [1]); break;	675	case KW_tile_path_2: thawer.get (tile_path [1]); break;
657	case KW_tile_path_3: thawer.get (tile_path [2]); break;	676	case KW_tile_path_3: thawer.get (tile_path [2]); break;
658	case KW_tile_path_4: thawer.get (tile_path [3]); break;	677	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		678	case KW_tile_path_5: thawer.get (tile_path [4]); break;
		679	case KW_tile_path_6: thawer.get (tile_path [5]); break;
659		680
660	case KW_ERROR:	681	case KW_ERROR:
661	set_key_text (thawer.kw_str, thawer.value);	682	set_key_text (thawer.kw_str, thawer.value);
662	break;	683	break;
663		684
664	case KW_end:	685	case KW_end:
665	thawer.next ();	686	thawer.next ();
666	return true;	687	return true;
667		688
668	default:	689	default:
669	if (!thawer.parse_error ("map", 0))	690	if (!thawer.parse_error ("map"))
670	return false;	691	return false;
671	break;	692	break;
672	}	693	}
673		694
674	thawer.next ();	695	thawer.next ();
…		…
692	int unique = 0;	713	int unique = 0;
693	for (object *op = spaces [i].bot; op; )	714	for (object *op = spaces [i].bot; op; )
694	{	715	{
695	object *above = op->above;	716	object *above = op->above;
696		717
697	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	718	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
698	unique = 1;	719	unique = 1;
699		720
700	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	721	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
701	op->destroy ();	722	op->destroy ();
702		723
703	op = above;	724	op = above;
704	}	725	}
705	}	726	}
…		…
746		767
747	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	768	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]);	769	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]);	770	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]);	771	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
		772	if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
		773	if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
751		774
752	freezer.put (this);	775	freezer.put (this);
753	freezer.put (KW(end));	776	freezer.put (KW(end));
754		777
755	return true;	778	return true;
…		…
812	msg = 0;	835	msg = 0;
813	maplore = 0;	836	maplore = 0;
814	shoprace = 0;	837	shoprace = 0;
815	delete [] shopitems, shopitems = 0;	838	delete [] shopitems, shopitems = 0;
816		839
817	for (int i = 0; i < 4; i++)	840	for (int i = 0; i < TILE_NUM; i++)
818	tile_path [i] = 0;	841	tile_path [i] = 0;
819	}	842	}
820		843
821	maptile::~maptile ()	844	maptile::~maptile ()
822	{	845	{
…		…
829	/* We need to look through all the maps and see if any maps	852	/* We need to look through all the maps and see if any maps
830	* are pointing at this one for tiling information. Since	853	* are pointing at this one for tiling information. Since
831	* tiling can be asymetric, we just can not look to see which	854	* tiling can be asymetric, we just can not look to see which
832	* maps this map tiles with and clears those.	855	* maps this map tiles with and clears those.
833	*/	856	*/
834	for (int i = 0; i < 4; i++)	857	for (int i = 0; i < TILE_NUM; i++)
835	if (tile_map[i] == m)	858	if (tile_map[i] == m)
836	tile_map[i] = 0;	859	tile_map[i] = 0;
837	}	860	}
838		861
839	void	862	void
…		…
855	for (mapspace *ms = spaces + size (); ms-- > spaces; )	878	for (mapspace *ms = spaces + size (); ms-- > spaces; )
856	for (object above, op = ms->bot; op; op = above)	879	for (object above, op = ms->bot; op; op = above)
857	{	880	{
858	above = op->above;	881	above = op->above;
859		882
		883	// do not decay anything above unique floor tiles (yet :)
		884	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
		885	break;
		886
860	bool destroy = 0;	887	bool destroy = 0;
861		888
862	// do not decay anything above unique floor tiles (yet :)	889	if (op->flag [FLAG_IS_FLOOR]
863	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	890	\|\| op->flag [FLAG_OBJ_ORIGINAL]
864	break;	891	\|\| op->flag [FLAG_UNIQUE]
865		892	\|\| op->flag [FLAG_OVERLAY_FLOOR]
866	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	893	\|\| op->flag [FLAG_UNPAID]
867	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
868	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
869	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
870	\|\| QUERY_FLAG (op, FLAG_UNPAID)
871	\|\| op->is_alive ())	894	\|\| op->is_alive ())
872	; // do not decay	895	; // do not decay
873	else if (op->is_weapon ())	896	else if (op->is_weapon ())
874	{	897	{
875	op->stats.dam--;	898	op->stats.dam--;
…		…
931	sint64 total_exp = 0;	954	sint64 total_exp = 0;
932		955
933	for (mapspace *ms = spaces + size (); ms-- > spaces; )	956	for (mapspace *ms = spaces + size (); ms-- > spaces; )
934	for (object *op = ms->bot; op; op = op->above)	957	for (object *op = ms->bot; op; op = op->above)
935	{	958	{
936	if (QUERY_FLAG (op, FLAG_MONSTER))	959	if (op->flag [FLAG_MONSTER])
937	{	960	{
938	total_exp += op->stats.exp;	961	total_exp += op->stats.exp;
939	monster_cnt++;	962	monster_cnt++;
940	}	963	}
941		964
942	if (QUERY_FLAG (op, FLAG_GENERATOR))	965	if (op->flag [FLAG_GENERATOR])
943	{	966	{
944	total_exp += op->stats.exp;	967	total_exp += op->stats.exp;
945		968
946	if (archetype *at = op->other_arch)	969	if (archetype *at = op->other_arch)
947	{	970	{
…		…
1129	*/	1152	*/
1130		1153
1131	for (object *tmp = last; tmp; tmp = tmp->below)	1154	for (object *tmp = last; tmp; tmp = tmp->below)
1132	{	1155	{
1133	/* Once we get to a floor, stop, since we already have a floor object */	1156	/* Once we get to a floor, stop, since we already have a floor object */
1134	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1157	if (tmp->flag [FLAG_IS_FLOOR])
1135	break;	1158	break;
1136		1159
1137	/* If two top faces are already set, quit processing */	1160	/* If two top faces are already set, quit processing */
1138	if (top && middle)	1161	if (top && middle)
1139	break;	1162	break;
…		…
1182	maptile *	1205	maptile *
1183	maptile::tile_available (int dir, bool load)	1206	maptile::tile_available (int dir, bool load)
1184	{	1207	{
1185	if (tile_path[dir])	1208	if (tile_path[dir])
1186	{	1209	{
		1210	// map is there and we don't need to load it OR it's loaded => return what we have
1187	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1211	if (tile_map[dir] && (!load \|\| tile_map[dir]->linkable ()))
1188	return tile_map[dir];	1212	return tile_map[dir];
1189		1213
		1214	// well, try to locate it then, if possible - maybe it's there already
1190	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))	1215	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1191	return tile_map[dir];	1216	return tile_map[dir];
1192	}	1217	}
1193		1218
1194	return 0;	1219	return 0;
…		…
1306	/**	1331	/**
1307	* Return whether map2 is adjacent to map1. If so, store the distance from	1332	* Return whether map2 is adjacent to map1. If so, store the distance from
1308	* map1 to map2 in dx/dy.	1333	* map1 to map2 in dx/dy.
1309	*/	1334	*/
1310	int	1335	int
1311	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1336	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1312	{	1337	{
1313	if (!map1 \|\| !map2)	1338	if (!map1 \|\| !map2)
1314	return 0;	1339	return 0;
1315		1340
1316	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1341	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1318	if (map1 == map2)	1343	if (map1 == map2)
1319	{	1344	{
1320	*dx = 0;	1345	*dx = 0;
1321	*dy = 0;	1346	*dy = 0;
1322	}	1347	}
1323	else if (map1->tile_map[0] == map2)	1348	else if (map1->tile_available (TILE_NORTH, false) == map2)
1324	{ /* up */	1349	{
1325	*dx = 0;	1350	*dx = 0;
1326	*dy = -map2->height;	1351	*dy = -map2->height;
1327	}	1352	}
1328	else if (map1->tile_map[1] == map2)	1353	else if (map1->tile_available (TILE_EAST , false) == map2)
1329	{ /* right */	1354	{
1330	*dx = map1->width;	1355	*dx = map1->width;
1331	*dy = 0;	1356	*dy = 0;
1332	}	1357	}
1333	else if (map1->tile_map[2] == map2)	1358	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1334	{ /* down */	1359	{
1335	*dx = 0;	1360	*dx = 0;
1336	*dy = map1->height;	1361	*dy = map1->height;
1337	}	1362	}
1338	else if (map1->tile_map[3] == map2)	1363	else if (map1->tile_available (TILE_WEST , false) == map2)
1339	{ /* left */	1364	{
1340	*dx = -map2->width;	1365	*dx = -map2->width;
1341	*dy = 0;	1366	*dy = 0;
1342	}	1367	}
1343	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1368	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1344	{ /* up right */	1369	{ /* up right */
1345	*dx = map1->tile_map[0]->width;	1370	*dx = +map1->tile_map[TILE_NORTH]->width;
1346	*dy = -map1->tile_map[0]->height;	1371	*dy = -map1->tile_map[TILE_NORTH]->height;
1347	}	1372	}
1348	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1373	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1349	{ /* up left */	1374	{ /* up left */
1350	*dx = -map2->width;	1375	*dx = -map2->width;
1351	*dy = -map1->tile_map[0]->height;	1376	*dy = -map1->tile_map[TILE_NORTH]->height;
1352	}	1377	}
1353	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1378	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1354	{ /* right up */	1379	{ /* right up */
1355	*dx = map1->width;	1380	*dx = +map1->width;
1356	*dy = -map2->height;	1381	*dy = -map2->height;
1357	}	1382	}
1358	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1383	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1359	{ /* right down */	1384	{ /* right down */
1360	*dx = map1->width;	1385	*dx = +map1->width;
1361	*dy = map1->tile_map[1]->height;	1386	*dy = +map1->tile_map[TILE_EAST]->height;
1362	}	1387	}
1363	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1388	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1364	{ /* down right */	1389	{ /* down right */
1365	*dx = map1->tile_map[2]->width;	1390	*dx = +map1->tile_map[TILE_SOUTH]->width;
1366	*dy = map1->height;	1391	*dy = +map1->height;
1367	}	1392	}
1368	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1393	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1369	{ /* down left */	1394	{ /* down left */
1370	*dx = -map2->width;	1395	*dx = -map2->width;
1371	*dy = map1->height;	1396	*dy = +map1->height;
1372	}	1397	}
1373	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1398	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1374	{ /* left up */	1399	{ /* left up */
1375	*dx = -map1->tile_map[3]->width;	1400	*dx = -map1->tile_map[TILE_WEST]->width;
1376	*dy = -map2->height;	1401	*dy = -map2->height;
1377	}	1402	}
1378	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1403	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1379	{ /* left down */	1404	{ /* left down */
1380	*dx = -map1->tile_map[3]->width;	1405	*dx = -map1->tile_map[TILE_WEST]->width;
1381	*dy = map1->tile_map[3]->height;	1406	*dy = +map1->tile_map[TILE_WEST]->height;
1382	}	1407	}
1383	else	1408	else
1384	return 0;	1409	return 0;
1385		1410
1386	return 1;	1411	return 1;
…		…
1422	*	1447	*
1423	* currently, the only flag supported (0x1) is don't translate for	1448	* currently, the only flag supported (0x1) is don't translate for
1424	* closest body part of 'op1'	1449	* closest body part of 'op1'
1425	*/	1450	*/
1426	void	1451	void
1427	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1452	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1428	{	1453	{
1429	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1454	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1430	{	1455	{
1431	/* be conservative and fill in _some_ data */	1456	/* be conservative and fill in _some_ data */
1432	retval->distance = 10000;	1457	retval->distance = 10000;
1433	retval->distance_x = 10000;	1458	retval->distance_x = 10000;
1434	retval->distance_y = 10000;	1459	retval->distance_y = 10000;
1435	retval->direction = 0;	1460	retval->direction = 0;
1436	retval->part = 0;	1461	retval->part = 0;
1437	}	1462	}
1438	else	1463	else
1439	{	1464	{
1440	object *best;
1441
1442	retval->distance_x += op2->x - op1->x;	1465	retval->distance_x += op2->x - op1->x;
1443	retval->distance_y += op2->y - op1->y;	1466	retval->distance_y += op2->y - op1->y;
1444		1467
1445	best = op1;	1468	object *best = op1;
		1469
1446	/* If this is multipart, find the closest part now */	1470	/* If this is multipart, find the closest part now */
1447	if (!(flags & 0x1) && op1->more)	1471	if (!(flags & 1) && op1->more)
1448	{	1472	{
1449	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1473	int best_distance = idistance (retval->distance_x, retval->distance_y);
1450		1474
1451	/* we just take the offset of the piece to head to figure	1475	/* we just take the offset of the piece to head to figure
1452	* distance instead of doing all that work above again	1476	* distance instead of doing all that work above again
1453	* since the distance fields we set above are positive in the	1477	* since the distance fields we set above are positive in the
1454	* same axis as is used for multipart objects, the simply arithmetic	1478	* same axis as is used for multipart objects, the simply arithmetic
1455	* below works.	1479	* below works.
1456	*/	1480	*/
1457	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1481	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1458	{	1482	{
1459	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1483	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1460	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1484
1461	if (tmpi < best_distance)	1485	if (tmpi < best_distance)
1462	{	1486	{
1463	best_distance = tmpi;	1487	best_distance = tmpi;
1464	best = tmp;	1488	best = tmp;
1465	}	1489	}
1466	}	1490	}
1467		1491
1468	if (best != op1)	1492	if (best != op1)
1469	{	1493	{
1470	retval->distance_x += op1->x - best->x;	1494	retval->distance_x += op1->x - best->x;
1471	retval->distance_y += op1->y - best->y;	1495	retval->distance_y += op1->y - best->y;
1472	}	1496	}
1473	}	1497	}
1474		1498
1475	retval->part = best;	1499	retval->part = best;
1476	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1500	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1477	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1501	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1478	}	1502	}
1479	}	1503	}
1480		1504
1481	/* this is basically the same as get_rangevector above, but instead of	1505	/* this is basically the same as get_rangevector above, but instead of
1482	* the first parameter being an object, it instead is the map	1506	* the first parameter being an object, it instead is the map
…		…
1487	* be more consistant with the above function and also in case they are needed	1511	* be more consistant with the above function and also in case they are needed
1488	* for something in the future. Also, since no object is pasted, the best	1512	* for something in the future. Also, since no object is pasted, the best
1489	* field of the rv_vector is set to NULL.	1513	* field of the rv_vector is set to NULL.
1490	*/	1514	*/
1491	void	1515	void
1492	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1516	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1493	{	1517	{
1494	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1518	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1495	{	1519	{
1496	/* be conservative and fill in _some_ data */	1520	/* be conservative and fill in _some_ data */
1497	retval->distance = 100000;	1521	retval->distance = 100000;
1498	retval->distance_x = 32767;	1522	retval->distance_x = 32767;
1499	retval->distance_y = 32767;	1523	retval->distance_y = 32767;
1500	retval->direction = 0;	1524	retval->direction = 0;
1501	retval->part = 0;	1525	retval->part = 0;
1502	}	1526	}
1503	else	1527	else
1504	{	1528	{
1505	retval->distance_x += op2->x - x;	1529	retval->distance_x += op2->x - x;
1506	retval->distance_y += op2->y - y;	1530	retval->distance_y += op2->y - y;
1507		1531
1508	retval->part = 0;	1532	retval->part = 0;
1509	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1533	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1510	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1534	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1511	}	1535	}
1512	}	1536	}
1513		1537
1514	/* Returns true of op1 and op2 are effectively on the same map	1538	/* Returns true of op1 and op2 are effectively on the same map
1515	* (as related to map tiling). Note that this looks for a path from	1539	* (as related to map tiling). Note that this looks for a path from
…		…
1565	*/	1589	*/
1566	for (int i = 1000; --i;)	1590	for (int i = 1000; --i;)
1567	{	1591	{
1568	object *pick = at (gen (width), gen (height)).bot;	1592	object *pick = at (gen (width), gen (height)).bot;
1569		1593
1570	// do not prefer big monsters just because they are big.	1594	// must be head: do not prefer big monsters just because they are big.
1571	if (pick && pick->is_head ())	1595	if (pick && pick->is_head ())
1572	return pick->head_ ();	1596	return pick;
1573	}	1597	}
1574		1598
1575	// instead of crashing in the unlikely(?) case, try to return something	1599	// instead of crashing in the unlikely(?) case, try to return something
1576	return archetype::find (shstr_bug);	1600	return archetype::find (shstr_bug);
1577	}	1601	}
…		…
1611	if (distance <= MAX_SOUND_DISTANCE)	1635	if (distance <= MAX_SOUND_DISTANCE)
1612	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1636	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1613	}	1637	}
1614	}	1638	}
1615		1639
		1640	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1641
1616	static void	1642	static void
1617	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1643	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1618	{	1644	{
1619	// clip to map to the left	1645	// clip to map to the left
1620	if (x0 < 0)	1646	if (x0 < 0)
1621	{	1647	{
1622	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1648	if (maptile *tile = m->tile_available (TILE_WEST, 1))
1623	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);	1649	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1624		1650
1625	if (x1 < 0) // entirely to the left	1651	if (x1 < 0) // entirely to the left
1626	return;	1652	return;
1627		1653
…		…
1629	}	1655	}
1630		1656
1631	// clip to map to the right	1657	// clip to map to the right
1632	if (x1 > m->width)	1658	if (x1 > m->width)
1633	{	1659	{
1634	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1660	if (maptile *tile = m->tile_available (TILE_EAST, 1))
1635	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);	1661	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1636		1662
1637	if (x0 > m->width) // entirely to the right	1663	if (x0 > m->width) // entirely to the right
1638	return;	1664	return;
1639		1665
…		…
1641	}	1667	}
1642		1668
1643	// clip to map above	1669	// clip to map above
1644	if (y0 < 0)	1670	if (y0 < 0)
1645	{	1671	{
1646	if (maptile *tile = m->tile_available (TILE_UP, 1))	1672	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1647	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);	1673	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1648		1674
1649	if (y1 < 0) // entirely above	1675	if (y1 < 0) // entirely above
1650	return;	1676	return;
1651		1677
…		…
1653	}	1679	}
1654		1680
1655	// clip to map below	1681	// clip to map below
1656	if (y1 > m->height)	1682	if (y1 > m->height)
1657	{	1683	{
1658	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1684	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1659	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);	1685	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1660		1686
1661	if (y0 > m->height) // entirely below	1687	if (y0 > m->height) // entirely below
1662	return;	1688	return;
1663		1689
…		…
1675	r->dx = dx;	1701	r->dx = dx;
1676	r->dy = dy;	1702	r->dy = dy;
1677	}	1703	}
1678		1704
1679	maprect *	1705	maprect *
1680	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1706	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1681	{	1707	{
1682	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1683	buf.clear ();	1708	buf.clear ();
1684		1709
1685	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1710	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1686		1711
1687	// add end marker	1712	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.178 by root, Sun Nov 29 09:41:27 2009 UTC vs. Revision 1.206 by root, Wed May 4 16:12:15 2011 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.178 by root, Sun Nov 29 09:41:27 2009 UTC vs.
Revision 1.206 by root, Wed May 4 16:12:15 2011 UTC