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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.161 by root, Wed Jun 13 21:09:39 2007 UTC vs.
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Crossfire TRT is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* 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, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
300	return 0;	299	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	301	return 0;
303	}	302	}
304		303
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self \|\| ob2->self)	304	if (ob1->self \|\| ob2->self)
307	{	305	{
308	ob1->optimise ();	306	ob1->optimise ();
309	ob2->optimise ();	307	ob2->optimise ();
310		308
311	if (ob1->self \|\| ob2->self)	309	if (ob1->self \|\| ob2->self)
		310	if (!cfperl_can_merge (ob1, ob2))
312	return 0;	311	return 0;
313	}	312	}
314		313
315	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
316	return 1;	315	return 1;
317	}	316	}
…		…
375	/*	374	/*
376	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
377	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
378	* If it's not a multi-object, it is returned.	377	* If it's not a multi-object, it is returned.
379	*/	378	*/
380
381	object *	379	object *
382	get_nearest_part (object op, const object pl)	380	get_nearest_part (object op, const object pl)
383	{	381	{
384	object tmp, closest;	382	object tmp, closest;
385	int last_dist, i;	383	int last_dist, i;
…		…
430	}	428	}
431		429
432	/*	430	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	431	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	432	* skill and experience objects.
		433	* ACTUALLY NO! investigate! TODO
435	*/	434	*/
436	void	435	void
437	object::set_owner (object *owner)	436	object::set_owner (object *owner)
438	{	437	{
		438	// allow objects which own objects
439	if (!owner)	439	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	440	while (owner->owner)
450	owner = owner->owner;	441	owner = owner->owner;
451		442
452	this->owner = owner;	443	this->owner = owner;
453	}	444	}
454		445
455	int	446	int
…		…
587	object::copy_to (object *dst)	578	object::copy_to (object *dst)
588	{	579	{
589	dst = this;	580	dst = this;
590		581
591	if (speed < 0)	582	if (speed < 0)
592	dst->speed_left = speed_left - rndm ();	583	dst->speed_left -= rndm ();
593		584
594	dst->set_speed (dst->speed);	585	dst->set_speed (dst->speed);
595	}	586	}
596		587
597	void	588	void
…		…
924		915
925	if (!freed_map)	916	if (!freed_map)
926	{	917	{
927	freed_map = new maptile;	918	freed_map = new maptile;
928		919
		920	freed_map->path = "<freed objects map>";
929	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
930	freed_map->width = 3;	922	freed_map->width = 3;
931	freed_map->height = 3;	923	freed_map->height = 3;
932		924
933	freed_map->alloc ();	925	freed_map->alloc ();
…		…
937	map = freed_map;	929	map = freed_map;
938	x = 1;	930	x = 1;
939	y = 1;	931	y = 1;
940	}	932	}
941		933
942	head = 0;
943
944	if (more)	934	if (more)
945	{	935	{
946	more->destroy ();	936	more->destroy ();
947	more = 0;	937	more = 0;
948	}	938	}
949		939
		940	head = 0;
		941
950	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
951	owner = 0;	943	owner = 0;
952	enemy = 0;	944	enemy = 0;
953	attacked_by = 0;	945	attacked_by = 0;
		946	current_weapon = 0;
954	}	947	}
955		948
956	void	949	void
957	object::destroy (bool destroy_inventory)	950	object::destroy (bool destroy_inventory)
958	{	951	{
959	if (destroyed ())	952	if (destroyed ())
960	return;	953	return;
961		954
962	if (destroy_inventory)	955	if (destroy_inventory)
963	destroy_inv (false);	956	destroy_inv (false);
		957
		958	if (is_head ())
		959	if (sound_destroy)
		960	play_sound (sound_destroy);
		961	else if (flag [FLAG_MONSTER])
		962	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
964		963
965	attachable::destroy ();	964	attachable::destroy ();
966	}	965	}
967		966
968	/*	967	/*
…		…
1083	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1084	return;	1083	return;
1085		1084
1086	int check_walk_off = !flag [FLAG_NO_APPLY];	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1087		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (pl->container == this)
		1090	/* If a container that the player is currently using somehow gets
		1091	* removed (most likely destroyed), update the player view
		1092	* appropriately.
		1093	*/
		1094	pl->close_container ();
		1095
		1096	pl->contr->ns->floorbox_update ();
		1097	}
		1098
1088	for (tmp = ms.bot; tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1089	{	1100	{
1090	/* No point updating the players look faces if he is the object	1101	/* No point updating the players look faces if he is the object
1091	* being removed.	1102	* being removed.
1092	*/	1103	*/
1093
1094	if (tmp->type == PLAYER && tmp != this)
1095	{
1096	/* If a container that the player is currently using somehow gets
1097	* removed (most likely destroyed), update the player view
1098	* appropriately.
1099	*/
1100	if (tmp->container == this)
1101	{
1102	flag [FLAG_APPLIED] = 0;
1103	tmp->container = 0;
1104	}
1105
1106	if (tmp->contr->ns)
1107	tmp->contr->ns->floorbox_update ();
1108	}
1109		1104
1110	/* See if object moving off should effect something */	1105	/* See if object moving off should effect something */
1111	if (check_walk_off	1106	if (check_walk_off
1112	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1236		1231
1237	object top, floor = NULL;	1232	object top, floor = NULL;
1238		1233
1239	op->remove ();	1234	op->remove ();
1240		1235
1241	#if 0
1242	if (!m->active != !op->active)
1243	if (m->active)
1244	op->activate_recursive ();
1245	else
1246	op->deactivate_recursive ();
1247	#endif
1248
1249	if (out_of_map (m, op->x, op->y))
1250	{
1251	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1252	#ifdef MANY_CORES
1253	/* Better to catch this here, as otherwise the next use of this object
1254	* is likely to cause a crash. Better to find out where it is getting
1255	* improperly inserted.
1256	*/
1257	abort ();
1258	#endif
1259	return op;
1260	}
1261
1262	if (object *more = op->more)
1263	if (!insert_ob_in_map (more, m, originator, flag))
1264	return 0;
1265
1266	CLEAR_FLAG (op, FLAG_REMOVED);
1267
1268	/* Ideally, the caller figures this out. However, it complicates a lot	1236	/* Ideally, the caller figures this out. However, it complicates a lot
1269	* of areas of callers (eg, anything that uses find_free_spot would now	1237	* of areas of callers (eg, anything that uses find_free_spot would now
1270	* need extra work	1238	* need extra work
1271	*/	1239	*/
1272	if (!xy_normalise (m, op->x, op->y))	1240	if (!xy_normalise (m, op->x, op->y))
		1241	{
		1242	op->destroy ();
1273	return 0;	1243	return 0;
		1244	}
		1245
		1246	if (object *more = op->more)
		1247	if (!insert_ob_in_map (more, m, originator, flag))
		1248	return 0;
		1249
		1250	CLEAR_FLAG (op, FLAG_REMOVED);
1274		1251
1275	op->map = m;	1252	op->map = m;
1276	mapspace &ms = op->ms ();	1253	mapspace &ms = op->ms ();
1277		1254
1278	/* this has to be done after we translate the coordinates.	1255	/* this has to be done after we translate the coordinates.
…		…
1375	*/	1352	*/
1376	if (last && last->below && last != floor)	1353	if (last && last->below && last != floor)
1377	top = last->below;	1354	top = last->below;
1378	}	1355	}
1379	} /* If objects on this space */	1356	} /* If objects on this space */
1380
1381	if (flag & INS_MAP_LOAD)	1357	if (flag & INS_MAP_LOAD)
1382	top = ms.top;	1358	top = ms.top;
1383		1359
1384	if (flag & INS_ABOVE_FLOOR_ONLY)	1360	if (flag & INS_ABOVE_FLOOR_ONLY)
1385	top = floor;	1361	top = floor;
…		…
1420	op->map->touch ();	1396	op->map->touch ();
1421	}	1397	}
1422		1398
1423	op->map->dirty = true;	1399	op->map->dirty = true;
1424		1400
1425	/* If we have a floor, we know the player, if any, will be above
1426	* it, so save a few ticks and start from there.
1427	*/
1428	if (!(flag & INS_MAP_LOAD))	1401	if (!(flag & INS_MAP_LOAD))
1429	if (object *pl = ms.player ())	1402	if (object *pl = ms.player ())
1430	if (pl->contr->ns)
1431	pl->contr->ns->floorbox_update ();	1403	pl->contr->ns->floorbox_update ();
1432		1404
1433	/* If this object glows, it may affect lighting conditions that are	1405	/* If this object glows, it may affect lighting conditions that are
1434	* visible to others on this map. But update_all_los is really	1406	* visible to others on this map. But update_all_los is really
1435	* an inefficient way to do this, as it means los for all players	1407	* an inefficient way to do this, as it means los for all players
1436	* on the map will get recalculated. The players could very well	1408	* on the map will get recalculated. The players could very well
…		…
1674	* be != op, if items are merged. -Tero	1646	* be != op, if items are merged. -Tero
1675	*/	1647	*/
1676	object *	1648	object *
1677	object::insert (object *op)	1649	object::insert (object *op)
1678	{	1650	{
1679	object tmp, otmp;
1680
1681	if (!QUERY_FLAG (op, FLAG_REMOVED))	1651	if (!QUERY_FLAG (op, FLAG_REMOVED))
1682	op->remove ();	1652	op->remove ();
1683		1653
1684	if (op->more)	1654	if (op->more)
1685	{	1655	{
…		…
1687	return op;	1657	return op;
1688	}	1658	}
1689		1659
1690	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1660	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1691	CLEAR_FLAG (op, FLAG_REMOVED);	1661	CLEAR_FLAG (op, FLAG_REMOVED);
		1662
1692	if (op->nrof)	1663	if (op->nrof)
1693	{	1664	{
1694	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1665	for (object *tmp = inv; tmp; tmp = tmp->below)
1695	if (object::can_merge (tmp, op))	1666	if (object::can_merge (tmp, op))
1696	{	1667	{
1697	/* return the original object and remove inserted object	1668	/* return the original object and remove inserted object
1698	(client needs the original object) */	1669	(client needs the original object) */
1699	tmp->nrof += op->nrof;	1670	tmp->nrof += op->nrof;
…		…
1718	add_weight (this, op->weight * op->nrof);	1689	add_weight (this, op->weight * op->nrof);
1719	}	1690	}
1720	else	1691	else
1721	add_weight (this, (op->weight + op->carrying));	1692	add_weight (this, (op->weight + op->carrying));
1722		1693
1723	otmp = this->in_player ();	1694	if (object *otmp = this->in_player ())
1724	if (otmp && otmp->contr)
1725	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1695	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1726	otmp->update_stats ();	1696	otmp->update_stats ();
1727		1697
		1698	op->owner = 0; // its his/hers now. period.
1728	op->map = 0;	1699	op->map = 0;
1729	op->env = this;	1700	op->env = this;
1730	op->above = 0;	1701	op->above = 0;
1731	op->below = 0;	1702	op->below = 0;
1732	op->x = 0, op->y = 0;	1703	op->x = op->y = 0;
1733		1704
1734	/* reset the light list and los of the players on the map */	1705	/* reset the light list and los of the players on the map */
1735	if ((op->glow_radius != 0) && map)	1706	if (op->glow_radius && map)
1736	{	1707	{
1737	#ifdef DEBUG_LIGHTS	1708	#ifdef DEBUG_LIGHTS
1738	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1709	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1739	#endif /* DEBUG_LIGHTS */	1710	#endif /* DEBUG_LIGHTS */
1740	if (map->darkness)	1711	if (map->darkness)
…		…
2020	* customized, changed states, etc.	1991	* customized, changed states, etc.
2021	*/	1992	*/
2022	int	1993	int
2023	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	1994	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2024	{	1995	{
		1996	int altern[SIZEOFFREE];
2025	int index = 0, flag;	1997	int index = 0, flag;
2026	int altern[SIZEOFFREE];
2027		1998
2028	for (int i = start; i < stop; i++)	1999	for (int i = start; i < stop; i++)
2029	{	2000	{
2030	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2001	mapxy pos (m, x, y); pos.move (i);
2031	if (!flag)	2002
		2003	if (!pos.normalise ())
		2004	continue;
		2005
		2006	mapspace &ms = *pos;
		2007
		2008	if (ms.flags () & P_IS_ALIVE)
		2009	continue;
		2010
		2011	/* However, often
		2012	* ob doesn't have any move type (when used to place exits)
		2013	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2014	*/
		2015	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2016	{
2032	altern [index++] = i;	2017	altern [index++] = i;
		2018	continue;
		2019	}
2033		2020
2034	/* Basically, if we find a wall on a space, we cut down the search size.	2021	/* Basically, if we find a wall on a space, we cut down the search size.
2035	* In this way, we won't return spaces that are on another side of a wall.	2022	* In this way, we won't return spaces that are on another side of a wall.
2036	* This mostly work, but it cuts down the search size in all directions -	2023	* This mostly work, but it cuts down the search size in all directions -
2037	* if the space being examined only has a wall to the north and empty	2024	* if the space being examined only has a wall to the north and empty
2038	* spaces in all the other directions, this will reduce the search space	2025	* spaces in all the other directions, this will reduce the search space
2039	* to only the spaces immediately surrounding the target area, and	2026	* to only the spaces immediately surrounding the target area, and
2040	* won't look 2 spaces south of the target space.	2027	* won't look 2 spaces south of the target space.
2041	*/	2028	*/
2042	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2029	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2030	{
2043	stop = maxfree[i];	2031	stop = maxfree[i];
		2032	continue;
		2033	}
		2034
		2035	/* Note it is intentional that we check ob - the movement type of the
		2036	* head of the object should correspond for the entire object.
		2037	*/
		2038	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2039	continue;
		2040
		2041	altern [index++] = i;
2044	}	2042	}
2045		2043
2046	if (!index)	2044	if (!index)
2047	return -1;	2045	return -1;
2048		2046
…		…
2057	*/	2055	*/
2058	int	2056	int
2059	find_first_free_spot (const object ob, maptile m, int x, int y)	2057	find_first_free_spot (const object ob, maptile m, int x, int y)
2060	{	2058	{
2061	for (int i = 0; i < SIZEOFFREE; i++)	2059	for (int i = 0; i < SIZEOFFREE; i++)
2062	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2060	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2063	return i;	2061	return i;
2064		2062
2065	return -1;	2063	return -1;
2066	}	2064	}
2067		2065
…		…
2344	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2342	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2345	* core dumps if they do.	2343	* core dumps if they do.
2346	*	2344	*
2347	* Add a check so we can't pick up invisible objects (0.93.8)	2345	* Add a check so we can't pick up invisible objects (0.93.8)
2348	*/	2346	*/
2349
2350	int	2347	int
2351	can_pick (const object who, const object item)	2348	can_pick (const object who, const object item)
2352	{	2349	{
2353	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2350	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2354	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2351	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2569	}	2566	}
2570	else	2567	else
2571	item = item->env;	2568	item = item->env;
2572	}	2569	}
2573		2570
2574
2575	const char *	2571	const char *
2576	object::flag_desc (char *desc, int len) const	2572	object::flag_desc (char *desc, int len) const
2577	{	2573	{
2578	char *p = desc;	2574	char *p = desc;
2579	bool first = true;	2575	bool first = true;
…		…
2613	&name,	2609	&name,
2614	title ? "\",title:\"" : "",	2610	title ? "\",title:\"" : "",
2615	title ? (const char *)title : "",	2611	title ? (const char *)title : "",
2616	flag_desc (flagdesc, 512), type);	2612	flag_desc (flagdesc, 512), type);
2617		2613
2618	if (env)	2614	if (!this->flag[FLAG_REMOVED] && env)
2619	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2615	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2620		2616
2621	if (map)	2617	if (map)
2622	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2618	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2623		2619
…		…
2641	}	2637	}
2642		2638
2643	const materialtype_t *	2639	const materialtype_t *
2644	object::dominant_material () const	2640	object::dominant_material () const
2645	{	2641	{
2646	if (materialtype_t *mat = name_to_material (materialname))	2642	if (materialtype_t *mt = name_to_material (materialname))
2647	return mat;	2643	return mt;
2648		2644
2649	// omfg this is slow, this has to be temporary :)
2650	shstr unknown ("unknown");
2651
2652	return name_to_material (unknown);	2645	return name_to_material (shstr_unknown);
2653	}	2646	}
2654		2647
2655	void	2648	void
2656	object::open_container (object *new_container)	2649	object::open_container (object *new_container)
2657	{	2650	{
…		…
2673	old_container->flag [FLAG_APPLIED] = 0;	2666	old_container->flag [FLAG_APPLIED] = 0;
2674	container = 0;	2667	container = 0;
2675		2668
2676	esrv_update_item (UPD_FLAGS, this, old_container);	2669	esrv_update_item (UPD_FLAGS, this, old_container);
2677	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2670	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2671	play_sound (sound_find ("chest_close"));
2678	}	2672	}
2679		2673
2680	if (new_container)	2674	if (new_container)
2681	{	2675	{
2682	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2676	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2698	new_container->flag [FLAG_APPLIED] = 1;	2692	new_container->flag [FLAG_APPLIED] = 1;
2699	container = new_container;	2693	container = new_container;
2700		2694
2701	esrv_update_item (UPD_FLAGS, this, new_container);	2695	esrv_update_item (UPD_FLAGS, this, new_container);
2702	esrv_send_inventory (this, new_container);	2696	esrv_send_inventory (this, new_container);
		2697	play_sound (sound_find ("chest_open"));
		2698	}
		2699	}
		2700
		2701	object *
		2702	object::force_find (const shstr name)
		2703	{
		2704	/* cycle through his inventory to look for the MARK we want to
		2705	* place
		2706	*/
		2707	for (object *tmp = inv; tmp; tmp = tmp->below)
		2708	if (tmp->type == FORCE && tmp->slaying == name)
		2709	return splay (tmp);
		2710
		2711	return 0;
		2712	}
		2713
		2714	void
		2715	object::force_add (const shstr name, int duration)
		2716	{
		2717	if (object *force = force_find (name))
		2718	force->destroy ();
		2719
		2720	object *force = get_archetype (FORCE_NAME);
		2721
		2722	force->slaying = name;
		2723	force->stats.food = 1;
		2724	force->speed_left = -1.f;
		2725
		2726	force->set_speed (duration ? 1.f / duration : 0.f);
		2727	force->flag [FLAG_IS_USED_UP] = true;
		2728	force->flag [FLAG_APPLIED] = true;
		2729
		2730	insert (force);
		2731	}
		2732
		2733	void
		2734	object::play_sound (faceidx sound) const
		2735	{
		2736	if (!sound)
		2737	return;
		2738
		2739	if (flag [FLAG_REMOVED])
		2740	return;
		2741
		2742	if (env)
2703	}	2743	{
		2744	if (object *pl = in_player ())
		2745	pl->contr->play_sound (sound);
		2746	}
		2747	else
		2748	map->play_sound (sound, x, y);
2704	}	2749	}
2705		2750
2706

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.161 by root, Wed Jun 13 21:09:39 2007 UTC vs. Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.161 by root, Wed Jun 13 21:09:39 2007 UTC vs.
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC