ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.254 by root, Sun Aug 31 01:17:11 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
28	#include <global.h>	24	#include <global.h>
29	#include <stdio.h>	25	#include <stdio.h>
30	#include <sys/types.h>	26	#include <sys/types.h>
31	#include <sys/uio.h>	27	#include <sys/uio.h>
32	#include <object.h>	28	#include <object.h>
33	#include <funcpoint.h>
34	#include <sproto.h>	29	#include <sproto.h>
35	#include <loader.h>	30	#include <loader.h>
36		31
37	#include <bitset>	32	#include <bitset>
38		33
…		…
144		139
145	/* 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. */
146	static bool	141	static bool
147	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
148	{	143	{
149	key_value *wants_field;
150
151	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
152	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
153	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
154	*/	147	*/
155		148
156	/* For each field in wants, */	149	/* For each field in wants, */
157	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
158	{	151	if (has->kv_get (kv->key) != kv->value)
159	key_value *has_field;	152	return false;
160
161	/* Look for a field in has with the same key. */
162	has_field = get_ob_key_link (has, wants_field->key);
163
164	if (!has_field)
165	return 0; /* No field with that name. */
166
167	/* Found the matching field. */
168	if (has_field->value != wants_field->value)
169	return 0; /* Values don't match, so this half of the comparison is false. */
170
171	/* If we get here, we found a match. Now for the next field in wants. */
172	}
173		153
174	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
175	return 1;	155	return true;
176	}	156	}
177		157
178	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
179	static bool	159	static bool
180	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
181	{	161	{
182	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
183	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
184	*/	164	*/
185	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
186	}	167	}
187		168
188	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
189	* they can be merged together.	170	* they can be merged together.
190	*	171	*
…		…
205	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
206	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
207	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
208	return 0;	189	return 0;
209		190
210	/* Do not merge objects if nrof would overflow. First part checks	191	/* Do not merge objects if nrof would overflow, assume nrof
211	* for unsigned overflow (2c), second part checks wether the result	192	* is always 0 .. 2**31-1 */
212	* would fit into a 32 bit signed int, which is often used to hold	193	if (ob1->nrof > 0x7fffffff - ob2->nrof)
213	* nrof values.
214	*/
215	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
216	return 0;	194	return 0;
217		195
218	/* If the objects have been identified, set the BEEN_APPLIED flag.	196	/* If the objects have been identified, set the BEEN_APPLIED flag.
219	* This is to the comparison of the flags below will be OK. We	197	* This is to the comparison of the flags below will be OK. We
220	* just can't ignore the been applied or identified flags, as they	198	* just can't ignore the been applied or identified flags, as they
…		…
225	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
226		204
227	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
228	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
229		207
230	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	208	if (ob1->arch->archname != ob2->arch->archname
231	|| ob1->arch != ob2->arch
232	|| ob1->name != ob2->name	209	|| ob1->name != ob2->name
233	|| ob1->title != ob2->title	210	|| ob1->title != ob2->title
234	|| ob1->msg != ob2->msg	211	|| ob1->msg != ob2->msg
235	|| ob1->weight != ob2->weight	212	|| ob1->weight != ob2->weight
236	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	|| ob1->attacktype != ob2->attacktype	213	|| ob1->attacktype != ob2->attacktype
239	|| ob1->magic != ob2->magic	214	|| ob1->magic != ob2->magic
240	|| ob1->slaying != ob2->slaying	215	|| ob1->slaying != ob2->slaying
241	|| ob1->skill != ob2->skill	216	|| ob1->skill != ob2->skill
242	|| ob1->value != ob2->value	217	|| ob1->value != ob2->value
243	|| ob1->animation_id != ob2->animation_id	218	|| ob1->animation_id != ob2->animation_id
		219	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
244	|| ob1->client_type != ob2->client_type	220	|| ob1->client_type != ob2->client_type
245	|| ob1->materialname != ob2->materialname	221	|| ob1->materialname != ob2->materialname
246	|| ob1->lore != ob2->lore	222	|| ob1->lore != ob2->lore
247	|| ob1->subtype != ob2->subtype	223	|| ob1->subtype != ob2->subtype
248	|| ob1->move_type != ob2->move_type	224	|| ob1->move_type != ob2->move_type
249	|| ob1->move_block != ob2->move_block	225	|| ob1->move_block != ob2->move_block
250	|| ob1->move_allow != ob2->move_allow	226	|| ob1->move_allow != ob2->move_allow
251	|| ob1->move_on != ob2->move_on	227	|| ob1->move_on != ob2->move_on
252	|| ob1->move_off != ob2->move_off	228	|| ob1->move_off != ob2->move_off
253	|| ob1->move_slow != ob2->move_slow	229	|| ob1->move_slow != ob2->move_slow
254	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	230	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
		233	return 0;
		234
		235	if ((ob1->flag ^ ob2->flag)
		236	.reset (FLAG_INV_LOCKED)
		237	.reset (FLAG_CLIENT_SENT)
		238	.reset (FLAG_REMOVED)
		239	.any ())
255	return 0;	240	return 0;
256		241
257	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
258	* not merge objects with real inventories, as splitting them	243	* not merge objects with real inventories, as splitting them
259	* is hard.	244	* is hard.
…		…
298		283
299	if (ob1->key_values || ob2->key_values)	284	if (ob1->key_values || ob2->key_values)
300	{	285	{
301	/* At least one of these has key_values. */	286	/* At least one of these has key_values. */
302	if ((!ob1->key_values) != (!ob2->key_values))	287	if ((!ob1->key_values) != (!ob2->key_values))
303	/* One has fields, but the other one doesn't. */	288	return 0; /* One has fields, but the other one doesn't. */
304	return 0;	289
305	else if (!compare_ob_value_lists (ob1, ob2))	290	if (!compare_ob_value_lists (ob1, ob2))
306	return 0;	291	return 0;
307	}	292	}
308		293
309	if (ob1->self || ob2->self)	294	if (ob1->self || ob2->self)
310	{	295	{
…		…
316	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	301	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
317	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	302	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
318		303
319	if (k1 != k2)	304	if (k1 != k2)
320	return 0;	305	return 0;
		306
321	else if (k1 == 0)	307	if (k1 == 0)
322	return 1;	308	return 1;
		309
323	else if (!cfperl_can_merge (ob1, ob2))	310	if (!cfperl_can_merge (ob1, ob2))
324	return 0;	311	return 0;
325	}	312	}
326	}	313	}
327		314
328	/* Everything passes, must be OK. */	315	/* Everything passes, must be OK. */
329	return 1;	316	return 1;
330	}	317	}
331		318
		319	// find player who can see this object
		320	object *
		321	object::visible_to () const
		322	{
		323	if (client_visible () && !flag [FLAG_REMOVED])
		324	{
		325	// see if we are in a container of sorts
		326	if (env)
		327	{
		328	// the player inventory itself is always visible
		329	if (env->type == PLAYER)
		330	return env;
		331
		332	// else a player could have our env open
		333	object *envest = env->outer_env ();
		334
		335	// the player itself is always on a map, so we will find him here
		336	// even if our inv is in a player.
		337	if (envest->is_on_map ())
		338	if (object *pl = envest->ms ().player ())
		339	if (pl->container == env)
		340	return pl;
		341	}
		342	else
		343	{
		344	// maybe there is a player standing on the same mapspace
		345	// this will catch the case where "this" is a player
		346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		348	|| this == pl->container)
		349	return pl;
		350	}
		351	}
		352
		353	return 0;
		354	}
		355
		356	// adjust weight per container type ("of holding")
332	static sint32	357	static sint32
333	weight_adjust (object *op, sint32 weight)	358	weight_adjust_for (object *op, sint32 weight)
334	{	359	{
335	return op->type == CONTAINER	360	return op->type == CONTAINER
336	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
337	: weight;	362	: weight;
338	}	363	}
339		364
340	/*	365	/*
341	* add_weight(object, weight) adds the specified weight to an object,	366	* adjust_weight(object, weight) adds the specified weight to an object,
342	* and also updates how much the environment(s) is/are carrying.	367	* and also updates how much the environment(s) is/are carrying.
343	*/	368	*/
344	static void	369	static void
345	add_weight (object *op, sint32 weight)	370	adjust_weight (object *op, sint32 weight)
346	{	371	{
347	while (op)	372	while (op)
348	{	373	{
		374	// adjust by actual difference to account for rounding errors
		375	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
349	weight = weight_adjust (op, weight);	376	weight = weight_adjust_for (op, op->carrying)
		377	- weight_adjust_for (op, op->carrying - weight);
		378
		379	if (!weight)
		380	return;
350		381
351	op->carrying += weight;	382	op->carrying += weight;
		383
		384	if (object *pl = op->visible_to ())
		385	if (pl != op) // player is handled lazily
		386	esrv_update_item (UPD_WEIGHT, pl, op);
		387
352	op = op->env;	388	op = op->env;
353	}	389	}
354	}
355
356	/*
357	* sub_weight() recursively (outwards) subtracts a number from the
358	* weight of an object (and what is carried by it's environment(s)).
359	*/
360	static void
361	sub_weight (object *op, long weight)
362	{
363	add_weight (op, -weight);
364	}	390	}
365		391
366	/*	392	/*
367	* this is a recursive function which calculates the weight	393	* this is a recursive function which calculates the weight
368	* an object is carrying. It goes through op and figures out how much	394	* an object is carrying. It goes through op and figures out how much
…		…
379	op->update_weight ();	405	op->update_weight ();
380		406
381	sum += op->total_weight ();	407	sum += op->total_weight ();
382	}	408	}
383		409
384	carrying = weight_adjust (this, sum);	410	sum = weight_adjust_for (this, sum);
385	}
386		411
		412	if (sum != carrying)
		413	{
		414	carrying = sum;
		415
		416	if (object *pl = visible_to ())
		417	if (pl != this) // player is handled lazily
		418	esrv_update_item (UPD_WEIGHT, pl, this);
		419	}
		420	}
		421
387	/*	422	/*
388	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	423	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
389	* Some error messages.
390	* The result of the dump is stored in the static global errmsg array.
391	*/	424	*/
392	char *	425	char *
393	dump_object (object *op)	426	dump_object (object *op)
394	{	427	{
395	if (!op)	428	if (!op)
…		…
409	get_nearest_part (object *op, const object *pl)	442	get_nearest_part (object *op, const object *pl)
410	{	443	{
411	object *tmp, *closest;	444	object *tmp, *closest;
412	int last_dist, i;	445	int last_dist, i;
413		446
414	if (op->more == NULL)	447	if (!op->more)
415	return op;	448	return op;
		449
416	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	450	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		451	tmp;
		452	tmp = tmp->more)
417	if ((i = distance (tmp, pl)) < last_dist)	453	if ((i = distance (tmp, pl)) < last_dist)
418	closest = tmp, last_dist = i;	454	closest = tmp, last_dist = i;
		455
419	return closest;	456	return closest;
420	}	457	}
421		458
422	/*	459	/*
423	* Returns the object which has the count-variable equal to the argument.	460	* Returns the object which has the count-variable equal to the argument.
		461	* VERRRY slow.
424	*/	462	*/
425	object *	463	object *
426	find_object (tag_t i)	464	find_object (tag_t i)
427	{	465	{
428	for_all_objects (op)	466	for_all_objects (op)
…		…
439	*/	477	*/
440	object *	478	object *
441	find_object_name (const char *str)	479	find_object_name (const char *str)
442	{	480	{
443	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
444	object *op;
445		482
		483	if (str_)
446	for_all_objects (op)	484	for_all_objects (op)
447	if (op->name == str_)	485	if (op->name == str_)
448	break;	486	return op;
449		487
450	return op;	488	return 0;
451	}	489	}
452		490
453	/*	491	/*
454	* Sets the owner and sets the skill and exp pointers to owner's current	492	* Sets the owner and sets the skill and exp pointers to owner's current
455	* skill and experience objects.	493	* skill and experience objects.
…		…
553	}	591	}
554		592
555	op->key_values = 0;	593	op->key_values = 0;
556	}	594	}
557		595
558	object &	596	/*
559	object::operator =(const object &src)	597	* copy_to first frees everything allocated by the dst object,
		598	* and then copies the contents of itself into the second
		599	* object, allocating what needs to be allocated. Basically, any
		600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		601	* if the first object is freed, the pointers in the new object
		602	* will point at garbage.
		603	*/
		604	void
		605	object::copy_to (object *dst)
560	{	606	{
561	bool is_freed = flag [FLAG_FREED];	607	dst->remove ();
562	bool is_removed = flag [FLAG_REMOVED];
563
564	*(object_copy *)this = src;	608	*(object_copy *)dst = *this;
565
566	flag [FLAG_FREED] = is_freed;
567	flag [FLAG_REMOVED] = is_removed;	609	dst->flag [FLAG_REMOVED] = true;
568		610
569	/* Copy over key_values, if any. */	611	/* Copy over key_values, if any. */
570	if (src.key_values)	612	if (key_values)
571	{	613	{
572	key_value *tail = 0;	614	key_value *tail = 0;
573	key_values = 0;	615	dst->key_values = 0;
574		616
575	for (key_value *i = src.key_values; i; i = i->next)	617	for (key_value *i = key_values; i; i = i->next)
576	{	618	{
577	key_value *new_link = new key_value;	619	key_value *new_link = new key_value;
578		620
579	new_link->next = 0;	621	new_link->next = 0;
580	new_link->key = i->key;	622	new_link->key = i->key;
581	new_link->value = i->value;	623	new_link->value = i->value;
582		624
583	/* Try and be clever here, too. */	625	/* Try and be clever here, too. */
584	if (!key_values)	626	if (!dst->key_values)
585	{	627	{
586	key_values = new_link;	628	dst->key_values = new_link;
587	tail = new_link;	629	tail = new_link;
588	}	630	}
589	else	631	else
590	{	632	{
591	tail->next = new_link;	633	tail->next = new_link;
592	tail = new_link;	634	tail = new_link;
593	}	635	}
594	}	636	}
595	}	637	}
596	}
597
598	/*
599	* copy_to first frees everything allocated by the dst object,
600	* and then copies the contents of itself into the second
601	* object, allocating what needs to be allocated. Basically, any
602	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
603	* if the first object is freed, the pointers in the new object
604	* will point at garbage.
605	*/
606	void
607	object::copy_to (object *dst)
608	{
609	*dst = *this;
610		638
611	if (speed < 0)	639	if (speed < 0)
612	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
613		641
614	dst->set_speed (dst->speed);	642	dst->set_speed (dst->speed);
…		…
636	object *	664	object *
637	object::clone ()	665	object::clone ()
638	{	666	{
639	object *neu = create ();	667	object *neu = create ();
640	copy_to (neu);	668	copy_to (neu);
		669	neu->map = map; // not copied by copy_to
641	return neu;	670	return neu;
642	}	671	}
643		672
644	/*	673	/*
645	* If an object with the IS_TURNABLE() flag needs to be turned due	674	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
696	* UP_OBJ_FACE: only the objects face has changed.	725	* UP_OBJ_FACE: only the objects face has changed.
697	*/	726	*/
698	void	727	void
699	update_object (object *op, int action)	728	update_object (object *op, int action)
700	{	729	{
701	if (op == NULL)	730	if (!op)
702	{	731	{
703	/* this should never happen */	732	/* this should never happen */
704	LOG (llevDebug, "update_object() called for NULL object.\n");	733	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
705	return;	734	return;
706	}	735	}
707		736
708	if (op->env)	737	if (!op->is_on_map ())
709	{	738	{
710	/* Animation is currently handled by client, so nothing	739	/* Animation is currently handled by client, so nothing
711	* to do in this case.	740	* to do in this case.
712	*/	741	*/
713	return;	742	return;
714	}	743	}
715
716	/* If the map is saving, don't do anything as everything is
717	* going to get freed anyways.
718	*/
719	if (!op->map || op->map->in_memory == MAP_SAVING)
720	return;
721		744
722	/* make sure the object is within map boundaries */	745	/* make sure the object is within map boundaries */
723	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	746	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
724	{	747	{
725	LOG (llevError, "update_object() called for object out of map!\n");	748	LOG (llevError, "update_object() called for object out of map!\n");
…		…
744	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
745	|| (m.move_on | op->move_on ) != m.move_on	768	|| (m.move_on | op->move_on ) != m.move_on
746	|| (m.move_off | op->move_off ) != m.move_off	769	|| (m.move_off | op->move_off ) != m.move_off
747	|| (m.move_slow | op->move_slow) != m.move_slow	770	|| (m.move_slow | op->move_slow) != m.move_slow
748	/* This isn't perfect, but I don't expect a lot of objects to	771	/* This isn't perfect, but I don't expect a lot of objects to
749	* to have move_allow right now.	772	* have move_allow right now.
750	*/	773	*/
751	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	774	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
752	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	775	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
753	m.flags_ = 0;	776	m.flags_ = 0;
754	}	777	}
…		…
868	object::destroy_inv (bool drop_to_ground)	891	object::destroy_inv (bool drop_to_ground)
869	{	892	{
870	// need to check first, because the checks below might segfault	893	// need to check first, because the checks below might segfault
871	// as we might be on an invalid mapspace and crossfire code	894	// as we might be on an invalid mapspace and crossfire code
872	// is too buggy to ensure that the inventory is empty.	895	// is too buggy to ensure that the inventory is empty.
873	// corollary: if you create arrows etc. with stuff in tis inventory,	896	// corollary: if you create arrows etc. with stuff in its inventory,
874	// cf will crash below with off-map x and y	897	// cf will crash below with off-map x and y
875	if (!inv)	898	if (!inv)
876	return;	899	return;
877		900
878	/* Only if the space blocks everything do we not process -	901	/* Only if the space blocks everything do we not process -
…		…
880	* drop on that space.	903	* drop on that space.
881	*/	904	*/
882	if (!drop_to_ground	905	if (!drop_to_ground
883	|| !map	906	|| !map
884	|| map->in_memory != MAP_ACTIVE	907	|| map->in_memory != MAP_ACTIVE
885	|| map->nodrop	908	|| map->no_drop
886	|| ms ().move_block == MOVE_ALL)	909	|| ms ().move_block == MOVE_ALL)
887	{	910	{
888	while (inv)	911	while (inv)
889	{
890	inv->destroy_inv (drop_to_ground);
891	inv->destroy ();	912	inv->destroy (true);
892	}
893	}	913	}
894	else	914	else
895	{ /* Put objects in inventory onto this space */	915	{ /* Put objects in inventory onto this space */
896	while (inv)	916	while (inv)
897	{	917	{
…		…
901	|| op->flag [FLAG_NO_DROP]	921	|| op->flag [FLAG_NO_DROP]
902	|| op->type == RUNE	922	|| op->type == RUNE
903	|| op->type == TRAP	923	|| op->type == TRAP
904	|| op->flag [FLAG_IS_A_TEMPLATE]	924	|| op->flag [FLAG_IS_A_TEMPLATE]
905	|| op->flag [FLAG_DESTROY_ON_DEATH])	925	|| op->flag [FLAG_DESTROY_ON_DEATH])
906	op->destroy ();	926	op->destroy (true);
907	else	927	else
908	map->insert (op, x, y);	928	map->insert (op, x, y);
909	}	929	}
910	}	930	}
911	}	931	}
…		…
915	object *op = new object;	935	object *op = new object;
916	op->link ();	936	op->link ();
917	return op;	937	return op;
918	}	938	}
919		939
		940	static struct freed_map : maptile
		941	{
		942	freed_map ()
		943	{
		944	path = "<freed objects map>";
		945	name = "/internal/freed_objects_map";
		946	width = 3;
		947	height = 3;
		948	no_drop = 1;
		949	no_reset = 1;
		950
		951	alloc ();
		952	in_memory = MAP_ACTIVE;
		953	}
		954
		955	~freed_map ()
		956	{
		957	destroy ();
		958	}
		959	} freed_map; // freed objects are moved here to avoid crashes
		960
920	void	961	void
921	object::do_destroy ()	962	object::do_destroy ()
922	{	963	{
923	attachable::do_destroy ();
924
925	if (flag [FLAG_IS_LINKED])	964	if (flag [FLAG_IS_LINKED])
926	remove_button_link (this);	965	remove_button_link (this);
927		966
928	if (flag [FLAG_FRIENDLY])	967	if (flag [FLAG_FRIENDLY])
929	remove_friendly_object (this);	968	remove_friendly_object (this);
930		969
931	if (!flag [FLAG_REMOVED])
932	remove ();	970	remove ();
933		971
934	destroy_inv (true);	972	attachable::do_destroy ();
935		973
936	deactivate ();	974	deactivate ();
937	unlink ();	975	unlink ();
938		976
939	flag [FLAG_FREED] = 1;	977	flag [FLAG_FREED] = 1;
940		978
941	// hack to ensure that freed objects still have a valid map	979	// hack to ensure that freed objects still have a valid map
942	{
943	static maptile *freed_map; // freed objects are moved here to avoid crashes
944
945	if (!freed_map)
946	{
947	freed_map = new maptile;
948
949	freed_map->path = "<freed objects map>";
950	freed_map->name = "/internal/freed_objects_map";
951	freed_map->width = 3;
952	freed_map->height = 3;
953	freed_map->nodrop = 1;
954
955	freed_map->alloc ();
956	freed_map->in_memory = MAP_ACTIVE;
957	}
958
959	map = freed_map;	980	map = &freed_map;
960	x = 1;	981	x = 1;
961	y = 1;	982	y = 1;
962	}
963		983
964	if (more)	984	if (more)
965	{	985	{
966	more->destroy ();	986	more->destroy ();
967	more = 0;	987	more = 0;
…		…
980	object::destroy (bool destroy_inventory)	1000	object::destroy (bool destroy_inventory)
981	{	1001	{
982	if (destroyed ())	1002	if (destroyed ())
983	return;	1003	return;
984		1004
		1005	if (!is_head () && !head->destroyed ())
		1006	{
		1007	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1008	head->destroy (destroy_inventory);
		1009	return;
		1010	}
		1011
985	if (destroy_inventory)	1012	destroy_inv (!destroy_inventory);
986	destroy_inv (false);
987		1013
988	if (is_head ())	1014	if (is_head ())
989	if (sound_destroy)	1015	if (sound_destroy)
990	play_sound (sound_destroy);	1016	play_sound (sound_destroy);
991	else if (flag [FLAG_MONSTER])	1017	else if (flag [FLAG_MONSTER])
…		…
1005	object::do_remove ()	1031	object::do_remove ()
1006	{	1032	{
1007	object *tmp, *last = 0;	1033	object *tmp, *last = 0;
1008	object *otmp;	1034	object *otmp;
1009		1035
1010	if (QUERY_FLAG (this, FLAG_REMOVED))	1036	if (flag [FLAG_REMOVED])
1011	return;	1037	return;
1012		1038
1013	SET_FLAG (this, FLAG_REMOVED);
1014	INVOKE_OBJECT (REMOVE, this);	1039	INVOKE_OBJECT (REMOVE, this);
		1040
		1041	flag [FLAG_REMOVED] = true;
1015		1042
1016	if (more)	1043	if (more)
1017	more->remove ();	1044	more->remove ();
1018		1045
1019	/*	1046	/*
1020	* In this case, the object to be removed is in someones	1047	* In this case, the object to be removed is in someones
1021	* inventory.	1048	* inventory.
1022	*/	1049	*/
1023	if (env)	1050	if (env)
1024	{	1051	{
1025	if (nrof)	1052	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1026	sub_weight (env, weight * nrof);	1053	if (object *pl = visible_to ())
1027	else	1054	esrv_del_item (pl->contr, count);
1028	sub_weight (env, weight + carrying);	1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1056
		1057	adjust_weight (env, -total_weight ());
		1058
		1059	/* we set up values so that it could be inserted into
		1060	* the map, but we don't actually do that - it is up
		1061	* to the caller to decide what we want to do.
		1062	*/
		1063	map = env->map;
		1064	x = env->x;
		1065	y = env->y;
		1066
		1067	// make sure cmov optimisation is applicable
		1068	*(above ? &above->below : &env->inv) = below;
		1069	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1070
		1071	above = 0;
		1072	below = 0;
		1073	env = 0;
1029		1074
1030	/* NO_FIX_PLAYER is set when a great many changes are being	1075	/* NO_FIX_PLAYER is set when a great many changes are being
1031	* made to players inventory. If set, avoiding the call	1076	* made to players inventory. If set, avoiding the call
1032	* to save cpu time.	1077	* to save cpu time.
1033	*/	1078	*/
1034	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1079	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1035	otmp->update_stats ();	1080	otmp->update_stats ();
1036
1037	if (above)
1038	above->below = below;
1039	else
1040	env->inv = below;
1041
1042	if (below)
1043	below->above = above;
1044
1045	/* we set up values so that it could be inserted into
1046	* the map, but we don't actually do that - it is up
1047	* to the caller to decide what we want to do.
1048	*/
1049	x = env->x, y = env->y;
1050	map = env->map;
1051	above = 0, below = 0;
1052	env = 0;
1053	}	1081	}
1054	else if (map)	1082	else if (map)
1055	{	1083	{
1056	if (type == PLAYER)
1057	{
1058	// leaving a spot always closes any open container on the ground
1059	if (container && !container->env)
1060	// this causes spurious floorbox updates, but it ensures
1061	// that the CLOSE event is being sent.
1062	close_container ();
1063
1064	--map->players;
1065	map->touch ();
1066	}
1067
1068	map->dirty = true;	1084	map->dirty = true;
1069	mapspace &ms = this->ms ();	1085	mapspace &ms = this->ms ();
1070		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (type == PLAYER) // this == pl(!)
		1090	{
		1091	// leaving a spot always closes any open container on the ground
		1092	if (container && !container->env)
		1093	// this causes spurious floorbox updates, but it ensures
		1094	// that the CLOSE event is being sent.
		1095	close_container ();
		1096
		1097	--map->players;
		1098	map->touch ();
		1099	}
		1100	else if (pl->container == this)
		1101	{
		1102	// removing a container should close it
		1103	close_container ();
		1104	}
		1105
		1106	esrv_del_item (pl->contr, count);
		1107	}
		1108
1071	/* link the object above us */	1109	/* link the object above us */
1072	if (above)	1110	// re-link, make sure compiler can easily use cmove
1073	above->below = below;	1111	*(above ? &above->below : &ms.top) = below;
1074	else	1112	*(below ? &below->above : &ms.bot) = above;
1075	ms.top = below; /* we were top, set new top */
1076
1077	/* Relink the object below us, if there is one */
1078	if (below)
1079	below->above = above;
1080	else
1081	{
1082	/* Nothing below, which means we need to relink map object for this space
1083	* use translated coordinates in case some oddness with map tiling is
1084	* evident
1085	*/
1086	if (GET_MAP_OB (map, x, y) != this)
1087	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1088
1089	ms.bot = above; /* goes on above it. */
1090	}
1091		1113
1092	above = 0;	1114	above = 0;
1093	below = 0;	1115	below = 0;
		1116
		1117	ms.flags_ = 0;
1094		1118
1095	if (map->in_memory == MAP_SAVING)	1119	if (map->in_memory == MAP_SAVING)
1096	return;	1120	return;
1097		1121
1098	int check_walk_off = !flag [FLAG_NO_APPLY];	1122	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1104	* removed (most likely destroyed), update the player view	1128	* removed (most likely destroyed), update the player view
1105	* appropriately.	1129	* appropriately.
1106	*/	1130	*/
1107	pl->close_container ();	1131	pl->close_container ();
1108		1132
		1133	//TODO: the floorbox prev/next might need updating
		1134	//esrv_del_item (pl->contr, count);
		1135	//TODO: update floorbox to preserve ordering
		1136	if (pl->contr->ns)
1109	pl->contr->ns->floorbox_update ();	1137	pl->contr->ns->floorbox_update ();
1110	}	1138	}
1111		1139
1112	for (tmp = ms.bot; tmp; tmp = tmp->above)	1140	for (tmp = ms.bot; tmp; tmp = tmp->above)
1113	{	1141	{
1114	/* No point updating the players look faces if he is the object	1142	/* No point updating the players look faces if he is the object
…		…
1127	}	1155	}
1128		1156
1129	last = tmp;	1157	last = tmp;
1130	}	1158	}
1131		1159
1132	/* last == NULL if there are no objects on this space */
1133	//TODO: this makes little sense, why only update the topmost object?
1134	if (!last)
1135	map->at (x, y).flags_ = 0;
1136	else
1137	update_object (last, UP_OBJ_REMOVE);
1138
1139	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1160	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1140	update_all_los (map, x, y);	1161	update_all_los (map, x, y);
1141	}	1162	}
1142	}	1163	}
1143		1164
…		…
1158	if (!top)	1179	if (!top)
1159	for (top = op; top && top->above; top = top->above)	1180	for (top = op; top && top->above; top = top->above)
1160	;	1181	;
1161		1182
1162	for (; top; top = top->below)	1183	for (; top; top = top->below)
1163	{
1164	if (top == op)
1165	continue;
1166
1167	if (object::can_merge (op, top))	1184	if (object::can_merge (op, top))
1168	{	1185	{
1169	top->nrof += op->nrof;	1186	top->nrof += op->nrof;
1170		1187
1171	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1188	if (object *pl = top->visible_to ())
1172	op->weight = 0; /* Don't want any adjustements now */	1189	esrv_update_item (UPD_NROF, pl, top);
		1190
		1191	op->weight = 0; // cancel the addition above
		1192	op->carrying = 0; // must be 0 already
		1193
1173	op->destroy ();	1194	op->destroy (1);
		1195
1174	return top;	1196	return top;
1175	}	1197	}
1176	}
1177		1198
1178	return 0;	1199	return 0;
1179	}	1200	}
1180		1201
1181	void	1202	void
…		…
1206	* job preparing multi-part monsters.	1227	* job preparing multi-part monsters.
1207	*/	1228	*/
1208	object *	1229	object *
1209	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1230	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1210	{	1231	{
		1232	op->remove ();
		1233
1211	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1234	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1212	{	1235	{
1213	tmp->x = x + tmp->arch->x;	1236	tmp->x = x + tmp->arch->x;
1214	tmp->y = y + tmp->arch->y;	1237	tmp->y = y + tmp->arch->y;
1215	}	1238	}
…		…
1238	* just 'op' otherwise	1261	* just 'op' otherwise
1239	*/	1262	*/
1240	object *	1263	object *
1241	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1264	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1242	{	1265	{
1243	assert (!op->flag [FLAG_FREED]);	1266	if (op->is_on_map ())
		1267	{
		1268	LOG (llevError, "insert_ob_in_map called for object already on map");
		1269	abort ();
		1270	}
1244		1271
1245	object *top, *floor = NULL;	1272	if (op->env)
1246		1273	{
		1274	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1247	op->remove ();	1275	op->remove ();
		1276	}
		1277
		1278	if (op->face && !face_info (op->face))//D TODO: remove soon
		1279	{//D
		1280	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1281	op->face = 1;//D
		1282	}//D
1248		1283
1249	/* Ideally, the caller figures this out. However, it complicates a lot	1284	/* Ideally, the caller figures this out. However, it complicates a lot
1250	* of areas of callers (eg, anything that uses find_free_spot would now	1285	* of areas of callers (eg, anything that uses find_free_spot would now
1251	* need extra work	1286	* need extra work
1252	*/	1287	*/
1253	if (!xy_normalise (m, op->x, op->y))	1288	if (!xy_normalise (m, op->x, op->y))
1254	{	1289	{
1255	op->destroy ();	1290	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1256	return 0;	1291	return 0;
1257	}	1292	}
1258		1293
1259	if (object *more = op->more)	1294	if (object *more = op->more)
1260	if (!insert_ob_in_map (more, m, originator, flag))	1295	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1269	*/	1304	*/
1270	if (op->nrof && !(flag & INS_NO_MERGE))	1305	if (op->nrof && !(flag & INS_NO_MERGE))
1271	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1272	if (object::can_merge (op, tmp))	1307	if (object::can_merge (op, tmp))
1273	{	1308	{
		1309	// TODO: we actually want to update tmp, not op,
		1310	// but some caller surely breaks when we return tmp
		1311	// from here :/
1274	op->nrof += tmp->nrof;	1312	op->nrof += tmp->nrof;
1275	tmp->destroy ();	1313	tmp->destroy (1);
1276	}	1314	}
1277		1315
1278	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1316	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1279	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1317	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1280		1318
…		…
1287	{	1325	{
1288	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1326	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1289	abort ();	1327	abort ();
1290	}	1328	}
1291		1329
		1330	if (!originator->is_on_map ())
		1331	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1332	op->debug_desc (), originator->debug_desc ());
		1333
1292	op->above = originator;	1334	op->above = originator;
1293	op->below = originator->below;	1335	op->below = originator->below;
1294
1295	if (op->below)
1296	op->below->above = op;
1297	else
1298	ms.bot = op;
1299
1300	/* since *below* originator, no need to update top */
1301	originator->below = op;	1336	originator->below = op;
		1337
		1338	*(op->below ? &op->below->above : &ms.bot) = op;
1302	}	1339	}
1303	else	1340	else
1304	{	1341	{
1305	top = ms.bot;	1342	object *floor = 0;
		1343	object *top = ms.top;
1306		1344
1307	/* If there are other objects, then */	1345	/* If there are other objects, then */
1308	if (top)	1346	if (top)
1309	{	1347	{
1310	object *last = 0;
1311
1312	/*	1348	/*
1313	* If there are multiple objects on this space, we do some trickier handling.	1349	* If there are multiple objects on this space, we do some trickier handling.
1314	* We've already dealt with merging if appropriate.	1350	* We've already dealt with merging if appropriate.
1315	* Generally, we want to put the new object on top. But if	1351	* Generally, we want to put the new object on top. But if
1316	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1352	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1319	* once we get to them. This reduces the need to traverse over all of	1355	* once we get to them. This reduces the need to traverse over all of
1320	* them when adding another one - this saves quite a bit of cpu time	1356	* them when adding another one - this saves quite a bit of cpu time
1321	* when lots of spells are cast in one area. Currently, it is presumed	1357	* when lots of spells are cast in one area. Currently, it is presumed
1322	* that flying non pickable objects are spell objects.	1358	* that flying non pickable objects are spell objects.
1323	*/	1359	*/
1324	for (top = ms.bot; top; top = top->above)	1360	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1325	{	1361	{
1326	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1362	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1327	floor = top;	1363	floor = tmp;
1328		1364
1329	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1365	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1330	{	1366	{
1331	/* We insert above top, so we want this object below this */	1367	/* We insert above top, so we want this object below this */
1332	top = top->below;	1368	top = tmp->below;
1333	break;	1369	break;
1334	}	1370	}
1335		1371
1336	last = top;	1372	top = tmp;
1337	}	1373	}
1338
1339	/* Don't want top to be NULL, so set it to the last valid object */
1340	top = last;
1341		1374
1342	/* We let update_position deal with figuring out what the space	1375	/* We let update_position deal with figuring out what the space
1343	* looks like instead of lots of conditions here.	1376	* looks like instead of lots of conditions here.
1344	* makes things faster, and effectively the same result.	1377	* makes things faster, and effectively the same result.
1345	*/	1378	*/
…		…
1352	*/	1385	*/
1353	if (!(flag & INS_ON_TOP)	1386	if (!(flag & INS_ON_TOP)
1354	&& ms.flags () & P_BLOCKSVIEW	1387	&& ms.flags () & P_BLOCKSVIEW
1355	&& (op->face && !faces [op->face].visibility))	1388	&& (op->face && !faces [op->face].visibility))
1356	{	1389	{
		1390	object *last;
		1391
1357	for (last = top; last != floor; last = last->below)	1392	for (last = top; last != floor; last = last->below)
1358	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1393	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1359	break;	1394	break;
1360		1395
1361	/* Check to see if we found the object that blocks view,	1396	/* Check to see if we found the object that blocks view,
…		…
1369	} /* If objects on this space */	1404	} /* If objects on this space */
1370		1405
1371	if (flag & INS_ABOVE_FLOOR_ONLY)	1406	if (flag & INS_ABOVE_FLOOR_ONLY)
1372	top = floor;	1407	top = floor;
1373		1408
1374	/* Top is the object that our object (op) is going to get inserted above.	1409	// insert object above top, or bottom-most if top = 0
1375	*/
1376
1377	/* First object on this space */
1378	if (!top)	1410	if (!top)
1379	{	1411	{
		1412	op->below = 0;
1380	op->above = ms.bot;	1413	op->above = ms.bot;
1381
1382	if (op->above)
1383	op->above->below = op;
1384
1385	op->below = 0;
1386	ms.bot = op;	1414	ms.bot = op;
		1415
		1416	*(op->above ? &op->above->below : &ms.top) = op;
1387	}	1417	}
1388	else	1418	else
1389	{ /* get inserted into the stack above top */	1419	{
1390	op->above = top->above;	1420	op->above = top->above;
1391
1392	if (op->above)
1393	op->above->below = op;	1421	top->above = op;
1394		1422
1395	op->below = top;	1423	op->below = top;
1396	top->above = op;	1424	*(op->above ? &op->above->below : &ms.top) = op;
1397	}	1425	}
1398		1426	}
1399	if (!op->above)
1400	ms.top = op;
1401	} /* else not INS_BELOW_ORIGINATOR */
1402		1427
1403	if (op->type == PLAYER)	1428	if (op->type == PLAYER)
1404	{	1429	{
1405	op->contr->do_los = 1;	1430	op->contr->do_los = 1;
1406	++op->map->players;	1431	++op->map->players;
…		…
1408	}	1433	}
1409		1434
1410	op->map->dirty = true;	1435	op->map->dirty = true;
1411		1436
1412	if (object *pl = ms.player ())	1437	if (object *pl = ms.player ())
		1438	//TODO: the floorbox prev/next might need updating
		1439	//esrv_send_item (pl, op);
		1440	//TODO: update floorbox to preserve ordering
		1441	if (pl->contr->ns)
1413	pl->contr->ns->floorbox_update ();	1442	pl->contr->ns->floorbox_update ();
1414		1443
1415	/* If this object glows, it may affect lighting conditions that are	1444	/* If this object glows, it may affect lighting conditions that are
1416	* visible to others on this map. But update_all_los is really	1445	* visible to others on this map. But update_all_los is really
1417	* an inefficient way to do this, as it means los for all players	1446	* an inefficient way to do this, as it means los for all players
1418	* on the map will get recalculated. The players could very well	1447	* on the map will get recalculated. The players could very well
…		…
1460	* op is the object to insert it under: supplies x and the map.	1489	* op is the object to insert it under: supplies x and the map.
1461	*/	1490	*/
1462	void	1491	void
1463	replace_insert_ob_in_map (const char *arch_string, object *op)	1492	replace_insert_ob_in_map (const char *arch_string, object *op)
1464	{	1493	{
1465	object *tmp, *tmp1;
1466
1467	/* first search for itself and remove any old instances */	1494	/* first search for itself and remove any old instances */
1468		1495
1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1496	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1497	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1471	tmp->destroy ();	1498	tmp->destroy (1);
1472		1499
1473	tmp1 = arch_to_object (archetype::find (arch_string));	1500	object *tmp = arch_to_object (archetype::find (arch_string));
1474		1501
1475	tmp1->x = op->x;	1502	tmp->x = op->x;
1476	tmp1->y = op->y;	1503	tmp->y = op->y;
		1504
1477	insert_ob_in_map (tmp1, op->map, op, 0);	1505	insert_ob_in_map (tmp, op->map, op, 0);
1478	}	1506	}
1479		1507
1480	object *	1508	object *
1481	object::insert_at (object *where, object *originator, int flags)	1509	object::insert_at (object *where, object *originator, int flags)
1482	{	1510	{
…		…
1485	else	1513	else
1486	return where->map->insert (this, where->x, where->y, originator, flags);	1514	return where->map->insert (this, where->x, where->y, originator, flags);
1487	}	1515	}
1488		1516
1489	/*	1517	/*
1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1491	* is returned contains nr objects, and the remaining parts contains
1492	* the rest (or is removed and freed if that number is 0).
1493	* On failure, NULL is returned, and the reason put into the
1494	* global static errmsg array.
1495	*/
1496	object *
1497	get_split_ob (object *orig_ob, uint32 nr)
1498	{
1499	object *newob;
1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501
1502	if (orig_ob->nrof < nr)
1503	{
1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1505	return NULL;
1506	}
1507
1508	newob = object_create_clone (orig_ob);
1509
1510	if ((orig_ob->nrof -= nr) < 1)
1511	orig_ob->destroy (1);
1512	else if (!is_removed)
1513	{
1514	if (orig_ob->env != NULL)
1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1517	{
1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1520	return NULL;
1521	}
1522	}
1523
1524	newob->nrof = nr;
1525
1526	return newob;
1527	}
1528
1529	/*
1530	* decrease_ob_nr(object, number) decreases a specified number from	1518	* decrease(object, number) decreases a specified number from
1531	* the amount of an object. If the amount reaches 0, the object	1519	* the amount of an object. If the amount reaches 0, the object
1532	* is subsequently removed and freed.	1520	* is subsequently removed and freed.
1533	*	1521	*
1534	* Return value: 'op' if something is left, NULL if the amount reached 0	1522	* Return value: 'op' if something is left, NULL if the amount reached 0
1535	*/	1523	*/
		1524	bool
		1525	object::decrease (sint32 nr)
		1526	{
		1527	if (!nr)
		1528	return true;
		1529
		1530	nr = min (nr, nrof);
		1531
		1532	if (nrof > nr)
		1533	{
		1534	nrof -= nr;
		1535	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1536
		1537	if (object *pl = visible_to ())
		1538	esrv_update_item (UPD_NROF, pl, this);
		1539
		1540	return true;
		1541	}
		1542	else
		1543	{
		1544	destroy ();
		1545	return false;
		1546	}
		1547	}
		1548
		1549	/*
		1550	* split(ob,nr) splits up ob into two parts. The part which
		1551	* is returned contains nr objects, and the remaining parts contains
		1552	* the rest (or is removed and returned if that number is 0).
		1553	* On failure, NULL is returned.
		1554	*/
1536	object *	1555	object *
1537	decrease_ob_nr (object *op, uint32 i)	1556	object::split (sint32 nr)
1538	{	1557	{
1539	object *tmp;	1558	int have = number_of ();
1540		1559
1541	if (i == 0) /* objects with op->nrof require this check */	1560	if (have < nr)
1542	return op;	1561	return 0;
1543		1562	else if (have == nr)
1544	if (i > op->nrof)
1545	i = op->nrof;
1546
1547	if (QUERY_FLAG (op, FLAG_REMOVED))
1548	op->nrof -= i;
1549	else if (op->env)
1550	{	1563	{
1551	/* is this object in the players inventory, or sub container
1552	* therein?
1553	*/
1554	tmp = op->in_player ();
1555	/* nope. Is this a container the player has opened?
1556	* If so, set tmp to that player.
1557	* IMO, searching through all the players will mostly
1558	* likely be quicker than following op->env to the map,
1559	* and then searching the map for a player.
1560	*/
1561	if (!tmp)
1562	for_all_players (pl)
1563	if (pl->ob->container == op->env)
1564	{
1565	tmp = pl->ob;
1566	break;
1567	}
1568
1569	if (i < op->nrof)
1570	{
1571	sub_weight (op->env, op->weight * i);
1572	op->nrof -= i;
1573	if (tmp)
1574	esrv_send_item (tmp, op);
1575	}
1576	else
1577	{
1578	op->remove ();	1564	remove ();
1579	op->nrof = 0;	1565	return this;
1580	if (tmp)
1581	esrv_del_item (tmp->contr, op->count);
1582	}
1583	}	1566	}
1584	else	1567	else
1585	{	1568	{
1586	object *above = op->above;	1569	decrease (nr);
1587		1570
1588	if (i < op->nrof)	1571	object *op = deep_clone ();
1589	op->nrof -= i;	1572	op->nrof = nr;
1590	else
1591	{
1592	op->remove ();
1593	op->nrof = 0;
1594	}
1595
1596	/* Since we just removed op, op->above is null */
1597	for (tmp = above; tmp; tmp = tmp->above)
1598	if (tmp->type == PLAYER)
1599	{
1600	if (op->nrof)
1601	esrv_send_item (tmp, op);
1602	else
1603	esrv_del_item (tmp->contr, op->count);
1604	}
1605	}
1606
1607	if (op->nrof)
1608	return op;	1573	return op;
1609	else
1610	{
1611	op->destroy ();
1612	return 0;
1613	}	1574	}
1614	}	1575	}
1615		1576
1616	object *	1577	object *
1617	insert_ob_in_ob (object *op, object *where)	1578	insert_ob_in_ob (object *op, object *where)
…		…
1642	* be != op, if items are merged. -Tero	1603	* be != op, if items are merged. -Tero
1643	*/	1604	*/
1644	object *	1605	object *
1645	object::insert (object *op)	1606	object::insert (object *op)
1646	{	1607	{
1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
1648	op->remove ();
1649
1650	if (op->more)	1608	if (op->more)
1651	{	1609	{
1652	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1610	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1653	return op;	1611	return op;
1654	}	1612	}
1655		1613
1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1614	op->remove ();
1657	CLEAR_FLAG (op, FLAG_REMOVED);	1615
		1616	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1658		1617
1659	if (op->nrof)	1618	if (op->nrof)
1660	{
1661	for (object *tmp = inv; tmp; tmp = tmp->below)	1619	for (object *tmp = inv; tmp; tmp = tmp->below)
1662	if (object::can_merge (tmp, op))	1620	if (object::can_merge (tmp, op))
1663	{	1621	{
1664	/* return the original object and remove inserted object	1622	/* return the original object and remove inserted object
1665	(client needs the original object) */	1623	(client needs the original object) */
1666	tmp->nrof += op->nrof;	1624	tmp->nrof += op->nrof;
1667	/* Weight handling gets pretty funky. Since we are adding to	1625
1668	* tmp->nrof, we need to increase the weight.	1626	if (object *pl = tmp->visible_to ())
1669	*/	1627	esrv_update_item (UPD_NROF, pl, tmp);
		1628
1670	add_weight (this, op->weight * op->nrof);	1629	adjust_weight (this, op->total_weight ());
1671	SET_FLAG (op, FLAG_REMOVED);	1630
1672	op->destroy (); /* free the inserted object */	1631	op->destroy (1);
1673	op = tmp;	1632	op = tmp;
1674	op->remove (); /* and fix old object's links */	1633	goto inserted;
1675	CLEAR_FLAG (op, FLAG_REMOVED);
1676	break;
1677	}	1634	}
1678		1635
1679	/* I assume combined objects have no inventory
1680	* We add the weight - this object could have just been removed
1681	* (if it was possible to merge). calling remove_ob will subtract
1682	* the weight, so we need to add it in again, since we actually do
1683	* the linking below
1684	*/
1685	add_weight (this, op->weight * op->nrof);
1686	}
1687	else
1688	add_weight (this, (op->weight + op->carrying));
1689
1690	if (object *otmp = this->in_player ())
1691	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1692	otmp->update_stats ();
1693
1694	op->owner = 0; // its his/hers now. period.	1636	op->owner = 0; // it's his/hers now. period.
1695	op->map = 0;	1637	op->map = 0;
		1638	op->x = 0;
		1639	op->y = 0;
		1640
		1641	op->above = 0;
		1642	op->below = inv;
1696	op->env = this;	1643	op->env = this;
1697	op->above = 0;
1698	op->below = 0;
1699	op->x = op->y = 0;
1700		1644
		1645	if (inv)
		1646	inv->above = op;
		1647
		1648	inv = op;
		1649
		1650	op->flag [FLAG_REMOVED] = 0;
		1651
		1652	if (object *pl = op->visible_to ())
		1653	esrv_send_item (pl, op);
		1654
		1655	adjust_weight (this, op->total_weight ());
		1656
		1657	inserted:
1701	/* reset the light list and los of the players on the map */	1658	/* reset the light list and los of the players on the map */
1702	if (op->glow_radius && map)	1659	if (op->glow_radius && map && map->darkness)
1703	{
1704	#ifdef DEBUG_LIGHTS
1705	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1706	#endif /* DEBUG_LIGHTS */
1707	if (map->darkness)
1708	update_all_los (map, x, y);	1660	update_all_los (map, x, y);
1709	}
1710		1661
1711	/* Client has no idea of ordering so lets not bother ordering it here.	1662	// if this is a player's inventory, update stats
1712	* It sure simplifies this function...	1663	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1713	*/	1664	update_stats ();
1714	if (!inv)
1715	inv = op;
1716	else
1717	{
1718	op->below = inv;
1719	op->below->above = op;
1720	inv = op;
1721	}
1722		1665
1723	INVOKE_OBJECT (INSERT, this);	1666	INVOKE_OBJECT (INSERT, this);
1724		1667
1725	return op;	1668	return op;
1726	}	1669	}
…		…
1854	LOG (llevError, "Present_arch called outside map.\n");	1797	LOG (llevError, "Present_arch called outside map.\n");
1855	return NULL;	1798	return NULL;
1856	}	1799	}
1857		1800
1858	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1801	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->arch == at)	1802	if (tmp->arch->archname == at->archname)
1860	return tmp;	1803	return tmp;
1861		1804
1862	return NULL;	1805	return NULL;
1863	}	1806	}
1864		1807
…		…
1928	* The first matching object is returned, or NULL if none.	1871	* The first matching object is returned, or NULL if none.
1929	*/	1872	*/
1930	object *	1873	object *
1931	present_arch_in_ob (const archetype *at, const object *op)	1874	present_arch_in_ob (const archetype *at, const object *op)
1932	{	1875	{
1933	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1876	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1934	if (tmp->arch == at)	1877	if (tmp->arch->archname == at->archname)
1935	return tmp;	1878	return tmp;
1936		1879
1937	return NULL;	1880	return NULL;
1938	}	1881	}
1939		1882
…		…
2348		2291
2349	/*	2292	/*
2350	* create clone from object to another	2293	* create clone from object to another
2351	*/	2294	*/
2352	object *	2295	object *
2353	object_create_clone (object *asrc)	2296	object::deep_clone ()
2354	{	2297	{
2355	object *dst = 0, *tmp, *src, *prev, *item;	2298	assert (("deep_clone called on non-head object", is_head ()));
2356		2299
2357	if (!asrc)	2300	object *dst = clone ();
2358	return 0;
2359		2301
2360	src = asrc->head_ ();	2302	object *prev = dst;
2361
2362	prev = 0;
2363	for (object *part = src; part; part = part->more)	2303	for (object *part = this->more; part; part = part->more)
2364	{	2304	{
2365	tmp = part->clone ();	2305	object *tmp = part->clone ();
2366	tmp->x -= src->x;
2367	tmp->y -= src->y;
2368
2369	if (!part->head)
2370	{
2371	dst = tmp;
2372	tmp->head = 0;
2373	}
2374	else
2375	tmp->head = dst;	2306	tmp->head = dst;
2376
2377	tmp->more = 0;
2378
2379	if (prev)
2380	prev->more = tmp;	2307	prev->more = tmp;
2381
2382	prev = tmp;	2308	prev = tmp;
2383	}	2309	}
2384		2310
2385	for (item = src->inv; item; item = item->below)	2311	for (object *item = inv; item; item = item->below)
2386	insert_ob_in_ob (object_create_clone (item), dst);	2312	insert_ob_in_ob (item->deep_clone (), dst);
2387		2313
2388	return dst;	2314	return dst;
2389	}	2315	}
2390		2316
2391	/* This returns the first object in who's inventory that	2317	/* This returns the first object in who's inventory that
…		…
2400	return tmp;	2326	return tmp;
2401		2327
2402	return 0;	2328	return 0;
2403	}	2329	}
2404		2330
2405	/* If ob has a field named key, return the link from the list,	2331	const shstr &
2406	* otherwise return NULL.	2332	object::kv_get (const shstr &key) const
2407	*
2408	* key must be a passed in shared string - otherwise, this won't
2409	* do the desired thing.
2410	*/
2411	key_value *
2412	get_ob_key_link (const object *ob, const char *key)
2413	{	2333	{
2414	for (key_value *link = ob->key_values; link; link = link->next)	2334	for (key_value *kv = key_values; kv; kv = kv->next)
2415	if (link->key == key)	2335	if (kv->key == key)
2416	return link;
2417
2418	return 0;
2419	}
2420
2421	/*
2422	* Returns the value of op has an extra_field for key, or NULL.
2423	*
2424	* The argument doesn't need to be a shared string.
2425	*
2426	* The returned string is shared.
2427	*/
2428	const char *
2429	get_ob_key_value (const object *op, const char *const key)
2430	{
2431	key_value *link;
2432	shstr_cmp canonical_key (key);
2433
2434	if (!canonical_key)
2435	{
2436	/* 1. There being a field named key on any object
2437	* implies there'd be a shared string to find.
2438	* 2. Since there isn't, no object has this field.
2439	* 3. Therefore, *this* object doesn't have this field.
2440	*/
2441	return 0;
2442	}
2443
2444	/* This is copied from get_ob_key_link() above -
2445	* only 4 lines, and saves the function call overhead.
2446	*/
2447	for (link = op->key_values; link; link = link->next)
2448	if (link->key == canonical_key)
2449	return link->value;	2336	return kv->value;
2450		2337
2451	return 0;	2338	return shstr_null;
2452	}	2339	}
2453		2340
2454	/*	2341	void
2455	* Updates the canonical_key in op to value.	2342	object::kv_set (const shstr &key, const shstr &value)
2456	*
2457	* canonical_key is a shared string (value doesn't have to be).
2458	*
2459	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2460	* keys.
2461	*
2462	* Returns TRUE on success.
2463	*/
2464	int
2465	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2466	{	2343	{
2467	key_value *field = NULL, *last = NULL;	2344	for (key_value *kv = key_values; kv; kv = kv->next)
2468		2345	if (kv->key == key)
2469	for (field = op->key_values; field != NULL; field = field->next)
2470	{
2471	if (field->key != canonical_key)
2472	{	2346	{
2473	last = field;	2347	kv->value = value;
2474	continue;	2348	return;
2475	}	2349	}
2476		2350
2477	if (value)	2351	key_value *kv = new key_value;
2478	field->value = value;	2352
2479	else	2353	kv->next = key_values;
		2354	kv->key = key;
		2355	kv->value = value;
		2356
		2357	key_values = kv;
		2358	}
		2359
		2360	void
		2361	object::kv_del (const shstr &key)
		2362	{
		2363	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2364	if ((*kvp)->key == key)
2480	{	2365	{
2481	/* Basically, if the archetype has this key set,	2366	key_value *kv = *kvp;
2482	* we need to store the null value so when we save	2367	*kvp = (*kvp)->next;
2483	* it, we save the empty value so that when we load,	2368	delete kv;
2484	* we get this value back again.	2369	return;
2485	*/
2486	if (get_ob_key_link (op->arch, canonical_key))
2487	field->value = 0;
2488	else
2489	{
2490	if (last)
2491	last->next = field->next;
2492	else
2493	op->key_values = field->next;
2494
2495	delete field;
2496	}
2497	}	2370	}
2498	return TRUE;
2499	}
2500	/* IF we get here, key doesn't exist */
2501
2502	/* No field, we'll have to add it. */
2503
2504	if (!add_key)
2505	return FALSE;
2506
2507	/* There isn't any good reason to store a null
2508	* value in the key/value list. If the archetype has
2509	* this key, then we should also have it, so shouldn't
2510	* be here. If user wants to store empty strings,
2511	* should pass in ""
2512	*/
2513	if (value == NULL)
2514	return TRUE;
2515
2516	field = new key_value;
2517
2518	field->key = canonical_key;
2519	field->value = value;
2520	/* Usual prepend-addition. */
2521	field->next = op->key_values;
2522	op->key_values = field;
2523
2524	return TRUE;
2525	}
2526
2527	/*
2528	* Updates the key in op to value.
2529	*
2530	* If add_key is FALSE, this will only update existing keys,
2531	* and not add new ones.
2532	* In general, should be little reason FALSE is ever passed in for add_key
2533	*
2534	* Returns TRUE on success.
2535	*/
2536	int
2537	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2538	{
2539	shstr key_ (key);
2540
2541	return set_ob_key_value_s (op, key_, value, add_key);
2542	}	2371	}
2543		2372
2544	object::depth_iterator::depth_iterator (object *container)	2373	object::depth_iterator::depth_iterator (object *container)
2545	: iterator_base (container)	2374	: iterator_base (container)
2546	{	2375	{
…		…
2596	{	2425	{
2597	char flagdesc[512];	2426	char flagdesc[512];
2598	char info2[256 * 4];	2427	char info2[256 * 4];
2599	char *p = info;	2428	char *p = info;
2600		2429
2601	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2430	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2602	count,	2431	count,
2603	uuid.c_str (),	2432	uuid.c_str (),
2604	&name,	2433	&name,
2605	title ? "\",title:\"" : "",	2434	title ? ",title:\"" : "",
2606	title ? (const char *)title : "",	2435	title ? (const char *)title : "",
		2436	title ? "\"" : "",
2607	flag_desc (flagdesc, 512), type);	2437	flag_desc (flagdesc, 512), type);
2608		2438
2609	if (!this->flag[FLAG_REMOVED] && env)	2439	if (!flag[FLAG_REMOVED] && env)
2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2440	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2611		2441
2612	if (map)	2442	if (map)
2613	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2443	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2614		2444
…		…
2644	object::open_container (object *new_container)	2474	object::open_container (object *new_container)
2645	{	2475	{
2646	if (container == new_container)	2476	if (container == new_container)
2647	return;	2477	return;
2648		2478
2649	if (object *old_container = container)	2479	object *old_container = container;
		2480
		2481	if (old_container)
2650	{	2482	{
2651	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2483	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2652	return;	2484	return;
2653		2485
2654	#if 0	2486	#if 0
…		…
2656	if (object *closer = old_container->inv)	2488	if (object *closer = old_container->inv)
2657	if (closer->type == CLOSE_CON)	2489	if (closer->type == CLOSE_CON)
2658	closer->destroy ();	2490	closer->destroy ();
2659	#endif	2491	#endif
2660		2492
		2493	// make sure the container is available
		2494	esrv_send_item (this, old_container);
		2495
2661	old_container->flag [FLAG_APPLIED] = 0;	2496	old_container->flag [FLAG_APPLIED] = false;
2662	container = 0;	2497	container = 0;
2663		2498
		2499	// client needs item update to make it work, client bug requires this to be separate
2664	esrv_update_item (UPD_FLAGS, this, old_container);	2500	esrv_update_item (UPD_FLAGS, this, old_container);
		2501
2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2502	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2666	play_sound (sound_find ("chest_close"));	2503	play_sound (sound_find ("chest_close"));
2667	}	2504	}
2668		2505
2669	if (new_container)	2506	if (new_container)
…		…
2682	}	2519	}
2683	#endif	2520	#endif
2684		2521
2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2686		2523
		2524	// make sure the container is available, client bug requires this to be separate
		2525	esrv_send_item (this, new_container);
		2526
2687	new_container->flag [FLAG_APPLIED] = 1;	2527	new_container->flag [FLAG_APPLIED] = true;
2688	container = new_container;	2528	container = new_container;
2689		2529
		2530	// client needs flag change
2690	esrv_update_item (UPD_FLAGS, this, new_container);	2531	esrv_update_item (UPD_FLAGS, this, new_container);
2691	esrv_send_inventory (this, new_container);	2532	esrv_send_inventory (this, new_container);
2692	play_sound (sound_find ("chest_open"));	2533	play_sound (sound_find ("chest_open"));
2693	}	2534	}
		2535	// else if (!old_container->env && contr && contr->ns)
		2536	// contr->ns->floorbox_reset ();
2694	}	2537	}
2695		2538
2696	object *	2539	object *
2697	object::force_find (const shstr name)	2540	object::force_find (const shstr name)
2698	{	2541	{
…		…
2724		2567
2725	insert (force);	2568	insert (force);
2726	}	2569	}
2727		2570
2728	void	2571	void
2729	object::play_sound (faceidx sound) const	2572	object::play_sound (faceidx sound)
2730	{	2573	{
2731	if (!sound)	2574	if (!sound)
2732	return;	2575	return;
2733		2576
2734	if (flag [FLAG_REMOVED])	2577	if (flag [FLAG_REMOVED])

Diff Legend

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