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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.200 by root, Fri May 7 19:46:18 2010 UTC vs.
Revision 1.223 by root, Wed Dec 5 19:03:26 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	9	* 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	10	* 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	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*	18	*
18	* You should have received a copy of the Affero GNU General Public License	19	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	20	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	21	* <http://www.gnu.org/licenses/>.
21	*	22	*
22	* The authors can be reached via e-mail to <support@deliantra.net>	23	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	24	*/
24		25
25	#include <unistd.h>	26	#include <unistd.h>
26		27
59	return mp->at (newx, newy).flags () \| (mp != oldmap ? P_NEW_MAP : 0);	60	return mp->at (newx, newy).flags () \| (mp != oldmap ? P_NEW_MAP : 0);
60	}	61	}
61		62
62	/*	63	/*
63	* Returns true if the given coordinate is blocked except by the	64	* Returns true if the given coordinate is blocked except by the
64	* object passed is not blocking. This is used with	65	* object passed is not blocking. This is used with
65	* multipart monsters - if we want to see if a 2x2 monster	66	* multipart monsters - if we want to see if a 2x2 monster
66	* can move 1 space to the left, we don't want its own area	67	* can move 1 space to the left, we don't want its own area
67	* to block it from moving there.	68	* to block it from moving there.
68	* Returns TRUE if the space is blocked by something other than the	69	* Returns TRUE if the space is blocked by something other than the
69	* monster.	70	* monster.
…		…
361	}	362	}
362		363
363	void	364	void
364	maptile::activate ()	365	maptile::activate ()
365	{	366	{
366	if (spaces)	367	if (state != MAP_INACTIVE)
		368	return;
		369
367	for (mapspace *ms = spaces + size (); ms-- > spaces; )	370	for (mapspace *ms = spaces + size (); ms-- > spaces; )
368	for (object *op = ms->bot; op; op = op->above)	371	for (object *op = ms->bot; op; op = op->above)
369	op->activate_recursive ();	372	op->activate_recursive ();
		373
		374	state = MAP_ACTIVE;
		375
		376	activate_physics ();
370	}	377	}
371		378
372	void	379	void
373	maptile::deactivate ()	380	maptile::deactivate ()
374	{	381	{
375	if (spaces)	382	if (state != MAP_ACTIVE)
		383	return;
		384
376	for (mapspace *ms = spaces + size (); ms-- > spaces; )	385	for (mapspace *ms = spaces + size (); ms-- > spaces; )
377	for (object *op = ms->bot; op; op = op->above)	386	for (object *op = ms->bot; op; op = op->above)
378	op->deactivate_recursive ();	387	op->deactivate_recursive ();
		388
		389	state = MAP_INACTIVE;
379	}	390	}
380		391
381	bool	392	bool
382	maptile::_save_objects (object_freezer &f, int flags)	393	maptile::_save_objects (object_freezer &f, int flags)
383	{	394	{
…		…
395		406
396	for (object *op = spaces [i].bot; op; op = op->above)	407	for (object *op = spaces [i].bot; op; op = op->above)
397	{	408	{
398	unique \|= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];	409	unique \|= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
399		410
400	if (expect_false (!op->can_map_save ()))	411	if (ecb_expect_false (!op->can_map_save ()))
401	continue;	412	continue;
402		413
403	if (expect_false (unique \|\| op->flag [FLAG_UNIQUE]))	414	if (ecb_expect_false (unique \|\| op->flag [FLAG_UNIQUE]))
404	{	415	{
405	if (flags & IO_UNIQUES)	416	if (flags & IO_UNIQUES)
406	op->write (f);	417	op->write (f);
407	}	418	}
408	else if (expect_true (flags & IO_OBJECTS))	419	else if (ecb_expect_true (flags & IO_OBJECTS))
409	op->write (f);	420	op->write (f);
410	}	421	}
411	}	422	}
412		423
413	coroapi::cede_to_tick ();	424	coroapi::cede_to_tick ();
…		…
427	}	438	}
428		439
429	void	440	void
430	maptile::init ()	441	maptile::init ()
431	{	442	{
432	in_memory = MAP_SWAPPED;	443	state = MAP_SWAPPED;
433		444
434	/* The maps used to pick up default x and y values from the	445	/* The maps used to pick up default x and y values from the
435	* map archetype. Mimic that behaviour.	446	* map archetype. Mimic that behaviour.
436	*/	447	*/
437	width = 16;	448	width = 16;
…		…
473	spaces = salloc0<mapspace> (size ());	484	spaces = salloc0<mapspace> (size ());
474	}	485	}
475		486
476	//+GPL	487	//+GPL
477		488
478	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	489	/* Takes a string from a map definition and outputs a pointer to the array of shopitems
479	* corresponding to that string. Memory is allocated for this, it must be freed	490	* corresponding to that string. Memory is allocated for this, it must be freed
480	* at a later date.	491	* at a later date.
481	* Called by parse_map_headers below.	492	* Called by parse_map_headers below.
482	*/	493	*/
483	static shopitems *	494	static shopitems *
484	parse_shop_string (const char *input_string)	495	parse_shop_string (const char *input_string)
…		…
533	*q = '\0';	544	*q = '\0';
534		545
535	current_type = get_typedata_by_name (p);	546	current_type = get_typedata_by_name (p);
536	if (current_type)	547	if (current_type)
537	{	548	{
538	items[i].name = current_type->name;	549	items[i].name = current_type->name;
539	items[i].typenum = current_type->number;	550	items[i].typenum = current_type->number;
540	items[i].name_pl = current_type->name_pl;	551	items[i].name_pl = current_type->name_pl;
541	}	552	}
542	else	553	else
543	{ /* oh uh, something's wrong, let's free up this one, and try	554	{ /* oh uh, something's wrong, let's free up this one, and try
544	* the next entry while we're at it, better print a warning	555	* the next entry while we're at it, better print a warning
545	*/	556	*/
546	LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);	557	LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
547	}	558	}
548	}	559	}
549		560
…		…
614	{	625	{
615	case KW_msg:	626	case KW_msg:
616	thawer.get_ml (KW_endmsg, msg);	627	thawer.get_ml (KW_endmsg, msg);
617	break;	628	break;
618		629
619	case KW_lore: // CF+ extension	630	case KW_lore: // deliantra extension
620	thawer.get_ml (KW_endlore, maplore);	631	thawer.get_ml (KW_endlore, maplore);
621	break;	632	break;
622		633
623	case KW_maplore:	634	case KW_maplore:
624	thawer.get_ml (KW_endmaplore, maplore);	635	thawer.get_ml (KW_endmaplore, maplore);
…		…
661	case KW_value: case KW_swap_time: thawer.get (timeout); break;	672	case KW_value: case KW_swap_time: thawer.get (timeout); break;
662	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;	673	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
663	case KW_invisible: case KW_darkness: thawer.get (darkness); break;	674	case KW_invisible: case KW_darkness: thawer.get (darkness); break;
664	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;	675	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
665		676
666	case KW_tile_path_1: thawer.get (tile_path [0]); break;	677	case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
667	case KW_tile_path_2: thawer.get (tile_path [1]); break;	678	case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
668	case KW_tile_path_3: thawer.get (tile_path [2]); break;	679	case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
669	case KW_tile_path_4: thawer.get (tile_path [3]); break;	680	case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
		681	case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
		682	case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
670		683
671	case KW_ERROR:	684	case KW_ERROR:
672	set_key_text (thawer.kw_str, thawer.value);	685	set_key_text (thawer.kw_str, thawer.value);
673	break;	686	break;
674		687
…		…
753	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);	766	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
754		767
755	MAP_OUT (per_player);	768	MAP_OUT (per_player);
756	MAP_OUT (per_party);	769	MAP_OUT (per_party);
757		770
758	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	771	if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
759	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	772	if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
760	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	773	if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
761	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	774	if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
		775	if (tile_path [TILE_UP ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP ]);
		776	if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
762		777
763	freezer.put (this);	778	freezer.put (this);
764	freezer.put (KW(end));	779	freezer.put (KW(end));
765		780
766	return true;	781	return true;
…		…
823	msg = 0;	838	msg = 0;
824	maplore = 0;	839	maplore = 0;
825	shoprace = 0;	840	shoprace = 0;
826	delete [] shopitems, shopitems = 0;	841	delete [] shopitems, shopitems = 0;
827		842
828	for (int i = 0; i < 4; i++)	843	for (int i = 0; i < ecb_array_length (tile_path); i++)
829	tile_path [i] = 0;	844	tile_path [i] = 0;
830	}	845	}
831		846
832	maptile::~maptile ()	847	maptile::~maptile ()
833	{	848	{
…		…
840	/* We need to look through all the maps and see if any maps	855	/* We need to look through all the maps and see if any maps
841	* are pointing at this one for tiling information. Since	856	* are pointing at this one for tiling information. Since
842	* tiling can be asymetric, we just can not look to see which	857	* tiling can be asymetric, we just can not look to see which
843	* maps this map tiles with and clears those.	858	* maps this map tiles with and clears those.
844	*/	859	*/
845	for (int i = 0; i < 4; i++)	860	for (int i = 0; i < ecb_array_length (tile_path); i++)
846	if (tile_map[i] == m)	861	if (tile_map[i] == m)
847	tile_map[i] = 0;	862	tile_map[i] = 0;
848	}	863	}
849		864
850	void	865	void
…		…
1003	update_all_map_los (this);	1018	update_all_map_los (this);
1004		1019
1005	return 1;	1020	return 1;
1006	}	1021	}
1007		1022
1008	/*	1023	/*
1009	* This function updates various attributes about a specific space	1024	* This function updates various attributes about a specific space
1010	* on the map (what it looks like, whether it blocks magic,	1025	* on the map (what it looks like, whether it blocks magic,
1011	* has a living creatures, prevents people from passing	1026	* has a living creatures, prevents people from passing
1012	* through, etc)	1027	* through, etc)
1013	*/	1028	*/
…		…
1044	* 3 times each time the player moves, because many of the	1059	* 3 times each time the player moves, because many of the
1045	* functions the move_player calls eventualy call this.	1060	* functions the move_player calls eventualy call this.
1046	*	1061	*
1047	* Always put the player down for drawing.	1062	* Always put the player down for drawing.
1048	*/	1063	*/
1049	if (expect_true (!tmp->invisible))	1064	if (ecb_expect_true (!tmp->invisible))
1050	{	1065	{
1051	if (expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))	1066	if (ecb_expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))
1052	top = tmp;	1067	top = tmp;
1053	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))	1068	else if (ecb_expect_false (tmp->flag [FLAG_IS_FLOOR]))
1054	{	1069	{
1055	/* If we got a floor, that means middle and top were below it,	1070	/* If we got a floor, that means middle and top were below it,
1056	* so should not be visible, so we clear them.	1071	* so should not be visible, so we clear them.
1057	*/	1072	*/
1058	middle = 0;	1073	middle = 0;
…		…
1061	volume = 0;	1076	volume = 0;
1062	items = 0;	1077	items = 0;
1063	}	1078	}
1064	else	1079	else
1065	{	1080	{
1066	if (expect_true (!tmp->flag [FLAG_NO_PICK]))	1081	if (ecb_expect_true (!tmp->flag [FLAG_NO_PICK]))
1067	{	1082	{
1068	++items;	1083	++items;
1069	volume += tmp->volume ();	1084	volume += tmp->volume ();
1070	}	1085	}
1071		1086
1072	/* Flag anywhere have high priority */	1087	/* Flag anywhere have high priority */
1073	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))	1088	if (ecb_expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1074	anywhere = tmp;	1089	anywhere = tmp;
1075		1090
1076	/* Find the highest visible face around. If equal	1091	/* Find the highest visible face around. If equal
1077	* visibilities, we still want the one nearer to the	1092	* visibilities, we still want the one nearer to the
1078	* top	1093	* top
1079	*/	1094	*/
1080	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))	1095	if (ecb_expect_false (::faces [tmp->face].visibility >= middle_visibility))
1081	{	1096	{
1082	middle_visibility = ::faces [tmp->face].visibility;	1097	middle_visibility = ::faces [tmp->face].visibility;
1083	middle = tmp;	1098	middle = tmp;
1084	}	1099	}
1085	}	1100	}
…		…
1117	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31	1132	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1118		1133
1119	/* At this point, we have a floor face (if there is a floor),	1134	/* At this point, we have a floor face (if there is a floor),
1120	* and the floor is set - we are not going to touch it at	1135	* and the floor is set - we are not going to touch it at
1121	* this point.	1136	* this point.
1122	* middle contains the highest visibility face.	1137	* middle contains the highest visibility face.
1123	* top contains a player/monster face, if there is one.	1138	* top contains a player/monster face, if there is one.
1124	*	1139	*
1125	* We now need to fill in top.face and/or middle.face.	1140	* We now need to fill in top.face and/or middle.face.
1126	*/	1141	*/
1127		1142
1128	/* If the top face also happens to be high visibility, re-do our	1143	/* If the top face also happens to be high visibility, re-do our
1129	* middle face. This should not happen, as we already have the	1144	* middle face. This should not happen, as we already have the
1130	* else statement above so middle should not get set. OTOH, it	1145	* else statement above so middle should not get set. OTOH, it
1131	* may be possible for the faces to match but be different objects.	1146	* may be possible for the faces to match but be different objects.
1132	*/	1147	*/
1133	if (top == middle)	1148	if (top == middle)
1134	middle = 0;	1149	middle = 0;
1135		1150
…		…
1164	/* top is already set - we should only get here if	1179	/* top is already set - we should only get here if
1165	* middle is not set	1180	* middle is not set
1166	*	1181	*
1167	* Set the middle face and break out, since there is nothing	1182	* Set the middle face and break out, since there is nothing
1168	* more to fill in. We don't check visiblity here, since	1183	* more to fill in. We don't check visiblity here, since
1169	*	1184	*
1170	*/	1185	*/
1171	if (tmp != top)	1186	if (tmp != top)
1172	{	1187	{
1173	middle = tmp;	1188	middle = tmp;
1174	break;	1189	break;
…		…
1181	middle = 0;	1196	middle = 0;
1182		1197
1183	if (top == middle)	1198	if (top == middle)
1184	middle = 0;	1199	middle = 0;
1185		1200
		1201	// set lower map transparent floor flag if applicable
		1202	if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
		1203	{
		1204	floor->set_anim_frame (0);
		1205
		1206	if (maptile *m = floor->map->tile_map [TILE_DOWN])
		1207	{
		1208	mapspace &ms = m->at (floor->x, floor->y);
		1209	ms.update ();
		1210
		1211	if (object *floor2 = ms.faces_obj [2])
		1212	if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
		1213	{
		1214	floor->set_anim_frame (1);
		1215	top = floor;
		1216	middle = ms.faces_obj [0];
		1217	floor = floor2;
		1218	}
		1219
		1220	ms.pflags \|= PF_VIS_UP;
		1221	}
		1222	}
		1223
1186	#if 0	1224	#if 0
1187	faces_obj [0] = top;	1225	faces_obj [0] = top;
1188	faces_obj [1] = middle;	1226	faces_obj [1] = middle;
1189	faces_obj [2] = floor;	1227	faces_obj [2] = floor;
1190	#endif	1228	#endif
1191	}	1229	}
1192		1230
		1231	void
		1232	mapspace::update_up ()
		1233	{
		1234	// invalidate up
		1235	if (!(pflags & PF_VIS_UP))
		1236	return;
		1237
		1238	pflags &= ~PF_VIS_UP;
		1239
		1240	if (bot)
		1241	if (maptile *m = bot->map->tile_map [TILE_UP])
		1242	m->at (bot->x, bot->y).invalidate ();
		1243	}
		1244
1193	maptile *	1245	maptile *
1194	maptile::tile_available (int dir, bool load)	1246	maptile::tile_available (int dir, bool load)
1195	{	1247	{
		1248	// map is there and we don't need to load it OR it's loaded => return what we have
		1249	if (tile_map [dir] && (!load \|\| tile_map [dir]->linkable ()))
		1250	return tile_map [dir];
		1251
1196	if (tile_path[dir])	1252	if (tile_path [dir])
1197	{	1253	{
1198	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1254	// well, try to locate it then, if possible - maybe it's there already
		1255	// this is the ONLY place in the server that links maps with each other,
		1256	// so any kind of inter-map stuff has to be initiated here.
		1257	if (maptile *m = find_async (tile_path [dir], this, load))
		1258	{
		1259	bool mismatch = false;
		1260
		1261	if (dir == TILE_NORTH \|\| dir == TILE_SOUTH \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1262	if (width != m->width)
		1263	mismatch = true;
		1264
		1265	if (dir == TILE_EAST \|\| dir == TILE_WEST \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1266	if (height != m->height)
		1267	mismatch = true;
		1268
		1269	if (mismatch)
		1270	{
		1271	LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
		1272	dir, &path, &m->path);
		1273	m = 0;
		1274	}
		1275	else if (0)//D
		1276	{
		1277	// as an optimisation, link us against the other map if the other map
		1278	// has us as neighbour, which is very common, but not guaranteed.
		1279	int dir2 = REVERSE_TILE_DIR (dir);
		1280
		1281	if (m->tile_path [dir2] == path)
		1282	m->tile_map [dir2] = this;
		1283	}
		1284
		1285
1199	return tile_map[dir];	1286	return tile_map [dir] = m;
1200		1287	}
1201	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1202	return tile_map[dir];
1203	}	1288	}
1204		1289
1205	return 0;	1290	return 0;
1206	}	1291	}
1207		1292
1208	/* this returns TRUE if the coordinates (x,y) are out of	1293	/* this returns TRUE if the coordinates (x,y) are out of
1209	* map m. This function also takes into account any	1294	* map m. This function also takes into account any
1210	* tiling considerations, loading adjacant maps as needed.	1295	* tiling considerations, loading adjacant maps as needed.
1211	* This is the function should always be used when it	1296	* This is the function should always be used when it
1212	* necessary to check for valid coordinates.	1297	* necessary to check for valid coordinates.
1213	* This function will recursively call itself for the	1298	* This function will recursively call itself for the
1214	* tiled maps.	1299	* tiled maps.
1215	*/	1300	*/
1216	int	1301	int
1217	out_of_map (maptile *m, int x, int y)	1302	out_of_map (maptile *m, int x, int y)
1218	{	1303	{
…		…
1223	if (!m)	1308	if (!m)
1224	return 0;	1309	return 0;
1225		1310
1226	if (x < 0)	1311	if (x < 0)
1227	{	1312	{
1228	if (!m->tile_available (3))	1313	if (!m->tile_available (TILE_WEST))
1229	return 1;	1314	return 1;
1230		1315
1231	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1316	return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1232	}	1317	}
1233		1318
1234	if (x >= m->width)	1319	if (x >= m->width)
1235	{	1320	{
1236	if (!m->tile_available (1))	1321	if (!m->tile_available (TILE_EAST))
1237	return 1;	1322	return 1;
1238		1323
1239	return out_of_map (m->tile_map[1], x - m->width, y);	1324	return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1240	}	1325	}
1241		1326
1242	if (y < 0)	1327	if (y < 0)
1243	{	1328	{
1244	if (!m->tile_available (0))	1329	if (!m->tile_available (TILE_NORTH))
1245	return 1;	1330	return 1;
1246		1331
1247	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1332	return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1248	}	1333	}
1249		1334
1250	if (y >= m->height)	1335	if (y >= m->height)
1251	{	1336	{
1252	if (!m->tile_available (2))	1337	if (!m->tile_available (TILE_SOUTH))
1253	return 1;	1338	return 1;
1254		1339
1255	return out_of_map (m->tile_map[2], x, y - m->height);	1340	return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1256	}	1341	}
1257		1342
1258	/* Simple case - coordinates are within this local	1343	/* Simple case - coordinates are within this local
1259	* map.	1344	* map.
1260	*/	1345	*/
…		…
1262	}	1347	}
1263		1348
1264	/* This is basically the same as out_of_map above, but	1349	/* This is basically the same as out_of_map above, but
1265	* instead we return NULL if no map is valid (coordinates	1350	* instead we return NULL if no map is valid (coordinates
1266	* out of bounds and no tiled map), otherwise it returns	1351	* out of bounds and no tiled map), otherwise it returns
1267	* the map as that the coordinates are really on, and	1352	* the map as that the coordinates are really on, and
1268	* updates x and y to be the localised coordinates.	1353	* updates x and y to be the localised coordinates.
1269	* Using this is more efficient of calling out_of_map	1354	* Using this is more efficient of calling out_of_map
1270	* and then figuring out what the real map is	1355	* and then figuring out what the real map is
1271	*/	1356	*/
1272	maptile *	1357	maptile *
1273	maptile::xy_find (sint16 &x, sint16 &y)	1358	maptile::xy_find (sint16 &x, sint16 &y)
1274	{	1359	{
1275	if (x < 0)	1360	if (x < 0)
1276	{	1361	{
1277	if (!tile_available (3))	1362	if (!tile_available (TILE_WEST))
1278	return 0;	1363	return 0;
1279		1364
1280	x += tile_map[3]->width;	1365	x += tile_map [TILE_WEST]->width;
1281	return tile_map[3]->xy_find (x, y);	1366	return tile_map [TILE_WEST]->xy_find (x, y);
1282	}	1367	}
1283		1368
1284	if (x >= width)	1369	if (x >= width)
1285	{	1370	{
1286	if (!tile_available (1))	1371	if (!tile_available (TILE_EAST))
1287	return 0;	1372	return 0;
1288		1373
1289	x -= width;	1374	x -= width;
1290	return tile_map[1]->xy_find (x, y);	1375	return tile_map [TILE_EAST]->xy_find (x, y);
1291	}	1376	}
1292		1377
1293	if (y < 0)	1378	if (y < 0)
1294	{	1379	{
1295	if (!tile_available (0))	1380	if (!tile_available (TILE_NORTH))
1296	return 0;	1381	return 0;
1297		1382
1298	y += tile_map[0]->height;	1383	y += tile_map [TILE_NORTH]->height;
1299	return tile_map[0]->xy_find (x, y);	1384	return tile_map [TILE_NORTH]->xy_find (x, y);
1300	}	1385	}
1301		1386
1302	if (y >= height)	1387	if (y >= height)
1303	{	1388	{
1304	if (!tile_available (2))	1389	if (!tile_available (TILE_SOUTH))
1305	return 0;	1390	return 0;
1306		1391
1307	y -= height;	1392	y -= height;
1308	return tile_map[2]->xy_find (x, y);	1393	return tile_map [TILE_SOUTH]->xy_find (x, y);
1309	}	1394	}
1310		1395
1311	/* Simple case - coordinates are within this local	1396	/* Simple case - coordinates are within this local
1312	* map.	1397	* map.
1313	*/	1398	*/
…		…
1329	if (map1 == map2)	1414	if (map1 == map2)
1330	{	1415	{
1331	*dx = 0;	1416	*dx = 0;
1332	*dy = 0;	1417	*dy = 0;
1333	}	1418	}
1334	else if (map1->tile_available (0, false) == map2)	1419	else if (map1->tile_available (TILE_NORTH, false) == map2)
1335	{ /* up */	1420	{
1336	*dx = 0;	1421	*dx = 0;
1337	*dy = -map2->height;	1422	*dy = -map2->height;
1338	}	1423	}
1339	else if (map1->tile_available (1, false) == map2)	1424	else if (map1->tile_available (TILE_EAST , false) == map2)
1340	{ /* right */	1425	{
1341	*dx = map1->width;	1426	*dx = map1->width;
1342	*dy = 0;	1427	*dy = 0;
1343	}	1428	}
1344	else if (map1->tile_available (2, false) == map2)	1429	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1345	{ /* down */	1430	{
1346	*dx = 0;	1431	*dx = 0;
1347	*dy = map1->height;	1432	*dy = map1->height;
1348	}	1433	}
1349	else if (map1->tile_available (3, false) == map2)	1434	else if (map1->tile_available (TILE_WEST , false) == map2)
1350	{ /* left */	1435	{
1351	*dx = -map2->width;	1436	*dx = -map2->width;
1352	*dy = 0;	1437	*dy = 0;
1353	}	1438	}
1354	else if (map1->tile_map[0] && map1->tile_map[0]->tile_available (1, false) == map2)	1439	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1355	{ /* up right */	1440	{ /* up right */
1356	*dx = map1->tile_map[0]->width;	1441	*dx = +map1->tile_map[TILE_NORTH]->width;
1357	*dy = -map1->tile_map[0]->height;	1442	*dy = -map1->tile_map[TILE_NORTH]->height;
1358	}	1443	}
1359	else if (map1->tile_map[0] && map1->tile_map[0]->tile_available (3, false) == map2)	1444	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1360	{ /* up left */	1445	{ /* up left */
1361	*dx = -map2->width;	1446	*dx = -map2->width;
1362	*dy = -map1->tile_map[0]->height;	1447	*dy = -map1->tile_map[TILE_NORTH]->height;
1363	}	1448	}
1364	else if (map1->tile_map[1] && map1->tile_map[1]->tile_available (0, false) == map2)	1449	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1365	{ /* right up */	1450	{ /* right up */
1366	*dx = map1->width;	1451	*dx = +map1->width;
1367	*dy = -map2->height;	1452	*dy = -map2->height;
1368	}	1453	}
1369	else if (map1->tile_map[1] && map1->tile_map[1]->tile_available (2, false) == map2)	1454	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1370	{ /* right down */	1455	{ /* right down */
1371	*dx = map1->width;	1456	*dx = +map1->width;
1372	*dy = map1->tile_map[1]->height;	1457	*dy = +map1->tile_map[TILE_EAST]->height;
1373	}	1458	}
1374	else if (map1->tile_map[2] && map1->tile_map[2]->tile_available (1, false) == map2)	1459	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1375	{ /* down right */	1460	{ /* down right */
1376	*dx = map1->tile_map[2]->width;	1461	*dx = +map1->tile_map[TILE_SOUTH]->width;
1377	*dy = map1->height;	1462	*dy = +map1->height;
1378	}	1463	}
1379	else if (map1->tile_map[2] && map1->tile_map[2]->tile_available (3, false) == map2)	1464	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1380	{ /* down left */	1465	{ /* down left */
1381	*dx = -map2->width;	1466	*dx = -map2->width;
1382	*dy = map1->height;	1467	*dy = +map1->height;
1383	}	1468	}
1384	else if (map1->tile_map[3] && map1->tile_map[3]->tile_available (0, false) == map2)	1469	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1385	{ /* left up */	1470	{ /* left up */
1386	*dx = -map1->tile_map[3]->width;	1471	*dx = -map1->tile_map[TILE_WEST]->width;
1387	*dy = -map2->height;	1472	*dy = -map2->height;
1388	}	1473	}
1389	else if (map1->tile_map[3] && map1->tile_map[3]->tile_available (2, false) == map2)	1474	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1390	{ /* left down */	1475	{ /* left down */
1391	*dx = -map1->tile_map[3]->width;	1476	*dx = -map1->tile_map[TILE_WEST]->width;
1392	*dy = map1->tile_map[3]->height;	1477	*dy = +map1->tile_map[TILE_WEST]->height;
1393	}	1478	}
1394	else	1479	else
1395	return 0;	1480	return 0;
1396		1481
1397	return 1;	1482	return 1;
…		…
1420	* so you just can not look the the map coordinates and get the	1505	* so you just can not look the the map coordinates and get the
1421	* righte value. distance_x/y are distance away, which	1506	* righte value. distance_x/y are distance away, which
1422	* can be negative. direction is the crossfire direction scheme	1507	* can be negative. direction is the crossfire direction scheme
1423	* that the creature should head. part is the part of the	1508	* that the creature should head. part is the part of the
1424	* monster that is closest.	1509	* monster that is closest.
1425	*	1510	*
1426	* get_rangevector looks at op1 and op2, and fills in the	1511	* get_rangevector looks at op1 and op2, and fills in the
1427	* structure for op1 to get to op2.	1512	* structure for op1 to get to op2.
1428	* We already trust that the caller has verified that the	1513	* We already trust that the caller has verified that the
1429	* two objects are at least on adjacent maps. If not,	1514	* two objects are at least on adjacent maps. If not,
1430	* results are not likely to be what is desired.	1515	* results are not likely to be what is desired.
…		…
1486	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1571	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1487	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);	1572	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1488	}	1573	}
1489	}	1574	}
1490		1575
1491	/* this is basically the same as get_rangevector above, but instead of	1576	/* this is basically the same as get_rangevector above, but instead of
1492	* the first parameter being an object, it instead is the map	1577	* the first parameter being an object, it instead is the map
1493	* and x,y coordinates - this is used for path to player -	1578	* and x,y coordinates - this is used for path to player -
1494	* since the object is not infact moving but we are trying to traverse	1579	* since the object is not infact moving but we are trying to traverse
1495	* the path, we need this.	1580	* the path, we need this.
1496	* flags has no meaning for this function at this time - I kept it in to	1581	* flags has no meaning for this function at this time - I kept it in to
1497	* be more consistant with the above function and also in case they are needed	1582	* be more consistant with the above function and also in case they are needed
1498	* for something in the future. Also, since no object is pasted, the best	1583	* for something in the future. Also, since no object is pasted, the best
…		…
1629	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1714	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1630	{	1715	{
1631	// clip to map to the left	1716	// clip to map to the left
1632	if (x0 < 0)	1717	if (x0 < 0)
1633	{	1718	{
1634	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1719	if (maptile *tile = m->tile_available (TILE_WEST, 1))
1635	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);	1720	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1636		1721
1637	if (x1 < 0) // entirely to the left	1722	if (x1 < 0) // entirely to the left
1638	return;	1723	return;
1639		1724
…		…
1641	}	1726	}
1642		1727
1643	// clip to map to the right	1728	// clip to map to the right
1644	if (x1 > m->width)	1729	if (x1 > m->width)
1645	{	1730	{
1646	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1731	if (maptile *tile = m->tile_available (TILE_EAST, 1))
1647	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);	1732	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1648		1733
1649	if (x0 > m->width) // entirely to the right	1734	if (x0 >= m->width) // entirely to the right
1650	return;	1735	return;
1651		1736
1652	x1 = m->width;	1737	x1 = m->width;
1653	}	1738	}
1654		1739
1655	// clip to map above	1740	// clip to map to the north
1656	if (y0 < 0)	1741	if (y0 < 0)
1657	{	1742	{
1658	if (maptile *tile = m->tile_available (TILE_UP, 1))	1743	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1659	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);	1744	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1660		1745
1661	if (y1 < 0) // entirely above	1746	if (y1 < 0) // entirely to the north
1662	return;	1747	return;
1663		1748
1664	y0 = 0;	1749	y0 = 0;
1665	}	1750	}
1666		1751
1667	// clip to map below	1752	// clip to map to the south
1668	if (y1 > m->height)	1753	if (y1 > m->height)
1669	{	1754	{
1670	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1755	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1671	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);	1756	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1672		1757
1673	if (y0 > m->height) // entirely below	1758	if (y0 >= m->height) // entirely to the south
1674	return;	1759	return;
1675		1760
1676	y1 = m->height;	1761	y1 = m->height;
1677	}	1762	}
1678		1763

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.200 by root, Fri May 7 19:46:18 2010 UTC vs. Revision 1.223 by root, Wed Dec 5 19:03:26 2018 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.200 by root, Fri May 7 19:46:18 2010 UTC vs.
Revision 1.223 by root, Wed Dec 5 19:03:26 2018 UTC