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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.181 by root, Sat Jan 16 13:41:37 2010 UTC vs.
Revision 1.215 by root, Sun May 8 12:40:41 2011 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008,2009,2010 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.
77	/* 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
78	* have already checked this.	78	* have already checked this.
79	*/	79	*/
80	if (OUT_OF_REAL_MAP (m, sx, sy))	80	if (OUT_OF_REAL_MAP (m, sx, sy))
81	{	81	{
82	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");
83	return 1;	83	return 1;
84	}	84	}
85		85
86	mapspace &ms = m->at (sx, sy);	86	mapspace &ms = m->at (sx, sy);
87		87
…		…
90		90
91	/* If space is currently not blocked by anything, no need to	91	/* If space is currently not blocked by anything, no need to
92	* go further. Not true for players - all sorts of special	92	* go further. Not true for players - all sorts of special
93	* things we need to do for players.	93	* things we need to do for players.
94	*/	94	*/
95	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	95	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
96	return 0;	96	return 0;
97		97
98	/* 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
99	* 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
100	* 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
…		…
110	/* 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
111	* 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
112	* true. If we get through the entire stack, that must mean	112	* true. If we get through the entire stack, that must mean
113	* ob is blocking it, so return 0.	113	* ob is blocking it, so return 0.
114	*/	114	*/
115	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	115	for (object *tmp = ms.top; tmp; tmp = tmp->below)
116	{	116	{
117	if (OB_MOVE_BLOCK (ob, tmp))	117	if (OB_MOVE_BLOCK (ob, tmp))
118	{	118	{
119	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))	119	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
120	if (RESULT_INT (0))	120	if (RESULT_INT (0))
…		…
144	return 1; // unconditional block	144	return 1; // unconditional block
145		145
146	} else {	146	} else {
147	// space does not block the ob, directly, but	147	// space does not block the ob, directly, but
148	// anything alive that is not a door still	148	// anything alive that is not a door still
149	// blocks anything but wizards.	149	// blocks anything
150		150
151	if (tmp->flag [FLAG_ALIVE]	151	if (tmp->flag [FLAG_ALIVE]
152	&& tmp->head_ () != ob
153	&& tmp != ob
154	&& tmp->type != DOOR)	152	&& tmp->type != DOOR
		153	&& tmp->head_ () != ob) //TODO: maybe move these check up?
155	return 1;	154	return 1;
156	}	155	}
157	}	156	}
158		157
159	return 0;	158	return 0;
160	}	159	}
161		160
162	/*	161	/*
163	* 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
164	* 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,
165	* just calling get_map_blocked and checking that against movement type	164	* just calling get_map_blocked and checking that against movement type
166	* 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
167	* object and makes sure they can be inserted.	166	* object and makes sure they can be inserted.
168	*	167	*
…		…
312	case KW_arch:	311	case KW_arch:
313	if (object *op = object::read (f, this))	312	if (object *op = object::read (f, this))
314	{	313	{
315	// TODO: why?	314	// TODO: why?
316	if (op->inv)	315	if (op->inv)
		316	{
		317	op->carrying = 0;
317	op->update_weight ();	318	op->update_weight ();
		319	}
318		320
319	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))
320	{	322	{
321	// we insert manually because	323	// we insert manually because
322	// a) its way faster	324	// a) its way faster
…		…
359	}	361	}
360		362
361	void	363	void
362	maptile::activate ()	364	maptile::activate ()
363	{	365	{
364	if (spaces)	366	if (state != MAP_INACTIVE)
		367	return;
		368
365	for (mapspace *ms = spaces + size (); ms-- > spaces; )	369	for (mapspace *ms = spaces + size (); ms-- > spaces; )
366	for (object *op = ms->bot; op; op = op->above)	370	for (object *op = ms->bot; op; op = op->above)
367	op->activate_recursive ();	371	op->activate_recursive ();
		372
		373	state = MAP_ACTIVE;
		374
		375	activate_physics ();
368	}	376	}
369		377
370	void	378	void
371	maptile::deactivate ()	379	maptile::deactivate ()
372	{	380	{
373	if (spaces)	381	if (state != MAP_ACTIVE)
		382	return;
		383
374	for (mapspace *ms = spaces + size (); ms-- > spaces; )	384	for (mapspace *ms = spaces + size (); ms-- > spaces; )
375	for (object *op = ms->bot; op; op = op->above)	385	for (object *op = ms->bot; op; op = op->above)
376	op->deactivate_recursive ();	386	op->deactivate_recursive ();
		387
		388	state = MAP_INACTIVE;
377	}	389	}
378		390
379	bool	391	bool
380	maptile::_save_objects (object_freezer &f, int flags)	392	maptile::_save_objects (object_freezer &f, int flags)
381	{	393	{
…		…
422	return false;	434	return false;
423		435
424	return freezer.save (path);	436	return freezer.save (path);
425	}	437	}
426		438
427	maptile::maptile ()	439	void
		440	maptile::init ()
428	{	441	{
429	in_memory = MAP_SWAPPED;	442	state = MAP_SWAPPED;
430		443
431	/* 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
432	* map archetype. Mimic that behaviour.	445	* map archetype. Mimic that behaviour.
433	*/	446	*/
434	width = 16;	447	width = 16;
435	height = 16;	448	height = 16;
436	timeout = 300;	449	timeout = 300;
437	max_items = MAX_ITEM_PER_ACTION;	450	max_items = MAX_ITEM_PER_ACTION;
438	max_volume = 2000000; // 2m³	451	max_volume = 2000000; // 2m³
439	}
440
441	maptile::maptile (int w, int h)
442	{
443	in_memory = MAP_SWAPPED;
444
445	width = w;
446	height = h;
447	reset_timeout = 0;	452	reset_timeout = 0;
448	timeout = 300;
449	enter_x = 0;	453	enter_x = 0;
450	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;
451		468
452	alloc ();	469	alloc ();
453	}	470	}
454		471
455	/*	472	/*
…		…
555	* the map (or something equivilent) into output_string. */	572	* the map (or something equivilent) into output_string. */
556	static const char *	573	static const char *
557	print_shop_string (maptile *m)	574	print_shop_string (maptile *m)
558	{	575	{
559	static dynbuf_text buf; buf.clear ();	576	static dynbuf_text buf; buf.clear ();
		577	bool first = true;
560		578
561	for (int i = 0; i < m->shopitems[0].index; i++)	579	for (int i = 0; i < m->shopitems[0].index; i++)
562	{	580	{
		581	if (!first)
		582	buf << ';';
		583
		584	first = false;
		585
563	if (m->shopitems[i].typenum)	586	if (m->shopitems[i].typenum)
564	{	587	{
565	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
566	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);
567	else	590	else
568	buf.printf ("%s;", m->shopitems[i].name);	591	buf.printf ("%s", m->shopitems[i].name);
569	}	592	}
570	else	593	else
571	{	594	{
572	if (m->shopitems[i].strength)	595	if (m->shopitems[i].strength)
573	buf.printf ("*:%d;", m->shopitems[i].strength);	596	buf.printf ("*:%d", m->shopitems[i].strength);
574	else	597	else
575	buf.printf ("*");	598	buf.printf ("*");
576	}	599	}
577	}	600	}
578		601
…		…
601	{	624	{
602	case KW_msg:	625	case KW_msg:
603	thawer.get_ml (KW_endmsg, msg);	626	thawer.get_ml (KW_endmsg, msg);
604	break;	627	break;
605		628
606	case KW_lore: // CF+ extension	629	case KW_lore: // deliantra extension
607	thawer.get_ml (KW_endlore, maplore);	630	thawer.get_ml (KW_endlore, maplore);
608	break;	631	break;
609		632
610	case KW_maplore:	633	case KW_maplore:
611	thawer.get_ml (KW_endmaplore, maplore);	634	thawer.get_ml (KW_endmaplore, maplore);
…		…
634	case KW_per_player: thawer.get (per_player); break;	657	case KW_per_player: thawer.get (per_player); break;
635	case KW_per_party: thawer.get (per_party); break;	658	case KW_per_party: thawer.get (per_party); break;
636	case KW_no_reset: thawer.get (no_reset); break;	659	case KW_no_reset: thawer.get (no_reset); break;
637	case KW_no_drop: thawer.get (no_drop); break;	660	case KW_no_drop: thawer.get (no_drop); break;
638		661
639	case KW_region: default_region = region::find (thawer.get_str ()); break;	662	case KW_region: thawer.get (default_region); break;
640	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
641		664
642	// old names new names	665	// old names new names
643	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;
644	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;
…		…
648	case KW_value: case KW_swap_time: thawer.get (timeout); break;	671	case KW_value: case KW_swap_time: thawer.get (timeout); break;
649	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;	672	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
650	case KW_invisible: case KW_darkness: thawer.get (darkness); break;	673	case KW_invisible: case KW_darkness: thawer.get (darkness); break;
651	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;	674	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
652		675
653	case KW_tile_path_1: thawer.get (tile_path [0]); break;	676	case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
654	case KW_tile_path_2: thawer.get (tile_path [1]); break;	677	case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
655	case KW_tile_path_3: thawer.get (tile_path [2]); break;	678	case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
656	case KW_tile_path_4: thawer.get (tile_path [3]); break;	679	case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
		680	case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
		681	case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
657		682
658	case KW_ERROR:	683	case KW_ERROR:
659	set_key_text (thawer.kw_str, thawer.value);	684	set_key_text (thawer.kw_str, thawer.value);
660	break;	685	break;
661		686
662	case KW_end:	687	case KW_end:
663	thawer.next ();	688	thawer.next ();
664	return true;	689	return true;
665		690
666	default:	691	default:
667	if (!thawer.parse_error ("map", 0))	692	if (!thawer.parse_error ("map"))
668	return false;	693	return false;
669	break;	694	break;
670	}	695	}
671		696
672	thawer.next ();	697	thawer.next ();
…		…
690	int unique = 0;	715	int unique = 0;
691	for (object *op = spaces [i].bot; op; )	716	for (object *op = spaces [i].bot; op; )
692	{	717	{
693	object *above = op->above;	718	object *above = op->above;
694		719
695	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	720	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
696	unique = 1;	721	unique = 1;
697		722
698	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	723	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
699	op->destroy ();	724	op->destroy ();
700		725
701	op = above;	726	op = above;
702	}	727	}
703	}	728	}
…		…
740	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);	765	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
741		766
742	MAP_OUT (per_player);	767	MAP_OUT (per_player);
743	MAP_OUT (per_party);	768	MAP_OUT (per_party);
744		769
745	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	770	if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
746	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	771	if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
747	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	772	if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
748	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	773	if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
		774	if (tile_path [TILE_UP ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP ]);
		775	if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
749		776
750	freezer.put (this);	777	freezer.put (this);
751	freezer.put (KW(end));	778	freezer.put (KW(end));
752		779
753	return true;	780	return true;
…		…
810	msg = 0;	837	msg = 0;
811	maplore = 0;	838	maplore = 0;
812	shoprace = 0;	839	shoprace = 0;
813	delete [] shopitems, shopitems = 0;	840	delete [] shopitems, shopitems = 0;
814		841
815	for (int i = 0; i < 4; i++)	842	for (int i = 0; i < array_length (tile_path); i++)
816	tile_path [i] = 0;	843	tile_path [i] = 0;
817	}	844	}
818		845
819	maptile::~maptile ()	846	maptile::~maptile ()
820	{	847	{
…		…
827	/* 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
828	* are pointing at this one for tiling information. Since	855	* are pointing at this one for tiling information. Since
829	* 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
830	* maps this map tiles with and clears those.	857	* maps this map tiles with and clears those.
831	*/	858	*/
832	for (int i = 0; i < 4; i++)	859	for (int i = 0; i < array_length (tile_path); i++)
833	if (tile_map[i] == m)	860	if (tile_map[i] == m)
834	tile_map[i] = 0;	861	tile_map[i] = 0;
835	}	862	}
836		863
837	void	864	void
…		…
854	for (object above, op = ms->bot; op; op = above)	881	for (object above, op = ms->bot; op; op = above)
855	{	882	{
856	above = op->above;	883	above = op->above;
857		884
858	// do not decay anything above unique floor tiles (yet :)	885	// do not decay anything above unique floor tiles (yet :)
859	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	886	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
860	break;	887	break;
861		888
862	bool destroy = 0;	889	bool destroy = 0;
863		890
864	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	891	if (op->flag [FLAG_IS_FLOOR]
865	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)	892	\|\| op->flag [FLAG_OBJ_ORIGINAL]
866	\|\| QUERY_FLAG (op, FLAG_UNIQUE)	893	\|\| op->flag [FLAG_UNIQUE]
867	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)	894	\|\| op->flag [FLAG_OVERLAY_FLOOR]
868	\|\| QUERY_FLAG (op, FLAG_UNPAID)	895	\|\| op->flag [FLAG_UNPAID]
869	\|\| op->is_alive ())	896	\|\| op->is_alive ())
870	; // do not decay	897	; // do not decay
871	else if (op->is_weapon ())	898	else if (op->is_weapon ())
872	{	899	{
873	op->stats.dam--;	900	op->stats.dam--;
…		…
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	// set lower map transparent floor flag if applicable
		1201	if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
		1202	{
		1203	floor->set_anim_frame (0);
		1204
		1205	if (maptile *m = floor->map->tile_map [TILE_DOWN])
		1206	{
		1207	mapspace &ms = m->at (floor->x, floor->y);
		1208	ms.update ();
		1209
		1210	if (object *floor2 = ms.faces_obj [2])
		1211	if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
		1212	{
		1213	floor->set_anim_frame (1);
		1214	top = floor;
		1215	middle = ms.faces_obj [0];
		1216	floor = floor2;
		1217	}
		1218
		1219	ms.pflags \|= PF_VIS_UP;
		1220	}
		1221	}
		1222
1173	#if 0	1223	#if 0
1174	faces_obj [0] = top;	1224	faces_obj [0] = top;
1175	faces_obj [1] = middle;	1225	faces_obj [1] = middle;
1176	faces_obj [2] = floor;	1226	faces_obj [2] = floor;
1177	#endif	1227	#endif
1178	}	1228	}
1179		1229
		1230	void
		1231	mapspace::update_up ()
		1232	{
		1233	// invalidate up
		1234	if (!(pflags & PF_VIS_UP))
		1235	return;
		1236
		1237	pflags &= ~PF_VIS_UP;
		1238
		1239	if (bot)
		1240	if (maptile *m = bot->map->tile_map [TILE_UP])
		1241	m->at (bot->x, bot->y).invalidate ();
		1242	}
		1243
1180	maptile *	1244	maptile *
1181	maptile::tile_available (int dir, bool load)	1245	maptile::tile_available (int dir, bool load)
1182	{	1246	{
		1247	// map is there and we don't need to load it OR it's loaded => return what we have
		1248	if (tile_map [dir] && (!load \|\| tile_map [dir]->linkable ()))
		1249	return tile_map [dir];
		1250
1183	if (tile_path[dir])	1251	if (tile_path [dir])
1184	{	1252	{
1185	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1253	// well, try to locate it then, if possible - maybe it's there already
		1254	// this is the ONLY place in the server that links maps with each other,
		1255	// so any kind of inter-map stuff has to be initiated here.
		1256	if (maptile *m = find_async (tile_path [dir], this, load))
		1257	{
		1258	bool mismatch = false;
		1259
		1260	if (dir == TILE_NORTH \|\| dir == TILE_SOUTH \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1261	if (width != m->width)
		1262	mismatch = true;
		1263
		1264	if (dir == TILE_EAST \|\| dir == TILE_WEST \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1265	if (height != m->height)
		1266	mismatch = true;
		1267
		1268	if (mismatch)
		1269	{
		1270	LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
		1271	dir, &path, &m->path);
		1272	m = 0;
		1273	}
		1274
		1275	// as an optimisation, link us against the other map if the other map
		1276	// has us as neighbour, which is very common, but not guaranteed.
		1277	int dir2 = REVERSE_TILE_DIR (dir);
		1278
		1279	if (m->tile_path [dir2] == path)
		1280	m->tile_map [dir2] = this;
		1281
1186	return tile_map[dir];	1282	return tile_map [dir] = m;
1187		1283	}
1188	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1189	return tile_map[dir];
1190	}	1284	}
1191		1285
1192	return 0;	1286	return 0;
1193	}	1287	}
1194		1288
…		…
1210	if (!m)	1304	if (!m)
1211	return 0;	1305	return 0;
1212		1306
1213	if (x < 0)	1307	if (x < 0)
1214	{	1308	{
1215	if (!m->tile_available (3))	1309	if (!m->tile_available (TILE_WEST))
1216	return 1;	1310	return 1;
1217		1311
1218	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1312	return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1219	}	1313	}
1220		1314
1221	if (x >= m->width)	1315	if (x >= m->width)
1222	{	1316	{
1223	if (!m->tile_available (1))	1317	if (!m->tile_available (TILE_EAST))
1224	return 1;	1318	return 1;
1225		1319
1226	return out_of_map (m->tile_map[1], x - m->width, y);	1320	return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1227	}	1321	}
1228		1322
1229	if (y < 0)	1323	if (y < 0)
1230	{	1324	{
1231	if (!m->tile_available (0))	1325	if (!m->tile_available (TILE_NORTH))
1232	return 1;	1326	return 1;
1233		1327
1234	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1328	return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1235	}	1329	}
1236		1330
1237	if (y >= m->height)	1331	if (y >= m->height)
1238	{	1332	{
1239	if (!m->tile_available (2))	1333	if (!m->tile_available (TILE_SOUTH))
1240	return 1;	1334	return 1;
1241		1335
1242	return out_of_map (m->tile_map[2], x, y - m->height);	1336	return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1243	}	1337	}
1244		1338
1245	/* Simple case - coordinates are within this local	1339	/* Simple case - coordinates are within this local
1246	* map.	1340	* map.
1247	*/	1341	*/
…		…
1259	maptile *	1353	maptile *
1260	maptile::xy_find (sint16 &x, sint16 &y)	1354	maptile::xy_find (sint16 &x, sint16 &y)
1261	{	1355	{
1262	if (x < 0)	1356	if (x < 0)
1263	{	1357	{
1264	if (!tile_available (3))	1358	if (!tile_available (TILE_WEST))
1265	return 0;	1359	return 0;
1266		1360
1267	x += tile_map[3]->width;	1361	x += tile_map [TILE_WEST]->width;
1268	return tile_map[3]->xy_find (x, y);	1362	return tile_map [TILE_WEST]->xy_find (x, y);
1269	}	1363	}
1270		1364
1271	if (x >= width)	1365	if (x >= width)
1272	{	1366	{
1273	if (!tile_available (1))	1367	if (!tile_available (TILE_EAST))
1274	return 0;	1368	return 0;
1275		1369
1276	x -= width;	1370	x -= width;
1277	return tile_map[1]->xy_find (x, y);	1371	return tile_map [TILE_EAST]->xy_find (x, y);
1278	}	1372	}
1279		1373
1280	if (y < 0)	1374	if (y < 0)
1281	{	1375	{
1282	if (!tile_available (0))	1376	if (!tile_available (TILE_NORTH))
1283	return 0;	1377	return 0;
1284		1378
1285	y += tile_map[0]->height;	1379	y += tile_map [TILE_NORTH]->height;
1286	return tile_map[0]->xy_find (x, y);	1380	return tile_map [TILE_NORTH]->xy_find (x, y);
1287	}	1381	}
1288		1382
1289	if (y >= height)	1383	if (y >= height)
1290	{	1384	{
1291	if (!tile_available (2))	1385	if (!tile_available (TILE_SOUTH))
1292	return 0;	1386	return 0;
1293		1387
1294	y -= height;	1388	y -= height;
1295	return tile_map[2]->xy_find (x, y);	1389	return tile_map [TILE_SOUTH]->xy_find (x, y);
1296	}	1390	}
1297		1391
1298	/* Simple case - coordinates are within this local	1392	/* Simple case - coordinates are within this local
1299	* map.	1393	* map.
1300	*/	1394	*/
…		…
1304	/**	1398	/**
1305	* Return whether map2 is adjacent to map1. If so, store the distance from	1399	* Return whether map2 is adjacent to map1. If so, store the distance from
1306	* map1 to map2 in dx/dy.	1400	* map1 to map2 in dx/dy.
1307	*/	1401	*/
1308	int	1402	int
1309	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1403	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1310	{	1404	{
1311	if (!map1 \|\| !map2)	1405	if (!map1 \|\| !map2)
1312	return 0;	1406	return 0;
1313		1407
1314	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1408	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1316	if (map1 == map2)	1410	if (map1 == map2)
1317	{	1411	{
1318	*dx = 0;	1412	*dx = 0;
1319	*dy = 0;	1413	*dy = 0;
1320	}	1414	}
1321	else if (map1->tile_map[0] == map2)	1415	else if (map1->tile_available (TILE_NORTH, false) == map2)
1322	{ /* up */	1416	{
1323	*dx = 0;	1417	*dx = 0;
1324	*dy = -map2->height;	1418	*dy = -map2->height;
1325	}	1419	}
1326	else if (map1->tile_map[1] == map2)	1420	else if (map1->tile_available (TILE_EAST , false) == map2)
1327	{ /* right */	1421	{
1328	*dx = map1->width;	1422	*dx = map1->width;
1329	*dy = 0;	1423	*dy = 0;
1330	}	1424	}
1331	else if (map1->tile_map[2] == map2)	1425	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1332	{ /* down */	1426	{
1333	*dx = 0;	1427	*dx = 0;
1334	*dy = map1->height;	1428	*dy = map1->height;
1335	}	1429	}
1336	else if (map1->tile_map[3] == map2)	1430	else if (map1->tile_available (TILE_WEST , false) == map2)
1337	{ /* left */	1431	{
1338	*dx = -map2->width;	1432	*dx = -map2->width;
1339	*dy = 0;	1433	*dy = 0;
1340	}	1434	}
1341	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1435	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1342	{ /* up right */	1436	{ /* up right */
1343	*dx = map1->tile_map[0]->width;	1437	*dx = +map1->tile_map[TILE_NORTH]->width;
1344	*dy = -map1->tile_map[0]->height;	1438	*dy = -map1->tile_map[TILE_NORTH]->height;
1345	}	1439	}
1346	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1440	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1347	{ /* up left */	1441	{ /* up left */
1348	*dx = -map2->width;	1442	*dx = -map2->width;
1349	*dy = -map1->tile_map[0]->height;	1443	*dy = -map1->tile_map[TILE_NORTH]->height;
1350	}	1444	}
1351	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1445	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1352	{ /* right up */	1446	{ /* right up */
1353	*dx = map1->width;	1447	*dx = +map1->width;
1354	*dy = -map2->height;	1448	*dy = -map2->height;
1355	}	1449	}
1356	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1450	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1357	{ /* right down */	1451	{ /* right down */
1358	*dx = map1->width;	1452	*dx = +map1->width;
1359	*dy = map1->tile_map[1]->height;	1453	*dy = +map1->tile_map[TILE_EAST]->height;
1360	}	1454	}
1361	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1455	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1362	{ /* down right */	1456	{ /* down right */
1363	*dx = map1->tile_map[2]->width;	1457	*dx = +map1->tile_map[TILE_SOUTH]->width;
1364	*dy = map1->height;	1458	*dy = +map1->height;
1365	}	1459	}
1366	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1460	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1367	{ /* down left */	1461	{ /* down left */
1368	*dx = -map2->width;	1462	*dx = -map2->width;
1369	*dy = map1->height;	1463	*dy = +map1->height;
1370	}	1464	}
1371	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1465	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1372	{ /* left up */	1466	{ /* left up */
1373	*dx = -map1->tile_map[3]->width;	1467	*dx = -map1->tile_map[TILE_WEST]->width;
1374	*dy = -map2->height;	1468	*dy = -map2->height;
1375	}	1469	}
1376	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1470	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1377	{ /* left down */	1471	{ /* left down */
1378	*dx = -map1->tile_map[3]->width;	1472	*dx = -map1->tile_map[TILE_WEST]->width;
1379	*dy = map1->tile_map[3]->height;	1473	*dy = +map1->tile_map[TILE_WEST]->height;
1380	}	1474	}
1381	else	1475	else
1382	return 0;	1476	return 0;
1383		1477
1384	return 1;	1478	return 1;
…		…
1420	*	1514	*
1421	* currently, the only flag supported (0x1) is don't translate for	1515	* currently, the only flag supported (0x1) is don't translate for
1422	* closest body part of 'op1'	1516	* closest body part of 'op1'
1423	*/	1517	*/
1424	void	1518	void
1425	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1519	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1426	{	1520	{
1427	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1521	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1428	{	1522	{
1429	/* be conservative and fill in _some_ data */	1523	/* be conservative and fill in _some_ data */
1430	retval->distance = 10000;	1524	retval->distance = 10000;
1431	retval->distance_x = 10000;	1525	retval->distance_x = 10000;
1432	retval->distance_y = 10000;	1526	retval->distance_y = 10000;
1433	retval->direction = 0;	1527	retval->direction = 0;
1434	retval->part = 0;	1528	retval->part = 0;
1435	}	1529	}
1436	else	1530	else
1437	{	1531	{
1438	object *best;
1439
1440	retval->distance_x += op2->x - op1->x;	1532	retval->distance_x += op2->x - op1->x;
1441	retval->distance_y += op2->y - op1->y;	1533	retval->distance_y += op2->y - op1->y;
1442		1534
1443	best = op1;	1535	object *best = op1;
		1536
1444	/* If this is multipart, find the closest part now */	1537	/* If this is multipart, find the closest part now */
1445	if (!(flags & 0x1) && op1->more)	1538	if (!(flags & 1) && op1->more)
1446	{	1539	{
1447	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1540	int best_distance = idistance (retval->distance_x, retval->distance_y);
1448		1541
1449	/* we just take the offset of the piece to head to figure	1542	/* we just take the offset of the piece to head to figure
1450	* distance instead of doing all that work above again	1543	* distance instead of doing all that work above again
1451	* since the distance fields we set above are positive in the	1544	* since the distance fields we set above are positive in the
1452	* same axis as is used for multipart objects, the simply arithmetic	1545	* same axis as is used for multipart objects, the simply arithmetic
1453	* below works.	1546	* below works.
1454	*/	1547	*/
1455	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1548	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1456	{	1549	{
1457	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1550	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1458	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1551
1459	if (tmpi < best_distance)	1552	if (tmpi < best_distance)
1460	{	1553	{
1461	best_distance = tmpi;	1554	best_distance = tmpi;
1462	best = tmp;	1555	best = tmp;
1463	}	1556	}
1464	}	1557	}
1465		1558
1466	if (best != op1)	1559	if (best != op1)
1467	{	1560	{
1468	retval->distance_x += op1->x - best->x;	1561	retval->distance_x += op1->x - best->x;
1469	retval->distance_y += op1->y - best->y;	1562	retval->distance_y += op1->y - best->y;
1470	}	1563	}
1471	}	1564	}
1472		1565
1473	retval->part = best;	1566	retval->part = best;
1474	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1567	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1475	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1568	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1476	}	1569	}
1477	}	1570	}
1478		1571
1479	/* this is basically the same as get_rangevector above, but instead of	1572	/* this is basically the same as get_rangevector above, but instead of
1480	* the first parameter being an object, it instead is the map	1573	* 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	1578	* 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	1579	* for something in the future. Also, since no object is pasted, the best
1487	* field of the rv_vector is set to NULL.	1580	* field of the rv_vector is set to NULL.
1488	*/	1581	*/
1489	void	1582	void
1490	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1583	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1491	{	1584	{
1492	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1585	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1493	{	1586	{
1494	/* be conservative and fill in _some_ data */	1587	/* be conservative and fill in _some_ data */
1495	retval->distance = 100000;	1588	retval->distance = 100000;
1496	retval->distance_x = 32767;	1589	retval->distance_x = 32767;
1497	retval->distance_y = 32767;	1590	retval->distance_y = 32767;
1498	retval->direction = 0;	1591	retval->direction = 0;
1499	retval->part = 0;	1592	retval->part = 0;
1500	}	1593	}
1501	else	1594	else
1502	{	1595	{
1503	retval->distance_x += op2->x - x;	1596	retval->distance_x += op2->x - x;
1504	retval->distance_y += op2->y - y;	1597	retval->distance_y += op2->y - y;
1505		1598
1506	retval->part = 0;	1599	retval->part = 0;
1507	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1600	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1508	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1601	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1509	}	1602	}
1510	}	1603	}
1511		1604
1512	/* Returns true of op1 and op2 are effectively on the same map	1605	/* Returns true of op1 and op2 are effectively on the same map
1513	* (as related to map tiling). Note that this looks for a path from	1606	* (as related to map tiling). Note that this looks for a path from
…		…
1563	*/	1656	*/
1564	for (int i = 1000; --i;)	1657	for (int i = 1000; --i;)
1565	{	1658	{
1566	object *pick = at (gen (width), gen (height)).bot;	1659	object *pick = at (gen (width), gen (height)).bot;
1567		1660
1568	// do not prefer big monsters just because they are big.	1661	// must be head: do not prefer big monsters just because they are big.
1569	if (pick && pick->is_head ())	1662	if (pick && pick->is_head ())
1570	return pick->head_ ();	1663	return pick;
1571	}	1664	}
1572		1665
1573	// instead of crashing in the unlikely(?) case, try to return something	1666	// instead of crashing in the unlikely(?) case, try to return something
1574	return archetype::find (shstr_bug);	1667	return archetype::find (shstr_bug);
1575	}	1668	}
…		…
1609	if (distance <= MAX_SOUND_DISTANCE)	1702	if (distance <= MAX_SOUND_DISTANCE)
1610	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1703	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1611	}	1704	}
1612	}	1705	}
1613		1706
		1707	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1708
1614	static void	1709	static void
1615	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1710	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1616	{	1711	{
1617	// clip to map to the left	1712	// clip to map to the left
1618	if (x0 < 0)	1713	if (x0 < 0)
1619	{	1714	{
1620	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1715	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);	1716	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1622		1717
1623	if (x1 < 0) // entirely to the left	1718	if (x1 < 0) // entirely to the left
1624	return;	1719	return;
1625		1720
…		…
1627	}	1722	}
1628		1723
1629	// clip to map to the right	1724	// clip to map to the right
1630	if (x1 > m->width)	1725	if (x1 > m->width)
1631	{	1726	{
1632	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1727	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);	1728	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1634		1729
1635	if (x0 > m->width) // entirely to the right	1730	if (x0 > m->width) // entirely to the right
1636	return;	1731	return;
1637		1732
…		…
1639	}	1734	}
1640		1735
1641	// clip to map above	1736	// clip to map above
1642	if (y0 < 0)	1737	if (y0 < 0)
1643	{	1738	{
1644	if (maptile *tile = m->tile_available (TILE_UP, 1))	1739	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);	1740	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1646		1741
1647	if (y1 < 0) // entirely above	1742	if (y1 < 0) // entirely above
1648	return;	1743	return;
1649		1744
…		…
1651	}	1746	}
1652		1747
1653	// clip to map below	1748	// clip to map below
1654	if (y1 > m->height)	1749	if (y1 > m->height)
1655	{	1750	{
1656	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1751	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);	1752	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1658		1753
1659	if (y0 > m->height) // entirely below	1754	if (y0 > m->height) // entirely below
1660	return;	1755	return;
1661		1756
…		…
1673	r->dx = dx;	1768	r->dx = dx;
1674	r->dy = dy;	1769	r->dy = dy;
1675	}	1770	}
1676		1771
1677	maprect *	1772	maprect *
1678	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1773	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1679	{	1774	{
1680	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1681	buf.clear ();	1775	buf.clear ();
1682		1776
1683	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1777	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1684		1778
1685	// add end marker	1779	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.181 by root, Sat Jan 16 13:41:37 2010 UTC vs. Revision 1.215 by root, Sun May 8 12:40:41 2011 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.181 by root, Sat Jan 16 13:41:37 2010 UTC vs.
Revision 1.215 by root, Sun May 8 12:40:41 2011 UTC