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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.168 by root, Thu Jul 26 00:27:07 2007 UTC vs.
Revision 1.197 by root, Wed Oct 17 22:04:31 2007 UTC

…		…
254	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
255	* check all objects in the inventory.	255	* check all objects in the inventory.
256	*/	256	*/
257	if (ob1->inv \|\| ob2->inv)	257	if (ob1->inv \|\| ob2->inv)
258	{	258	{
259	/* if one object has inventory but the other doesn't, not equiv */	259	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	260	return 0; /* inventories differ in length */
261	return 0;
262		261
263	/* Now check to see if the two inventory objects could merge */	262	if (ob1->inv->below \|\| ob2->inv->below)
		263	return 0; /* more than one object in inv */
		264
264	if (!object::can_merge (ob1->inv, ob2->inv))	265	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	266	return 0; /* inventory objexts differ */
266		267
267	/* inventory ok - still need to check rest of this object to see	268	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	269	* if it is valid.
269	*/	270	*/
270	}	271	}
…		…
305	{	306	{
306	ob1->optimise ();	307	ob1->optimise ();
307	ob2->optimise ();	308	ob2->optimise ();
308		309
309	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
310	if (!cfperl_can_merge (ob1, ob2))	311	{
		312	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		313	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		314
		315	if (k1 != k2)
311	return 0;	316	return 0;
		317	else if (k1 == 0)
		318	return 1;
		319	else if (!cfperl_can_merge (ob1, ob2))
		320	return 0;
		321	}
312	}	322	}
313		323
314	/* Everything passes, must be OK. */	324	/* Everything passes, must be OK. */
315	return 1;	325	return 1;
316	}	326	}
…		…
374	/*	384	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	385	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	386	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	387	* If it's not a multi-object, it is returned.
378	*/	388	*/
379
380	object *	389	object *
381	get_nearest_part (object op, const object pl)	390	get_nearest_part (object op, const object pl)
382	{	391	{
383	object tmp, closest;	392	object tmp, closest;
384	int last_dist, i;	393	int last_dist, i;
…		…
429	}	438	}
430		439
431	/*	440	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	441	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	442	* skill and experience objects.
		443	* ACTUALLY NO! investigate! TODO
434	*/	444	*/
435	void	445	void
436	object::set_owner (object *owner)	446	object::set_owner (object *owner)
437	{	447	{
		448	// allow objects which own objects
438	if (!owner)	449	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	450	while (owner->owner)
449	owner = owner->owner;	451	owner = owner->owner;
450		452
451	this->owner = owner;	453	this->owner = owner;
452	}	454	}
453		455
454	int	456	int
…		…
586	object::copy_to (object *dst)	588	object::copy_to (object *dst)
587	{	589	{
588	dst = this;	590	dst = this;
589		591
590	if (speed < 0)	592	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	593	dst->speed_left -= rndm ();
592		594
593	dst->set_speed (dst->speed);	595	dst->set_speed (dst->speed);
594	}	596	}
595		597
596	void	598	void
…		…
923		925
924	if (!freed_map)	926	if (!freed_map)
925	{	927	{
926	freed_map = new maptile;	928	freed_map = new maptile;
927		929
		930	freed_map->path = "<freed objects map>";
928	freed_map->name = "/internal/freed_objects_map";	931	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;	932	freed_map->width = 3;
930	freed_map->height = 3;	933	freed_map->height = 3;
931		934
932	freed_map->alloc ();	935	freed_map->alloc ();
…		…
959	if (destroyed ())	962	if (destroyed ())
960	return;	963	return;
961		964
962	if (destroy_inventory)	965	if (destroy_inventory)
963	destroy_inv (false);	966	destroy_inv (false);
		967
		968	if (is_head ())
		969	if (sound_destroy)
		970	play_sound (sound_destroy);
		971	else if (flag [FLAG_MONSTER])
		972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
964		973
965	attachable::destroy ();	974	attachable::destroy ();
966	}	975	}
967		976
968	/*	977	/*
…		…
1083	if (map->in_memory == MAP_SAVING)	1092	if (map->in_memory == MAP_SAVING)
1084	return;	1093	return;
1085		1094
1086	int check_walk_off = !flag [FLAG_NO_APPLY];	1095	int check_walk_off = !flag [FLAG_NO_APPLY];
1087		1096
		1097	if (object *pl = ms.player ())
		1098	{
		1099	if (pl->container == this)
		1100	/* If a container that the player is currently using somehow gets
		1101	* removed (most likely destroyed), update the player view
		1102	* appropriately.
		1103	*/
		1104	pl->close_container ();
		1105
		1106	pl->contr->ns->floorbox_update ();
		1107	}
		1108
1088	for (tmp = ms.bot; tmp; tmp = tmp->above)	1109	for (tmp = ms.bot; tmp; tmp = tmp->above)
1089	{	1110	{
1090	/* No point updating the players look faces if he is the object	1111	/* No point updating the players look faces if he is the object
1091	* being removed.	1112	* being removed.
1092	*/	1113	*/
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		1114
1110	/* See if object moving off should effect something */	1115	/* See if object moving off should effect something */
1111	if (check_walk_off	1116	if (check_walk_off
1112	&& ((move_type & tmp->move_off)	1117	&& ((move_type & tmp->move_off)
1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1118	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1145	merge_ob (object op, object top)	1150	merge_ob (object op, object top)
1146	{	1151	{
1147	if (!op->nrof)	1152	if (!op->nrof)
1148	return 0;	1153	return 0;
1149		1154
1150	if (top)	1155	if (!top)
1151	for (top = op; top && top->above; top = top->above)	1156	for (top = op; top && top->above; top = top->above)
1152	;	1157	;
1153		1158
1154	for (; top; top = top->below)	1159	for (; top; top = top->below)
1155	{	1160	{
…		…
1236		1241
1237	object top, floor = NULL;	1242	object top, floor = NULL;
1238		1243
1239	op->remove ();	1244	op->remove ();
1240		1245
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	1246	/* 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	1247	* of areas of callers (eg, anything that uses find_free_spot would now
1270	* need extra work	1248	* need extra work
1271	*/	1249	*/
1272	if (!xy_normalise (m, op->x, op->y))	1250	if (!xy_normalise (m, op->x, op->y))
		1251	{
		1252	op->destroy ();
1273	return 0;	1253	return 0;
		1254	}
		1255
		1256	if (object *more = op->more)
		1257	if (!insert_ob_in_map (more, m, originator, flag))
		1258	return 0;
		1259
		1260	CLEAR_FLAG (op, FLAG_REMOVED);
1274		1261
1275	op->map = m;	1262	op->map = m;
1276	mapspace &ms = op->ms ();	1263	mapspace &ms = op->ms ();
1277		1264
1278	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
…		…
1313	else	1300	else
1314	{	1301	{
1315	top = ms.bot;	1302	top = ms.bot;
1316		1303
1317	/* If there are other objects, then */	1304	/* If there are other objects, then */
1318	if ((!(flag & INS_MAP_LOAD)) && top)	1305	if (top)
1319	{	1306	{
1320	object *last = 0;	1307	object *last = 0;
1321		1308
1322	/*	1309	/*
1323	* If there are multiple objects on this space, we do some trickier handling.	1310	* If there are multiple objects on this space, we do some trickier handling.
…		…
1375	*/	1362	*/
1376	if (last && last->below && last != floor)	1363	if (last && last->below && last != floor)
1377	top = last->below;	1364	top = last->below;
1378	}	1365	}
1379	} /* If objects on this space */	1366	} /* If objects on this space */
1380	if (flag & INS_MAP_LOAD)
1381	top = ms.top;
1382		1367
1383	if (flag & INS_ABOVE_FLOOR_ONLY)	1368	if (flag & INS_ABOVE_FLOOR_ONLY)
1384	top = floor;	1369	top = floor;
1385		1370
1386	/* Top is the object that our object (op) is going to get inserted above.	1371	/* Top is the object that our object (op) is going to get inserted above.
…		…
1419	op->map->touch ();	1404	op->map->touch ();
1420	}	1405	}
1421		1406
1422	op->map->dirty = true;	1407	op->map->dirty = true;
1423		1408
1424	/* If we have a floor, we know the player, if any, will be above
1425	* it, so save a few ticks and start from there.
1426	*/
1427	if (!(flag & INS_MAP_LOAD))
1428	if (object *pl = ms.player ())	1409	if (object *pl = ms.player ())
1429	if (pl->contr->ns)
1430	pl->contr->ns->floorbox_update ();	1410	pl->contr->ns->floorbox_update ();
1431		1411
1432	/* If this object glows, it may affect lighting conditions that are	1412	/* If this object glows, it may affect lighting conditions that are
1433	* visible to others on this map. But update_all_los is really	1413	* visible to others on this map. But update_all_los is really
1434	* an inefficient way to do this, as it means los for all players	1414	* an inefficient way to do this, as it means los for all players
1435	* on the map will get recalculated. The players could very well	1415	* on the map will get recalculated. The players could very well
…		…
1673	* be != op, if items are merged. -Tero	1653	* be != op, if items are merged. -Tero
1674	*/	1654	*/
1675	object *	1655	object *
1676	object::insert (object *op)	1656	object::insert (object *op)
1677	{	1657	{
1678	object tmp, otmp;
1679
1680	if (!QUERY_FLAG (op, FLAG_REMOVED))	1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1681	op->remove ();	1659	op->remove ();
1682		1660
1683	if (op->more)	1661	if (op->more)
1684	{	1662	{
…		…
1686	return op;	1664	return op;
1687	}	1665	}
1688		1666
1689	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1690	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
		1669
1691	if (op->nrof)	1670	if (op->nrof)
1692	{	1671	{
1693	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1672	for (object *tmp = inv; tmp; tmp = tmp->below)
1694	if (object::can_merge (tmp, op))	1673	if (object::can_merge (tmp, op))
1695	{	1674	{
1696	/* return the original object and remove inserted object	1675	/* return the original object and remove inserted object
1697	(client needs the original object) */	1676	(client needs the original object) */
1698	tmp->nrof += op->nrof;	1677	tmp->nrof += op->nrof;
…		…
1717	add_weight (this, op->weight * op->nrof);	1696	add_weight (this, op->weight * op->nrof);
1718	}	1697	}
1719	else	1698	else
1720	add_weight (this, (op->weight + op->carrying));	1699	add_weight (this, (op->weight + op->carrying));
1721		1700
1722	otmp = this->in_player ();	1701	if (object *otmp = this->in_player ())
1723	if (otmp && otmp->contr)
1724	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1725	otmp->update_stats ();	1703	otmp->update_stats ();
1726		1704
		1705	op->owner = 0; // its his/hers now. period.
1727	op->map = 0;	1706	op->map = 0;
1728	op->env = this;	1707	op->env = this;
1729	op->above = 0;	1708	op->above = 0;
1730	op->below = 0;	1709	op->below = 0;
1731	op->x = 0, op->y = 0;	1710	op->x = op->y = 0;
1732		1711
1733	/* reset the light list and los of the players on the map */	1712	/* reset the light list and los of the players on the map */
1734	if ((op->glow_radius != 0) && map)	1713	if (op->glow_radius && map)
1735	{	1714	{
1736	#ifdef DEBUG_LIGHTS	1715	#ifdef DEBUG_LIGHTS
1737	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1716	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1738	#endif /* DEBUG_LIGHTS */	1717	#endif /* DEBUG_LIGHTS */
1739	if (map->darkness)	1718	if (map->darkness)
…		…
1973	* activate recursively a flag on an object inventory	1952	* activate recursively a flag on an object inventory
1974	*/	1953	*/
1975	void	1954	void
1976	flag_inv (object *op, int flag)	1955	flag_inv (object *op, int flag)
1977	{	1956	{
1978	if (op->inv)
1979	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1957	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1980	{	1958	{
1981	SET_FLAG (tmp, flag);	1959	SET_FLAG (tmp, flag);
1982	flag_inv (tmp, flag);	1960	flag_inv (tmp, flag);
1983	}	1961	}
1984	}	1962	}
1985		1963
1986	/*	1964	/*
1987	* deactivate recursively a flag on an object inventory	1965	* deactivate recursively a flag on an object inventory
1988	*/	1966	*/
1989	void	1967	void
1990	unflag_inv (object *op, int flag)	1968	unflag_inv (object *op, int flag)
1991	{	1969	{
1992	if (op->inv)
1993	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1970	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1994	{	1971	{
1995	CLEAR_FLAG (tmp, flag);	1972	CLEAR_FLAG (tmp, flag);
1996	unflag_inv (tmp, flag);	1973	unflag_inv (tmp, flag);
1997	}	1974	}
1998	}	1975	}
1999		1976
2000	/*	1977	/*
2001	* find_free_spot(object, map, x, y, start, stop) will search for	1978	* find_free_spot(object, map, x, y, start, stop) will search for
2002	* a spot at the given map and coordinates which will be able to contain	1979	* a spot at the given map and coordinates which will be able to contain
…		…
2004	* to search (see the freearr_x/y[] definition).	1981	* to search (see the freearr_x/y[] definition).
2005	* It returns a random choice among the alternatives found.	1982	* It returns a random choice among the alternatives found.
2006	* start and stop are where to start relative to the free_arr array (1,9	1983	* start and stop are where to start relative to the free_arr array (1,9
2007	* does all 4 immediate directions). This returns the index into the	1984	* does all 4 immediate directions). This returns the index into the
2008	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1985	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2009	* Note - this only checks to see if there is space for the head of the
2010	* object - if it is a multispace object, this should be called for all
2011	* pieces.
2012	* Note2: This function does correctly handle tiled maps, but does not	1986	* Note: This function does correctly handle tiled maps, but does not
2013	* inform the caller. However, insert_ob_in_map will update as	1987	* inform the caller. However, insert_ob_in_map will update as
2014	* necessary, so the caller shouldn't need to do any special work.	1988	* necessary, so the caller shouldn't need to do any special work.
2015	* Note - updated to take an object instead of archetype - this is necessary	1989	* Note - updated to take an object instead of archetype - this is necessary
2016	* because arch_blocked (now ob_blocked) needs to know the movement type	1990	* because arch_blocked (now ob_blocked) needs to know the movement type
2017	* to know if the space in question will block the object. We can't use	1991	* to know if the space in question will block the object. We can't use
…		…
2019	* customized, changed states, etc.	1993	* customized, changed states, etc.
2020	*/	1994	*/
2021	int	1995	int
2022	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	1996	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2023	{	1997	{
		1998	int altern[SIZEOFFREE];
2024	int index = 0, flag;	1999	int index = 0, flag;
2025	int altern[SIZEOFFREE];
2026		2000
2027	for (int i = start; i < stop; i++)	2001	for (int i = start; i < stop; i++)
2028	{	2002	{
2029	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2003	mapxy pos (m, x, y); pos.move (i);
2030	if (!flag)	2004
		2005	if (!pos.normalise ())
		2006	continue;
		2007
		2008	mapspace &ms = *pos;
		2009
		2010	if (ms.flags () & P_IS_ALIVE)
		2011	continue;
		2012
		2013	/* However, often
		2014	* ob doesn't have any move type (when used to place exits)
		2015	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2016	*/
		2017	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2018	{
2031	altern [index++] = i;	2019	altern [index++] = i;
		2020	continue;
		2021	}
2032		2022
2033	/* Basically, if we find a wall on a space, we cut down the search size.	2023	/* Basically, if we find a wall on a space, we cut down the search size.
2034	* In this way, we won't return spaces that are on another side of a wall.	2024	* In this way, we won't return spaces that are on another side of a wall.
2035	* This mostly work, but it cuts down the search size in all directions -	2025	* This mostly work, but it cuts down the search size in all directions -
2036	* if the space being examined only has a wall to the north and empty	2026	* if the space being examined only has a wall to the north and empty
2037	* spaces in all the other directions, this will reduce the search space	2027	* spaces in all the other directions, this will reduce the search space
2038	* to only the spaces immediately surrounding the target area, and	2028	* to only the spaces immediately surrounding the target area, and
2039	* won't look 2 spaces south of the target space.	2029	* won't look 2 spaces south of the target space.
2040	*/	2030	*/
2041	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2031	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2032	{
2042	stop = maxfree[i];	2033	stop = maxfree[i];
		2034	continue;
		2035	}
		2036
		2037	/* Note it is intentional that we check ob - the movement type of the
		2038	* head of the object should correspond for the entire object.
		2039	*/
		2040	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2041	continue;
		2042
		2043	if (ob->blocked (m, pos.x, pos.y))
		2044	continue;
		2045
		2046	altern [index++] = i;
2043	}	2047	}
2044		2048
2045	if (!index)	2049	if (!index)
2046	return -1;	2050	return -1;
2047		2051
…		…
2056	*/	2060	*/
2057	int	2061	int
2058	find_first_free_spot (const object ob, maptile m, int x, int y)	2062	find_first_free_spot (const object ob, maptile m, int x, int y)
2059	{	2063	{
2060	for (int i = 0; i < SIZEOFFREE; i++)	2064	for (int i = 0; i < SIZEOFFREE; i++)
2061	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2065	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2062	return i;	2066	return i;
2063		2067
2064	return -1;	2068	return -1;
2065	}	2069	}
2066		2070
…		…
2343	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2347	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2344	* core dumps if they do.	2348	* core dumps if they do.
2345	*	2349	*
2346	* Add a check so we can't pick up invisible objects (0.93.8)	2350	* Add a check so we can't pick up invisible objects (0.93.8)
2347	*/	2351	*/
2348
2349	int	2352	int
2350	can_pick (const object who, const object item)	2353	can_pick (const object who, const object item)
2351	{	2354	{
2352	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2355	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2353	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2356	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2611	&name,	2614	&name,
2612	title ? "\",title:\"" : "",	2615	title ? "\",title:\"" : "",
2613	title ? (const char *)title : "",	2616	title ? (const char *)title : "",
2614	flag_desc (flagdesc, 512), type);	2617	flag_desc (flagdesc, 512), type);
2615		2618
2616	if (env)	2619	if (!this->flag[FLAG_REMOVED] && env)
2617	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2618		2621
2619	if (map)	2622	if (map)
2620	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2623	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2621		2624
…		…
2668	old_container->flag [FLAG_APPLIED] = 0;	2671	old_container->flag [FLAG_APPLIED] = 0;
2669	container = 0;	2672	container = 0;
2670		2673
2671	esrv_update_item (UPD_FLAGS, this, old_container);	2674	esrv_update_item (UPD_FLAGS, this, old_container);
2672	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2675	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2676	play_sound (sound_find ("chest_close"));
2673	}	2677	}
2674		2678
2675	if (new_container)	2679	if (new_container)
2676	{	2680	{
2677	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2681	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2693	new_container->flag [FLAG_APPLIED] = 1;	2697	new_container->flag [FLAG_APPLIED] = 1;
2694	container = new_container;	2698	container = new_container;
2695		2699
2696	esrv_update_item (UPD_FLAGS, this, new_container);	2700	esrv_update_item (UPD_FLAGS, this, new_container);
2697	esrv_send_inventory (this, new_container);	2701	esrv_send_inventory (this, new_container);
		2702	play_sound (sound_find ("chest_open"));
2698	}	2703	}
2699	}	2704	}
2700		2705
2701	object *	2706	object *
2702	object::force_find (const shstr name)	2707	object::force_find (const shstr name)
…		…
2731	}	2736	}
2732		2737
2733	void	2738	void
2734	object::play_sound (faceidx sound) const	2739	object::play_sound (faceidx sound) const
2735	{	2740	{
2736	if (map)	2741	if (!sound)
		2742	return;
		2743
		2744	if (flag [FLAG_REMOVED])
		2745	return;
		2746
		2747	if (env)
		2748	{
		2749	if (object *pl = in_player ())
		2750	pl->contr->play_sound (sound);
		2751	}
		2752	else
2737	map->play_sound (sound, x, y);	2753	map->play_sound (sound, x, y);
2738	}	2754	}
		2755

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.168 by root, Thu Jul 26 00:27:07 2007 UTC vs. Revision 1.197 by root, Wed Oct 17 22:04:31 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.168 by root, Thu Jul 26 00:27:07 2007 UTC vs.
Revision 1.197 by root, Wed Oct 17 22:04:31 2007 UTC