[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.211 by root, Sat May 7 14:13:48 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;
		374
		375	activate_physics ();
370	}	376	}
371		377
372	void	378	void
373	maptile::deactivate ()	379	maptile::deactivate ()
374	{	380	{
375	if (spaces)	381	if (state != MAP_ACTIVE)
		382	return;
		383
376	for (mapspace *ms = spaces + size (); ms-- > spaces; )	384	for (mapspace *ms = spaces + size (); ms-- > spaces; )
377	for (object *op = ms->bot; op; op = op->above)	385	for (object *op = ms->bot; op; op = op->above)
378	op->deactivate_recursive ();	386	op->deactivate_recursive ();
		387
		388	state = MAP_INACTIVE;
379	}	389	}
380		390
381	bool	391	bool
382	maptile::_save_objects (object_freezer &f, int flags)	392	maptile::_save_objects (object_freezer &f, int flags)
383	{	393	{
…		…
424	return false;	434	return false;
425		435
426	return freezer.save (path);	436	return freezer.save (path);
427	}	437	}
428		438
429	maptile::maptile ()	439	void
		440	maptile::init ()
430	{	441	{
431	in_memory = MAP_SWAPPED;	442	state = MAP_SWAPPED;
432		443
433	/* The maps used to pick up default x and y values from the	444	/* The maps used to pick up default x and y values from the
434	* map archetype. Mimic that behaviour.	445	* map archetype. Mimic that behaviour.
435	*/	446	*/
436	width = 16;	447	width = 16;
437	height = 16;	448	height = 16;
438	timeout = 300;	449	timeout = 300;
439	max_items = MAX_ITEM_PER_ACTION;	450	max_items = MAX_ITEM_PER_ACTION;
440	max_volume = 2000000; // 2m³	451	max_volume = 2000000; // 2m³
441	}
442
443	maptile::maptile (int w, int h)
444	{
445	in_memory = MAP_SWAPPED;
446
447	width = w;
448	height = h;
449	reset_timeout = 0;	452	reset_timeout = 0;
450	timeout = 300;
451	enter_x = 0;	453	enter_x = 0;
452	enter_y = 0;	454	enter_y = 0;
		455	}
		456
		457	maptile::maptile ()
		458	{
		459	init ();
		460	}
		461
		462	maptile::maptile (int w, int h)
		463	{
		464	init ();
		465
		466	width = w;
		467	height = h;
453		468
454	alloc ();	469	alloc ();
455	}	470	}
456		471
457	/*	472	/*
…		…
557	* the map (or something equivilent) into output_string. */	572	* the map (or something equivilent) into output_string. */
558	static const char *	573	static const char *
559	print_shop_string (maptile *m)	574	print_shop_string (maptile *m)
560	{	575	{
561	static dynbuf_text buf; buf.clear ();	576	static dynbuf_text buf; buf.clear ();
		577	bool first = true;
562		578
563	for (int i = 0; i < m->shopitems[0].index; i++)	579	for (int i = 0; i < m->shopitems[0].index; i++)
564	{	580	{
		581	if (!first)
		582	buf << ';';
		583
		584	first = false;
		585
565	if (m->shopitems[i].typenum)	586	if (m->shopitems[i].typenum)
566	{	587	{
567	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
568	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	589	buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
569	else	590	else
570	buf.printf ("%s;", m->shopitems[i].name);	591	buf.printf ("%s", m->shopitems[i].name);
571	}	592	}
572	else	593	else
573	{	594	{
574	if (m->shopitems[i].strength)	595	if (m->shopitems[i].strength)
575	buf.printf ("*:%d;", m->shopitems[i].strength);	596	buf.printf ("*:%d", m->shopitems[i].strength);
576	else	597	else
577	buf.printf ("*");	598	buf.printf ("*");
578	}	599	}
579	}	600	}
580		601
…		…
603	{	624	{
604	case KW_msg:	625	case KW_msg:
605	thawer.get_ml (KW_endmsg, msg);	626	thawer.get_ml (KW_endmsg, msg);
606	break;	627	break;
607		628
608	case KW_lore: // CF+ extension	629	case KW_lore: // deliantra extension
609	thawer.get_ml (KW_endlore, maplore);	630	thawer.get_ml (KW_endlore, maplore);
610	break;	631	break;
611		632
612	case KW_maplore:	633	case KW_maplore:
613	thawer.get_ml (KW_endmaplore, maplore);	634	thawer.get_ml (KW_endmaplore, maplore);
…		…
636	case KW_per_player: thawer.get (per_player); break;	657	case KW_per_player: thawer.get (per_player); break;
637	case KW_per_party: thawer.get (per_party); break;	658	case KW_per_party: thawer.get (per_party); break;
638	case KW_no_reset: thawer.get (no_reset); break;	659	case KW_no_reset: thawer.get (no_reset); break;
639	case KW_no_drop: thawer.get (no_drop); break;	660	case KW_no_drop: thawer.get (no_drop); break;
640		661
641	case KW_region: default_region = region::find (thawer.get_str ()); break;	662	case KW_region: thawer.get (default_region); break;
642	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
643		664
644	// old names new names	665	// old names new names
645	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;
646	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;
…		…
654		675
655	case KW_tile_path_1: thawer.get (tile_path [0]); break;	676	case KW_tile_path_1: thawer.get (tile_path [0]); break;
656	case KW_tile_path_2: thawer.get (tile_path [1]); break;	677	case KW_tile_path_2: thawer.get (tile_path [1]); break;
657	case KW_tile_path_3: thawer.get (tile_path [2]); break;	678	case KW_tile_path_3: thawer.get (tile_path [2]); break;
658	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;
659		682
660	case KW_ERROR:	683	case KW_ERROR:
661	set_key_text (thawer.kw_str, thawer.value);	684	set_key_text (thawer.kw_str, thawer.value);
662	break;	685	break;
663		686
664	case KW_end:	687	case KW_end:
665	thawer.next ();	688	thawer.next ();
666	return true;	689	return true;
667		690
668	default:	691	default:
669	if (!thawer.parse_error ("map", 0))	692	if (!thawer.parse_error ("map"))
670	return false;	693	return false;
671	break;	694	break;
672	}	695	}
673		696
674	thawer.next ();	697	thawer.next ();
…		…
692	int unique = 0;	715	int unique = 0;
693	for (object *op = spaces [i].bot; op; )	716	for (object *op = spaces [i].bot; op; )
694	{	717	{
695	object *above = op->above;	718	object *above = op->above;
696		719
697	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	720	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
698	unique = 1;	721	unique = 1;
699		722
700	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	723	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
701	op->destroy ();	724	op->destroy ();
702		725
703	op = above;	726	op = above;
704	}	727	}
705	}	728	}
…		…
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;
…		…
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
…		…
855	for (mapspace *ms = spaces + size (); ms-- > spaces; )	880	for (mapspace *ms = spaces + size (); ms-- > spaces; )
856	for (object above, op = ms->bot; op; op = above)	881	for (object above, op = ms->bot; op; op = above)
857	{	882	{
858	above = op->above;	883	above = op->above;
859		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
860	bool destroy = 0;	889	bool destroy = 0;
861		890
862	// do not decay anything above unique floor tiles (yet :)	891	if (op->flag [FLAG_IS_FLOOR]
863	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	892	\|\| op->flag [FLAG_OBJ_ORIGINAL]
864	break;	893	\|\| op->flag [FLAG_UNIQUE]
865		894	\|\| op->flag [FLAG_OVERLAY_FLOOR]
866	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	895	\|\| 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 ())	896	\|\| op->is_alive ())
872	; // do not decay	897	; // do not decay
873	else if (op->is_weapon ())	898	else if (op->is_weapon ())
874	{	899	{
875	op->stats.dam--;	900	op->stats.dam--;
…		…
931	sint64 total_exp = 0;	956	sint64 total_exp = 0;
932		957
933	for (mapspace *ms = spaces + size (); ms-- > spaces; )	958	for (mapspace *ms = spaces + size (); ms-- > spaces; )
934	for (object *op = ms->bot; op; op = op->above)	959	for (object *op = ms->bot; op; op = op->above)
935	{	960	{
936	if (QUERY_FLAG (op, FLAG_MONSTER))	961	if (op->flag [FLAG_MONSTER])
937	{	962	{
938	total_exp += op->stats.exp;	963	total_exp += op->stats.exp;
939	monster_cnt++;	964	monster_cnt++;
940	}	965	}
941		966
942	if (QUERY_FLAG (op, FLAG_GENERATOR))	967	if (op->flag [FLAG_GENERATOR])
943	{	968	{
944	total_exp += op->stats.exp;	969	total_exp += op->stats.exp;
945		970
946	if (archetype *at = op->other_arch)	971	if (archetype *at = op->other_arch)
947	{	972	{
…		…
1129	*/	1154	*/
1130		1155
1131	for (object *tmp = last; tmp; tmp = tmp->below)	1156	for (object *tmp = last; tmp; tmp = tmp->below)
1132	{	1157	{
1133	/* 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 */
1134	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1159	if (tmp->flag [FLAG_IS_FLOOR])
1135	break;	1160	break;
1136		1161
1137	/* If two top faces are already set, quit processing */	1162	/* If two top faces are already set, quit processing */
1138	if (top && middle)	1163	if (top && middle)
1139	break;	1164	break;
…		…
1170	middle = 0;	1195	middle = 0;
1171		1196
1172	if (top == middle)	1197	if (top == middle)
1173	middle = 0;	1198	middle = 0;
1174		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	mapspace &ms = m->at (floor->x, floor->y);
		1210	ms.update ();
		1211
		1212	if (object *floor2 = ms.faces_obj [2])
		1213	if (floor2->arch->archname != shstr_quad_open_space && !middle)
		1214	{
		1215	floor->set_anim_frame (1);
		1216	middle = floor;
		1217	floor = floor2;
		1218	}
		1219	}
		1220	}
		1221
1175	#if 0	1222	#if 0
1176	faces_obj [0] = top;	1223	faces_obj [0] = top;
1177	faces_obj [1] = middle;	1224	faces_obj [1] = middle;
1178	faces_obj [2] = floor;	1225	faces_obj [2] = floor;
1179	#endif	1226	#endif
…		…
1182	maptile *	1229	maptile *
1183	maptile::tile_available (int dir, bool load)	1230	maptile::tile_available (int dir, bool load)
1184	{	1231	{
1185	if (tile_path[dir])	1232	if (tile_path[dir])
1186	{	1233	{
		1234	// 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))	1235	if (tile_map[dir] && (!load \|\| tile_map[dir]->linkable ()))
1188	return tile_map[dir];	1236	return tile_map[dir];
1189		1237
		1238	// 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)))	1239	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1191	return tile_map[dir];	1240	return tile_map[dir];
1192	}	1241	}
1193		1242
1194	return 0;	1243	return 0;
…		…
1306	/**	1355	/**
1307	* Return whether map2 is adjacent to map1. If so, store the distance from	1356	* Return whether map2 is adjacent to map1. If so, store the distance from
1308	* map1 to map2 in dx/dy.	1357	* map1 to map2 in dx/dy.
1309	*/	1358	*/
1310	int	1359	int
1311	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1360	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1312	{	1361	{
1313	if (!map1 \|\| !map2)	1362	if (!map1 \|\| !map2)
1314	return 0;	1363	return 0;
1315		1364
1316	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1365	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1318	if (map1 == map2)	1367	if (map1 == map2)
1319	{	1368	{
1320	*dx = 0;	1369	*dx = 0;
1321	*dy = 0;	1370	*dy = 0;
1322	}	1371	}
1323	else if (map1->tile_map[0] == map2)	1372	else if (map1->tile_available (TILE_NORTH, false) == map2)
1324	{ /* up */	1373	{
1325	*dx = 0;	1374	*dx = 0;
1326	*dy = -map2->height;	1375	*dy = -map2->height;
1327	}	1376	}
1328	else if (map1->tile_map[1] == map2)	1377	else if (map1->tile_available (TILE_EAST , false) == map2)
1329	{ /* right */	1378	{
1330	*dx = map1->width;	1379	*dx = map1->width;
1331	*dy = 0;	1380	*dy = 0;
1332	}	1381	}
1333	else if (map1->tile_map[2] == map2)	1382	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1334	{ /* down */	1383	{
1335	*dx = 0;	1384	*dx = 0;
1336	*dy = map1->height;	1385	*dy = map1->height;
1337	}	1386	}
1338	else if (map1->tile_map[3] == map2)	1387	else if (map1->tile_available (TILE_WEST , false) == map2)
1339	{ /* left */	1388	{
1340	*dx = -map2->width;	1389	*dx = -map2->width;
1341	*dy = 0;	1390	*dy = 0;
1342	}	1391	}
1343	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1392	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1344	{ /* up right */	1393	{ /* up right */
1345	*dx = map1->tile_map[0]->width;	1394	*dx = +map1->tile_map[TILE_NORTH]->width;
1346	*dy = -map1->tile_map[0]->height;	1395	*dy = -map1->tile_map[TILE_NORTH]->height;
1347	}	1396	}
1348	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1397	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1349	{ /* up left */	1398	{ /* up left */
1350	*dx = -map2->width;	1399	*dx = -map2->width;
1351	*dy = -map1->tile_map[0]->height;	1400	*dy = -map1->tile_map[TILE_NORTH]->height;
1352	}	1401	}
1353	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1402	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1354	{ /* right up */	1403	{ /* right up */
1355	*dx = map1->width;	1404	*dx = +map1->width;
1356	*dy = -map2->height;	1405	*dy = -map2->height;
1357	}	1406	}
1358	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1407	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1359	{ /* right down */	1408	{ /* right down */
1360	*dx = map1->width;	1409	*dx = +map1->width;
1361	*dy = map1->tile_map[1]->height;	1410	*dy = +map1->tile_map[TILE_EAST]->height;
1362	}	1411	}
1363	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1412	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1364	{ /* down right */	1413	{ /* down right */
1365	*dx = map1->tile_map[2]->width;	1414	*dx = +map1->tile_map[TILE_SOUTH]->width;
1366	*dy = map1->height;	1415	*dy = +map1->height;
1367	}	1416	}
1368	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1417	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1369	{ /* down left */	1418	{ /* down left */
1370	*dx = -map2->width;	1419	*dx = -map2->width;
1371	*dy = map1->height;	1420	*dy = +map1->height;
1372	}	1421	}
1373	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1422	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1374	{ /* left up */	1423	{ /* left up */
1375	*dx = -map1->tile_map[3]->width;	1424	*dx = -map1->tile_map[TILE_WEST]->width;
1376	*dy = -map2->height;	1425	*dy = -map2->height;
1377	}	1426	}
1378	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1427	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1379	{ /* left down */	1428	{ /* left down */
1380	*dx = -map1->tile_map[3]->width;	1429	*dx = -map1->tile_map[TILE_WEST]->width;
1381	*dy = map1->tile_map[3]->height;	1430	*dy = +map1->tile_map[TILE_WEST]->height;
1382	}	1431	}
1383	else	1432	else
1384	return 0;	1433	return 0;
1385		1434
1386	return 1;	1435	return 1;
…		…
1422	*	1471	*
1423	* currently, the only flag supported (0x1) is don't translate for	1472	* currently, the only flag supported (0x1) is don't translate for
1424	* closest body part of 'op1'	1473	* closest body part of 'op1'
1425	*/	1474	*/
1426	void	1475	void
1427	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1476	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1428	{	1477	{
1429	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1478	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1430	{	1479	{
1431	/* be conservative and fill in _some_ data */	1480	/* be conservative and fill in _some_ data */
1432	retval->distance = 10000;	1481	retval->distance = 10000;
1433	retval->distance_x = 10000;	1482	retval->distance_x = 10000;
1434	retval->distance_y = 10000;	1483	retval->distance_y = 10000;
1435	retval->direction = 0;	1484	retval->direction = 0;
1436	retval->part = 0;	1485	retval->part = 0;
1437	}	1486	}
1438	else	1487	else
1439	{	1488	{
1440	object *best;
1441
1442	retval->distance_x += op2->x - op1->x;	1489	retval->distance_x += op2->x - op1->x;
1443	retval->distance_y += op2->y - op1->y;	1490	retval->distance_y += op2->y - op1->y;
1444		1491
1445	best = op1;	1492	object *best = op1;
		1493
1446	/* If this is multipart, find the closest part now */	1494	/* If this is multipart, find the closest part now */
1447	if (!(flags & 0x1) && op1->more)	1495	if (!(flags & 1) && op1->more)
1448	{	1496	{
1449	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1497	int best_distance = idistance (retval->distance_x, retval->distance_y);
1450		1498
1451	/* we just take the offset of the piece to head to figure	1499	/* we just take the offset of the piece to head to figure
1452	* distance instead of doing all that work above again	1500	* distance instead of doing all that work above again
1453	* since the distance fields we set above are positive in the	1501	* since the distance fields we set above are positive in the
1454	* same axis as is used for multipart objects, the simply arithmetic	1502	* same axis as is used for multipart objects, the simply arithmetic
1455	* below works.	1503	* below works.
1456	*/	1504	*/
1457	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1505	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1458	{	1506	{
1459	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1507	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);	1508
1461	if (tmpi < best_distance)	1509	if (tmpi < best_distance)
1462	{	1510	{
1463	best_distance = tmpi;	1511	best_distance = tmpi;
1464	best = tmp;	1512	best = tmp;
1465	}	1513	}
1466	}	1514	}
1467		1515
1468	if (best != op1)	1516	if (best != op1)
1469	{	1517	{
1470	retval->distance_x += op1->x - best->x;	1518	retval->distance_x += op1->x - best->x;
1471	retval->distance_y += op1->y - best->y;	1519	retval->distance_y += op1->y - best->y;
1472	}	1520	}
1473	}	1521	}
1474		1522
1475	retval->part = best;	1523	retval->part = best;
1476	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1524	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1477	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1525	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1478	}	1526	}
1479	}	1527	}
1480		1528
1481	/* this is basically the same as get_rangevector above, but instead of	1529	/* this is basically the same as get_rangevector above, but instead of
1482	* the first parameter being an object, it instead is the map	1530	* 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	1535	* 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	1536	* for something in the future. Also, since no object is pasted, the best
1489	* field of the rv_vector is set to NULL.	1537	* field of the rv_vector is set to NULL.
1490	*/	1538	*/
1491	void	1539	void
1492	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1540	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1493	{	1541	{
1494	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1542	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1495	{	1543	{
1496	/* be conservative and fill in _some_ data */	1544	/* be conservative and fill in _some_ data */
1497	retval->distance = 100000;	1545	retval->distance = 100000;
1498	retval->distance_x = 32767;	1546	retval->distance_x = 32767;
1499	retval->distance_y = 32767;	1547	retval->distance_y = 32767;
1500	retval->direction = 0;	1548	retval->direction = 0;
1501	retval->part = 0;	1549	retval->part = 0;
1502	}	1550	}
1503	else	1551	else
1504	{	1552	{
1505	retval->distance_x += op2->x - x;	1553	retval->distance_x += op2->x - x;
1506	retval->distance_y += op2->y - y;	1554	retval->distance_y += op2->y - y;
1507		1555
1508	retval->part = 0;	1556	retval->part = 0;
1509	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1557	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1510	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1558	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1511	}	1559	}
1512	}	1560	}
1513		1561
1514	/* Returns true of op1 and op2 are effectively on the same map	1562	/* 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	1563	* (as related to map tiling). Note that this looks for a path from
…		…
1565	*/	1613	*/
1566	for (int i = 1000; --i;)	1614	for (int i = 1000; --i;)
1567	{	1615	{
1568	object *pick = at (gen (width), gen (height)).bot;	1616	object *pick = at (gen (width), gen (height)).bot;
1569		1617
1570	// do not prefer big monsters just because they are big.	1618	// must be head: do not prefer big monsters just because they are big.
1571	if (pick && pick->is_head ())	1619	if (pick && pick->is_head ())
1572	return pick->head_ ();	1620	return pick;
1573	}	1621	}
1574		1622
1575	// instead of crashing in the unlikely(?) case, try to return something	1623	// instead of crashing in the unlikely(?) case, try to return something
1576	return archetype::find (shstr_bug);	1624	return archetype::find (shstr_bug);
1577	}	1625	}
…		…
1611	if (distance <= MAX_SOUND_DISTANCE)	1659	if (distance <= MAX_SOUND_DISTANCE)
1612	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1660	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1613	}	1661	}
1614	}	1662	}
1615		1663
		1664	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1665
1616	static void	1666	static void
1617	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1667	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1618	{	1668	{
1619	// clip to map to the left	1669	// clip to map to the left
1620	if (x0 < 0)	1670	if (x0 < 0)
1621	{	1671	{
1622	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1672	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);	1673	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1624		1674
1625	if (x1 < 0) // entirely to the left	1675	if (x1 < 0) // entirely to the left
1626	return;	1676	return;
1627		1677
…		…
1629	}	1679	}
1630		1680
1631	// clip to map to the right	1681	// clip to map to the right
1632	if (x1 > m->width)	1682	if (x1 > m->width)
1633	{	1683	{
1634	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1684	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);	1685	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1636		1686
1637	if (x0 > m->width) // entirely to the right	1687	if (x0 > m->width) // entirely to the right
1638	return;	1688	return;
1639		1689
…		…
1641	}	1691	}
1642		1692
1643	// clip to map above	1693	// clip to map above
1644	if (y0 < 0)	1694	if (y0 < 0)
1645	{	1695	{
1646	if (maptile *tile = m->tile_available (TILE_UP, 1))	1696	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);	1697	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1648		1698
1649	if (y1 < 0) // entirely above	1699	if (y1 < 0) // entirely above
1650	return;	1700	return;
1651		1701
…		…
1653	}	1703	}
1654		1704
1655	// clip to map below	1705	// clip to map below
1656	if (y1 > m->height)	1706	if (y1 > m->height)
1657	{	1707	{
1658	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1708	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);	1709	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1660		1710
1661	if (y0 > m->height) // entirely below	1711	if (y0 > m->height) // entirely below
1662	return;	1712	return;
1663		1713
…		…
1675	r->dx = dx;	1725	r->dx = dx;
1676	r->dy = dy;	1726	r->dy = dy;
1677	}	1727	}
1678		1728
1679	maprect *	1729	maprect *
1680	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1730	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1681	{	1731	{
1682	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1683	buf.clear ();	1732	buf.clear ();
1684		1733
1685	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1734	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1686		1735
1687	// add end marker	1736	// 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.211 by root, Sat May 7 14:13:48 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.211 by root, Sat May 7 14:13:48 2011 UTC