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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC vs.
Revision 1.296 by root, Fri Nov 6 13:31:47 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* 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 Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
37	uint32_t mapspace::smellcount = 10000;	38	uint32_t mapspace::smellcount = 10000;
38		39
39	objectvec objects;	40	objectvec objects;
40	activevec actives;	41	activevec actives;
		42
		43	//+GPL
41		44
42	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
43	0,	46	0,
44	0, 1, 1, 1, 0, -1, -1, -1,	47	0, 1, 1, 1, 0, -1, -1, -1,
45	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
49	0,	52	0,
50	-1, -1, 0, 1, 1, 1, 0, -1,	53	-1, -1, 0, 1, 1, 1, 0, -1,
51	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53	};	56	};
54	int maxfree[SIZEOFFREE] = {
55	0,
56	9, 10, 13, 14, 17, 18, 21, 22,
57	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59	};
60	int freedir[SIZEOFFREE] = {	57	int freedir[SIZEOFFREE] = {
61	0,	58	0,
62	1, 2, 3, 4, 5, 6, 7, 8,	59	1, 2, 3, 4, 5, 6, 7, 8,
63	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
64	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	61	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
		62	};
		63
		64	static int maxfree[SIZEOFFREE] = {
		65	0,
		66	9, 10, 13, 14, 17, 18, 21, 22,
		67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
65	};	69	};
66		70
67	static void	71	static void
68	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
69	{	73	{
…		…
328	// the player inventory itself is always visible	332	// the player inventory itself is always visible
329	if (env->is_player ())	333	if (env->is_player ())
330	return env;	334	return env;
331		335
332	// else a player could have our env open	336	// else a player could have our env open
333	object *envest = env->outer_env ();	337	object *envest = env->outer_env_or_self ();
334		338
335	// the player itself is always on a map, so we will find him here	339	// the player itself is always on a map, so we will find him here
336	// even if our inv is in a player.	340	// even if our inv is in a player.
337	if (envest->is_on_map ())	341	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	342	if (object *pl = envest->ms ().player ())
339	if (pl->container == env)	343	if (pl->container_ () == env)
340	return pl;	344	return pl;
341	}	345	}
342	else	346	else
343	{	347	{
344	// maybe there is a player standing on the same mapspace	348	// maybe there is a player standing on the same mapspace
345	// this will catch the case where "this" is a player	349	// this will catch the case where "this" is a player
346	if (object *pl = ms ().player ())	350	if (object *pl = ms ().player ())
347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	351	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348	\|\| this == pl->container)	352	\|\| pl->container_ () == this)
349	return pl;	353	return pl;
350	}	354	}
351	}	355	}
352		356
353	return 0;	357	return 0;
…		…
431	object_freezer freezer;	435	object_freezer freezer;
432	op->write (freezer);	436	op->write (freezer);
433	return freezer.as_string ();	437	return freezer.as_string ();
434	}	438	}
435		439
436	/*	440	char *
437	* get_nearest_part(multi-object, object 2) returns the part of the	441	object::as_string ()
438	* multi-object 1 which is closest to the second object.
439	* If it's not a multi-object, it is returned.
440	*/
441	object *
442	get_nearest_part (object op, const object pl)
443	{	442	{
444	object tmp, closest;	443	return dump_object (this);
445	int last_dist, i;
446
447	if (!op->more)
448	return op;
449
450	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
451	tmp;
452	tmp = tmp->more)
453	if ((i = distance (tmp, pl)) < last_dist)
454	closest = tmp, last_dist = i;
455
456	return closest;
457	}	444	}
458		445
459	/*	446	/*
460	* Returns the object which has the count-variable equal to the argument.	447	* Returns the object which has the count-variable equal to the argument.
461	* VERRRY slow.	448	* VERRRY slow.
…		…
555	update_stats ();	542	update_stats ();
556		543
557	new_draw_info_format (NDI_UNIQUE, 0, this,	544	new_draw_info_format (NDI_UNIQUE, 0, this,
558	"You try to balance all your items at once, "	545	"You try to balance all your items at once, "
559	"but the %s is just too much for your body. "	546	"but the %s is just too much for your body. "
560	"[You need to unapply some items first.]", &ob->name);	547	"[You need to unapply some items first - use the 'body' command to see "
		548	"how many items you cna wera on a specific body part.]", &ob->name);
561	return false;	549	return false;
562	}	550	}
563		551
564	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	552	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565	}	553	}
…		…
792		780
793	object::object ()	781	object::object ()
794	{	782	{
795	SET_FLAG (this, FLAG_REMOVED);	783	SET_FLAG (this, FLAG_REMOVED);
796		784
797	expmul = 1.0;	785	//expmul = 1.0; declared const for the time being
798	face = blank_face;	786	face = blank_face;
799	}	787	}
800		788
801	object::~object ()	789	object::~object ()
802	{	790	{
…		…
831	{	819	{
832	/* If already on active list, don't do anything */	820	/* If already on active list, don't do anything */
833	if (active)	821	if (active)
834	return;	822	return;
835		823
836	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839	if (has_active_speed ())	824	if (has_active_speed ())
		825	{
		826	if (flag [FLAG_FREED])
		827	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		828
840	actives.insert (this);	829	actives.insert (this);
		830	}
841	}	831	}
842		832
843	void	833	void
844	object::activate_recursive ()	834	object::activate_recursive ()
845	{	835	{
…		…
963		953
964	void	954	void
965	object::do_destroy ()	955	object::do_destroy ()
966	{	956	{
967	if (flag [FLAG_IS_LINKED])	957	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	958	remove_link ();
969		959
970	if (flag [FLAG_FRIENDLY])	960	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	961	remove_friendly_object (this);
972		962
973	remove ();	963	remove ();
…		…
1031	* the previous environment.	1021	* the previous environment.
1032	*/	1022	*/
1033	void	1023	void
1034	object::do_remove ()	1024	object::do_remove ()
1035	{	1025	{
1036	object tmp, last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1026	if (flag [FLAG_REMOVED])
1040	return;	1027	return;
1041		1028
1042	INVOKE_OBJECT (REMOVE, this);	1029	INVOKE_OBJECT (REMOVE, this);
1043		1030
…		…
1097		1084
1098	if (object *pl = ms.player ())	1085	if (object *pl = ms.player ())
1099	{	1086	{
1100	if (is_player ())	1087	if (is_player ())
1101	{	1088	{
		1089	if (!flag [FLAG_WIZPASS])
1102	ms.smell = ++mapspace::smellcount; // remember the smell of the player	1090	ms.smell = ++mapspace::smellcount; // remember the smell of the player
1103		1091
1104	// leaving a spot always closes any open container on the ground	1092	// leaving a spot always closes any open container on the ground
1105	if (container && !container->env)	1093	if (container && !container->env)
1106	// this causes spurious floorbox updates, but it ensures	1094	// this causes spurious floorbox updates, but it ensures
1107	// that the CLOSE event is being sent.	1095	// that the CLOSE event is being sent.
1108	close_container ();	1096	close_container ();
1109		1097
1110	--map->players;	1098	--map->players;
1111	map->touch ();	1099	map->touch ();
1112	}	1100	}
1113	else if (pl->container == this)	1101	else if (pl->container_ () == this)
1114	{	1102	{
1115	// removing a container should close it	1103	// removing a container should close it
1116	close_container ();	1104	close_container ();
1117	}	1105	}
1118		1106
…		…
1134		1122
1135	int check_walk_off = !flag [FLAG_NO_APPLY];	1123	int check_walk_off = !flag [FLAG_NO_APPLY];
1136		1124
1137	if (object *pl = ms.player ())	1125	if (object *pl = ms.player ())
1138	{	1126	{
1139	if (pl->container == this)	1127	if (pl->container_ () == this)
1140	/* If a container that the player is currently using somehow gets	1128	/* If a container that the player is currently using somehow gets
1141	* removed (most likely destroyed), update the player view	1129	* removed (most likely destroyed), update the player view
1142	* appropriately.	1130	* appropriately.
1143	*/	1131	*/
1144	pl->close_container ();	1132	pl->close_container ();
…		…
1148	//TODO: update floorbox to preserve ordering	1136	//TODO: update floorbox to preserve ordering
1149	if (pl->contr->ns)	1137	if (pl->contr->ns)
1150	pl->contr->ns->floorbox_update ();	1138	pl->contr->ns->floorbox_update ();
1151	}	1139	}
1152		1140
		1141	if (check_walk_off)
1153	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (object above, tmp = ms.bot; tmp; tmp = above)
1154	{	1143	{
		1144	above = tmp->above;
		1145
1155	/* No point updating the players look faces if he is the object	1146	/* No point updating the players look faces if he is the object
1156	* being removed.	1147	* being removed.
1157	*/	1148	*/
1158		1149
1159	/* See if object moving off should effect something */	1150	/* See if object moving off should effect something */
1160	if (check_walk_off
1161	&& ((move_type & tmp->move_off)	1151	if ((move_type & tmp->move_off)
1162	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1152	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1163	{
1164	move_apply (tmp, this, 0);	1153	move_apply (tmp, this, 0);
1165
1166	if (destroyed ())
1167	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1168	}	1154	}
1169
1170	last = tmp;
1171	}
1172		1155
1173	if (affects_los ())	1156	if (affects_los ())
1174	update_all_los (map, x, y);	1157	update_all_los (map, x, y);
1175	}	1158	}
1176	}	1159	}
…		…
1285		1268
1286	/* Ideally, the caller figures this out. However, it complicates a lot	1269	/* Ideally, the caller figures this out. However, it complicates a lot
1287	* of areas of callers (eg, anything that uses find_free_spot would now	1270	* of areas of callers (eg, anything that uses find_free_spot would now
1288	* need extra work	1271	* need extra work
1289	*/	1272	*/
		1273	maptile *newmap = m;
1290	if (!xy_normalise (m, op->x, op->y))	1274	if (!xy_normalise (newmap, op->x, op->y))
1291	{	1275	{
1292	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found	1276	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1293	return 0;	1277	return 0;
1294	}	1278	}
1295		1279
1296	if (object *more = op->more)	1280	if (object *more = op->more)
1297	if (!insert_ob_in_map (more, m, originator, flag))	1281	if (!insert_ob_in_map (more, m, originator, flag))
1298	return 0;	1282	return 0;
1299		1283
1300	CLEAR_FLAG (op, FLAG_REMOVED);	1284	op->flag [FLAG_REMOVED] = false;
1301		1285	op->env = 0;
1302	op->map = m;	1286	op->map = newmap;
		1287
1303	mapspace &ms = op->ms ();	1288	mapspace &ms = op->ms ();
1304		1289
1305	/* this has to be done after we translate the coordinates.	1290	/* this has to be done after we translate the coordinates.
1306	*/	1291	*/
1307	if (op->nrof && !(flag & INS_NO_MERGE))	1292	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1328	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1313	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1329	abort ();	1314	abort ();
1330	}	1315	}
1331		1316
1332	if (!originator->is_on_map ())	1317	if (!originator->is_on_map ())
		1318	{
1333	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1319	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1334	op->debug_desc (), originator->debug_desc ());	1320	op->debug_desc (), originator->debug_desc ());
		1321	abort ();
		1322	}
1335		1323
1336	op->above = originator;	1324	op->above = originator;
1337	op->below = originator->below;	1325	op->below = originator->below;
1338	originator->below = op;	1326	originator->below = op;
1339		1327
…		…
1471	* blocked() and wall() work properly), and these flags are updated by	1459	* blocked() and wall() work properly), and these flags are updated by
1472	* update_object().	1460	* update_object().
1473	*/	1461	*/
1474		1462
1475	/* if this is not the head or flag has been passed, don't check walk on status */	1463	/* if this is not the head or flag has been passed, don't check walk on status */
1476	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1464	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1477	{	1465	{
1478	if (check_move_on (op, originator))	1466	if (check_move_on (op, originator))
1479	return 0;	1467	return 0;
1480		1468
1481	/* If we are a multi part object, lets work our way through the check	1469	/* If we are a multi part object, lets work our way through the check
…		…
1492	/* this function inserts an object in the map, but if it	1480	/* this function inserts an object in the map, but if it
1493	* finds an object of its own type, it'll remove that one first.	1481	* finds an object of its own type, it'll remove that one first.
1494	* op is the object to insert it under: supplies x and the map.	1482	* op is the object to insert it under: supplies x and the map.
1495	*/	1483	*/
1496	void	1484	void
1497	replace_insert_ob_in_map (const char arch_string, object op)	1485	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1498	{	1486	{
1499	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1500		1488
1501	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1489	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1502	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1490	if (tmp->arch->archname == archname) /* same archetype */
1503	tmp->destroy ();	1491	tmp->destroy ();
1504		1492
1505	object *tmp = arch_to_object (archetype::find (arch_string));	1493	object *tmp = arch_to_object (archetype::find (archname));
1506		1494
1507	tmp->x = op->x;	1495	tmp->x = op->x;
1508	tmp->y = op->y;	1496	tmp->y = op->y;
1509		1497
1510	insert_ob_in_map (tmp, op->map, op, 0);	1498	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1696	* on top.	1684	* on top.
1697	*/	1685	*/
1698	int	1686	int
1699	check_move_on (object op, object originator)	1687	check_move_on (object op, object originator)
1700	{	1688	{
		1689	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1690	return 0;
		1691
1701	object *tmp;	1692	object *tmp;
1702	maptile *m = op->map;	1693	maptile *m = op->map;
1703	int x = op->x, y = op->y;	1694	int x = op->x, y = op->y;
1704		1695
1705	MoveType move_on, move_slow, move_block;	1696	mapspace &ms = m->at (x, y);
1706		1697
1707	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1698	ms.update ();
1708	return 0;
1709		1699
1710	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1700	MoveType move_on = ms.move_on;
1711	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1701	MoveType move_slow = ms.move_slow;
1712	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1702	MoveType move_block = ms.move_block;
1713		1703
1714	/* if nothing on this space will slow op down or be applied,	1704	/* if nothing on this space will slow op down or be applied,
1715	* no need to do checking below. have to make sure move_type	1705	* no need to do checking below. have to make sure move_type
1716	* is set, as lots of objects don't have it set - we treat that	1706	* is set, as lots of objects don't have it set - we treat that
1717	* as walking.	1707	* as walking.
…		…
1728	return 0;	1718	return 0;
1729		1719
1730	/* The objects have to be checked from top to bottom.	1720	/* The objects have to be checked from top to bottom.
1731	* Hence, we first go to the top:	1721	* Hence, we first go to the top:
1732	*/	1722	*/
1733		1723	for (object next, tmp = ms.top; tmp; tmp = next)
1734	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1735	{
1736	/* Trim the search when we find the first other spell effect
1737	* this helps performance so that if a space has 50 spell objects,
1738	* we don't need to check all of them.
1739	*/
1740	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1741	break;
1742	}	1724	{
		1725	next = tmp->below;
1743		1726
1744	for (; tmp; tmp = tmp->below)
1745	{
1746	if (tmp == op)	1727	if (tmp == op)
1747	continue; /* Can't apply yourself */	1728	continue; /* Can't apply yourself */
1748		1729
1749	/* Check to see if one of the movement types should be slowed down.	1730	/* Check to see if one of the movement types should be slowed down.
1750	* Second check makes sure that the movement types not being slowed	1731	* Second check makes sure that the movement types not being slowed
…		…
1755	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1736	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1756	{	1737	{
1757	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1738	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1758	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1739	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1759	{	1740	{
1760
1761	float
1762	diff = tmp->move_slow_penalty * fabs (op->speed);	1741	float diff = tmp->move_slow_penalty * fabs (op->speed);
1763		1742
1764	if (op->is_player ())	1743	if (op->is_player ())
1765	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1744	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1766	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1745	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1767	diff /= 4.0;	1746	diff /= 4.0;
1768		1747
1769	op->speed_left -= diff;	1748	op->speed_left -= diff;
1770	}	1749	}
1771	}	1750	}
…		…
2055	* there is capable of.	2034	* there is capable of.
2056	*/	2035	*/
2057	int	2036	int
2058	find_dir (maptile m, int x, int y, object exclude)	2037	find_dir (maptile m, int x, int y, object exclude)
2059	{	2038	{
2060	int i, max = SIZEOFFREE, mflags;	2039	int max = SIZEOFFREE, mflags;
2061
2062	sint16 nx, ny;
2063	object *tmp;
2064	maptile *mp;
2065
2066	MoveType blocked, move_type;	2040	MoveType move_type;
2067		2041
2068	if (exclude && exclude->head_ () != exclude)	2042	if (exclude && exclude->head_ () != exclude)
2069	{	2043	{
2070	exclude = exclude->head;	2044	exclude = exclude->head;
2071	move_type = exclude->move_type;	2045	move_type = exclude->move_type;
…		…
2074	{	2048	{
2075	/* If we don't have anything, presume it can use all movement types. */	2049	/* If we don't have anything, presume it can use all movement types. */
2076	move_type = MOVE_ALL;	2050	move_type = MOVE_ALL;
2077	}	2051	}
2078		2052
2079	for (i = 1; i < max; i++)	2053	for (int i = 1; i < max; i++)
2080	{	2054	{
2081	mp = m;	2055	mapxy pos (m, x, y);
2082	nx = x + freearr_x[i];	2056	pos.move (i);
2083	ny = y + freearr_y[i];
2084		2057
2085	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2058	if (!pos.normalise ())
2086
2087	if (mflags & P_OUT_OF_MAP)
2088	max = maxfree[i];	2059	max = maxfree[i];
2089	else	2060	else
2090	{	2061	{
2091	mapspace &ms = mp->at (nx, ny);	2062	mapspace &ms = *pos;
2092		2063
2093	blocked = ms.move_block;
2094
2095	if ((move_type & blocked) == move_type)	2064	if ((move_type & ms.move_block) == move_type)
2096	max = maxfree[i];	2065	max = maxfree [i];
2097	else if (mflags & P_IS_ALIVE)	2066	else if (ms.flags () & P_IS_ALIVE)
2098	{	2067	{
2099	for (tmp = ms.bot; tmp; tmp = tmp->above)	2068	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2100	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())	2069	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2101	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2070	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2102	break;
2103
2104	if (tmp)
2105	return freedir[i];	2071	return freedir [i];
2106	}	2072	}
2107	}	2073	}
2108	}	2074	}
2109		2075
2110	return 0;	2076	return 0;
…		…
2185	* This basically means that if direction is 15, then it could either go	2151	* This basically means that if direction is 15, then it could either go
2186	* direction 4, 14, or 16 to get back to where we are.	2152	* direction 4, 14, or 16 to get back to where we are.
2187	* Moved from spell_util.c to object.c with the other related direction	2153	* Moved from spell_util.c to object.c with the other related direction
2188	* functions.	2154	* functions.
2189	*/	2155	*/
2190	int reduction_dir[SIZEOFFREE][3] = {	2156	static const int reduction_dir[SIZEOFFREE][3] = {
2191	{0, 0, 0}, /* 0 */	2157	{0, 0, 0}, /* 0 */
2192	{0, 0, 0}, /* 1 */	2158	{0, 0, 0}, /* 1 */
2193	{0, 0, 0}, /* 2 */	2159	{0, 0, 0}, /* 2 */
2194	{0, 0, 0}, /* 3 */	2160	{0, 0, 0}, /* 3 */
2195	{0, 0, 0}, /* 4 */	2161	{0, 0, 0}, /* 4 */
…		…
2333	return tmp;	2299	return tmp;
2334		2300
2335	return 0;	2301	return 0;
2336	}	2302	}
2337		2303
2338	const shstr &	2304	shstr_tmp
2339	object::kv_get (const shstr &key) const	2305	object::kv_get (shstr_tmp key) const
2340	{	2306	{
2341	for (key_value *kv = key_values; kv; kv = kv->next)	2307	for (key_value *kv = key_values; kv; kv = kv->next)
2342	if (kv->key == key)	2308	if (kv->key == key)
2343	return kv->value;	2309	return kv->value;
2344		2310
2345	return shstr_null;	2311	return shstr ();
2346	}	2312	}
2347		2313
2348	void	2314	void
2349	object::kv_set (const shstr &key, const shstr &value)	2315	object::kv_set (shstr_tmp key, shstr_tmp value)
2350	{	2316	{
2351	for (key_value *kv = key_values; kv; kv = kv->next)	2317	for (key_value *kv = key_values; kv; kv = kv->next)
2352	if (kv->key == key)	2318	if (kv->key == key)
2353	{	2319	{
2354	kv->value = value;	2320	kv->value = value;
…		…
2363		2329
2364	key_values = kv;	2330	key_values = kv;
2365	}	2331	}
2366		2332
2367	void	2333	void
2368	object::kv_del (const shstr &key)	2334	object::kv_del (shstr_tmp key)
2369	{	2335	{
2370	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2336	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2371	if ((*kvp)->key == key)	2337	if ((*kvp)->key == key)
2372	{	2338	{
2373	key_value kv = kvp;	2339	key_value kv = kvp;
…		…
2504	container = 0;	2470	container = 0;
2505		2471
2506	// client needs item update to make it work, client bug requires this to be separate	2472	// client needs item update to make it work, client bug requires this to be separate
2507	esrv_update_item (UPD_FLAGS, this, old_container);	2473	esrv_update_item (UPD_FLAGS, this, old_container);
2508		2474
2509	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2475	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2510	play_sound (sound_find ("chest_close"));	2476	play_sound (sound_find ("chest_close"));
2511	}	2477	}
2512		2478
2513	if (new_container)	2479	if (new_container)
2514	{	2480	{
…		…
2524	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2490	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2525	new_container->insert (closer);	2491	new_container->insert (closer);
2526	}	2492	}
2527	#endif	2493	#endif
2528		2494
2529	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2495	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2530		2496
2531	// make sure the container is available, client bug requires this to be separate	2497	// make sure the container is available, client bug requires this to be separate
2532	esrv_send_item (this, new_container);	2498	esrv_send_item (this, new_container);
2533		2499
2534	new_container->flag [FLAG_APPLIED] = true;	2500	new_container->flag [FLAG_APPLIED] = true;
…		…
2542	// else if (!old_container->env && contr && contr->ns)	2508	// else if (!old_container->env && contr && contr->ns)
2543	// contr->ns->floorbox_reset ();	2509	// contr->ns->floorbox_reset ();
2544	}	2510	}
2545		2511
2546	object *	2512	object *
2547	object::force_find (const shstr name)	2513	object::force_find (shstr_tmp name)
2548	{	2514	{
2549	/* cycle through his inventory to look for the MARK we want to	2515	/* cycle through his inventory to look for the MARK we want to
2550	* place	2516	* place
2551	*/	2517	*/
2552	for (object *tmp = inv; tmp; tmp = tmp->below)	2518	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2554	return splay (tmp);	2520	return splay (tmp);
2555		2521
2556	return 0;	2522	return 0;
2557	}	2523	}
2558		2524
		2525	//-GPL
		2526
		2527	void
		2528	object::force_set_timer (int duration)
		2529	{
		2530	this->duration = 1;
		2531	this->speed_left = -1.f;
		2532
		2533	this->set_speed (duration ? 1.f / duration : 0.f);
		2534	}
		2535
2559	object *	2536	object *
2560	object::force_add (const shstr name, int duration)	2537	object::force_add (shstr_tmp name, int duration)
2561	{	2538	{
2562	if (object *force = force_find (name))	2539	if (object *force = force_find (name))
2563	force->destroy ();	2540	force->destroy ();
2564		2541
2565	object *force = get_archetype (FORCE_NAME);	2542	object *force = get_archetype (FORCE_NAME);
2566		2543
2567	force->slaying = name;	2544	force->slaying = name;
2568	force->stats.food = 1;	2545	force->force_set_timer (duration);
2569	force->speed_left = -1.f;
2570
2571	force->set_speed (duration ? 1.f / duration : 0.f);
2572	force->flag [FLAG_IS_USED_UP] = true;
2573	force->flag [FLAG_APPLIED] = true;	2546	force->flag [FLAG_APPLIED] = true;
2574		2547
2575	return insert (force);	2548	return insert (force);
2576	}	2549	}
2577		2550
2578	void	2551	void
2579	object::play_sound (faceidx sound)	2552	object::play_sound (faceidx sound) const
2580	{	2553	{
2581	if (!sound)	2554	if (!sound)
2582	return;	2555	return;
2583		2556
2584	if (flag [FLAG_REMOVED])	2557	if (is_on_map ())
2585	return;
2586
2587	if (env)
2588	{
2589	if (object *pl = in_player ())
2590	pl->contr->play_sound (sound);
2591	}
2592	else
2593	map->play_sound (sound, x, y);	2558	map->play_sound (sound, x, y);
		2559	else if (object *pl = in_player ())
		2560	pl->contr->play_sound (sound);
		2561	}
		2562
		2563	void
		2564	object::say_msg (const char *msg) const
		2565	{
		2566	if (is_on_map ())
		2567	map->say_msg (msg, x, y);
		2568	else if (object *pl = in_player ())
		2569	pl->contr->play_sound (sound);
2594	}	2570	}
2595		2571
2596	void	2572	void
2597	object::make_noise ()	2573	object::make_noise ()
2598	{	2574	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC vs. Revision 1.296 by root, Fri Nov 6 13:31:47 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC vs.
Revision 1.296 by root, Fri Nov 6 13:31:47 2009 UTC