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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC vs.
Revision 1.292 by root, Mon Oct 19 21:48:49 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>
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
37		39
38	objectvec objects;	40	objectvec objects;
39	activevec actives;	41	activevec actives;
40		42
41	short freearr_x[SIZEOFFREE] = {	43	short freearr_x[SIZEOFFREE] = {
…		…
327	// the player inventory itself is always visible	329	// the player inventory itself is always visible
328	if (env->is_player ())	330	if (env->is_player ())
329	return env;	331	return env;
330		332
331	// else a player could have our env open	333	// else a player could have our env open
332	object *envest = env->outer_env ();	334	object *envest = env->outer_env_or_self ();
333		335
334	// the player itself is always on a map, so we will find him here	336	// the player itself is always on a map, so we will find him here
335	// even if our inv is in a player.	337	// even if our inv is in a player.
336	if (envest->is_on_map ())	338	if (envest->is_on_map ())
337	if (object *pl = envest->ms ().player ())	339	if (object *pl = envest->ms ().player ())
338	if (pl->container == env)	340	if (pl->container_ () == env)
339	return pl;	341	return pl;
340	}	342	}
341	else	343	else
342	{	344	{
343	// maybe there is a player standing on the same mapspace	345	// maybe there is a player standing on the same mapspace
344	// this will catch the case where "this" is a player	346	// this will catch the case where "this" is a player
345	if (object *pl = ms ().player ())	347	if (object *pl = ms ().player ())
346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	348	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
347	\|\| this == pl->container)	349	\|\| pl->container_ () == this)
348	return pl;	350	return pl;
349	}	351	}
350	}	352	}
351		353
352	return 0;	354	return 0;
…		…
428	return strdup ("[NULLOBJ]");	430	return strdup ("[NULLOBJ]");
429		431
430	object_freezer freezer;	432	object_freezer freezer;
431	op->write (freezer);	433	op->write (freezer);
432	return freezer.as_string ();	434	return freezer.as_string ();
		435	}
		436
		437	char *
		438	object::as_string ()
		439	{
		440	return dump_object (this);
433	}	441	}
434		442
435	/*	443	/*
436	* get_nearest_part(multi-object, object 2) returns the part of the	444	* get_nearest_part(multi-object, object 2) returns the part of the
437	* multi-object 1 which is closest to the second object.	445	* multi-object 1 which is closest to the second object.
…		…
554	update_stats ();	562	update_stats ();
555		563
556	new_draw_info_format (NDI_UNIQUE, 0, this,	564	new_draw_info_format (NDI_UNIQUE, 0, this,
557	"You try to balance all your items at once, "	565	"You try to balance all your items at once, "
558	"but the %s is just too much for your body. "	566	"but the %s is just too much for your body. "
559	"[You need to unapply some items first.]", &ob->name);	567	"[You need to unapply some items first - use the 'body' command to see "
		568	"how many items you cna wera on a specific body part.]", &ob->name);
560	return false;	569	return false;
561	}	570	}
562		571
563	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	572	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
564	}	573	}
…		…
791		800
792	object::object ()	801	object::object ()
793	{	802	{
794	SET_FLAG (this, FLAG_REMOVED);	803	SET_FLAG (this, FLAG_REMOVED);
795		804
796	expmul = 1.0;	805	//expmul = 1.0; declared const for the time being
797	face = blank_face;	806	face = blank_face;
798	}	807	}
799		808
800	object::~object ()	809	object::~object ()
801	{	810	{
…		…
830	{	839	{
831	/* If already on active list, don't do anything */	840	/* If already on active list, don't do anything */
832	if (active)	841	if (active)
833	return;	842	return;
834		843
835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
838	if (has_active_speed ())	844	if (has_active_speed ())
		845	{
		846	if (flag [FLAG_FREED])
		847	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		848
839	actives.insert (this);	849	actives.insert (this);
		850	}
840	}	851	}
841		852
842	void	853	void
843	object::activate_recursive ()	854	object::activate_recursive ()
844	{	855	{
…		…
962		973
963	void	974	void
964	object::do_destroy ()	975	object::do_destroy ()
965	{	976	{
966	if (flag [FLAG_IS_LINKED])	977	if (flag [FLAG_IS_LINKED])
967	remove_button_link (this);	978	remove_link ();
968		979
969	if (flag [FLAG_FRIENDLY])	980	if (flag [FLAG_FRIENDLY])
970	remove_friendly_object (this);	981	remove_friendly_object (this);
971		982
972	remove ();	983	remove ();
…		…
1096		1107
1097	if (object *pl = ms.player ())	1108	if (object *pl = ms.player ())
1098	{	1109	{
1099	if (is_player ())	1110	if (is_player ())
1100	{	1111	{
		1112	if (!flag [FLAG_WIZPASS])
1101	ms.smell = pticks; // remember the smell of the player	1113	ms.smell = ++mapspace::smellcount; // remember the smell of the player
1102		1114
1103	// leaving a spot always closes any open container on the ground	1115	// leaving a spot always closes any open container on the ground
1104	if (container && !container->env)	1116	if (container && !container->env)
1105	// this causes spurious floorbox updates, but it ensures	1117	// this causes spurious floorbox updates, but it ensures
1106	// that the CLOSE event is being sent.	1118	// that the CLOSE event is being sent.
1107	close_container ();	1119	close_container ();
1108		1120
1109	--map->players;	1121	--map->players;
1110	map->touch ();	1122	map->touch ();
1111	}	1123	}
1112	else if (pl->container == this)	1124	else if (pl->container_ () == this)
1113	{	1125	{
1114	// removing a container should close it	1126	// removing a container should close it
1115	close_container ();	1127	close_container ();
1116	}	1128	}
1117		1129
…		…
1133		1145
1134	int check_walk_off = !flag [FLAG_NO_APPLY];	1146	int check_walk_off = !flag [FLAG_NO_APPLY];
1135		1147
1136	if (object *pl = ms.player ())	1148	if (object *pl = ms.player ())
1137	{	1149	{
1138	if (pl->container == this)	1150	if (pl->container_ () == this)
1139	/* If a container that the player is currently using somehow gets	1151	/* If a container that the player is currently using somehow gets
1140	* removed (most likely destroyed), update the player view	1152	* removed (most likely destroyed), update the player view
1141	* appropriately.	1153	* appropriately.
1142	*/	1154	*/
1143	pl->close_container ();	1155	pl->close_container ();
…		…
1284		1296
1285	/* Ideally, the caller figures this out. However, it complicates a lot	1297	/* Ideally, the caller figures this out. However, it complicates a lot
1286	* of areas of callers (eg, anything that uses find_free_spot would now	1298	* of areas of callers (eg, anything that uses find_free_spot would now
1287	* need extra work	1299	* need extra work
1288	*/	1300	*/
		1301	maptile *newmap = m;
1289	if (!xy_normalise (m, op->x, op->y))	1302	if (!xy_normalise (newmap, op->x, op->y))
1290	{	1303	{
1291	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found	1304	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1292	return 0;	1305	return 0;
1293	}	1306	}
1294		1307
1295	if (object *more = op->more)	1308	if (object *more = op->more)
1296	if (!insert_ob_in_map (more, m, originator, flag))	1309	if (!insert_ob_in_map (more, m, originator, flag))
1297	return 0;	1310	return 0;
1298		1311
1299	CLEAR_FLAG (op, FLAG_REMOVED);	1312	op->flag [FLAG_REMOVED] = false;
1300		1313	op->env = 0;
1301	op->map = m;	1314	op->map = newmap;
		1315
1302	mapspace &ms = op->ms ();	1316	mapspace &ms = op->ms ();
1303		1317
1304	/* this has to be done after we translate the coordinates.	1318	/* this has to be done after we translate the coordinates.
1305	*/	1319	*/
1306	if (op->nrof && !(flag & INS_NO_MERGE))	1320	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1327	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1341	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1328	abort ();	1342	abort ();
1329	}	1343	}
1330		1344
1331	if (!originator->is_on_map ())	1345	if (!originator->is_on_map ())
		1346	{
1332	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1347	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1333	op->debug_desc (), originator->debug_desc ());	1348	op->debug_desc (), originator->debug_desc ());
		1349	abort ();
		1350	}
1334		1351
1335	op->above = originator;	1352	op->above = originator;
1336	op->below = originator->below;	1353	op->below = originator->below;
1337	originator->below = op;	1354	originator->below = op;
1338		1355
…		…
1470	* blocked() and wall() work properly), and these flags are updated by	1487	* blocked() and wall() work properly), and these flags are updated by
1471	* update_object().	1488	* update_object().
1472	*/	1489	*/
1473		1490
1474	/* if this is not the head or flag has been passed, don't check walk on status */	1491	/* if this is not the head or flag has been passed, don't check walk on status */
1475	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1492	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1476	{	1493	{
1477	if (check_move_on (op, originator))	1494	if (check_move_on (op, originator))
1478	return 0;	1495	return 0;
1479		1496
1480	/* If we are a multi part object, lets work our way through the check	1497	/* If we are a multi part object, lets work our way through the check
…		…
1491	/* this function inserts an object in the map, but if it	1508	/* this function inserts an object in the map, but if it
1492	* finds an object of its own type, it'll remove that one first.	1509	* finds an object of its own type, it'll remove that one first.
1493	* op is the object to insert it under: supplies x and the map.	1510	* op is the object to insert it under: supplies x and the map.
1494	*/	1511	*/
1495	void	1512	void
1496	replace_insert_ob_in_map (const char arch_string, object op)	1513	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1497	{	1514	{
1498	/* first search for itself and remove any old instances */	1515	/* first search for itself and remove any old instances */
1499		1516
1500	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1501	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1518	if (tmp->arch->archname == archname) /* same archetype */
1502	tmp->destroy ();	1519	tmp->destroy ();
1503		1520
1504	object *tmp = arch_to_object (archetype::find (arch_string));	1521	object *tmp = arch_to_object (archetype::find (archname));
1505		1522
1506	tmp->x = op->x;	1523	tmp->x = op->x;
1507	tmp->y = op->y;	1524	tmp->y = op->y;
1508		1525
1509	insert_ob_in_map (tmp, op->map, op, 0);	1526	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1695	* on top.	1712	* on top.
1696	*/	1713	*/
1697	int	1714	int
1698	check_move_on (object op, object originator)	1715	check_move_on (object op, object originator)
1699	{	1716	{
		1717	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1718	return 0;
		1719
1700	object *tmp;	1720	object *tmp;
1701	maptile *m = op->map;	1721	maptile *m = op->map;
1702	int x = op->x, y = op->y;	1722	int x = op->x, y = op->y;
1703		1723
1704	MoveType move_on, move_slow, move_block;	1724	mapspace &ms = m->at (x, y);
1705		1725
1706	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1726	ms.update ();
1707	return 0;
1708		1727
1709	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1728	MoveType move_on = ms.move_on;
1710	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1729	MoveType move_slow = ms.move_slow;
1711	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1730	MoveType move_block = ms.move_block;
1712		1731
1713	/* if nothing on this space will slow op down or be applied,	1732	/* if nothing on this space will slow op down or be applied,
1714	* no need to do checking below. have to make sure move_type	1733	* no need to do checking below. have to make sure move_type
1715	* is set, as lots of objects don't have it set - we treat that	1734	* is set, as lots of objects don't have it set - we treat that
1716	* as walking.	1735	* as walking.
…		…
1727	return 0;	1746	return 0;
1728		1747
1729	/* The objects have to be checked from top to bottom.	1748	/* The objects have to be checked from top to bottom.
1730	* Hence, we first go to the top:	1749	* Hence, we first go to the top:
1731	*/	1750	*/
1732		1751	for (object next, tmp = ms.top; tmp; tmp = next)
1733	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1734	{
1735	/* Trim the search when we find the first other spell effect
1736	* this helps performance so that if a space has 50 spell objects,
1737	* we don't need to check all of them.
1738	*/
1739	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1740	break;
1741	}	1752	{
		1753	next = tmp->below;
1742		1754
1743	for (; tmp; tmp = tmp->below)
1744	{
1745	if (tmp == op)	1755	if (tmp == op)
1746	continue; /* Can't apply yourself */	1756	continue; /* Can't apply yourself */
1747		1757
1748	/* Check to see if one of the movement types should be slowed down.	1758	/* Check to see if one of the movement types should be slowed down.
1749	* Second check makes sure that the movement types not being slowed	1759	* Second check makes sure that the movement types not being slowed
…		…
1754	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1764	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1755	{	1765	{
1756	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1757	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1758	{	1768	{
1759
1760	float
1761	diff = tmp->move_slow_penalty * fabs (op->speed);	1769	float diff = tmp->move_slow_penalty * fabs (op->speed);
1762		1770
1763	if (op->is_player ())	1771	if (op->is_player ())
1764	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1772	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1765	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1773	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1766	diff /= 4.0;	1774	diff /= 4.0;
1767		1775
1768	op->speed_left -= diff;	1776	op->speed_left -= diff;
1769	}	1777	}
1770	}	1778	}
…		…
2054	* there is capable of.	2062	* there is capable of.
2055	*/	2063	*/
2056	int	2064	int
2057	find_dir (maptile m, int x, int y, object exclude)	2065	find_dir (maptile m, int x, int y, object exclude)
2058	{	2066	{
2059	int i, max = SIZEOFFREE, mflags;	2067	int max = SIZEOFFREE, mflags;
2060
2061	sint16 nx, ny;
2062	object *tmp;
2063	maptile *mp;
2064
2065	MoveType blocked, move_type;	2068	MoveType move_type;
2066		2069
2067	if (exclude && exclude->head_ () != exclude)	2070	if (exclude && exclude->head_ () != exclude)
2068	{	2071	{
2069	exclude = exclude->head;	2072	exclude = exclude->head;
2070	move_type = exclude->move_type;	2073	move_type = exclude->move_type;
…		…
2073	{	2076	{
2074	/* If we don't have anything, presume it can use all movement types. */	2077	/* If we don't have anything, presume it can use all movement types. */
2075	move_type = MOVE_ALL;	2078	move_type = MOVE_ALL;
2076	}	2079	}
2077		2080
2078	for (i = 1; i < max; i++)	2081	for (int i = 1; i < max; i++)
2079	{	2082	{
2080	mp = m;	2083	mapxy pos (m, x, y);
2081	nx = x + freearr_x[i];	2084	pos.move (i);
2082	ny = y + freearr_y[i];
2083		2085
2084	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2086	if (!pos.normalise ())
2085
2086	if (mflags & P_OUT_OF_MAP)
2087	max = maxfree[i];	2087	max = maxfree[i];
2088	else	2088	else
2089	{	2089	{
2090	mapspace &ms = mp->at (nx, ny);	2090	mapspace &ms = *pos;
2091		2091
2092	blocked = ms.move_block;
2093
2094	if ((move_type & blocked) == move_type)	2092	if ((move_type & ms.move_block) == move_type)
2095	max = maxfree[i];	2093	max = maxfree [i];
2096	else if (mflags & P_IS_ALIVE)	2094	else if (ms.flags () & P_IS_ALIVE)
2097	{	2095	{
2098	for (tmp = ms.bot; tmp; tmp = tmp->above)	2096	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2099	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())	2097	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2100	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2098	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2101	break;
2102
2103	if (tmp)
2104	return freedir[i];	2099	return freedir [i];
2105	}	2100	}
2106	}	2101	}
2107	}	2102	}
2108		2103
2109	return 0;	2104	return 0;
…		…
2184	* This basically means that if direction is 15, then it could either go	2179	* This basically means that if direction is 15, then it could either go
2185	* direction 4, 14, or 16 to get back to where we are.	2180	* direction 4, 14, or 16 to get back to where we are.
2186	* Moved from spell_util.c to object.c with the other related direction	2181	* Moved from spell_util.c to object.c with the other related direction
2187	* functions.	2182	* functions.
2188	*/	2183	*/
2189	int reduction_dir[SIZEOFFREE][3] = {	2184	const int reduction_dir[SIZEOFFREE][3] = {
2190	{0, 0, 0}, /* 0 */	2185	{0, 0, 0}, /* 0 */
2191	{0, 0, 0}, /* 1 */	2186	{0, 0, 0}, /* 1 */
2192	{0, 0, 0}, /* 2 */	2187	{0, 0, 0}, /* 2 */
2193	{0, 0, 0}, /* 3 */	2188	{0, 0, 0}, /* 3 */
2194	{0, 0, 0}, /* 4 */	2189	{0, 0, 0}, /* 4 */
…		…
2332	return tmp;	2327	return tmp;
2333		2328
2334	return 0;	2329	return 0;
2335	}	2330	}
2336		2331
2337	const shstr &	2332	shstr_tmp
2338	object::kv_get (const shstr &key) const	2333	object::kv_get (shstr_tmp key) const
2339	{	2334	{
2340	for (key_value *kv = key_values; kv; kv = kv->next)	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2341	if (kv->key == key)	2336	if (kv->key == key)
2342	return kv->value;	2337	return kv->value;
2343		2338
2344	return shstr_null;	2339	return shstr ();
2345	}	2340	}
2346		2341
2347	void	2342	void
2348	object::kv_set (const shstr &key, const shstr &value)	2343	object::kv_set (shstr_tmp key, shstr_tmp value)
2349	{	2344	{
2350	for (key_value *kv = key_values; kv; kv = kv->next)	2345	for (key_value *kv = key_values; kv; kv = kv->next)
2351	if (kv->key == key)	2346	if (kv->key == key)
2352	{	2347	{
2353	kv->value = value;	2348	kv->value = value;
…		…
2362		2357
2363	key_values = kv;	2358	key_values = kv;
2364	}	2359	}
2365		2360
2366	void	2361	void
2367	object::kv_del (const shstr &key)	2362	object::kv_del (shstr_tmp key)
2368	{	2363	{
2369	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2364	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2370	if ((*kvp)->key == key)	2365	if ((*kvp)->key == key)
2371	{	2366	{
2372	key_value kv = kvp;	2367	key_value kv = kvp;
…		…
2503	container = 0;	2498	container = 0;
2504		2499
2505	// client needs item update to make it work, client bug requires this to be separate	2500	// client needs item update to make it work, client bug requires this to be separate
2506	esrv_update_item (UPD_FLAGS, this, old_container);	2501	esrv_update_item (UPD_FLAGS, this, old_container);
2507		2502
2508	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2503	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2509	play_sound (sound_find ("chest_close"));	2504	play_sound (sound_find ("chest_close"));
2510	}	2505	}
2511		2506
2512	if (new_container)	2507	if (new_container)
2513	{	2508	{
…		…
2523	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2518	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2524	new_container->insert (closer);	2519	new_container->insert (closer);
2525	}	2520	}
2526	#endif	2521	#endif
2527		2522
2528	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2523	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2529		2524
2530	// make sure the container is available, client bug requires this to be separate	2525	// make sure the container is available, client bug requires this to be separate
2531	esrv_send_item (this, new_container);	2526	esrv_send_item (this, new_container);
2532		2527
2533	new_container->flag [FLAG_APPLIED] = true;	2528	new_container->flag [FLAG_APPLIED] = true;
…		…
2541	// else if (!old_container->env && contr && contr->ns)	2536	// else if (!old_container->env && contr && contr->ns)
2542	// contr->ns->floorbox_reset ();	2537	// contr->ns->floorbox_reset ();
2543	}	2538	}
2544		2539
2545	object *	2540	object *
2546	object::force_find (const shstr name)	2541	object::force_find (shstr_tmp name)
2547	{	2542	{
2548	/* cycle through his inventory to look for the MARK we want to	2543	/* cycle through his inventory to look for the MARK we want to
2549	* place	2544	* place
2550	*/	2545	*/
2551	for (object *tmp = inv; tmp; tmp = tmp->below)	2546	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2553	return splay (tmp);	2548	return splay (tmp);
2554		2549
2555	return 0;	2550	return 0;
2556	}	2551	}
2557		2552
		2553	void
		2554	object::force_set_timer (int duration)
		2555	{
		2556	this->duration = 1;
		2557	this->speed_left = -1.f;
		2558
		2559	this->set_speed (duration ? 1.f / duration : 0.f);
		2560	}
		2561
2558	object *	2562	object *
2559	object::force_add (const shstr name, int duration)	2563	object::force_add (shstr_tmp name, int duration)
2560	{	2564	{
2561	if (object *force = force_find (name))	2565	if (object *force = force_find (name))
2562	force->destroy ();	2566	force->destroy ();
2563		2567
2564	object *force = get_archetype (FORCE_NAME);	2568	object *force = get_archetype (FORCE_NAME);
2565		2569
2566	force->slaying = name;	2570	force->slaying = name;
2567	force->stats.food = 1;
2568	force->speed_left = -1.f;
2569		2571
2570	force->set_speed (duration ? 1.f / duration : 0.f);	2572	force->force_set_timer (duration);
2571	force->flag [FLAG_IS_USED_UP] = true;	2573
2572	force->flag [FLAG_APPLIED] = true;	2574	force->flag [FLAG_APPLIED] = true;
2573		2575
2574	return insert (force);	2576	return insert (force);
2575	}	2577	}
2576		2578
2577	void	2579	void
2578	object::play_sound (faceidx sound)	2580	object::play_sound (faceidx sound) const
2579	{	2581	{
2580	if (!sound)	2582	if (!sound)
2581	return;	2583	return;
2582		2584
2583	if (flag [FLAG_REMOVED])	2585	if (is_on_map ())
2584	return;
2585
2586	if (env)
2587	{
2588	if (object *pl = in_player ())
2589	pl->contr->play_sound (sound);
2590	}
2591	else
2592	map->play_sound (sound, x, y);	2586	map->play_sound (sound, x, y);
		2587	else if (object *pl = in_player ())
		2588	pl->contr->play_sound (sound);
		2589	}
		2590
		2591	void
		2592	object::say_msg (const char *msg) const
		2593	{
		2594	if (is_on_map ())
		2595	map->say_msg (msg, x, y);
		2596	else if (object *pl = in_player ())
		2597	pl->contr->play_sound (sound);
2593	}	2598	}
2594		2599
2595	void	2600	void
2596	object::make_noise ()	2601	object::make_noise ()
2597	{	2602	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC vs. Revision 1.292 by root, Mon Oct 19 21:48:49 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC vs.
Revision 1.292 by root, Mon Oct 19 21:48:49 2009 UTC