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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.180 by root, Thu Jan 14 23:46:14 2010 UTC vs.
Revision 1.213 by root, Sat May 7 20:03:27 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
		153	&& tmp->head_ () != ob) //TODO: maybe move these check up?
156	return 1;	154	return 1;
157	}	155	}
158	}	156	}
159		157
160	return 0;	158	return 0;
161	}	159	}
162		160
163	/*	161	/*
164	* 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
165	* 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,
166	* just calling get_map_blocked and checking that against movement type	164	* just calling get_map_blocked and checking that against movement type
167	* 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
168	* object and makes sure they can be inserted.	166	* object and makes sure they can be inserted.
169	*	167	*
…		…
313	case KW_arch:	311	case KW_arch:
314	if (object *op = object::read (f, this))	312	if (object *op = object::read (f, this))
315	{	313	{
316	// TODO: why?	314	// TODO: why?
317	if (op->inv)	315	if (op->inv)
		316	{
		317	op->carrying = 0;
318	op->update_weight ();	318	op->update_weight ();
		319	}
319		320
320	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))
321	{	322	{
322	// we insert manually because	323	// we insert manually because
323	// a) its way faster	324	// a) its way faster
…		…
360	}	361	}
361		362
362	void	363	void
363	maptile::activate ()	364	maptile::activate ()
364	{	365	{
365	if (spaces)	366	if (state != MAP_INACTIVE)
		367	return;
		368
366	for (mapspace *ms = spaces + size (); ms-- > spaces; )	369	for (mapspace *ms = spaces + size (); ms-- > spaces; )
367	for (object *op = ms->bot; op; op = op->above)	370	for (object *op = ms->bot; op; op = op->above)
368	op->activate_recursive ();	371	op->activate_recursive ();
		372
		373	state = MAP_ACTIVE;
		374
		375	activate_physics ();
369	}	376	}
370		377
371	void	378	void
372	maptile::deactivate ()	379	maptile::deactivate ()
373	{	380	{
374	if (spaces)	381	if (state != MAP_ACTIVE)
		382	return;
		383
375	for (mapspace *ms = spaces + size (); ms-- > spaces; )	384	for (mapspace *ms = spaces + size (); ms-- > spaces; )
376	for (object *op = ms->bot; op; op = op->above)	385	for (object *op = ms->bot; op; op = op->above)
377	op->deactivate_recursive ();	386	op->deactivate_recursive ();
		387
		388	state = MAP_INACTIVE;
378	}	389	}
379		390
380	bool	391	bool
381	maptile::_save_objects (object_freezer &f, int flags)	392	maptile::_save_objects (object_freezer &f, int flags)
382	{	393	{
…		…
423	return false;	434	return false;
424		435
425	return freezer.save (path);	436	return freezer.save (path);
426	}	437	}
427		438
428	maptile::maptile ()	439	void
		440	maptile::init ()
429	{	441	{
430	in_memory = MAP_SWAPPED;	442	state = MAP_SWAPPED;
431		443
432	/* 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
433	* map archetype. Mimic that behaviour.	445	* map archetype. Mimic that behaviour.
434	*/	446	*/
435	width = 16;	447	width = 16;
436	height = 16;	448	height = 16;
437	timeout = 300;	449	timeout = 300;
438	max_items = MAX_ITEM_PER_ACTION;	450	max_items = MAX_ITEM_PER_ACTION;
439	max_volume = 2000000; // 2m³	451	max_volume = 2000000; // 2m³
440	}
441
442	maptile::maptile (int w, int h)
443	{
444	in_memory = MAP_SWAPPED;
445
446	width = w;
447	height = h;
448	reset_timeout = 0;	452	reset_timeout = 0;
449	timeout = 300;
450	enter_x = 0;	453	enter_x = 0;
451	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;
452		468
453	alloc ();	469	alloc ();
454	}	470	}
455		471
456	/*	472	/*
…		…
556	* the map (or something equivilent) into output_string. */	572	* the map (or something equivilent) into output_string. */
557	static const char *	573	static const char *
558	print_shop_string (maptile *m)	574	print_shop_string (maptile *m)
559	{	575	{
560	static dynbuf_text buf; buf.clear ();	576	static dynbuf_text buf; buf.clear ();
		577	bool first = true;
561		578
562	for (int i = 0; i < m->shopitems[0].index; i++)	579	for (int i = 0; i < m->shopitems[0].index; i++)
563	{	580	{
		581	if (!first)
		582	buf << ';';
		583
		584	first = false;
		585
564	if (m->shopitems[i].typenum)	586	if (m->shopitems[i].typenum)
565	{	587	{
566	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
567	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);
568	else	590	else
569	buf.printf ("%s;", m->shopitems[i].name);	591	buf.printf ("%s", m->shopitems[i].name);
570	}	592	}
571	else	593	else
572	{	594	{
573	if (m->shopitems[i].strength)	595	if (m->shopitems[i].strength)
574	buf.printf ("*:%d;", m->shopitems[i].strength);	596	buf.printf ("*:%d", m->shopitems[i].strength);
575	else	597	else
576	buf.printf ("*");	598	buf.printf ("*");
577	}	599	}
578	}	600	}
579		601
…		…
602	{	624	{
603	case KW_msg:	625	case KW_msg:
604	thawer.get_ml (KW_endmsg, msg);	626	thawer.get_ml (KW_endmsg, msg);
605	break;	627	break;
606		628
607	case KW_lore: // CF+ extension	629	case KW_lore: // deliantra extension
608	thawer.get_ml (KW_endlore, maplore);	630	thawer.get_ml (KW_endlore, maplore);
609	break;	631	break;
610		632
611	case KW_maplore:	633	case KW_maplore:
612	thawer.get_ml (KW_endmaplore, maplore);	634	thawer.get_ml (KW_endmaplore, maplore);
…		…
635	case KW_per_player: thawer.get (per_player); break;	657	case KW_per_player: thawer.get (per_player); break;
636	case KW_per_party: thawer.get (per_party); break;	658	case KW_per_party: thawer.get (per_party); break;
637	case KW_no_reset: thawer.get (no_reset); break;	659	case KW_no_reset: thawer.get (no_reset); break;
638	case KW_no_drop: thawer.get (no_drop); break;	660	case KW_no_drop: thawer.get (no_drop); break;
639		661
640	case KW_region: default_region = region::find (thawer.get_str ()); break;	662	case KW_region: thawer.get (default_region); break;
641	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
642		664
643	// old names new names	665	// old names new names
644	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;
645	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;
…		…
649	case KW_value: case KW_swap_time: thawer.get (timeout); break;	671	case KW_value: case KW_swap_time: thawer.get (timeout); break;
650	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;
651	case KW_invisible: case KW_darkness: thawer.get (darkness); break;	673	case KW_invisible: case KW_darkness: thawer.get (darkness); break;
652	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;
653		675
654	case KW_tile_path_1: thawer.get (tile_path [0]); break;	676	case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
655	case KW_tile_path_2: thawer.get (tile_path [1]); break;	677	case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
656	case KW_tile_path_3: thawer.get (tile_path [2]); break;	678	case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
657	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;
658		682
659	case KW_ERROR:	683	case KW_ERROR:
660	set_key_text (thawer.kw_str, thawer.value);	684	set_key_text (thawer.kw_str, thawer.value);
661	break;	685	break;
662		686
663	case KW_end:	687	case KW_end:
664	thawer.next ();	688	thawer.next ();
665	return true;	689	return true;
666		690
667	default:	691	default:
668	if (!thawer.parse_error ("map", 0))	692	if (!thawer.parse_error ("map"))
669	return false;	693	return false;
670	break;	694	break;
671	}	695	}
672		696
673	thawer.next ();	697	thawer.next ();
…		…
691	int unique = 0;	715	int unique = 0;
692	for (object *op = spaces [i].bot; op; )	716	for (object *op = spaces [i].bot; op; )
693	{	717	{
694	object *above = op->above;	718	object *above = op->above;
695		719
696	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	720	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
697	unique = 1;	721	unique = 1;
698		722
699	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	723	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
700	op->destroy ();	724	op->destroy ();
701		725
702	op = above;	726	op = above;
703	}	727	}
704	}	728	}
…		…
741	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);	765	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
742		766
743	MAP_OUT (per_player);	767	MAP_OUT (per_player);
744	MAP_OUT (per_party);	768	MAP_OUT (per_party);
745		769
746	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]);
747	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 ]);
748	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]);
749	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 ]);
750		776
751	freezer.put (this);	777	freezer.put (this);
752	freezer.put (KW(end));	778	freezer.put (KW(end));
753		779
754	return true;	780	return true;
…		…
811	msg = 0;	837	msg = 0;
812	maplore = 0;	838	maplore = 0;
813	shoprace = 0;	839	shoprace = 0;
814	delete [] shopitems, shopitems = 0;	840	delete [] shopitems, shopitems = 0;
815		841
816	for (int i = 0; i < 4; i++)	842	for (int i = 0; i < array_length (tile_path); i++)
817	tile_path [i] = 0;	843	tile_path [i] = 0;
818	}	844	}
819		845
820	maptile::~maptile ()	846	maptile::~maptile ()
821	{	847	{
…		…
828	/* 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
829	* are pointing at this one for tiling information. Since	855	* are pointing at this one for tiling information. Since
830	* 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
831	* maps this map tiles with and clears those.	857	* maps this map tiles with and clears those.
832	*/	858	*/
833	for (int i = 0; i < 4; i++)	859	for (int i = 0; i < array_length (tile_path); i++)
834	if (tile_map[i] == m)	860	if (tile_map[i] == m)
835	tile_map[i] = 0;	861	tile_map[i] = 0;
836	}	862	}
837		863
838	void	864	void
…		…
855	for (object above, op = ms->bot; op; op = above)	881	for (object above, op = ms->bot; op; op = above)
856	{	882	{
857	above = op->above;	883	above = op->above;
858		884
859	// do not decay anything above unique floor tiles (yet :)	885	// do not decay anything above unique floor tiles (yet :)
860	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	886	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
861	break;	887	break;
862		888
863	bool destroy = 0;	889	bool destroy = 0;
864		890
865	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	891	if (op->flag [FLAG_IS_FLOOR]
866	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)	892	\|\| op->flag [FLAG_OBJ_ORIGINAL]
867	\|\| QUERY_FLAG (op, FLAG_UNIQUE)	893	\|\| op->flag [FLAG_UNIQUE]
868	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)	894	\|\| op->flag [FLAG_OVERLAY_FLOOR]
869	\|\| QUERY_FLAG (op, FLAG_UNPAID)	895	\|\| op->flag [FLAG_UNPAID]
870	\|\| op->is_alive ())	896	\|\| op->is_alive ())
871	; // do not decay	897	; // do not decay
872	else if (op->is_weapon ())	898	else if (op->is_weapon ())
873	{	899	{
874	op->stats.dam--;	900	op->stats.dam--;
…		…
930	sint64 total_exp = 0;	956	sint64 total_exp = 0;
931		957
932	for (mapspace *ms = spaces + size (); ms-- > spaces; )	958	for (mapspace *ms = spaces + size (); ms-- > spaces; )
933	for (object *op = ms->bot; op; op = op->above)	959	for (object *op = ms->bot; op; op = op->above)
934	{	960	{
935	if (QUERY_FLAG (op, FLAG_MONSTER))	961	if (op->flag [FLAG_MONSTER])
936	{	962	{
937	total_exp += op->stats.exp;	963	total_exp += op->stats.exp;
938	monster_cnt++;	964	monster_cnt++;
939	}	965	}
940		966
941	if (QUERY_FLAG (op, FLAG_GENERATOR))	967	if (op->flag [FLAG_GENERATOR])
942	{	968	{
943	total_exp += op->stats.exp;	969	total_exp += op->stats.exp;
944		970
945	if (archetype *at = op->other_arch)	971	if (archetype *at = op->other_arch)
946	{	972	{
…		…
1128	*/	1154	*/
1129		1155
1130	for (object *tmp = last; tmp; tmp = tmp->below)	1156	for (object *tmp = last; tmp; tmp = tmp->below)
1131	{	1157	{
1132	/* 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 */
1133	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1159	if (tmp->flag [FLAG_IS_FLOOR])
1134	break;	1160	break;
1135		1161
1136	/* If two top faces are already set, quit processing */	1162	/* If two top faces are already set, quit processing */
1137	if (top && middle)	1163	if (top && middle)
1138	break;	1164	break;
…		…
1169	middle = 0;	1195	middle = 0;
1170		1196
1171	if (top == middle)	1197	if (top == middle)
1172	middle = 0;	1198	middle = 0;
1173		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
1174	#if 0	1223	#if 0
1175	faces_obj [0] = top;	1224	faces_obj [0] = top;
1176	faces_obj [1] = middle;	1225	faces_obj [1] = middle;
1177	faces_obj [2] = floor;	1226	faces_obj [2] = floor;
1178	#endif	1227	#endif
1179	}	1228	}
1180		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
1181	maptile *	1244	maptile *
1182	maptile::tile_available (int dir, bool load)	1245	maptile::tile_available (int dir, bool load)
1183	{	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
1184	if (tile_path[dir])	1251	if (tile_path [dir])
1185	{	1252	{
1186	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	if (maptile *m = find_async (tile_path [dir], this, load))
		1255	{
		1256	bool match = true;
		1257
		1258	if (dir == TILE_NORTH \|\| dir == TILE_SOUTH \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1259	if (width != m->width)
		1260	match = false;
		1261
		1262	if (dir == TILE_EAST \|\| dir == TILE_WEST \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1263	if (height != m->height)
		1264	match = false;
		1265
		1266	if (!match)
		1267	{
		1268	LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
		1269	dir, &path, &m->path);
		1270	m = 0;
		1271	}
		1272
		1273	// this could be optimised endlessly
		1274	//m->activate_physics ();
		1275
1187	return tile_map[dir];	1276	return tile_map [dir] = m;
1188		1277	}
1189	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1190	return tile_map[dir];
1191	}	1278	}
1192		1279
1193	return 0;	1280	return 0;
1194	}	1281	}
1195		1282
…		…
1211	if (!m)	1298	if (!m)
1212	return 0;	1299	return 0;
1213		1300
1214	if (x < 0)	1301	if (x < 0)
1215	{	1302	{
1216	if (!m->tile_available (3))	1303	if (!m->tile_available (TILE_WEST))
1217	return 1;	1304	return 1;
1218		1305
1219	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1306	return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1220	}	1307	}
1221		1308
1222	if (x >= m->width)	1309	if (x >= m->width)
1223	{	1310	{
1224	if (!m->tile_available (1))	1311	if (!m->tile_available (TILE_EAST))
1225	return 1;	1312	return 1;
1226		1313
1227	return out_of_map (m->tile_map[1], x - m->width, y);	1314	return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1228	}	1315	}
1229		1316
1230	if (y < 0)	1317	if (y < 0)
1231	{	1318	{
1232	if (!m->tile_available (0))	1319	if (!m->tile_available (TILE_NORTH))
1233	return 1;	1320	return 1;
1234		1321
1235	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1322	return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1236	}	1323	}
1237		1324
1238	if (y >= m->height)	1325	if (y >= m->height)
1239	{	1326	{
1240	if (!m->tile_available (2))	1327	if (!m->tile_available (TILE_SOUTH))
1241	return 1;	1328	return 1;
1242		1329
1243	return out_of_map (m->tile_map[2], x, y - m->height);	1330	return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1244	}	1331	}
1245		1332
1246	/* Simple case - coordinates are within this local	1333	/* Simple case - coordinates are within this local
1247	* map.	1334	* map.
1248	*/	1335	*/
…		…
1260	maptile *	1347	maptile *
1261	maptile::xy_find (sint16 &x, sint16 &y)	1348	maptile::xy_find (sint16 &x, sint16 &y)
1262	{	1349	{
1263	if (x < 0)	1350	if (x < 0)
1264	{	1351	{
1265	if (!tile_available (3))	1352	if (!tile_available (TILE_WEST))
1266	return 0;	1353	return 0;
1267		1354
1268	x += tile_map[3]->width;	1355	x += tile_map [TILE_WEST]->width;
1269	return tile_map[3]->xy_find (x, y);	1356	return tile_map [TILE_WEST]->xy_find (x, y);
1270	}	1357	}
1271		1358
1272	if (x >= width)	1359	if (x >= width)
1273	{	1360	{
1274	if (!tile_available (1))	1361	if (!tile_available (TILE_EAST))
1275	return 0;	1362	return 0;
1276		1363
1277	x -= width;	1364	x -= width;
1278	return tile_map[1]->xy_find (x, y);	1365	return tile_map [TILE_EAST]->xy_find (x, y);
1279	}	1366	}
1280		1367
1281	if (y < 0)	1368	if (y < 0)
1282	{	1369	{
1283	if (!tile_available (0))	1370	if (!tile_available (TILE_NORTH))
1284	return 0;	1371	return 0;
1285		1372
1286	y += tile_map[0]->height;	1373	y += tile_map [TILE_NORTH]->height;
1287	return tile_map[0]->xy_find (x, y);	1374	return tile_map [TILE_NORTH]->xy_find (x, y);
1288	}	1375	}
1289		1376
1290	if (y >= height)	1377	if (y >= height)
1291	{	1378	{
1292	if (!tile_available (2))	1379	if (!tile_available (TILE_SOUTH))
1293	return 0;	1380	return 0;
1294		1381
1295	y -= height;	1382	y -= height;
1296	return tile_map[2]->xy_find (x, y);	1383	return tile_map [TILE_SOUTH]->xy_find (x, y);
1297	}	1384	}
1298		1385
1299	/* Simple case - coordinates are within this local	1386	/* Simple case - coordinates are within this local
1300	* map.	1387	* map.
1301	*/	1388	*/
…		…
1305	/**	1392	/**
1306	* Return whether map2 is adjacent to map1. If so, store the distance from	1393	* Return whether map2 is adjacent to map1. If so, store the distance from
1307	* map1 to map2 in dx/dy.	1394	* map1 to map2 in dx/dy.
1308	*/	1395	*/
1309	int	1396	int
1310	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1397	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1311	{	1398	{
1312	if (!map1 \|\| !map2)	1399	if (!map1 \|\| !map2)
1313	return 0;	1400	return 0;
1314		1401
1315	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1402	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1317	if (map1 == map2)	1404	if (map1 == map2)
1318	{	1405	{
1319	*dx = 0;	1406	*dx = 0;
1320	*dy = 0;	1407	*dy = 0;
1321	}	1408	}
1322	else if (map1->tile_map[0] == map2)	1409	else if (map1->tile_available (TILE_NORTH, false) == map2)
1323	{ /* up */	1410	{
1324	*dx = 0;	1411	*dx = 0;
1325	*dy = -map2->height;	1412	*dy = -map2->height;
1326	}	1413	}
1327	else if (map1->tile_map[1] == map2)	1414	else if (map1->tile_available (TILE_EAST , false) == map2)
1328	{ /* right */	1415	{
1329	*dx = map1->width;	1416	*dx = map1->width;
1330	*dy = 0;	1417	*dy = 0;
1331	}	1418	}
1332	else if (map1->tile_map[2] == map2)	1419	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1333	{ /* down */	1420	{
1334	*dx = 0;	1421	*dx = 0;
1335	*dy = map1->height;	1422	*dy = map1->height;
1336	}	1423	}
1337	else if (map1->tile_map[3] == map2)	1424	else if (map1->tile_available (TILE_WEST , false) == map2)
1338	{ /* left */	1425	{
1339	*dx = -map2->width;	1426	*dx = -map2->width;
1340	*dy = 0;	1427	*dy = 0;
1341	}	1428	}
1342	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1429	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1343	{ /* up right */	1430	{ /* up right */
1344	*dx = map1->tile_map[0]->width;	1431	*dx = +map1->tile_map[TILE_NORTH]->width;
1345	*dy = -map1->tile_map[0]->height;	1432	*dy = -map1->tile_map[TILE_NORTH]->height;
1346	}	1433	}
1347	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1434	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1348	{ /* up left */	1435	{ /* up left */
1349	*dx = -map2->width;	1436	*dx = -map2->width;
1350	*dy = -map1->tile_map[0]->height;	1437	*dy = -map1->tile_map[TILE_NORTH]->height;
1351	}	1438	}
1352	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1439	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1353	{ /* right up */	1440	{ /* right up */
1354	*dx = map1->width;	1441	*dx = +map1->width;
1355	*dy = -map2->height;	1442	*dy = -map2->height;
1356	}	1443	}
1357	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1444	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1358	{ /* right down */	1445	{ /* right down */
1359	*dx = map1->width;	1446	*dx = +map1->width;
1360	*dy = map1->tile_map[1]->height;	1447	*dy = +map1->tile_map[TILE_EAST]->height;
1361	}	1448	}
1362	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1449	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1363	{ /* down right */	1450	{ /* down right */
1364	*dx = map1->tile_map[2]->width;	1451	*dx = +map1->tile_map[TILE_SOUTH]->width;
1365	*dy = map1->height;	1452	*dy = +map1->height;
1366	}	1453	}
1367	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1454	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1368	{ /* down left */	1455	{ /* down left */
1369	*dx = -map2->width;	1456	*dx = -map2->width;
1370	*dy = map1->height;	1457	*dy = +map1->height;
1371	}	1458	}
1372	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1459	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1373	{ /* left up */	1460	{ /* left up */
1374	*dx = -map1->tile_map[3]->width;	1461	*dx = -map1->tile_map[TILE_WEST]->width;
1375	*dy = -map2->height;	1462	*dy = -map2->height;
1376	}	1463	}
1377	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1464	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1378	{ /* left down */	1465	{ /* left down */
1379	*dx = -map1->tile_map[3]->width;	1466	*dx = -map1->tile_map[TILE_WEST]->width;
1380	*dy = map1->tile_map[3]->height;	1467	*dy = +map1->tile_map[TILE_WEST]->height;
1381	}	1468	}
1382	else	1469	else
1383	return 0;	1470	return 0;
1384		1471
1385	return 1;	1472	return 1;
…		…
1421	*	1508	*
1422	* currently, the only flag supported (0x1) is don't translate for	1509	* currently, the only flag supported (0x1) is don't translate for
1423	* closest body part of 'op1'	1510	* closest body part of 'op1'
1424	*/	1511	*/
1425	void	1512	void
1426	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1513	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1427	{	1514	{
1428	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1515	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1429	{	1516	{
1430	/* be conservative and fill in _some_ data */	1517	/* be conservative and fill in _some_ data */
1431	retval->distance = 10000;	1518	retval->distance = 10000;
1432	retval->distance_x = 10000;	1519	retval->distance_x = 10000;
1433	retval->distance_y = 10000;	1520	retval->distance_y = 10000;
1434	retval->direction = 0;	1521	retval->direction = 0;
1435	retval->part = 0;	1522	retval->part = 0;
1436	}	1523	}
1437	else	1524	else
1438	{	1525	{
1439	object *best;
1440
1441	retval->distance_x += op2->x - op1->x;	1526	retval->distance_x += op2->x - op1->x;
1442	retval->distance_y += op2->y - op1->y;	1527	retval->distance_y += op2->y - op1->y;
1443		1528
1444	best = op1;	1529	object *best = op1;
		1530
1445	/* If this is multipart, find the closest part now */	1531	/* If this is multipart, find the closest part now */
1446	if (!(flags & 0x1) && op1->more)	1532	if (!(flags & 1) && op1->more)
1447	{	1533	{
1448	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1534	int best_distance = idistance (retval->distance_x, retval->distance_y);
1449		1535
1450	/* we just take the offset of the piece to head to figure	1536	/* we just take the offset of the piece to head to figure
1451	* distance instead of doing all that work above again	1537	* distance instead of doing all that work above again
1452	* since the distance fields we set above are positive in the	1538	* since the distance fields we set above are positive in the
1453	* same axis as is used for multipart objects, the simply arithmetic	1539	* same axis as is used for multipart objects, the simply arithmetic
1454	* below works.	1540	* below works.
1455	*/	1541	*/
1456	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1542	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1457	{	1543	{
1458	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1544	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1459	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1545
1460	if (tmpi < best_distance)	1546	if (tmpi < best_distance)
1461	{	1547	{
1462	best_distance = tmpi;	1548	best_distance = tmpi;
1463	best = tmp;	1549	best = tmp;
1464	}	1550	}
1465	}	1551	}
1466		1552
1467	if (best != op1)	1553	if (best != op1)
1468	{	1554	{
1469	retval->distance_x += op1->x - best->x;	1555	retval->distance_x += op1->x - best->x;
1470	retval->distance_y += op1->y - best->y;	1556	retval->distance_y += op1->y - best->y;
1471	}	1557	}
1472	}	1558	}
1473		1559
1474	retval->part = best;	1560	retval->part = best;
1475	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1561	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1476	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1562	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1477	}	1563	}
1478	}	1564	}
1479		1565
1480	/* this is basically the same as get_rangevector above, but instead of	1566	/* this is basically the same as get_rangevector above, but instead of
1481	* the first parameter being an object, it instead is the map	1567	* the first parameter being an object, it instead is the map
…		…
1486	* be more consistant with the above function and also in case they are needed	1572	* be more consistant with the above function and also in case they are needed
1487	* for something in the future. Also, since no object is pasted, the best	1573	* for something in the future. Also, since no object is pasted, the best
1488	* field of the rv_vector is set to NULL.	1574	* field of the rv_vector is set to NULL.
1489	*/	1575	*/
1490	void	1576	void
1491	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1577	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1492	{	1578	{
1493	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1579	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1494	{	1580	{
1495	/* be conservative and fill in _some_ data */	1581	/* be conservative and fill in _some_ data */
1496	retval->distance = 100000;	1582	retval->distance = 100000;
1497	retval->distance_x = 32767;	1583	retval->distance_x = 32767;
1498	retval->distance_y = 32767;	1584	retval->distance_y = 32767;
1499	retval->direction = 0;	1585	retval->direction = 0;
1500	retval->part = 0;	1586	retval->part = 0;
1501	}	1587	}
1502	else	1588	else
1503	{	1589	{
1504	retval->distance_x += op2->x - x;	1590	retval->distance_x += op2->x - x;
1505	retval->distance_y += op2->y - y;	1591	retval->distance_y += op2->y - y;
1506		1592
1507	retval->part = 0;	1593	retval->part = 0;
1508	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1594	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1509	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1595	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1510	}	1596	}
1511	}	1597	}
1512		1598
1513	/* Returns true of op1 and op2 are effectively on the same map	1599	/* Returns true of op1 and op2 are effectively on the same map
1514	* (as related to map tiling). Note that this looks for a path from	1600	* (as related to map tiling). Note that this looks for a path from
…		…
1564	*/	1650	*/
1565	for (int i = 1000; --i;)	1651	for (int i = 1000; --i;)
1566	{	1652	{
1567	object *pick = at (gen (width), gen (height)).bot;	1653	object *pick = at (gen (width), gen (height)).bot;
1568		1654
1569	// do not prefer big monsters just because they are big.	1655	// must be head: do not prefer big monsters just because they are big.
1570	if (pick && pick->is_head ())	1656	if (pick && pick->is_head ())
1571	return pick->head_ ();	1657	return pick;
1572	}	1658	}
1573		1659
1574	// instead of crashing in the unlikely(?) case, try to return something	1660	// instead of crashing in the unlikely(?) case, try to return something
1575	return archetype::find (shstr_bug);	1661	return archetype::find (shstr_bug);
1576	}	1662	}
…		…
1610	if (distance <= MAX_SOUND_DISTANCE)	1696	if (distance <= MAX_SOUND_DISTANCE)
1611	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1697	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1612	}	1698	}
1613	}	1699	}
1614		1700
		1701	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1702
1615	static void	1703	static void
1616	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1704	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1617	{	1705	{
1618	// clip to map to the left	1706	// clip to map to the left
1619	if (x0 < 0)	1707	if (x0 < 0)
1620	{	1708	{
1621	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1709	if (maptile *tile = m->tile_available (TILE_WEST, 1))
1622	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);	1710	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1623		1711
1624	if (x1 < 0) // entirely to the left	1712	if (x1 < 0) // entirely to the left
1625	return;	1713	return;
1626		1714
…		…
1628	}	1716	}
1629		1717
1630	// clip to map to the right	1718	// clip to map to the right
1631	if (x1 > m->width)	1719	if (x1 > m->width)
1632	{	1720	{
1633	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1721	if (maptile *tile = m->tile_available (TILE_EAST, 1))
1634	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);	1722	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1635		1723
1636	if (x0 > m->width) // entirely to the right	1724	if (x0 > m->width) // entirely to the right
1637	return;	1725	return;
1638		1726
…		…
1640	}	1728	}
1641		1729
1642	// clip to map above	1730	// clip to map above
1643	if (y0 < 0)	1731	if (y0 < 0)
1644	{	1732	{
1645	if (maptile *tile = m->tile_available (TILE_UP, 1))	1733	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1646	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);	1734	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1647		1735
1648	if (y1 < 0) // entirely above	1736	if (y1 < 0) // entirely above
1649	return;	1737	return;
1650		1738
…		…
1652	}	1740	}
1653		1741
1654	// clip to map below	1742	// clip to map below
1655	if (y1 > m->height)	1743	if (y1 > m->height)
1656	{	1744	{
1657	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1745	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1658	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);	1746	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1659		1747
1660	if (y0 > m->height) // entirely below	1748	if (y0 > m->height) // entirely below
1661	return;	1749	return;
1662		1750
…		…
1674	r->dx = dx;	1762	r->dx = dx;
1675	r->dy = dy;	1763	r->dy = dy;
1676	}	1764	}
1677		1765
1678	maprect *	1766	maprect *
1679	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1767	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1680	{	1768	{
1681	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1682	buf.clear ();	1769	buf.clear ();
1683		1770
1684	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1771	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1685		1772
1686	// add end marker	1773	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.180 by root, Thu Jan 14 23:46:14 2010 UTC vs. Revision 1.213 by root, Sat May 7 20:03:27 2011 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.180 by root, Thu Jan 14 23:46:14 2010 UTC vs.
Revision 1.213 by root, Sat May 7 20:03:27 2011 UTC