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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.131 by root, Sat Feb 10 15:20:23 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7		7	*
8	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	(at your option) any later version.	11	* (at your option) any later version.
12		12	*
13	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	16	* GNU General Public License for more details.
17		17	*
18	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		21	*
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
27	variable. */	27	variable. */
28	#include <global.h>	28	#include <global.h>
489		489
490	if (is_removed)	490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
492		492
493	if (speed < 0)	493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - rndm ();
495		495
496	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
497	if (key_values)	497	if (key_values)
498	{	498	{
499	key_value *tail = 0;	499	key_value *tail = 0;
…		…
670	face = blank_face;	670	face = blank_face;
671	}	671	}
672		672
673	object::~object ()	673	object::~object ()
674	{	674	{
		675	unlink ();
		676
675	free_key_values (this);	677	free_key_values (this);
676	}	678	}
677		679
678	static int object_count;	680	static int object_count;
679		681
…		…
687	objects.insert (this);	689	objects.insert (this);
688	}	690	}
689		691
690	void object::unlink ()	692	void object::unlink ()
691	{	693	{
692	assert (index);//D	694	if (!index)
		695	return;
		696
693	objects.erase (this);	697	objects.erase (this);
694	refcnt_dec ();	698	refcnt_dec ();
695	}	699	}
696		700
697	void	701	void
…		…
771	* drop on that space.	775	* drop on that space.
772	*/	776	*/
773	if (!drop_to_ground	777	if (!drop_to_ground
774	\|\| !map	778	\|\| !map
775	\|\| map->in_memory != MAP_IN_MEMORY	779	\|\| map->in_memory != MAP_IN_MEMORY
		780	\|\| map->nodrop
776	\|\| ms ().move_block == MOVE_ALL)	781	\|\| ms ().move_block == MOVE_ALL)
777	{	782	{
778	while (inv)	783	while (inv)
779	{	784	{
780	inv->destroy_inv (drop_to_ground);	785	inv->destroy_inv (drop_to_ground);
…		…
814		819
815	if (flag [FLAG_IS_LINKED])	820	if (flag [FLAG_IS_LINKED])
816	remove_button_link (this);	821	remove_button_link (this);
817		822
818	if (flag [FLAG_FRIENDLY])	823	if (flag [FLAG_FRIENDLY])
		824	{
819	remove_friendly_object (this);	825	remove_friendly_object (this);
		826
		827	if (type == GOLEM
		828	&& owner
		829	&& owner->type == PLAYER
		830	&& owner->contr->ranges[range_golem] == this)
		831	owner->contr->ranges[range_golem] = 0;
		832	}
820		833
821	if (!flag [FLAG_REMOVED])	834	if (!flag [FLAG_REMOVED])
822	remove ();	835	remove ();
823		836
824	destroy_inv (true);	837	destroy_inv (true);
…		…
896	* This function removes the object op from the linked list of objects	909	* This function removes the object op from the linked list of objects
897	* which it is currently tied to. When this function is done, the	910	* which it is currently tied to. When this function is done, the
898	* object will have no environment. If the object previously had an	911	* object will have no environment. If the object previously had an
899	* environment, the x and y coordinates will be updated to	912	* environment, the x and y coordinates will be updated to
900	* the previous environment.	913	* the previous environment.
901	* Beware: This function is called from the editor as well!
902	*/	914	*/
903	void	915	void
904	object::remove ()	916	object::do_remove ()
905	{	917	{
906	object tmp, last = 0;	918	object tmp, last = 0;
907	object *otmp;	919	object *otmp;
908		920
909	if (QUERY_FLAG (this, FLAG_REMOVED))	921	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
952	}	964	}
953	else if (map)	965	else if (map)
954	{	966	{
955	if (type == PLAYER)	967	if (type == PLAYER)
956	{	968	{
		969	// leaving a spot always closes any open container on the ground
		970	if (container && !container->env)
		971	// this causes spurious floorbox updates, but it ensures
		972	// that the CLOSE event is being sent.
		973	close_container ();
		974
957	--map->players;	975	--map->players;
958	map->touch ();	976	map->touch ();
959	}	977	}
960		978
961	map->dirty = true;	979	map->dirty = true;
		980	mapspace &ms = this->ms ();
962		981
963	/* link the object above us */	982	/* link the object above us */
964	if (above)	983	if (above)
965	above->below = below;	984	above->below = below;
966	else	985	else
967	map->at (x, y).top = below; /* we were top, set new top */	986	ms.top = below; /* we were top, set new top */
968		987
969	/* Relink the object below us, if there is one */	988	/* Relink the object below us, if there is one */
970	if (below)	989	if (below)
971	below->above = above;	990	below->above = above;
972	else	991	else
…		…
974	/* Nothing below, which means we need to relink map object for this space	993	/* Nothing below, which means we need to relink map object for this space
975	* use translated coordinates in case some oddness with map tiling is	994	* use translated coordinates in case some oddness with map tiling is
976	* evident	995	* evident
977	*/	996	*/
978	if (GET_MAP_OB (map, x, y) != this)	997	if (GET_MAP_OB (map, x, y) != this)
979	{
980	char *dump = dump_object (this);
981	LOG (llevError,
982	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	998	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
983	free (dump);
984	dump = dump_object (GET_MAP_OB (map, x, y));
985	LOG (llevError, "%s\n", dump);
986	free (dump);
987	}
988		999
989	map->at (x, y).bot = above; /* goes on above it. */	1000	ms.bot = above; /* goes on above it. */
990	}	1001	}
991		1002
992	above = 0;	1003	above = 0;
993	below = 0;	1004	below = 0;
994		1005
995	if (map->in_memory == MAP_SAVING)	1006	if (map->in_memory == MAP_SAVING)
996	return;	1007	return;
997		1008
998	int check_walk_off = !flag [FLAG_NO_APPLY];	1009	int check_walk_off = !flag [FLAG_NO_APPLY];
999		1010
1000	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1011	for (tmp = ms.bot; tmp; tmp = tmp->above)
1001	{	1012	{
1002	/* No point updating the players look faces if he is the object	1013	/* No point updating the players look faces if he is the object
1003	* being removed.	1014	* being removed.
1004	*/	1015	*/
1005		1016
…		…
1086		1097
1087	return 0;	1098	return 0;
1088	}	1099	}
1089		1100
1090	/*	1101	/*
1091	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1102	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1092	* job preparing multi-part monsters	1103	* job preparing multi-part monsters.
1093	*/	1104	*/
1094	object *	1105	object *
1095	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1106	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1096	{	1107	{
1097	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1108	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1125	*/	1136	*/
1126	object *	1137	object *
1127	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1138	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1128	{	1139	{
1129	object tmp, top, *floor = NULL;	1140	object tmp, top, *floor = NULL;
1130	sint16 x, y;
1131		1141
1132	if (QUERY_FLAG (op, FLAG_FREED))	1142	if (QUERY_FLAG (op, FLAG_FREED))
1133	{	1143	{
1134	LOG (llevError, "Trying to insert freed object!\n");	1144	LOG (llevError, "Trying to insert freed object!\n");
1135	return NULL;	1145	return NULL;
1136	}	1146	}
		1147
		1148	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1149	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1150
		1151	op->remove ();
1137		1152
1138	if (!m)	1153	if (!m)
1139	{	1154	{
1140	char *dump = dump_object (op);	1155	char *dump = dump_object (op);
1141	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1156	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
…		…
1156	#endif	1171	#endif
1157	free (dump);	1172	free (dump);
1158	return op;	1173	return op;
1159	}	1174	}
1160		1175
1161	if (!QUERY_FLAG (op, FLAG_REMOVED))
1162	{
1163	char *dump = dump_object (op);
1164	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1165	free (dump);
1166	return op;
1167	}
1168
1169	if (op->more)
1170	{
1171	/* The part may be on a different map. */
1172
1173	object *more = op->more;	1176	if (object *more = op->more)
1174		1177	{
1175	/* We really need the caller to normalise coordinates - if
1176	* we set the map, that doesn't work if the location is within
1177	* a map and this is straddling an edge. So only if coordinate
1178	* is clear wrong do we normalise it.
1179	*/
1180	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1181	more->map = get_map_from_coord (m, &more->x, &more->y);
1182	else if (!more->map)
1183	{
1184	/* For backwards compatibility - when not dealing with tiled maps,
1185	* more->map should always point to the parent.
1186	*/
1187	more->map = m;
1188	}
1189
1190	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1178	if (!insert_ob_in_map (more, m, originator, flag))
1191	{	1179	{
1192	if (!op->head)	1180	if (!op->head)
1193	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1181	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1194		1182
1195	return 0;	1183	return 0;
…		…
1200		1188
1201	/* Ideally, the caller figures this out. However, it complicates a lot	1189	/* Ideally, the caller figures this out. However, it complicates a lot
1202	* of areas of callers (eg, anything that uses find_free_spot would now	1190	* of areas of callers (eg, anything that uses find_free_spot would now
1203	* need extra work	1191	* need extra work
1204	*/	1192	*/
1205	op->map = get_map_from_coord (m, &op->x, &op->y);	1193	if (!xy_normalise (m, op->x, op->y))
1206	x = op->x;	1194	return 0;
1207	y = op->y;	1195
		1196	op->map = m;
		1197	mapspace &ms = op->ms ();
1208		1198
1209	/* this has to be done after we translate the coordinates.	1199	/* this has to be done after we translate the coordinates.
1210	*/	1200	*/
1211	if (op->nrof && !(flag & INS_NO_MERGE))	1201	if (op->nrof && !(flag & INS_NO_MERGE))
1212	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1202	for (tmp = ms.bot; tmp; tmp = tmp->above)
1213	if (object::can_merge (op, tmp))	1203	if (object::can_merge (op, tmp))
1214	{	1204	{
1215	op->nrof += tmp->nrof;	1205	op->nrof += tmp->nrof;
1216	tmp->destroy ();	1206	tmp->destroy ();
1217	}	1207	}
…		…
1234	op->below = originator->below;	1224	op->below = originator->below;
1235		1225
1236	if (op->below)	1226	if (op->below)
1237	op->below->above = op;	1227	op->below->above = op;
1238	else	1228	else
1239	op->ms ().bot = op;	1229	ms.bot = op;
1240		1230
1241	/* since below originator, no need to update top */	1231	/* since below originator, no need to update top */
1242	originator->below = op;	1232	originator->below = op;
1243	}	1233	}
1244	else	1234	else
1245	{	1235	{
		1236	top = ms.bot;
		1237
1246	/* If there are other objects, then */	1238	/* If there are other objects, then */
1247	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1239	if ((!(flag & INS_MAP_LOAD)) && top)
1248	{	1240	{
1249	object *last = 0;	1241	object *last = 0;
1250		1242
1251	/*	1243	/*
1252	* If there are multiple objects on this space, we do some trickier handling.	1244	* If there are multiple objects on this space, we do some trickier handling.
…		…
1258	* once we get to them. This reduces the need to traverse over all of	1250	* once we get to them. This reduces the need to traverse over all of
1259	* them when adding another one - this saves quite a bit of cpu time	1251	* them when adding another one - this saves quite a bit of cpu time
1260	* when lots of spells are cast in one area. Currently, it is presumed	1252	* when lots of spells are cast in one area. Currently, it is presumed
1261	* that flying non pickable objects are spell objects.	1253	* that flying non pickable objects are spell objects.
1262	*/	1254	*/
1263	while (top)	1255	for (top = ms.bot; top; top = top->above)
1264	{	1256	{
1265	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1257	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1266	floor = top;	1258	floor = top;
1267		1259
1268	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1260	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1271	top = top->below;	1263	top = top->below;
1272	break;	1264	break;
1273	}	1265	}
1274		1266
1275	last = top;	1267	last = top;
1276	top = top->above;
1277	}	1268	}
1278		1269
1279	/* Don't want top to be NULL, so set it to the last valid object */	1270	/* Don't want top to be NULL, so set it to the last valid object */
1280	top = last;	1271	top = last;
1281		1272
…		…
1288	* Unless those objects are exits, type 66	1279	* Unless those objects are exits, type 66
1289	* If INS_ON_TOP is used, don't do this processing	1280	* If INS_ON_TOP is used, don't do this processing
1290	* Need to find the object that in fact blocks view, otherwise	1281	* Need to find the object that in fact blocks view, otherwise
1291	* stacking is a bit odd.	1282	* stacking is a bit odd.
1292	*/	1283	*/
1293	if (!(flag & INS_ON_TOP) &&	1284	if (!(flag & INS_ON_TOP)
1294	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1285	&& ms.flags () & P_BLOCKSVIEW
		1286	&& (op->face && !op->face->visibility))
1295	{	1287	{
1296	for (last = top; last != floor; last = last->below)	1288	for (last = top; last != floor; last = last->below)
1297	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1289	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1298	break;	1290	break;
		1291
1299	/* Check to see if we found the object that blocks view,	1292	/* Check to see if we found the object that blocks view,
1300	* and make sure we have a below pointer for it so that	1293	* and make sure we have a below pointer for it so that
1301	* we can get inserted below this one, which requires we	1294	* we can get inserted below this one, which requires we
1302	* set top to the object below us.	1295	* set top to the object below us.
1303	*/	1296	*/
…		…
1305	top = last->below;	1298	top = last->below;
1306	}	1299	}
1307	} /* If objects on this space */	1300	} /* If objects on this space */
1308		1301
1309	if (flag & INS_MAP_LOAD)	1302	if (flag & INS_MAP_LOAD)
1310	top = GET_MAP_TOP (op->map, op->x, op->y);	1303	top = ms.top;
1311		1304
1312	if (flag & INS_ABOVE_FLOOR_ONLY)	1305	if (flag & INS_ABOVE_FLOOR_ONLY)
1313	top = floor;	1306	top = floor;
1314		1307
1315	/* Top is the object that our object (op) is going to get inserted above.	1308	/* Top is the object that our object (op) is going to get inserted above.
1316	*/	1309	*/
1317		1310
1318	/* First object on this space */	1311	/* First object on this space */
1319	if (!top)	1312	if (!top)
1320	{	1313	{
1321	op->above = GET_MAP_OB (op->map, op->x, op->y);	1314	op->above = ms.bot;
1322		1315
1323	if (op->above)	1316	if (op->above)
1324	op->above->below = op;	1317	op->above->below = op;
1325		1318
1326	op->below = 0;	1319	op->below = 0;
1327	op->ms ().bot = op;	1320	ms.bot = op;
1328	}	1321	}
1329	else	1322	else
1330	{ /* get inserted into the stack above top */	1323	{ /* get inserted into the stack above top */
1331	op->above = top->above;	1324	op->above = top->above;
1332		1325
…		…
1336	op->below = top;	1329	op->below = top;
1337	top->above = op;	1330	top->above = op;
1338	}	1331	}
1339		1332
1340	if (!op->above)	1333	if (!op->above)
1341	op->ms ().top = op;	1334	ms.top = op;
1342	} /* else not INS_BELOW_ORIGINATOR */	1335	} /* else not INS_BELOW_ORIGINATOR */
1343		1336
1344	if (op->type == PLAYER)	1337	if (op->type == PLAYER)
1345	{	1338	{
1346	op->contr->do_los = 1;	1339	op->contr->do_los = 1;
…		…
1352		1345
1353	/* If we have a floor, we know the player, if any, will be above	1346	/* If we have a floor, we know the player, if any, will be above
1354	* it, so save a few ticks and start from there.	1347	* it, so save a few ticks and start from there.
1355	*/	1348	*/
1356	if (!(flag & INS_MAP_LOAD))	1349	if (!(flag & INS_MAP_LOAD))
1357	if (object *pl = op->ms ().player ())	1350	if (object *pl = ms.player ())
1358	if (pl->contr->ns)	1351	if (pl->contr->ns)
1359	pl->contr->ns->floorbox_update ();	1352	pl->contr->ns->floorbox_update ();
1360		1353
1361	/* If this object glows, it may affect lighting conditions that are	1354	/* If this object glows, it may affect lighting conditions that are
1362	* visible to others on this map. But update_all_los is really	1355	* visible to others on this map. But update_all_los is really
…		…
1771	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1764	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1772	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1765	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1773	{	1766	{
1774		1767
1775	float	1768	float
1776	diff = tmp->move_slow_penalty * FABS (op->speed);	1769	diff = tmp->move_slow_penalty * fabs (op->speed);
1777		1770
1778	if (op->type == PLAYER)	1771	if (op->type == PLAYER)
1779	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1772	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1780	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1773	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1781	diff /= 4.0;	1774	diff /= 4.0;
…		…
1988	}	1981	}
1989		1982
1990	if (!index)	1983	if (!index)
1991	return -1;	1984	return -1;
1992		1985
1993	return altern[RANDOM () % index];	1986	return altern [rndm (index)];
1994	}	1987	}
1995		1988
1996	/*	1989	/*
1997	* find_first_free_spot(archetype, maptile, x, y) works like	1990	* find_first_free_spot(archetype, maptile, x, y) works like
1998	* find_free_spot(), but it will search max number of squares.	1991	* find_free_spot(), but it will search max number of squares.
…		…
2019	{	2012	{
2020	arr += begin;	2013	arr += begin;
2021	end -= begin;	2014	end -= begin;
2022		2015
2023	while (--end)	2016	while (--end)
2024	swap (arr [end], arr [RANDOM () % (end + 1)]);	2017	swap (arr [end], arr [rndm (end + 1)]);
2025	}	2018	}
2026		2019
2027	/* new function to make monster searching more efficient, and effective!	2020	/* new function to make monster searching more efficient, and effective!
2028	* This basically returns a randomized array (in the passed pointer) of	2021	* This basically returns a randomized array (in the passed pointer) of
2029	* the spaces to find monsters. In this way, it won't always look for	2022	* the spaces to find monsters. In this way, it won't always look for
…		…
2163		2156
2164	return 3;	2157	return 3;
2165	}	2158	}
2166		2159
2167	/*	2160	/*
2168	* absdir(int): Returns a number between 1 and 8, which represent
2169	* the "absolute" direction of a number (it actually takes care of
2170	* "overflow" in previous calculations of a direction).
2171	*/
2172
2173	int
2174	absdir (int d)
2175	{
2176	while (d < 1)
2177	d += 8;
2178
2179	while (d > 8)
2180	d -= 8;
2181
2182	return d;
2183	}
2184
2185	/*
2186	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2161	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2187	* between two directions (which are expected to be absolute (see absdir())	2162	* between two directions (which are expected to be absolute (see absdir())
2188	*/	2163	*/
2189
2190	int	2164	int
2191	dirdiff (int dir1, int dir2)	2165	dirdiff (int dir1, int dir2)
2192	{	2166	{
2193	int d;	2167	int d;
2194		2168
…		…
2610	{	2584	{
2611	char flagdesc[512];	2585	char flagdesc[512];
2612	char info2[256 * 4];	2586	char info2[256 * 4];
2613	char *p = info;	2587	char *p = info;
2614		2588
2615	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2589	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2616	count, uuid.seq,	2590	count, uuid.seq,
2617	&name,	2591	&name,
2618	title ? "\",title:" : "",	2592	title ? "\",title:\"" : "",
2619	title ? (const char *)title : "",	2593	title ? (const char *)title : "",
2620	flag_desc (flagdesc, 512), type);	2594	flag_desc (flagdesc, 512), type);
2621		2595
2622	if (env)	2596	if (env)
2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2597	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2633	{	2607	{
2634	static char info[256 * 4];	2608	static char info[256 * 4];
2635	return debug_desc (info);	2609	return debug_desc (info);
2636	}	2610	}
2637		2611
		2612	const char *
		2613	object::debug_desc2 () const
		2614	{
		2615	static char info[256 * 4];
		2616	return debug_desc (info);
		2617	}
		2618
		2619	struct region *
		2620	object::region () const
		2621	{
		2622	return map ? map->region (x, y)
		2623	: region::default_region ();
		2624	}
		2625
		2626	const materialtype_t *
		2627	object::dominant_material () const
		2628	{
		2629	if (materialtype_t *mat = name_to_material (materialname))
		2630	return mat;
		2631
		2632	// omfg this is slow, this has to be temporary :)
		2633	shstr unknown ("unknown");
		2634
		2635	return name_to_material (unknown);
		2636	}
		2637
		2638	void
		2639	object::open_container (object *new_container)
		2640	{
		2641	if (container == new_container)
		2642	return;
		2643
		2644	if (contr && contr->ns)
		2645	contr->ns->floorbox_reset ();
		2646
		2647	if (object *old_container = container)
		2648	{
		2649	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2650	return;
		2651
		2652	#if 0
		2653	// remove the "Close old_container" object.
		2654	if (object *closer = old_container->inv)
		2655	if (closer->type == CLOSE_CON)
		2656	closer->destroy ();
		2657	#endif
		2658
		2659	old_container->flag [FLAG_APPLIED] = 0;
		2660	container = 0;
		2661
		2662	esrv_update_item (UPD_FLAGS, this, old_container);
		2663	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2664	}
		2665
		2666	if (new_container)
		2667	{
		2668	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2669	return;
		2670
		2671	// TODO: this does not seem to serve any purpose anymore?
		2672	#if 0
		2673	// insert the "Close Container" object.
		2674	if (archetype *closer = new_container->other_arch)
		2675	{
		2676	object *closer = arch_to_object (new_container->other_arch);
		2677	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2678	new_container->insert (closer);
		2679	}
		2680	#endif
		2681
		2682	new_container->flag [FLAG_APPLIED] = 1;
		2683	container = new_container;
		2684
		2685	esrv_update_item (UPD_FLAGS, this, new_container);
		2686	esrv_send_inventory (this, new_container);
		2687	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2688	}
		2689	}
		2690
		2691

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC vs. Revision 1.131 by root, Sat Feb 10 15:20:23 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.131 by root, Sat Feb 10 15:20:23 2007 UTC