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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC vs.
Revision 1.221 by root, Thu Apr 24 12:06:01 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008 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
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
…		…
140	{	136	{
141	read_uuid ();	137	read_uuid ();
142	}	138	}
143		139
144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
145	static int	141	static bool
146	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
147	{	143	{
148	key_value *wants_field;	144	key_value *wants_field;
149		145
150	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
158	key_value *has_field;	154	key_value *has_field;
159		155
160	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
161	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
162		158
163	if (has_field == NULL)	159	if (!has_field)
164	{
165	/* No field with that name. */	160	return 0; /* No field with that name. */
166	return FALSE;
167	}
168		161
169	/* Found the matching field. */	162	/* Found the matching field. */
170	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
171	{
172	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
173	return FALSE;
174	}
175		165
176	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
177	}	167	}
178		168
179	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
180	return TRUE;	170	return 1;
181	}	171	}
182		172
183	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
184	static int	174	static bool
185	compare_ob_value_lists (const object ob1, const object ob2)	175	compare_ob_value_lists (const object ob1, const object ob2)
186	{	176	{
187	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
188	* so we need to run the comparison twice. :(	178	* so we need to run the comparison twice. :(
189	*/	179	*/
…		…
210	\|\| ob1->speed != ob2->speed	200	\|\| ob1->speed != ob2->speed
211	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
212	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
213	return 0;	203	return 0;
214		204
215	//TODO: this ain't working well, use nicer and correct overflow check	205	/* Do not merge objects if nrof would overflow. First part checks
216	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	206	* for unsigned overflow (2c), second part checks whether the result
217	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* would fit into a 32 bit signed int, which is often used to hold
218	* used to store nrof).	208	* nrof values.
219	*/	209	*/
220	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
221	return 0;	211	return 0;
222		212
223	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* If the objects have been identified, set the BEEN_APPLIED flag.
224	* This is to the comparison of the flags below will be OK. We	214	* This is to the comparison of the flags below will be OK. We
225	* just can't ignore the been applied or identified flags, as they	215	* just can't ignore the been applied or identified flags, as they
226	* are not equal - just if it has been identified, the been_applied	216	* are not equal - just if it has been identified, the been_applied
227	* flags lose any meaning.	217	* flags lose any meaning.
228	*/	218	*/
229	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
230	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
231		221
232	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
233	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
234		224
235	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
236	\|\| ob1->arch != ob2->arch
237	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
238	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
239	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
240	\|\| ob1->weight != ob2->weight	229	\|\| ob1->weight != ob2->weight
241	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
242	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
243	\|\| ob1->attacktype != ob2->attacktype	230	\|\| ob1->attacktype != ob2->attacktype
244	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
245	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
246	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
247	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
254	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
255	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
256	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
257	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
258	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
259	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
260	return 0;	249	return 0;
261		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
262	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
263	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
264	*/	261	*/
265	if (ob1->inv \|\| ob2->inv)	262	if (ob1->inv \|\| ob2->inv)
266	{	263	{
267	if (!(ob1->inv && ob2->inv))	264	if (!(ob1->inv && ob2->inv))
268	return 0; /* inventories differ in length */	265	return 0; /* inventories differ in length */
269		266
270	if (ob1->inv->below \|\| ob2->inv->below)	267	if (ob1->inv->below \|\| ob2->inv->below)
271	return 0; /* more than one object in inv */	268	return 0; /* more than one object in inv */
272		269
273	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
274	return 0; /* inventory objexts differ */	271	return 0; /* inventory objects differ */
275		272
276	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
277	* if it is valid.	274	* if it is valid.
278	*/	275	*/
279	}	276	}
…		…
298	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
299	return 0;	296	return 0;
300	break;	297	break;
301	}	298	}
302		299
303	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	300	if (ob1->key_values \|\| ob2->key_values)
304	{	301	{
305	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
306	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
307	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
308	return 0;	305
309	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
310	return 0;	307	return 0;
311	}	308	}
312		309
313	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
314	{	311	{
…		…
320	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
321	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
322		319
323	if (k1 != k2)	320	if (k1 != k2)
324	return 0;	321	return 0;
		322
325	else if (k1 == 0)	323	if (k1 == 0)
326	return 1;	324	return 1;
		325
327	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
328	return 0;	327	return 0;
329	}	328	}
330	}	329	}
331		330
332	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
333	return 1;	332	return 1;
334	}	333	}
335		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (client_visible () && !flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	if (!pl->container \|\| this == pl->container)
		364	return pl;
		365	}
		366	}
		367
		368	return 0;
		369	}
		370
		371	// adjust weight per container type ("of holding")
		372	static sint32
		373	weight_adjust (object *op, sint32 weight)
		374	{
		375	return op->type == CONTAINER
		376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		377	: weight;
		378	}
		379
336	/*	380	/*
		381	* adjust_weight(object, weight) adds the specified weight to an object,
		382	* and also updates how much the environment(s) is/are carrying.
		383	*/
		384	static void
		385	adjust_weight (object *op, sint32 weight)
		386	{
		387	while (op)
		388	{
		389	weight = weight_adjust (op, weight);
		390
		391	if (!weight)
		392	return;
		393
		394	op->carrying += weight;
		395
		396	if (object *pl = op->visible_to ())
		397	if (pl != op) // player is handled lazily
		398	esrv_update_item (UPD_WEIGHT, pl, op);
		399
		400	op = op->env;
		401	}
		402	}
		403
		404	/*
337	* sum_weight() is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
338	* an object is carrying. It goes through in figures out how much	406	* an object is carrying. It goes through op and figures out how much
339	* containers are carrying, and sums it up.	407	* containers are carrying, and sums it up.
340	*/	408	*/
341	long	409	void
342	sum_weight (object *op)	410	object::update_weight ()
343	{	411	{
344	long sum;	412	sint32 sum = 0;
345	object *inv;
346		413
347	for (sum = 0, inv = op->inv; inv; inv = inv->below)	414	for (object *op = inv; op; op = op->below)
348	{	415	{
349	if (inv->inv)	416	if (op->inv)
350	sum_weight (inv);	417	op->update_weight ();
351		418
352	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	419	sum += op->total_weight ();
		420	}
		421
		422	sum = weight_adjust (this, sum);
		423
		424	if (sum != carrying)
353	}	425	{
354
355	if (op->type == CONTAINER && op->stats.Str)
356	sum = (sum * (100 - op->stats.Str)) / 100;
357
358	if (op->carrying != sum)
359	op->carrying = sum;	426	carrying = sum;
360		427
361	return sum;	428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
362	}	432	}
363		433
364	/**	434	/*
365	* Return the outermost environment object for a given object.	435	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
366	*/
367
368	object *
369	object_get_env_recursive (object *op)
370	{
371	while (op->env != NULL)
372	op = op->env;
373	return op;
374	}
375
376	/*
377	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
378	* Some error messages.
379	* The result of the dump is stored in the static global errmsg array.
380	*/	436	*/
381	char *	437	char *
382	dump_object (object *op)	438	dump_object (object *op)
383	{	439	{
384	if (!op)	440	if (!op)
…		…
398	get_nearest_part (object op, const object pl)	454	get_nearest_part (object op, const object pl)
399	{	455	{
400	object tmp, closest;	456	object tmp, closest;
401	int last_dist, i;	457	int last_dist, i;
402		458
403	if (op->more == NULL)	459	if (!op->more)
404	return op;	460	return op;
		461
405	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		463	tmp;
		464	tmp = tmp->more)
406	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
407	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
408	return closest;	468	return closest;
409	}	469	}
410		470
411	/*	471	/*
412	* Returns the object which has the count-variable equal to the argument.	472	* Returns the object which has the count-variable equal to the argument.
		473	* VERRRY slow.
413	*/	474	*/
414	object *	475	object *
415	find_object (tag_t i)	476	find_object (tag_t i)
416	{	477	{
417	for_all_objects (op)	478	for_all_objects (op)
…		…
857	object::destroy_inv (bool drop_to_ground)	918	object::destroy_inv (bool drop_to_ground)
858	{	919	{
859	// need to check first, because the checks below might segfault	920	// need to check first, because the checks below might segfault
860	// as we might be on an invalid mapspace and crossfire code	921	// as we might be on an invalid mapspace and crossfire code
861	// is too buggy to ensure that the inventory is empty.	922	// is too buggy to ensure that the inventory is empty.
862	// corollary: if you create arrows etc. with stuff in tis inventory,	923	// corollary: if you create arrows etc. with stuff in its inventory,
863	// cf will crash below with off-map x and y	924	// cf will crash below with off-map x and y
864	if (!inv)	925	if (!inv)
865	return;	926	return;
866		927
867	/* Only if the space blocks everything do we not process -	928	/* Only if the space blocks everything do we not process -
868	* if some form of movement is allowed, let objects	929	* if some form of movement is allowed, let objects
869	* drop on that space.	930	* drop on that space.
870	*/	931	*/
871	if (!drop_to_ground	932	if (!drop_to_ground
872	\|\| !map	933	\|\| !map
873	\|\| map->in_memory != MAP_IN_MEMORY	934	\|\| map->in_memory != MAP_ACTIVE
874	\|\| map->nodrop	935	\|\| map->nodrop
875	\|\| ms ().move_block == MOVE_ALL)	936	\|\| ms ().move_block == MOVE_ALL)
876	{	937	{
877	while (inv)	938	while (inv)
878	{	939	{
879	inv->destroy_inv (drop_to_ground);	940	inv->destroy_inv (false);
880	inv->destroy ();	941	inv->destroy ();
881	}	942	}
882	}	943	}
883	else	944	else
884	{ /* Put objects in inventory onto this space */	945	{ /* Put objects in inventory onto this space */
…		…
890	\|\| op->flag [FLAG_NO_DROP]	951	\|\| op->flag [FLAG_NO_DROP]
891	\|\| op->type == RUNE	952	\|\| op->type == RUNE
892	\|\| op->type == TRAP	953	\|\| op->type == TRAP
893	\|\| op->flag [FLAG_IS_A_TEMPLATE]	954	\|\| op->flag [FLAG_IS_A_TEMPLATE]
894	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	955	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
895	op->destroy ();	956	op->destroy (true);
896	else	957	else
897	map->insert (op, x, y);	958	map->insert (op, x, y);
898	}	959	}
899	}	960	}
900	}	961	}
…		…
907	}	968	}
908		969
909	void	970	void
910	object::do_destroy ()	971	object::do_destroy ()
911	{	972	{
912	attachable::do_destroy ();
913
914	if (flag [FLAG_IS_LINKED])	973	if (flag [FLAG_IS_LINKED])
915	remove_button_link (this);	974	remove_button_link (this);
916		975
917	if (flag [FLAG_FRIENDLY])	976	if (flag [FLAG_FRIENDLY])
918	remove_friendly_object (this);	977	remove_friendly_object (this);
919		978
920	if (!flag [FLAG_REMOVED])
921	remove ();	979	remove ();
922		980
923	destroy_inv (true);	981	attachable::do_destroy ();
924		982
925	deactivate ();	983	deactivate ();
926	unlink ();	984	unlink ();
927		985
928	flag [FLAG_FREED] = 1;	986	flag [FLAG_FREED] = 1;
…		…
940	freed_map->width = 3;	998	freed_map->width = 3;
941	freed_map->height = 3;	999	freed_map->height = 3;
942	freed_map->nodrop = 1;	1000	freed_map->nodrop = 1;
943		1001
944	freed_map->alloc ();	1002	freed_map->alloc ();
945	freed_map->in_memory = MAP_IN_MEMORY;	1003	freed_map->in_memory = MAP_ACTIVE;
946	}	1004	}
947		1005
948	map = freed_map;	1006	map = freed_map;
949	x = 1;	1007	x = 1;
950	y = 1;	1008	y = 1;
…		…
969	object::destroy (bool destroy_inventory)	1027	object::destroy (bool destroy_inventory)
970	{	1028	{
971	if (destroyed ())	1029	if (destroyed ())
972	return;	1030	return;
973		1031
		1032	if (!is_head () && !head->destroyed ())
		1033	{
		1034	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1035	head->destroy (destroy_inventory);
		1036	}
		1037
974	if (destroy_inventory)	1038	destroy_inv (!destroy_inventory);
975	destroy_inv (false);
976		1039
977	if (is_head ())	1040	if (is_head ())
978	if (sound_destroy)	1041	if (sound_destroy)
979	play_sound (sound_destroy);	1042	play_sound (sound_destroy);
980	else if (flag [FLAG_MONSTER])	1043	else if (flag [FLAG_MONSTER])
981	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1044	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
982		1045
983	attachable::destroy ();	1046	attachable::destroy ();
984	}
985
986	/*
987	* sub_weight() recursively (outwards) subtracts a number from the
988	* weight of an object (and what is carried by it's environment(s)).
989	*/
990	void
991	sub_weight (object *op, signed long weight)
992	{
993	while (op != NULL)
994	{
995	if (op->type == CONTAINER)
996	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
997
998	op->carrying -= weight;
999	op = op->env;
1000	}
1001	}	1047	}
1002		1048
1003	/* op->remove ():	1049	/* op->remove ():
1004	* This function removes the object op from the linked list of objects	1050	* This function removes the object op from the linked list of objects
1005	* which it is currently tied to. When this function is done, the	1051	* which it is currently tied to. When this function is done, the
…		…
1011	object::do_remove ()	1057	object::do_remove ()
1012	{	1058	{
1013	object tmp, last = 0;	1059	object tmp, last = 0;
1014	object *otmp;	1060	object *otmp;
1015		1061
1016	if (QUERY_FLAG (this, FLAG_REMOVED))	1062	if (flag [FLAG_REMOVED])
1017	return;	1063	return;
1018		1064
1019	SET_FLAG (this, FLAG_REMOVED);
1020	INVOKE_OBJECT (REMOVE, this);	1065	INVOKE_OBJECT (REMOVE, this);
		1066
		1067	flag [FLAG_REMOVED] = true;
1021		1068
1022	if (more)	1069	if (more)
1023	more->remove ();	1070	more->remove ();
1024		1071
1025	/*	1072	/*
1026	* In this case, the object to be removed is in someones	1073	* In this case, the object to be removed is in someones
1027	* inventory.	1074	* inventory.
1028	*/	1075	*/
1029	if (env)	1076	if (env)
1030	{	1077	{
		1078	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1079	if (object *pl = visible_to ())
		1080	esrv_del_item (pl->contr, count);
		1081	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1082
		1083	adjust_weight (env, -total_weight ());
		1084
		1085	*(above ? &above->below : &env->inv) = below;
		1086
1031	if (nrof)	1087	if (below)
1032	sub_weight (env, weight * nrof);	1088	below->above = above;
1033	else	1089
1034	sub_weight (env, weight + carrying);	1090	/* we set up values so that it could be inserted into
		1091	* the map, but we don't actually do that - it is up
		1092	* to the caller to decide what we want to do.
		1093	*/
		1094	map = env->map;
		1095	x = env->x;
		1096	y = env->y;
		1097	above = 0;
		1098	below = 0;
		1099	env = 0;
1035		1100
1036	/* NO_FIX_PLAYER is set when a great many changes are being	1101	/* NO_FIX_PLAYER is set when a great many changes are being
1037	* made to players inventory. If set, avoiding the call	1102	* made to players inventory. If set, avoiding the call
1038	* to save cpu time.	1103	* to save cpu time.
1039	*/	1104	*/
1040	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1105	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1041	otmp->update_stats ();	1106	otmp->update_stats ();
1042
1043	if (above)
1044	above->below = below;
1045	else
1046	env->inv = below;
1047
1048	if (below)
1049	below->above = above;
1050
1051	/* we set up values so that it could be inserted into
1052	* the map, but we don't actually do that - it is up
1053	* to the caller to decide what we want to do.
1054	*/
1055	x = env->x, y = env->y;
1056	map = env->map;
1057	above = 0, below = 0;
1058	env = 0;
1059	}	1107	}
1060	else if (map)	1108	else if (map)
1061	{	1109	{
1062	if (type == PLAYER)
1063	{
1064	// leaving a spot always closes any open container on the ground
1065	if (container && !container->env)
1066	// this causes spurious floorbox updates, but it ensures
1067	// that the CLOSE event is being sent.
1068	close_container ();
1069
1070	--map->players;
1071	map->touch ();
1072	}
1073
1074	map->dirty = true;	1110	map->dirty = true;
1075	mapspace &ms = this->ms ();	1111	mapspace &ms = this->ms ();
		1112
		1113	if (object *pl = ms.player ())
		1114	{
		1115	if (type == PLAYER) // this == pl(!)
		1116	{
		1117	// leaving a spot always closes any open container on the ground
		1118	if (container && !container->env)
		1119	// this causes spurious floorbox updates, but it ensures
		1120	// that the CLOSE event is being sent.
		1121	close_container ();
		1122
		1123	--map->players;
		1124	map->touch ();
		1125	}
		1126	else if (pl->container == this)
		1127	{
		1128	// removing a container should close it
		1129	close_container ();
		1130	}
		1131
		1132	esrv_del_item (pl->contr, count);
		1133	}
1076		1134
1077	/* link the object above us */	1135	/* link the object above us */
1078	if (above)	1136	if (above)
1079	above->below = below;	1137	above->below = below;
1080	else	1138	else
…		…
1110	* removed (most likely destroyed), update the player view	1168	* removed (most likely destroyed), update the player view
1111	* appropriately.	1169	* appropriately.
1112	*/	1170	*/
1113	pl->close_container ();	1171	pl->close_container ();
1114		1172
1115	pl->contr->ns->floorbox_update ();	1173	//TODO: the floorbox prev/next might need updating
		1174	esrv_del_item (pl->contr, count);
1116	}	1175	}
1117		1176
1118	for (tmp = ms.bot; tmp; tmp = tmp->above)	1177	for (tmp = ms.bot; tmp; tmp = tmp->above)
1119	{	1178	{
1120	/* No point updating the players look faces if he is the object	1179	/* No point updating the players look faces if he is the object
…		…
1164	if (!top)	1223	if (!top)
1165	for (top = op; top && top->above; top = top->above)	1224	for (top = op; top && top->above; top = top->above)
1166	;	1225	;
1167		1226
1168	for (; top; top = top->below)	1227	for (; top; top = top->below)
1169	{
1170	if (top == op)
1171	continue;
1172
1173	if (object::can_merge (op, top))	1228	if (object::can_merge (op, top))
1174	{	1229	{
1175	top->nrof += op->nrof;	1230	top->nrof += op->nrof;
1176		1231
1177	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1232	if (object *pl = top->visible_to ())
1178	op->weight = 0; /* Don't want any adjustements now */	1233	esrv_update_item (UPD_NROF, pl, top);
		1234
		1235	op->weight = 0; // cancel the addition above
		1236	op->carrying = 0; // must be 0 already
		1237
1179	op->destroy ();	1238	op->destroy (1);
		1239
1180	return top;	1240	return top;
1181	}	1241	}
1182	}
1183		1242
1184	return 0;	1243	return 0;
1185	}	1244	}
1186		1245
1187	void	1246	void
…		…
1246	object *	1305	object *
1247	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1306	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1248	{	1307	{
1249	assert (!op->flag [FLAG_FREED]);	1308	assert (!op->flag [FLAG_FREED]);
1250		1309
1251	object top, floor = NULL;
1252
1253	op->remove ();	1310	op->remove ();
1254		1311
1255	/* Ideally, the caller figures this out. However, it complicates a lot	1312	/* Ideally, the caller figures this out. However, it complicates a lot
1256	* of areas of callers (eg, anything that uses find_free_spot would now	1313	* of areas of callers (eg, anything that uses find_free_spot would now
1257	* need extra work	1314	* need extra work
1258	*/	1315	*/
1259	if (!xy_normalise (m, op->x, op->y))	1316	if (!xy_normalise (m, op->x, op->y))
1260	{	1317	{
1261	op->destroy ();	1318	op->destroy (1);
1262	return 0;	1319	return 0;
1263	}	1320	}
1264		1321
1265	if (object *more = op->more)	1322	if (object *more = op->more)
1266	if (!insert_ob_in_map (more, m, originator, flag))	1323	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1275	*/	1332	*/
1276	if (op->nrof && !(flag & INS_NO_MERGE))	1333	if (op->nrof && !(flag & INS_NO_MERGE))
1277	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1334	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1278	if (object::can_merge (op, tmp))	1335	if (object::can_merge (op, tmp))
1279	{	1336	{
		1337	// TODO: we atcually want to update tmp, not op,
		1338	// but some caller surely breaks when we return tmp
		1339	// from here :/
1280	op->nrof += tmp->nrof;	1340	op->nrof += tmp->nrof;
1281	tmp->destroy ();	1341	tmp->destroy (1);
1282	}	1342	}
1283		1343
1284	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1344	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1285	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1345	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1286		1346
…		…
1306	/* since below originator, no need to update top */	1366	/* since below originator, no need to update top */
1307	originator->below = op;	1367	originator->below = op;
1308	}	1368	}
1309	else	1369	else
1310	{	1370	{
		1371	object top, floor = NULL;
		1372
1311	top = ms.bot;	1373	top = ms.bot;
1312		1374
1313	/* If there are other objects, then */	1375	/* If there are other objects, then */
1314	if (top)	1376	if (top)
1315	{	1377	{
…		…
1414	}	1476	}
1415		1477
1416	op->map->dirty = true;	1478	op->map->dirty = true;
1417		1479
1418	if (object *pl = ms.player ())	1480	if (object *pl = ms.player ())
1419	pl->contr->ns->floorbox_update ();	1481	//TODO: the floorbox prev/next might need updating
		1482	esrv_send_item (pl, op);
1420		1483
1421	/* If this object glows, it may affect lighting conditions that are	1484	/* If this object glows, it may affect lighting conditions that are
1422	* visible to others on this map. But update_all_los is really	1485	* visible to others on this map. But update_all_los is really
1423	* an inefficient way to do this, as it means los for all players	1486	* an inefficient way to do this, as it means los for all players
1424	* on the map will get recalculated. The players could very well	1487	* on the map will get recalculated. The players could very well
…		…
1466	* op is the object to insert it under: supplies x and the map.	1529	* op is the object to insert it under: supplies x and the map.
1467	*/	1530	*/
1468	void	1531	void
1469	replace_insert_ob_in_map (const char arch_string, object op)	1532	replace_insert_ob_in_map (const char arch_string, object op)
1470	{	1533	{
1471	object tmp, tmp1;
1472
1473	/* first search for itself and remove any old instances */	1534	/* first search for itself and remove any old instances */
1474		1535
1475	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1536	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1476	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1537	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1477	tmp->destroy ();	1538	tmp->destroy (1);
1478		1539
1479	tmp1 = arch_to_object (archetype::find (arch_string));	1540	object *tmp = arch_to_object (archetype::find (arch_string));
1480		1541
1481	tmp1->x = op->x;	1542	tmp->x = op->x;
1482	tmp1->y = op->y;	1543	tmp->y = op->y;
		1544
1483	insert_ob_in_map (tmp1, op->map, op, 0);	1545	insert_ob_in_map (tmp, op->map, op, 0);
1484	}	1546	}
1485		1547
1486	object *	1548	object *
1487	object::insert_at (object where, object originator, int flags)	1549	object::insert_at (object where, object originator, int flags)
1488	{	1550	{
		1551	if (where->env)
		1552	return where->env->insert (this);
		1553	else
1489	return where->map->insert (this, where->x, where->y, originator, flags);	1554	return where->map->insert (this, where->x, where->y, originator, flags);
1490	}	1555	}
1491		1556
1492	/*	1557	/*
1493	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1494	* is returned contains nr objects, and the remaining parts contains
1495	* the rest (or is removed and freed if that number is 0).
1496	* On failure, NULL is returned, and the reason put into the
1497	* global static errmsg array.
1498	*/
1499	object *
1500	get_split_ob (object *orig_ob, uint32 nr)
1501	{
1502	object *newob;
1503	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1504
1505	if (orig_ob->nrof < nr)
1506	{
1507	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1508	return NULL;
1509	}
1510
1511	newob = object_create_clone (orig_ob);
1512
1513	if ((orig_ob->nrof -= nr) < 1)
1514	orig_ob->destroy (1);
1515	else if (!is_removed)
1516	{
1517	if (orig_ob->env != NULL)
1518	sub_weight (orig_ob->env, orig_ob->weight * nr);
1519	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1520	{
1521	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1522	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1523	return NULL;
1524	}
1525	}
1526
1527	newob->nrof = nr;
1528
1529	return newob;
1530	}
1531
1532	/*
1533	* decrease_ob_nr(object, number) decreases a specified number from	1558	* decrease(object, number) decreases a specified number from
1534	* the amount of an object. If the amount reaches 0, the object	1559	* the amount of an object. If the amount reaches 0, the object
1535	* is subsequently removed and freed.	1560	* is subsequently removed and freed.
1536	*	1561	*
1537	* Return value: 'op' if something is left, NULL if the amount reached 0	1562	* Return value: 'op' if something is left, NULL if the amount reached 0
1538	*/	1563	*/
		1564	bool
		1565	object::decrease (sint32 nr)
		1566	{
		1567	if (!nr)
		1568	return true;
		1569
		1570	nr = min (nr, nrof);
		1571
		1572	nrof -= nr;
		1573
		1574	if (nrof)
		1575	{
		1576	adjust_weight (env, -weight * nr); // carrying == 0
		1577
		1578	if (object *pl = visible_to ())
		1579	esrv_update_item (UPD_NROF, pl, this);
		1580
		1581	return true;
		1582	}
		1583	else
		1584	{
		1585	destroy (1);
		1586	return false;
		1587	}
		1588	}
		1589
		1590	/*
		1591	* split(ob,nr) splits up ob into two parts. The part which
		1592	* is returned contains nr objects, and the remaining parts contains
		1593	* the rest (or is removed and returned if that number is 0).
		1594	* On failure, NULL is returned.
		1595	*/
1539	object *	1596	object *
1540	decrease_ob_nr (object *op, uint32 i)	1597	object::split (sint32 nr)
1541	{	1598	{
1542	object *tmp;	1599	int have = number_of ();
1543		1600
1544	if (i == 0) /* objects with op->nrof require this check */	1601	if (have < nr)
1545	return op;	1602	return 0;
1546		1603	else if (have == nr)
1547	if (i > op->nrof)
1548	i = op->nrof;
1549
1550	if (QUERY_FLAG (op, FLAG_REMOVED))
1551	op->nrof -= i;
1552	else if (op->env)
1553	{	1604	{
1554	/* is this object in the players inventory, or sub container
1555	* therein?
1556	*/
1557	tmp = op->in_player ();
1558	/* nope. Is this a container the player has opened?
1559	* If so, set tmp to that player.
1560	* IMO, searching through all the players will mostly
1561	* likely be quicker than following op->env to the map,
1562	* and then searching the map for a player.
1563	*/
1564	if (!tmp)
1565	for_all_players (pl)
1566	if (pl->ob->container == op->env)
1567	{
1568	tmp = pl->ob;
1569	break;
1570	}
1571
1572	if (i < op->nrof)
1573	{
1574	sub_weight (op->env, op->weight * i);
1575	op->nrof -= i;
1576	if (tmp)
1577	esrv_send_item (tmp, op);
1578	}
1579	else
1580	{
1581	op->remove ();	1605	remove ();
1582	op->nrof = 0;	1606	return this;
1583	if (tmp)
1584	esrv_del_item (tmp->contr, op->count);
1585	}
1586	}	1607	}
1587	else	1608	else
1588	{	1609	{
1589	object *above = op->above;	1610	decrease (nr);
1590		1611
1591	if (i < op->nrof)	1612	object *op = object_create_clone (this);
1592	op->nrof -= i;	1613	op->nrof = nr;
1593	else
1594	{
1595	op->remove ();
1596	op->nrof = 0;
1597	}
1598
1599	/* Since we just removed op, op->above is null */
1600	for (tmp = above; tmp; tmp = tmp->above)
1601	if (tmp->type == PLAYER)
1602	{
1603	if (op->nrof)
1604	esrv_send_item (tmp, op);
1605	else
1606	esrv_del_item (tmp->contr, op->count);
1607	}
1608	}
1609
1610	if (op->nrof)
1611	return op;	1614	return op;
1612	else
1613	{
1614	op->destroy ();
1615	return 0;
1616	}
1617	}
1618
1619	/*
1620	* add_weight(object, weight) adds the specified weight to an object,
1621	* and also updates how much the environment(s) is/are carrying.
1622	*/
1623	void
1624	add_weight (object *op, signed long weight)
1625	{
1626	while (op != NULL)
1627	{
1628	if (op->type == CONTAINER)
1629	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1630
1631	op->carrying += weight;
1632	op = op->env;
1633	}	1615	}
1634	}	1616	}
1635		1617
1636	object *	1618	object *
1637	insert_ob_in_ob (object op, object where)	1619	insert_ob_in_ob (object op, object where)
…		…
1662	* be != op, if items are merged. -Tero	1644	* be != op, if items are merged. -Tero
1663	*/	1645	*/
1664	object *	1646	object *
1665	object::insert (object *op)	1647	object::insert (object *op)
1666	{	1648	{
1667	if (!QUERY_FLAG (op, FLAG_REMOVED))
1668	op->remove ();
1669
1670	if (op->more)	1649	if (op->more)
1671	{	1650	{
1672	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1651	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1673	return op;	1652	return op;
1674	}	1653	}
1675		1654
1676	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1655	op->remove ();
1677	CLEAR_FLAG (op, FLAG_REMOVED);	1656
		1657	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1678		1658
1679	if (op->nrof)	1659	if (op->nrof)
1680	{
1681	for (object *tmp = inv; tmp; tmp = tmp->below)	1660	for (object *tmp = inv; tmp; tmp = tmp->below)
1682	if (object::can_merge (tmp, op))	1661	if (object::can_merge (tmp, op))
1683	{	1662	{
1684	/* return the original object and remove inserted object	1663	/* return the original object and remove inserted object
1685	(client needs the original object) */	1664	(client needs the original object) */
1686	tmp->nrof += op->nrof;	1665	tmp->nrof += op->nrof;
1687	/* Weight handling gets pretty funky. Since we are adding to	1666
1688	* tmp->nrof, we need to increase the weight.	1667	if (object *pl = tmp->visible_to ())
1689	*/	1668	esrv_update_item (UPD_NROF, pl, tmp);
		1669
1690	add_weight (this, op->weight * op->nrof);	1670	adjust_weight (this, op->total_weight ());
1691	SET_FLAG (op, FLAG_REMOVED);	1671
1692	op->destroy (); /* free the inserted object */	1672	op->destroy (1);
1693	op = tmp;	1673	op = tmp;
1694	op->remove (); /* and fix old object's links */	1674	goto inserted;
1695	CLEAR_FLAG (op, FLAG_REMOVED);
1696	break;
1697	}	1675	}
1698		1676
1699	/* I assume combined objects have no inventory
1700	* We add the weight - this object could have just been removed
1701	* (if it was possible to merge). calling remove_ob will subtract
1702	* the weight, so we need to add it in again, since we actually do
1703	* the linking below
1704	*/
1705	add_weight (this, op->weight * op->nrof);
1706	}
1707	else
1708	add_weight (this, (op->weight + op->carrying));
1709
1710	if (object *otmp = this->in_player ())
1711	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1712	otmp->update_stats ();
1713
1714	op->owner = 0; // its his/hers now. period.	1677	op->owner = 0; // it's his/hers now. period.
1715	op->map = 0;	1678	op->map = 0;
		1679	op->x = 0;
		1680	op->y = 0;
		1681
		1682	op->above = 0;
		1683	op->below = inv;
1716	op->env = this;	1684	op->env = this;
1717	op->above = 0;
1718	op->below = 0;
1719	op->x = op->y = 0;
1720		1685
		1686	if (inv)
		1687	inv->above = op;
		1688
		1689	inv = op;
		1690
		1691	op->flag [FLAG_REMOVED] = 0;
		1692
		1693	if (object *pl = op->visible_to ())
		1694	esrv_send_item (pl, op);
		1695
		1696	adjust_weight (this, op->total_weight ());
		1697
		1698	inserted:
1721	/* reset the light list and los of the players on the map */	1699	/* reset the light list and los of the players on the map */
1722	if (op->glow_radius && map)	1700	if (op->glow_radius && map && map->darkness)
1723	{
1724	#ifdef DEBUG_LIGHTS
1725	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1726	#endif /* DEBUG_LIGHTS */
1727	if (map->darkness)
1728	update_all_los (map, x, y);	1701	update_all_los (map, x, y);
1729	}
1730		1702
1731	/* Client has no idea of ordering so lets not bother ordering it here.	1703	// if this is a player's inventory, update stats
1732	* It sure simplifies this function...	1704	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1733	*/	1705	update_stats ();
1734	if (!inv)
1735	inv = op;
1736	else
1737	{
1738	op->below = inv;
1739	op->below->above = op;
1740	inv = op;
1741	}
1742		1706
1743	INVOKE_OBJECT (INSERT, this);	1707	INVOKE_OBJECT (INSERT, this);
1744		1708
1745	return op;	1709	return op;
1746	}	1710	}
…		…
2624	&name,	2588	&name,
2625	title ? "\",title:\"" : "",	2589	title ? "\",title:\"" : "",
2626	title ? (const char *)title : "",	2590	title ? (const char *)title : "",
2627	flag_desc (flagdesc, 512), type);	2591	flag_desc (flagdesc, 512), type);
2628		2592
2629	if (!this->flag[FLAG_REMOVED] && env)	2593	if (!flag[FLAG_REMOVED] && env)
2630	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2594	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2631		2595
2632	if (map)	2596	if (map)
2633	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2597	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2634		2598
…		…
2664	object::open_container (object *new_container)	2628	object::open_container (object *new_container)
2665	{	2629	{
2666	if (container == new_container)	2630	if (container == new_container)
2667	return;	2631	return;
2668		2632
2669	if (object *old_container = container)	2633	object *old_container = container;
		2634
		2635	if (old_container)
2670	{	2636	{
2671	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2637	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2672	return;	2638	return;
2673		2639
2674	#if 0	2640	#if 0
…		…
2676	if (object *closer = old_container->inv)	2642	if (object *closer = old_container->inv)
2677	if (closer->type == CLOSE_CON)	2643	if (closer->type == CLOSE_CON)
2678	closer->destroy ();	2644	closer->destroy ();
2679	#endif	2645	#endif
2680		2646
		2647	// make sure the container is available
		2648	esrv_send_item (this, old_container);
		2649
2681	old_container->flag [FLAG_APPLIED] = 0;	2650	old_container->flag [FLAG_APPLIED] = false;
2682	container = 0;	2651	container = 0;
2683		2652
		2653	// client needs item update to make it work, client bug requires this to be separate
2684	esrv_update_item (UPD_FLAGS, this, old_container);	2654	esrv_update_item (UPD_FLAGS, this, old_container);
		2655
2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2656	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2686	play_sound (sound_find ("chest_close"));	2657	play_sound (sound_find ("chest_close"));
2687	}	2658	}
2688		2659
2689	if (new_container)	2660	if (new_container)
…		…
2702	}	2673	}
2703	#endif	2674	#endif
2704		2675
2705	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2676	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2706		2677
		2678	// make sure the container is available, client bug requires this to be separate
		2679	esrv_send_item (this, new_container);
		2680
2707	new_container->flag [FLAG_APPLIED] = 1;	2681	new_container->flag [FLAG_APPLIED] = true;
2708	container = new_container;	2682	container = new_container;
2709		2683
		2684	// client needs flag change
2710	esrv_update_item (UPD_FLAGS, this, new_container);	2685	esrv_update_item (UPD_FLAGS, this, new_container);
2711	esrv_send_inventory (this, new_container);	2686	esrv_send_inventory (this, new_container);
2712	play_sound (sound_find ("chest_open"));	2687	play_sound (sound_find ("chest_open"));
2713	}	2688	}
		2689	// else if (!old_container->env && contr && contr->ns)
		2690	// contr->ns->floorbox_reset ();
2714	}	2691	}
2715		2692
2716	object *	2693	object *
2717	object::force_find (const shstr name)	2694	object::force_find (const shstr name)
2718	{	2695	{
…		…
2744		2721
2745	insert (force);	2722	insert (force);
2746	}	2723	}
2747		2724
2748	void	2725	void
2749	object::play_sound (faceidx sound) const	2726	object::play_sound (faceidx sound)
2750	{	2727	{
2751	if (!sound)	2728	if (!sound)
2752	return;	2729	return;
2753		2730
2754	if (flag [FLAG_REMOVED])	2731	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC vs. Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC vs.
Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC