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.208 by root, Mon Apr 21 06:16:01 2008 UTC vs.
Revision 1.286 by root, Wed Sep 2 16:54:20 2009 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
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
…		…
24	#include <global.h>	24	#include <global.h>
25	#include <stdio.h>	25	#include <stdio.h>
26	#include <sys/types.h>	26	#include <sys/types.h>
27	#include <sys/uio.h>	27	#include <sys/uio.h>
28	#include <object.h>	28	#include <object.h>
29	#include <funcpoint.h>
30	#include <sproto.h>	29	#include <sproto.h>
31	#include <loader.h>	30	#include <loader.h>
32		31
33	#include <bitset>	32	#include <bitset>
34		33
35	UUID UUID::cur;	34	UUID UUID::cur;
36	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
37	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
38		38
39	objectvec objects;	39	objectvec objects;
40	activevec actives;	40	activevec actives;
41		41
42	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
140		140
141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
142	static bool	142	static bool
143	compare_ob_value_lists_one (const object *wants, const object *has)	143	compare_ob_value_lists_one (const object *wants, const object *has)
144	{	144	{
145	key_value *wants_field;
146
147	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	145	/* n-squared behaviour (see kv_get), but I'm hoping both
148	* objects with lists are rare, and lists stay short. If not, use a	146	* objects with lists are rare, and lists stay short. If not, use a
149	* different structure or at least keep the lists sorted...	147	* different structure or at least keep the lists sorted...
150	*/	148	*/
151		149
152	/* For each field in wants, */	150	/* For each field in wants, */
153	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	151	for (key_value *kv = wants->key_values; kv; kv = kv->next)
154	{	152	if (has->kv_get (kv->key) != kv->value)
155	key_value *has_field;	153	return false;
156
157	/* Look for a field in has with the same key. */
158	has_field = get_ob_key_link (has, wants_field->key);
159
160	if (!has_field)
161	return 0; /* No field with that name. */
162
163	/* Found the matching field. */
164	if (has_field->value != wants_field->value)
165	return 0; /* Values don't match, so this half of the comparison is false. */
166
167	/* If we get here, we found a match. Now for the next field in wants. */
168	}
169		154
170	/* If we get here, every field in wants has a matching field in has. */	155	/* If we get here, every field in wants has a matching field in has. */
171	return 1;	156	return true;
172	}	157	}
173		158
174	/* Returns TRUE if ob1 has the same key_values as ob2. */	159	/* Returns TRUE if ob1 has the same key_values as ob2. */
175	static bool	160	static bool
176	compare_ob_value_lists (const object *ob1, const object *ob2)	161	compare_ob_value_lists (const object *ob1, const object *ob2)
177	{	162	{
178	/* However, there may be fields in has which aren't partnered in wants,	163	/* However, there may be fields in has which aren't partnered in wants,
179	* so we need to run the comparison *twice*. :(	164	* so we need to run the comparison *twice*. :(
180	*/	165	*/
181	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	166	return compare_ob_value_lists_one (ob1, ob2)
		167	&& compare_ob_value_lists_one (ob2, ob1);
182	}	168	}
183		169
184	/* Function examines the 2 objects given to it, and returns true if	170	/* Function examines the 2 objects given to it, and returns true if
185	* they can be merged together.	171	* they can be merged together.
186	*	172	*
…		…
201	|| ob1->speed != ob2->speed	187	|| ob1->speed != ob2->speed
202	|| ob1->value != ob2->value	188	|| ob1->value != ob2->value
203	|| ob1->name != ob2->name)	189	|| ob1->name != ob2->name)
204	return 0;	190	return 0;
205		191
206	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
207	* for unsigned overflow (2c), second part checks whether the result	193	* is always 0 .. 2**31-1 */
208	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
209	* nrof values.
210	*/
211	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
212	return 0;	195	return 0;
213		196
214	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
215	* This is to the comparison of the flags below will be OK. We	198	* This is to the comparison of the flags below will be OK. We
216	* just can't ignore the been applied or identified flags, as they	199	* just can't ignore the been applied or identified flags, as they
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		205
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		208
226	if (ob1->arch->name != ob2->arch->name	209	if (ob1->arch->archname != ob2->arch->archname
227	|| ob1->name != ob2->name	210	|| ob1->name != ob2->name
228	|| ob1->title != ob2->title	211	|| ob1->title != ob2->title
229	|| ob1->msg != ob2->msg	212	|| ob1->msg != ob2->msg
230	|| ob1->weight != ob2->weight	213	|| ob1->weight != ob2->weight
231	|| ob1->attacktype != ob2->attacktype	214	|| ob1->attacktype != ob2->attacktype
232	|| ob1->magic != ob2->magic	215	|| ob1->magic != ob2->magic
233	|| ob1->slaying != ob2->slaying	216	|| ob1->slaying != ob2->slaying
234	|| ob1->skill != ob2->skill	217	|| ob1->skill != ob2->skill
235	|| ob1->value != ob2->value	218	|| ob1->value != ob2->value
236	|| ob1->animation_id != ob2->animation_id	219	|| ob1->animation_id != ob2->animation_id
		220	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
237	|| ob1->client_type != ob2->client_type	221	|| ob1->client_type != ob2->client_type
238	|| ob1->materialname != ob2->materialname	222	|| ob1->materialname != ob2->materialname
239	|| ob1->lore != ob2->lore	223	|| ob1->lore != ob2->lore
240	|| ob1->subtype != ob2->subtype	224	|| ob1->subtype != ob2->subtype
241	|| ob1->move_type != ob2->move_type	225	|| ob1->move_type != ob2->move_type
…		…
249	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
250	return 0;	234	return 0;
251		235
252	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
253	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
254	.reset (FLAG_CLIENT_SENT)
255	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
256	.any ())	239	.any ())
257	return 0;	240	return 0;
258		241
259	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
331		314
332	/* Everything passes, must be OK. */	315	/* Everything passes, must be OK. */
333	return 1;	316	return 1;
334	}	317	}
335		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->is_player ())
		330	return env;
		331
		332	// else a player could have our env open
		333	object *envest = env->outer_env_or_self ();
		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
336	// adjust weight per container type ("of holding")	356	// adjust weight per container type ("of holding")
337	static sint32	357	static sint32
338	weight_adjust (object *op, sint32 weight)	358	weight_adjust_for (object *op, sint32 weight)
339	{	359	{
340	return op->type == CONTAINER	360	return op->type == CONTAINER
341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342	: weight;	362	: weight;
343	}	363	}
…		…
349	static void	369	static void
350	adjust_weight (object *op, sint32 weight)	370	adjust_weight (object *op, sint32 weight)
351	{	371	{
352	while (op)	372	while (op)
353	{	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
354	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;
355		381
356	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
357	op = op->env;	388	op = op->env;
358	}	389	}
359	}	390	}
360		391
361	/*	392	/*
…		…
374	op->update_weight ();	405	op->update_weight ();
375		406
376	sum += op->total_weight ();	407	sum += op->total_weight ();
377	}	408	}
378		409
379	carrying = weight_adjust (this, sum);	410	sum = weight_adjust_for (this, sum);
		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	}
380	}	420	}
381		421
382	/*	422	/*
383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	423	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
384	*/	424	*/
…		…
437	*/	477	*/
438	object *	478	object *
439	find_object_name (const char *str)	479	find_object_name (const char *str)
440	{	480	{
441	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
442	object *op;
443		482
		483	if (str_)
444	for_all_objects (op)	484	for_all_objects (op)
445	if (op->name == str_)	485	if (op->name == str_)
446	break;	486	return op;
447		487
448	return op;	488	return 0;
449	}	489	}
450		490
451	/*	491	/*
452	* 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
453	* skill and experience objects.	493	* skill and experience objects.
…		…
551	}	591	}
552		592
553	op->key_values = 0;	593	op->key_values = 0;
554	}	594	}
555		595
556	object &	596	/*
557	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)
558	{	606	{
559	bool is_freed = flag [FLAG_FREED];	607	dst->remove ();
560	bool is_removed = flag [FLAG_REMOVED];
561
562	*(object_copy *)this = src;	608	*(object_copy *)dst = *this;
563
564	flag [FLAG_FREED] = is_freed;
565	flag [FLAG_REMOVED] = is_removed;	609	dst->flag [FLAG_REMOVED] = true;
566		610
567	/* Copy over key_values, if any. */	611	/* Copy over key_values, if any. */
568	if (src.key_values)	612	if (key_values)
569	{	613	{
570	key_value *tail = 0;	614	key_value *tail = 0;
571	key_values = 0;	615	dst->key_values = 0;
572		616
573	for (key_value *i = src.key_values; i; i = i->next)	617	for (key_value *i = key_values; i; i = i->next)
574	{	618	{
575	key_value *new_link = new key_value;	619	key_value *new_link = new key_value;
576		620
577	new_link->next = 0;	621	new_link->next = 0;
578	new_link->key = i->key;	622	new_link->key = i->key;
579	new_link->value = i->value;	623	new_link->value = i->value;
580		624
581	/* Try and be clever here, too. */	625	/* Try and be clever here, too. */
582	if (!key_values)	626	if (!dst->key_values)
583	{	627	{
584	key_values = new_link;	628	dst->key_values = new_link;
585	tail = new_link;	629	tail = new_link;
586	}	630	}
587	else	631	else
588	{	632	{
589	tail->next = new_link;	633	tail->next = new_link;
590	tail = new_link;	634	tail = new_link;
591	}	635	}
592	}	636	}
593	}	637	}
594	}
595
596	/*
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)
606	{
607	*dst = *this;
608		638
609	if (speed < 0)	639	if (speed < 0)
610	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
611		641
612	dst->set_speed (dst->speed);	642	dst->activate ();
613	}	643	}
614		644
615	void	645	void
616	object::instantiate ()	646	object::instantiate ()
617	{	647	{
…		…
634	object *	664	object *
635	object::clone ()	665	object::clone ()
636	{	666	{
637	object *neu = create ();	667	object *neu = create ();
638	copy_to (neu);	668	copy_to (neu);
		669	neu->map = map; // not copied by copy_to
639	return neu;	670	return neu;
640	}	671	}
641		672
642	/*	673	/*
643	* 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
…		…
694	* UP_OBJ_FACE: only the objects face has changed.	725	* UP_OBJ_FACE: only the objects face has changed.
695	*/	726	*/
696	void	727	void
697	update_object (object *op, int action)	728	update_object (object *op, int action)
698	{	729	{
699	if (op == NULL)	730	if (!op)
700	{	731	{
701	/* this should never happen */	732	/* this should never happen */
702	LOG (llevDebug, "update_object() called for NULL object.\n");	733	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
703	return;	734	return;
704	}	735	}
705		736
706	if (op->env)	737	if (!op->is_on_map ())
707	{	738	{
708	/* Animation is currently handled by client, so nothing	739	/* Animation is currently handled by client, so nothing
709	* to do in this case.	740	* to do in this case.
710	*/	741	*/
711	return;	742	return;
712	}	743	}
713
714	/* If the map is saving, don't do anything as everything is
715	* going to get freed anyways.
716	*/
717	if (!op->map || op->map->in_memory == MAP_SAVING)
718	return;
719		744
720	/* make sure the object is within map boundaries */	745	/* make sure the object is within map boundaries */
721	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)
722	{	747	{
723	LOG (llevError, "update_object() called for object out of map!\n");	748	LOG (llevError, "update_object() called for object out of map!\n");
…		…
734	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
735	{	760	{
736	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
737	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
738	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
739	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	|| (op->is_player () && !(m.flags_ & P_PLAYER))
740	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
741	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
742	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
743	|| (m.move_on | op->move_on ) != m.move_on	768	|| (m.move_on | op->move_on ) != m.move_on
744	|| (m.move_off | op->move_off ) != m.move_off	769	|| (m.move_off | op->move_off ) != m.move_off
745	|| (m.move_slow | op->move_slow) != m.move_slow	770	|| (m.move_slow | op->move_slow) != m.move_slow
746	/* 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
747	* to have move_allow right now.	772	* have move_allow right now.
748	*/	773	*/
749	|| ((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
750	|| 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)
751	m.flags_ = 0;	776	m.invalidate ();
752	}	777	}
753	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
754	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
755	* that is being removed.	780	* that is being removed.
756	*/	781	*/
757	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
758	m.flags_ = 0;	783	m.invalidate ();
759	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
760	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
761	else	786	else
762	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
763		788
…		…
767		792
768	object::object ()	793	object::object ()
769	{	794	{
770	SET_FLAG (this, FLAG_REMOVED);	795	SET_FLAG (this, FLAG_REMOVED);
771		796
772	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
773	face = blank_face;	798	face = blank_face;
774	}	799	}
775		800
776	object::~object ()	801	object::~object ()
777	{	802	{
…		…
807	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
808	if (active)	833	if (active)
809	return;	834	return;
810		835
811	if (has_active_speed ())	836	if (has_active_speed ())
		837	{
		838	if (flag [FLAG_FREED])
		839	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		840
812	actives.insert (this);	841	actives.insert (this);
		842	}
813	}	843	}
814		844
815	void	845	void
816	object::activate_recursive ()	846	object::activate_recursive ()
817	{	847	{
…		…
866	object::destroy_inv (bool drop_to_ground)	896	object::destroy_inv (bool drop_to_ground)
867	{	897	{
868	// need to check first, because the checks below might segfault	898	// need to check first, because the checks below might segfault
869	// as we might be on an invalid mapspace and crossfire code	899	// as we might be on an invalid mapspace and crossfire code
870	// is too buggy to ensure that the inventory is empty.	900	// is too buggy to ensure that the inventory is empty.
871	// corollary: if you create arrows etc. with stuff in tis inventory,	901	// corollary: if you create arrows etc. with stuff in its inventory,
872	// cf will crash below with off-map x and y	902	// cf will crash below with off-map x and y
873	if (!inv)	903	if (!inv)
874	return;	904	return;
875		905
876	/* Only if the space blocks everything do we not process -	906	/* Only if the space blocks everything do we not process -
…		…
878	* drop on that space.	908	* drop on that space.
879	*/	909	*/
880	if (!drop_to_ground	910	if (!drop_to_ground
881	|| !map	911	|| !map
882	|| map->in_memory != MAP_ACTIVE	912	|| map->in_memory != MAP_ACTIVE
883	|| map->nodrop	913	|| map->no_drop
884	|| ms ().move_block == MOVE_ALL)	914	|| ms ().move_block == MOVE_ALL)
885	{	915	{
886	while (inv)	916	while (inv)
887	{
888	inv->destroy_inv (drop_to_ground);
889	inv->destroy ();	917	inv->destroy ();
890	}
891	}	918	}
892	else	919	else
893	{ /* Put objects in inventory onto this space */	920	{ /* Put objects in inventory onto this space */
894	while (inv)	921	while (inv)
895	{	922	{
…		…
913	object *op = new object;	940	object *op = new object;
914	op->link ();	941	op->link ();
915	return op;	942	return op;
916	}	943	}
917		944
		945	static struct freed_map : maptile
		946	{
		947	freed_map ()
		948	{
		949	path = "<freed objects map>";
		950	name = "/internal/freed_objects_map";
		951	width = 3;
		952	height = 3;
		953	no_drop = 1;
		954	no_reset = 1;
		955
		956	alloc ();
		957	in_memory = MAP_ACTIVE;
		958	}
		959
		960	~freed_map ()
		961	{
		962	destroy ();
		963	}
		964	} freed_map; // freed objects are moved here to avoid crashes
		965
918	void	966	void
919	object::do_destroy ()	967	object::do_destroy ()
920	{	968	{
921	attachable::do_destroy ();
922
923	if (flag [FLAG_IS_LINKED])	969	if (flag [FLAG_IS_LINKED])
924	remove_button_link (this);	970	remove_link ();
925		971
926	if (flag [FLAG_FRIENDLY])	972	if (flag [FLAG_FRIENDLY])
927	remove_friendly_object (this);	973	remove_friendly_object (this);
928		974
929	if (!flag [FLAG_REMOVED])
930	remove ();	975	remove ();
931		976
932	destroy_inv (true);	977	attachable::do_destroy ();
933		978
934	deactivate ();	979	deactivate ();
935	unlink ();	980	unlink ();
936		981
937	flag [FLAG_FREED] = 1;	982	flag [FLAG_FREED] = 1;
938		983
939	// hack to ensure that freed objects still have a valid map	984	// hack to ensure that freed objects still have a valid map
940	{
941	static maptile *freed_map; // freed objects are moved here to avoid crashes
942
943	if (!freed_map)
944	{
945	freed_map = new maptile;
946
947	freed_map->path = "<freed objects map>";
948	freed_map->name = "/internal/freed_objects_map";
949	freed_map->width = 3;
950	freed_map->height = 3;
951	freed_map->nodrop = 1;
952
953	freed_map->alloc ();
954	freed_map->in_memory = MAP_ACTIVE;
955	}
956
957	map = freed_map;	985	map = &freed_map;
958	x = 1;	986	x = 1;
959	y = 1;	987	y = 1;
960	}
961		988
962	if (more)	989	if (more)
963	{	990	{
964	more->destroy ();	991	more->destroy ();
965	more = 0;	992	more = 0;
…		…
973	attacked_by = 0;	1000	attacked_by = 0;
974	current_weapon = 0;	1001	current_weapon = 0;
975	}	1002	}
976		1003
977	void	1004	void
978	object::destroy (bool destroy_inventory)	1005	object::destroy ()
979	{	1006	{
980	if (destroyed ())	1007	if (destroyed ())
981	return;	1008	return;
982		1009
983	if (destroy_inventory)	1010	if (!is_head () && !head->destroyed ())
		1011	{
		1012	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1013	head->destroy ();
		1014	return;
		1015	}
		1016
984	destroy_inv (false);	1017	destroy_inv (false);
985		1018
986	if (is_head ())	1019	if (is_head ())
987	if (sound_destroy)	1020	if (sound_destroy)
988	play_sound (sound_destroy);	1021	play_sound (sound_destroy);
989	else if (flag [FLAG_MONSTER])	1022	else if (flag [FLAG_MONSTER])
…		…
1003	object::do_remove ()	1036	object::do_remove ()
1004	{	1037	{
1005	object *tmp, *last = 0;	1038	object *tmp, *last = 0;
1006	object *otmp;	1039	object *otmp;
1007		1040
1008	if (QUERY_FLAG (this, FLAG_REMOVED))	1041	if (flag [FLAG_REMOVED])
1009	return;	1042	return;
1010		1043
1011	SET_FLAG (this, FLAG_REMOVED);
1012	INVOKE_OBJECT (REMOVE, this);	1044	INVOKE_OBJECT (REMOVE, this);
		1045
		1046	flag [FLAG_REMOVED] = true;
1013		1047
1014	if (more)	1048	if (more)
1015	more->remove ();	1049	more->remove ();
1016		1050
1017	/*	1051	/*
1018	* In this case, the object to be removed is in someones	1052	* In this case, the object to be removed is in someones
1019	* inventory.	1053	* inventory.
1020	*/	1054	*/
1021	if (env)	1055	if (env)
1022	{	1056	{
		1057	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1058	if (object *pl = visible_to ())
		1059	esrv_del_item (pl->contr, count);
		1060	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1061
1023	adjust_weight (env, -total_weight ());	1062	adjust_weight (env, -total_weight ());
1024		1063
1025	*(above ? &above->below : &env->inv) = below;	1064	object *pl = in_player ();
1026
1027	if (below)
1028	below->above = above;
1029		1065
1030	/* we set up values so that it could be inserted into	1066	/* we set up values so that it could be inserted into
1031	* the map, but we don't actually do that - it is up	1067	* the map, but we don't actually do that - it is up
1032	* to the caller to decide what we want to do.	1068	* to the caller to decide what we want to do.
1033	*/	1069	*/
1034	map = env->map;	1070	map = env->map;
1035	x = env->x;	1071	x = env->x;
1036	y = env->y;	1072	y = env->y;
		1073
		1074	// make sure cmov optimisation is applicable
		1075	*(above ? &above->below : &env->inv) = below;
		1076	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1077
1037	above = 0;	1078	above = 0;
1038	below = 0;	1079	below = 0;
1039	env = 0;	1080	env = 0;
1040		1081
1041	/* NO_FIX_PLAYER is set when a great many changes are being	1082	/* NO_FIX_PLAYER is set when a great many changes are being
1042	* made to players inventory. If set, avoiding the call	1083	* made to players inventory. If set, avoiding the call
1043	* to save cpu time.	1084	* to save cpu time.
1044	*/	1085	*/
1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1086	if (pl)
		1087	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1088	{
1046	otmp->update_stats ();	1089	pl->update_stats ();
		1090
		1091	if (glow_radius && pl->is_on_map ())
		1092	update_all_los (pl->map, pl->x, pl->y);
		1093	}
1047	}	1094	}
1048	else if (map)	1095	else if (map)
1049	{	1096	{
1050	if (type == PLAYER)
1051	{
1052	// leaving a spot always closes any open container on the ground
1053	if (container && !container->env)
1054	// this causes spurious floorbox updates, but it ensures
1055	// that the CLOSE event is being sent.
1056	close_container ();
1057
1058	--map->players;
1059	map->touch ();
1060	}
1061
1062	map->dirty = true;	1097	map->dirty = true;
1063	mapspace &ms = this->ms ();	1098	mapspace &ms = this->ms ();
1064		1099
		1100	if (object *pl = ms.player ())
		1101	{
		1102	if (is_player ())
		1103	{
		1104	if (!flag [FLAG_WIZPASS])
		1105	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1106
		1107	// leaving a spot always closes any open container on the ground
		1108	if (container && !container->env)
		1109	// this causes spurious floorbox updates, but it ensures
		1110	// that the CLOSE event is being sent.
		1111	close_container ();
		1112
		1113	--map->players;
		1114	map->touch ();
		1115	}
		1116	else if (pl->container == this)
		1117	{
		1118	// removing a container should close it
		1119	close_container ();
		1120	}
		1121
		1122	esrv_del_item (pl->contr, count);
		1123	}
		1124
1065	/* link the object above us */	1125	/* link the object above us */
1066	if (above)	1126	// re-link, make sure compiler can easily use cmove
1067	above->below = below;	1127	*(above ? &above->below : &ms.top) = below;
1068	else	1128	*(below ? &below->above : &ms.bot) = above;
1069	ms.top = below; /* we were top, set new top */
1070
1071	/* Relink the object below us, if there is one */
1072	if (below)
1073	below->above = above;
1074	else
1075	{
1076	/* Nothing below, which means we need to relink map object for this space
1077	* use translated coordinates in case some oddness with map tiling is
1078	* evident
1079	*/
1080	if (GET_MAP_OB (map, x, y) != this)
1081	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 ());
1082
1083	ms.bot = above; /* goes on above it. */
1084	}
1085		1129
1086	above = 0;	1130	above = 0;
1087	below = 0;	1131	below = 0;
		1132
		1133	ms.invalidate ();
1088		1134
1089	if (map->in_memory == MAP_SAVING)	1135	if (map->in_memory == MAP_SAVING)
1090	return;	1136	return;
1091		1137
1092	int check_walk_off = !flag [FLAG_NO_APPLY];	1138	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1098	* removed (most likely destroyed), update the player view	1144	* removed (most likely destroyed), update the player view
1099	* appropriately.	1145	* appropriately.
1100	*/	1146	*/
1101	pl->close_container ();	1147	pl->close_container ();
1102		1148
		1149	//TODO: the floorbox prev/next might need updating
		1150	//esrv_del_item (pl->contr, count);
		1151	//TODO: update floorbox to preserve ordering
		1152	if (pl->contr->ns)
1103	pl->contr->ns->floorbox_update ();	1153	pl->contr->ns->floorbox_update ();
1104	}	1154	}
1105		1155
1106	for (tmp = ms.bot; tmp; tmp = tmp->above)	1156	for (tmp = ms.bot; tmp; tmp = tmp->above)
1107	{	1157	{
1108	/* No point updating the players look faces if he is the object	1158	/* No point updating the players look faces if he is the object
…		…
1121	}	1171	}
1122		1172
1123	last = tmp;	1173	last = tmp;
1124	}	1174	}
1125		1175
1126	/* last == NULL if there are no objects on this space */	1176	if (affects_los ())
1127	//TODO: this makes little sense, why only update the topmost object?
1128	if (!last)
1129	map->at (x, y).flags_ = 0;
1130	else
1131	update_object (last, UP_OBJ_REMOVE);
1132
1133	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1134	update_all_los (map, x, y);	1177	update_all_los (map, x, y);
1135	}	1178	}
1136	}	1179	}
1137		1180
1138	/*	1181	/*
…		…
1152	if (!top)	1195	if (!top)
1153	for (top = op; top && top->above; top = top->above)	1196	for (top = op; top && top->above; top = top->above)
1154	;	1197	;
1155		1198
1156	for (; top; top = top->below)	1199	for (; top; top = top->below)
1157	{
1158	if (top == op)
1159	continue;
1160
1161	if (object::can_merge (op, top))	1200	if (object::can_merge (op, top))
1162	{	1201	{
1163	top->nrof += op->nrof;	1202	top->nrof += op->nrof;
1164		1203
1165	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1204	if (object *pl = top->visible_to ())
1166	op->weight = 0; /* Don't want any adjustements now */	1205	esrv_update_item (UPD_NROF, pl, top);
		1206
		1207	op->weight = 0; // cancel the addition above
		1208	op->carrying = 0; // must be 0 already
		1209
1167	op->destroy ();	1210	op->destroy ();
		1211
1168	return top;	1212	return top;
1169	}	1213	}
1170	}
1171		1214
1172	return 0;	1215	return 0;
1173	}	1216	}
1174		1217
1175	void	1218	void
…		…
1200	* job preparing multi-part monsters.	1243	* job preparing multi-part monsters.
1201	*/	1244	*/
1202	object *	1245	object *
1203	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1246	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1204	{	1247	{
		1248	op->remove ();
		1249
1205	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1250	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1206	{	1251	{
1207	tmp->x = x + tmp->arch->x;	1252	tmp->x = x + tmp->arch->x;
1208	tmp->y = y + tmp->arch->y;	1253	tmp->y = y + tmp->arch->y;
1209	}	1254	}
…		…
1232	* just 'op' otherwise	1277	* just 'op' otherwise
1233	*/	1278	*/
1234	object *	1279	object *
1235	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1280	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1236	{	1281	{
1237	assert (!op->flag [FLAG_FREED]);
1238
1239	object *top, *floor = NULL;
1240
1241	op->remove ();	1282	op->remove ();
		1283
		1284	if (m == &freed_map)//D TODO: remove soon
		1285	{//D
		1286	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1287	}//D
1242		1288
1243	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1244	* of areas of callers (eg, anything that uses find_free_spot would now	1290	* of areas of callers (eg, anything that uses find_free_spot would now
1245	* need extra work	1291	* need extra work
1246	*/	1292	*/
		1293	maptile *newmap = m;
1247	if (!xy_normalise (m, op->x, op->y))	1294	if (!xy_normalise (newmap, op->x, op->y))
1248	{	1295	{
1249	op->destroy ();	1296	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1250	return 0;	1297	return 0;
1251	}	1298	}
1252		1299
1253	if (object *more = op->more)	1300	if (object *more = op->more)
1254	if (!insert_ob_in_map (more, m, originator, flag))	1301	if (!insert_ob_in_map (more, m, originator, flag))
1255	return 0;	1302	return 0;
1256		1303
1257	CLEAR_FLAG (op, FLAG_REMOVED);	1304	op->flag [FLAG_REMOVED] = false;
1258		1305	op->env = 0;
1259	op->map = m;	1306	op->map = newmap;
		1307
1260	mapspace &ms = op->ms ();	1308	mapspace &ms = op->ms ();
1261		1309
1262	/* this has to be done after we translate the coordinates.	1310	/* this has to be done after we translate the coordinates.
1263	*/	1311	*/
1264	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1313	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1266	if (object::can_merge (op, tmp))	1314	if (object::can_merge (op, tmp))
1267	{	1315	{
		1316	// TODO: we actually want to update tmp, not op,
		1317	// but some caller surely breaks when we return tmp
		1318	// from here :/
1268	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1269	tmp->destroy (1);	1320	tmp->destroy ();
1270	}	1321	}
1271		1322
1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1323	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1274		1325
…		…
1281	{	1332	{
1282	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1333	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1283	abort ();	1334	abort ();
1284	}	1335	}
1285		1336
		1337	if (!originator->is_on_map ())
		1338	{
		1339	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1340	op->debug_desc (), originator->debug_desc ());
		1341	abort ();
		1342	}
		1343
1286	op->above = originator;	1344	op->above = originator;
1287	op->below = originator->below;	1345	op->below = originator->below;
1288
1289	if (op->below)
1290	op->below->above = op;
1291	else
1292	ms.bot = op;
1293
1294	/* since *below* originator, no need to update top */
1295	originator->below = op;	1346	originator->below = op;
		1347
		1348	*(op->below ? &op->below->above : &ms.bot) = op;
1296	}	1349	}
1297	else	1350	else
1298	{	1351	{
1299	top = ms.bot;	1352	object *floor = 0;
		1353	object *top = ms.top;
1300		1354
1301	/* If there are other objects, then */	1355	/* If there are other objects, then */
1302	if (top)	1356	if (top)
1303	{	1357	{
1304	object *last = 0;
1305
1306	/*	1358	/*
1307	* If there are multiple objects on this space, we do some trickier handling.	1359	* If there are multiple objects on this space, we do some trickier handling.
1308	* We've already dealt with merging if appropriate.	1360	* We've already dealt with merging if appropriate.
1309	* Generally, we want to put the new object on top. But if	1361	* Generally, we want to put the new object on top. But if
1310	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1313	* once we get to them. This reduces the need to traverse over all of	1365	* once we get to them. This reduces the need to traverse over all of
1314	* them when adding another one - this saves quite a bit of cpu time	1366	* them when adding another one - this saves quite a bit of cpu time
1315	* when lots of spells are cast in one area. Currently, it is presumed	1367	* when lots of spells are cast in one area. Currently, it is presumed
1316	* that flying non pickable objects are spell objects.	1368	* that flying non pickable objects are spell objects.
1317	*/	1369	*/
1318	for (top = ms.bot; top; top = top->above)	1370	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1319	{	1371	{
1320	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1372	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1321	floor = top;	1373	floor = tmp;
1322		1374
1323	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1375	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1324	{	1376	{
1325	/* We insert above top, so we want this object below this */	1377	/* We insert above top, so we want this object below this */
1326	top = top->below;	1378	top = tmp->below;
1327	break;	1379	break;
1328	}	1380	}
1329		1381
1330	last = top;	1382	top = tmp;
1331	}	1383	}
1332
1333	/* Don't want top to be NULL, so set it to the last valid object */
1334	top = last;
1335		1384
1336	/* We let update_position deal with figuring out what the space	1385	/* We let update_position deal with figuring out what the space
1337	* looks like instead of lots of conditions here.	1386	* looks like instead of lots of conditions here.
1338	* makes things faster, and effectively the same result.	1387	* makes things faster, and effectively the same result.
1339	*/	1388	*/
…		…
1346	*/	1395	*/
1347	if (!(flag & INS_ON_TOP)	1396	if (!(flag & INS_ON_TOP)
1348	&& ms.flags () & P_BLOCKSVIEW	1397	&& ms.flags () & P_BLOCKSVIEW
1349	&& (op->face && !faces [op->face].visibility))	1398	&& (op->face && !faces [op->face].visibility))
1350	{	1399	{
		1400	object *last;
		1401
1351	for (last = top; last != floor; last = last->below)	1402	for (last = top; last != floor; last = last->below)
1352	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1353	break;	1404	break;
1354		1405
1355	/* Check to see if we found the object that blocks view,	1406	/* Check to see if we found the object that blocks view,
…		…
1363	} /* If objects on this space */	1414	} /* If objects on this space */
1364		1415
1365	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1366	top = floor;	1417	top = floor;
1367		1418
1368	/* Top is the object that our object (op) is going to get inserted above.	1419	// insert object above top, or bottom-most if top = 0
1369	*/
1370
1371	/* First object on this space */
1372	if (!top)	1420	if (!top)
1373	{	1421	{
		1422	op->below = 0;
1374	op->above = ms.bot;	1423	op->above = ms.bot;
1375
1376	if (op->above)
1377	op->above->below = op;
1378
1379	op->below = 0;
1380	ms.bot = op;	1424	ms.bot = op;
		1425
		1426	*(op->above ? &op->above->below : &ms.top) = op;
1381	}	1427	}
1382	else	1428	else
1383	{ /* get inserted into the stack above top */	1429	{
1384	op->above = top->above;	1430	op->above = top->above;
1385
1386	if (op->above)
1387	op->above->below = op;	1431	top->above = op;
1388		1432
1389	op->below = top;	1433	op->below = top;
1390	top->above = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1391	}	1435	}
		1436	}
1392		1437
1393	if (!op->above)	1438	if (op->is_player ())
1394	ms.top = op;
1395	} /* else not INS_BELOW_ORIGINATOR */
1396
1397	if (op->type == PLAYER)
1398	{	1439	{
1399	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1400	++op->map->players;	1441	++op->map->players;
1401	op->map->touch ();	1442	op->map->touch ();
1402	}	1443	}
1403		1444
1404	op->map->dirty = true;	1445	op->map->dirty = true;
1405		1446
1406	if (object *pl = ms.player ())	1447	if (object *pl = ms.player ())
		1448	//TODO: the floorbox prev/next might need updating
		1449	//esrv_send_item (pl, op);
		1450	//TODO: update floorbox to preserve ordering
		1451	if (pl->contr->ns)
1407	pl->contr->ns->floorbox_update ();	1452	pl->contr->ns->floorbox_update ();
1408		1453
1409	/* If this object glows, it may affect lighting conditions that are	1454	/* If this object glows, it may affect lighting conditions that are
1410	* visible to others on this map. But update_all_los is really	1455	* visible to others on this map. But update_all_los is really
1411	* an inefficient way to do this, as it means los for all players	1456	* an inefficient way to do this, as it means los for all players
1412	* on the map will get recalculated. The players could very well	1457	* on the map will get recalculated. The players could very well
1413	* be far away from this change and not affected in any way -	1458	* be far away from this change and not affected in any way -
1414	* this should get redone to only look for players within range,	1459	* this should get redone to only look for players within range,
1415	* or just updating the P_UPTODATE for spaces within this area	1460	* or just updating the P_UPTODATE for spaces within this area
1416	* of effect may be sufficient.	1461	* of effect may be sufficient.
1417	*/	1462	*/
1418	if (op->map->darkness && (op->glow_radius != 0))	1463	if (op->affects_los ())
		1464	{
		1465	op->ms ().invalidate ();
1419	update_all_los (op->map, op->x, op->y);	1466	update_all_los (op->map, op->x, op->y);
		1467	}
1420		1468
1421	/* updates flags (blocked, alive, no magic, etc) for this map space */	1469	/* updates flags (blocked, alive, no magic, etc) for this map space */
1422	update_object (op, UP_OBJ_INSERT);	1470	update_object (op, UP_OBJ_INSERT);
1423		1471
1424	INVOKE_OBJECT (INSERT, op);	1472	INVOKE_OBJECT (INSERT, op);
…		…
1452	/* this function inserts an object in the map, but if it	1500	/* this function inserts an object in the map, but if it
1453	* finds an object of its own type, it'll remove that one first.	1501	* finds an object of its own type, it'll remove that one first.
1454	* op is the object to insert it under: supplies x and the map.	1502	* op is the object to insert it under: supplies x and the map.
1455	*/	1503	*/
1456	void	1504	void
1457	replace_insert_ob_in_map (const char *arch_string, object *op)	1505	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1458	{	1506	{
1459	/* first search for itself and remove any old instances */	1507	/* first search for itself and remove any old instances */
1460		1508
1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1510	if (tmp->arch->archname == archname) /* same archetype */
1463	tmp->destroy (1);	1511	tmp->destroy ();
1464		1512
1465	object *tmp = arch_to_object (archetype::find (arch_string));	1513	object *tmp = arch_to_object (archetype::find (archname));
1466		1514
1467	tmp->x = op->x;	1515	tmp->x = op->x;
1468	tmp->y = op->y;	1516	tmp->y = op->y;
1469		1517
1470	insert_ob_in_map (tmp, op->map, op, 0);	1518	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1478	else	1526	else
1479	return where->map->insert (this, where->x, where->y, originator, flags);	1527	return where->map->insert (this, where->x, where->y, originator, flags);
1480	}	1528	}
1481		1529
1482	/*	1530	/*
1483	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1484	* is returned contains nr objects, and the remaining parts contains
1485	* the rest (or is removed and freed if that number is 0).
1486	* On failure, NULL is returned, and the reason put into the
1487	* global static errmsg array.
1488	*/
1489	object *
1490	object::split_nr (sint32 nr)
1491	{
1492	if (nrof < nr)
1493	return 0;
1494	else if (nrof == nr)
1495	{
1496	remove ();
1497	return this;
1498	}
1499	else
1500	{
1501	decrease_nr (nr);
1502
1503	object *op = object_create_clone (this);
1504	op->nrof = nr;
1505	return op;
1506	}
1507	}
1508
1509	//TODO: remove, but semantics differs from split_nr
1510	object *
1511	get_split_ob (object *orig_ob, uint32 nr)
1512	{
1513	if (orig_ob->nrof < nr)
1514	{
1515	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1516	return 0;
1517	}
1518
1519	return orig_ob->split_nr (nr);
1520	}
1521
1522	// find player who can see this object
1523	static object *
1524	visible_to (object *op)
1525	{
1526	if (!op->flag [FLAG_REMOVED])
1527	{
1528	// see if we are in a container of sorts
1529	if (object *env = op->env)
1530	{
1531	// the player inventory itself is always visible
1532	if (env->type == PLAYER)
1533	return env;
1534
1535	// else a player could have our env open
1536	env = env->outer_env ();
1537
1538	// the player itself is always on a map, so we will find him here
1539	// even if our inv is in a player.
1540	if (env->is_on_map ())
1541	if (object *pl = env->ms ().player ())
1542	if (pl->container == op->env)
1543	return pl;
1544	}
1545	else
1546	{
1547	// maybe there is a player standing on the same mapspace
1548	if (object *pl = env->ms ().player ())
1549	return pl;
1550	}
1551	}
1552
1553	return 0;
1554	}
1555
1556	/*
1557	* decrease_ob_nr(object, number) decreases a specified number from	1531	* decrease(object, number) decreases a specified number from
1558	* the amount of an object. If the amount reaches 0, the object	1532	* the amount of an object. If the amount reaches 0, the object
1559	* is subsequently removed and freed.	1533	* is subsequently removed and freed.
1560	*	1534	*
1561	* Return value: 'op' if something is left, NULL if the amount reached 0	1535	* Return value: 'op' if something is left, NULL if the amount reached 0
1562	*/	1536	*/
1563	bool	1537	bool
1564	object::decrease_nr (sint32 nr)	1538	object::decrease (sint32 nr)
1565	{	1539	{
		1540	if (!nr)
		1541	return true;
		1542
1566	nr = min (nr, nrof);	1543	nr = min (nr, nrof);
1567		1544
1568	if (!nr)	1545	if (nrof > nr)
1569	return 1;	1546	{
1570
1571	nrof -= nr;	1547	nrof -= nr;
1572
1573	object *visible = visible_to (this);
1574
1575	if (nrof)
1576	{
1577	adjust_weight (env, -weight * nr); // carrying == 0	1548	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1578		1549
1579	if (visible)	1550	if (object *pl = visible_to ())
1580	esrv_send_item (visible, this);	1551	esrv_update_item (UPD_NROF, pl, this);
1581		1552
1582	return 1;	1553	return true;
1583	}	1554	}
1584	else	1555	else
1585	{	1556	{
1586	if (visible)
1587	esrv_del_item (visible->contr, count);
1588
1589	this->destroy (1);	1557	destroy ();
1590	return 0;	1558	return false;
1591	}	1559	}
1592	}	1560	}
1593		1561
1594	//TODO: remove	1562	/*
		1563	* split(ob,nr) splits up ob into two parts. The part which
		1564	* is returned contains nr objects, and the remaining parts contains
		1565	* the rest (or is removed and returned if that number is 0).
		1566	* On failure, NULL is returned.
		1567	*/
1595	object *	1568	object *
1596	decrease_ob_nr (object *op, uint32 i)	1569	object::split (sint32 nr)
1597	{	1570	{
1598	return op->decrease_nr (i) ? op : 0;	1571	int have = number_of ();
		1572
		1573	if (have < nr)
		1574	return 0;
		1575	else if (have == nr)
		1576	{
		1577	remove ();
		1578	return this;
		1579	}
		1580	else
		1581	{
		1582	decrease (nr);
		1583
		1584	object *op = deep_clone ();
		1585	op->nrof = nr;
		1586	return op;
		1587	}
1599	}	1588	}
1600		1589
1601	object *	1590	object *
1602	insert_ob_in_ob (object *op, object *where)	1591	insert_ob_in_ob (object *op, object *where)
1603	{	1592	{
…		…
1644	if (object::can_merge (tmp, op))	1633	if (object::can_merge (tmp, op))
1645	{	1634	{
1646	/* return the original object and remove inserted object	1635	/* return the original object and remove inserted object
1647	(client needs the original object) */	1636	(client needs the original object) */
1648	tmp->nrof += op->nrof;	1637	tmp->nrof += op->nrof;
		1638
		1639	if (object *pl = tmp->visible_to ())
		1640	esrv_update_item (UPD_NROF, pl, tmp);
		1641
		1642	adjust_weight (this, op->total_weight ());
		1643
1649	op->destroy (1);	1644	op->destroy ();
1650	op = tmp;	1645	op = tmp;
1651	goto inserted;	1646	goto inserted;
1652	}	1647	}
1653		1648
1654	op->owner = 0; // it's his/hers now. period.	1649	op->owner = 0; // it's his/hers now. period.
…		…
1665		1660
1666	inv = op;	1661	inv = op;
1667		1662
1668	op->flag [FLAG_REMOVED] = 0;	1663	op->flag [FLAG_REMOVED] = 0;
1669		1664
		1665	if (object *pl = op->visible_to ())
		1666	esrv_send_item (pl, op);
		1667
1670	adjust_weight (this, op->total_weight ());	1668	adjust_weight (this, op->total_weight ());
1671		1669
1672	inserted:	1670	inserted:
1673	/* reset the light list and los of the players on the map */	1671	/* reset the light list and los of the players on the map */
1674	if (op->glow_radius && map && map->darkness)	1672	if (op->glow_radius && is_on_map ())
		1673	{
		1674	update_stats ();
1675	update_all_los (map, x, y);	1675	update_all_los (map, x, y);
1676		1676	}
1677	if (object *otmp = in_player ())	1677	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1678	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1678	// if this is a player's inventory, update stats
1679	otmp->update_stats ();	1679	update_stats ();
1680		1680
1681	INVOKE_OBJECT (INSERT, this);	1681	INVOKE_OBJECT (INSERT, this);
1682		1682
1683	return op;	1683	return op;
1684	}	1684	}
…		…
1767	{	1767	{
1768		1768
1769	float	1769	float
1770	diff = tmp->move_slow_penalty * fabs (op->speed);	1770	diff = tmp->move_slow_penalty * fabs (op->speed);
1771		1771
1772	if (op->type == PLAYER)	1772	if (op->is_player ())
1773	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1773	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1774	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1774	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1775	diff /= 4.0;	1775	diff /= 4.0;
1776		1776
1777	op->speed_left -= diff;	1777	op->speed_left -= diff;
…		…
1812	LOG (llevError, "Present_arch called outside map.\n");	1812	LOG (llevError, "Present_arch called outside map.\n");
1813	return NULL;	1813	return NULL;
1814	}	1814	}
1815		1815
1816	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1816	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1817	if (tmp->arch == at)	1817	if (tmp->arch->archname == at->archname)
1818	return tmp;	1818	return tmp;
1819		1819
1820	return NULL;	1820	return NULL;
1821	}	1821	}
1822		1822
…		…
1886	* The first matching object is returned, or NULL if none.	1886	* The first matching object is returned, or NULL if none.
1887	*/	1887	*/
1888	object *	1888	object *
1889	present_arch_in_ob (const archetype *at, const object *op)	1889	present_arch_in_ob (const archetype *at, const object *op)
1890	{	1890	{
1891	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1891	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1892	if (tmp->arch == at)	1892	if (tmp->arch->archname == at->archname)
1893	return tmp;	1893	return tmp;
1894		1894
1895	return NULL;	1895	return NULL;
1896	}	1896	}
1897		1897
…		…
1985	* head of the object should correspond for the entire object.	1985	* head of the object should correspond for the entire object.
1986	*/	1986	*/
1987	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1987	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1988	continue;	1988	continue;
1989		1989
1990	if (ob->blocked (m, pos.x, pos.y))	1990	if (ob->blocked (pos.m, pos.x, pos.y))
1991	continue;	1991	continue;
1992		1992
1993	altern [index++] = i;	1993	altern [index++] = i;
1994	}	1994	}
1995		1995
…		…
2063	* there is capable of.	2063	* there is capable of.
2064	*/	2064	*/
2065	int	2065	int
2066	find_dir (maptile *m, int x, int y, object *exclude)	2066	find_dir (maptile *m, int x, int y, object *exclude)
2067	{	2067	{
2068	int i, max = SIZEOFFREE, mflags;	2068	int max = SIZEOFFREE, mflags;
2069
2070	sint16 nx, ny;
2071	object *tmp;
2072	maptile *mp;
2073
2074	MoveType blocked, move_type;	2069	MoveType move_type;
2075		2070
2076	if (exclude && exclude->head_ () != exclude)	2071	if (exclude && exclude->head_ () != exclude)
2077	{	2072	{
2078	exclude = exclude->head;	2073	exclude = exclude->head;
2079	move_type = exclude->move_type;	2074	move_type = exclude->move_type;
…		…
2082	{	2077	{
2083	/* If we don't have anything, presume it can use all movement types. */	2078	/* If we don't have anything, presume it can use all movement types. */
2084	move_type = MOVE_ALL;	2079	move_type = MOVE_ALL;
2085	}	2080	}
2086		2081
2087	for (i = 1; i < max; i++)	2082	for (int i = 1; i < max; i++)
2088	{	2083	{
2089	mp = m;	2084	mapxy pos (m, x, y);
2090	nx = x + freearr_x[i];	2085	pos.move (i);
2091	ny = y + freearr_y[i];
2092		2086
2093	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2087	if (!pos.normalise ())
2094
2095	if (mflags & P_OUT_OF_MAP)
2096	max = maxfree[i];	2088	max = maxfree[i];
2097	else	2089	else
2098	{	2090	{
2099	mapspace &ms = mp->at (nx, ny);	2091	mapspace &ms = *pos;
2100		2092
2101	blocked = ms.move_block;
2102
2103	if ((move_type & blocked) == move_type)	2093	if ((move_type & ms.move_block) == move_type)
2104	max = maxfree[i];	2094	max = maxfree [i];
2105	else if (mflags & P_IS_ALIVE)	2095	else if (ms.flags () & P_IS_ALIVE)
2106	{	2096	{
2107	for (tmp = ms.bot; tmp; tmp = tmp->above)	2097	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2108	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2098	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2109	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2099	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2110	break;
2111
2112	if (tmp)
2113	return freedir[i];	2100	return freedir [i];
2114	}	2101	}
2115	}	2102	}
2116	}	2103	}
2117		2104
2118	return 0;	2105	return 0;
…		…
2193	* This basically means that if direction is 15, then it could either go	2180	* This basically means that if direction is 15, then it could either go
2194	* direction 4, 14, or 16 to get back to where we are.	2181	* direction 4, 14, or 16 to get back to where we are.
2195	* Moved from spell_util.c to object.c with the other related direction	2182	* Moved from spell_util.c to object.c with the other related direction
2196	* functions.	2183	* functions.
2197	*/	2184	*/
2198	int reduction_dir[SIZEOFFREE][3] = {	2185	const int reduction_dir[SIZEOFFREE][3] = {
2199	{0, 0, 0}, /* 0 */	2186	{0, 0, 0}, /* 0 */
2200	{0, 0, 0}, /* 1 */	2187	{0, 0, 0}, /* 1 */
2201	{0, 0, 0}, /* 2 */	2188	{0, 0, 0}, /* 2 */
2202	{0, 0, 0}, /* 3 */	2189	{0, 0, 0}, /* 3 */
2203	{0, 0, 0}, /* 4 */	2190	{0, 0, 0}, /* 4 */
…		…
2299	int	2286	int
2300	can_pick (const object *who, const object *item)	2287	can_pick (const object *who, const object *item)
2301	{	2288	{
2302	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2289	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2303	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2290	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2304	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2291	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2305	}	2292	}
2306		2293
2307	/*	2294	/*
2308	* create clone from object to another	2295	* create clone from object to another
2309	*/	2296	*/
2310	object *	2297	object *
2311	object_create_clone (object *asrc)	2298	object::deep_clone ()
2312	{	2299	{
2313	object *dst = 0, *tmp, *src, *prev, *item;	2300	assert (("deep_clone called on non-head object", is_head ()));
2314		2301
2315	if (!asrc)	2302	object *dst = clone ();
2316	return 0;
2317		2303
2318	src = asrc->head_ ();	2304	object *prev = dst;
2319
2320	prev = 0;
2321	for (object *part = src; part; part = part->more)	2305	for (object *part = this->more; part; part = part->more)
2322	{	2306	{
2323	tmp = part->clone ();	2307	object *tmp = part->clone ();
2324	tmp->x -= src->x;
2325	tmp->y -= src->y;
2326
2327	if (!part->head)
2328	{
2329	dst = tmp;
2330	tmp->head = 0;
2331	}
2332	else
2333	tmp->head = dst;	2308	tmp->head = dst;
2334
2335	tmp->more = 0;
2336
2337	if (prev)
2338	prev->more = tmp;	2309	prev->more = tmp;
2339
2340	prev = tmp;	2310	prev = tmp;
2341	}	2311	}
2342		2312
2343	for (item = src->inv; item; item = item->below)	2313	for (object *item = inv; item; item = item->below)
2344	insert_ob_in_ob (object_create_clone (item), dst);	2314	insert_ob_in_ob (item->deep_clone (), dst);
2345		2315
2346	return dst;	2316	return dst;
2347	}	2317	}
2348		2318
2349	/* This returns the first object in who's inventory that	2319	/* This returns the first object in who's inventory that
…		…
2358	return tmp;	2328	return tmp;
2359		2329
2360	return 0;	2330	return 0;
2361	}	2331	}
2362		2332
2363	/* If ob has a field named key, return the link from the list,	2333	shstr_tmp
2364	* otherwise return NULL.	2334	object::kv_get (shstr_tmp key) const
2365	*
2366	* key must be a passed in shared string - otherwise, this won't
2367	* do the desired thing.
2368	*/
2369	key_value *
2370	get_ob_key_link (const object *ob, const char *key)
2371	{	2335	{
2372	for (key_value *link = ob->key_values; link; link = link->next)	2336	for (key_value *kv = key_values; kv; kv = kv->next)
2373	if (link->key == key)	2337	if (kv->key == key)
2374	return link;
2375
2376	return 0;
2377	}
2378
2379	/*
2380	* Returns the value of op has an extra_field for key, or NULL.
2381	*
2382	* The argument doesn't need to be a shared string.
2383	*
2384	* The returned string is shared.
2385	*/
2386	const char *
2387	get_ob_key_value (const object *op, const char *const key)
2388	{
2389	key_value *link;
2390	shstr_cmp canonical_key (key);
2391
2392	if (!canonical_key)
2393	{
2394	/* 1. There being a field named key on any object
2395	* implies there'd be a shared string to find.
2396	* 2. Since there isn't, no object has this field.
2397	* 3. Therefore, *this* object doesn't have this field.
2398	*/
2399	return 0;
2400	}
2401
2402	/* This is copied from get_ob_key_link() above -
2403	* only 4 lines, and saves the function call overhead.
2404	*/
2405	for (link = op->key_values; link; link = link->next)
2406	if (link->key == canonical_key)
2407	return link->value;	2338	return kv->value;
2408		2339
2409	return 0;	2340	return shstr ();
2410	}	2341	}
2411		2342
2412	/*	2343	void
2413	* Updates the canonical_key in op to value.	2344	object::kv_set (shstr_tmp key, shstr_tmp value)
2414	*
2415	* canonical_key is a shared string (value doesn't have to be).
2416	*
2417	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2418	* keys.
2419	*
2420	* Returns TRUE on success.
2421	*/
2422	int
2423	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2424	{	2345	{
2425	key_value *field = NULL, *last = NULL;	2346	for (key_value *kv = key_values; kv; kv = kv->next)
2426		2347	if (kv->key == key)
2427	for (field = op->key_values; field != NULL; field = field->next)
2428	{
2429	if (field->key != canonical_key)
2430	{	2348	{
2431	last = field;	2349	kv->value = value;
2432	continue;	2350	return;
2433	}	2351	}
2434		2352
2435	if (value)	2353	key_value *kv = new key_value;
2436	field->value = value;	2354
2437	else	2355	kv->next = key_values;
		2356	kv->key = key;
		2357	kv->value = value;
		2358
		2359	key_values = kv;
		2360	}
		2361
		2362	void
		2363	object::kv_del (shstr_tmp key)
		2364	{
		2365	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2366	if ((*kvp)->key == key)
2438	{	2367	{
2439	/* Basically, if the archetype has this key set,	2368	key_value *kv = *kvp;
2440	* we need to store the null value so when we save	2369	*kvp = (*kvp)->next;
2441	* it, we save the empty value so that when we load,	2370	delete kv;
2442	* we get this value back again.	2371	return;
2443	*/
2444	if (get_ob_key_link (op->arch, canonical_key))
2445	field->value = 0;
2446	else
2447	{
2448	if (last)
2449	last->next = field->next;
2450	else
2451	op->key_values = field->next;
2452
2453	delete field;
2454	}
2455	}	2372	}
2456	return TRUE;
2457	}
2458	/* IF we get here, key doesn't exist */
2459
2460	/* No field, we'll have to add it. */
2461
2462	if (!add_key)
2463	return FALSE;
2464
2465	/* There isn't any good reason to store a null
2466	* value in the key/value list. If the archetype has
2467	* this key, then we should also have it, so shouldn't
2468	* be here. If user wants to store empty strings,
2469	* should pass in ""
2470	*/
2471	if (value == NULL)
2472	return TRUE;
2473
2474	field = new key_value;
2475
2476	field->key = canonical_key;
2477	field->value = value;
2478	/* Usual prepend-addition. */
2479	field->next = op->key_values;
2480	op->key_values = field;
2481
2482	return TRUE;
2483	}
2484
2485	/*
2486	* Updates the key in op to value.
2487	*
2488	* If add_key is FALSE, this will only update existing keys,
2489	* and not add new ones.
2490	* In general, should be little reason FALSE is ever passed in for add_key
2491	*
2492	* Returns TRUE on success.
2493	*/
2494	int
2495	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2496	{
2497	shstr key_ (key);
2498
2499	return set_ob_key_value_s (op, key_, value, add_key);
2500	}	2373	}
2501		2374
2502	object::depth_iterator::depth_iterator (object *container)	2375	object::depth_iterator::depth_iterator (object *container)
2503	: iterator_base (container)	2376	: iterator_base (container)
2504	{	2377	{
…		…
2554	{	2427	{
2555	char flagdesc[512];	2428	char flagdesc[512];
2556	char info2[256 * 4];	2429	char info2[256 * 4];
2557	char *p = info;	2430	char *p = info;
2558		2431
2559	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2432	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2560	count,	2433	count,
2561	uuid.c_str (),	2434	uuid.c_str (),
2562	&name,	2435	&name,
2563	title ? "\",title:\"" : "",	2436	title ? ",title:\"" : "",
2564	title ? (const char *)title : "",	2437	title ? (const char *)title : "",
		2438	title ? "\"" : "",
2565	flag_desc (flagdesc, 512), type);	2439	flag_desc (flagdesc, 512), type);
2566		2440
2567	if (!this->flag[FLAG_REMOVED] && env)	2441	if (!flag[FLAG_REMOVED] && env)
2568	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2442	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2569		2443
2570	if (map)	2444	if (map)
2571	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2445	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2572		2446
…		…
2602	object::open_container (object *new_container)	2476	object::open_container (object *new_container)
2603	{	2477	{
2604	if (container == new_container)	2478	if (container == new_container)
2605	return;	2479	return;
2606		2480
2607	if (object *old_container = container)	2481	object *old_container = container;
		2482
		2483	if (old_container)
2608	{	2484	{
2609	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2485	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2610	return;	2486	return;
2611		2487
2612	#if 0	2488	#if 0
…		…
2614	if (object *closer = old_container->inv)	2490	if (object *closer = old_container->inv)
2615	if (closer->type == CLOSE_CON)	2491	if (closer->type == CLOSE_CON)
2616	closer->destroy ();	2492	closer->destroy ();
2617	#endif	2493	#endif
2618		2494
		2495	// make sure the container is available
		2496	esrv_send_item (this, old_container);
		2497
2619	old_container->flag [FLAG_APPLIED] = 0;	2498	old_container->flag [FLAG_APPLIED] = false;
2620	container = 0;	2499	container = 0;
2621		2500
		2501	// client needs item update to make it work, client bug requires this to be separate
2622	esrv_update_item (UPD_FLAGS, this, old_container);	2502	esrv_update_item (UPD_FLAGS, this, old_container);
		2503
2623	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2504	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2624	play_sound (sound_find ("chest_close"));	2505	play_sound (sound_find ("chest_close"));
2625	}	2506	}
2626		2507
2627	if (new_container)	2508	if (new_container)
2628	{	2509	{
…		…
2638	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2519	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2639	new_container->insert (closer);	2520	new_container->insert (closer);
2640	}	2521	}
2641	#endif	2522	#endif
2642		2523
2643	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2524	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2644		2525
		2526	// make sure the container is available, client bug requires this to be separate
		2527	esrv_send_item (this, new_container);
		2528
2645	new_container->flag [FLAG_APPLIED] = 1;	2529	new_container->flag [FLAG_APPLIED] = true;
2646	container = new_container;	2530	container = new_container;
2647		2531
		2532	// client needs flag change
2648	esrv_update_item (UPD_FLAGS, this, new_container);	2533	esrv_update_item (UPD_FLAGS, this, new_container);
2649	esrv_send_inventory (this, new_container);	2534	esrv_send_inventory (this, new_container);
2650	play_sound (sound_find ("chest_open"));	2535	play_sound (sound_find ("chest_open"));
2651	}	2536	}
		2537	// else if (!old_container->env && contr && contr->ns)
		2538	// contr->ns->floorbox_reset ();
2652	}	2539	}
2653		2540
2654	object *	2541	object *
2655	object::force_find (const shstr name)	2542	object::force_find (shstr_tmp name)
2656	{	2543	{
2657	/* cycle through his inventory to look for the MARK we want to	2544	/* cycle through his inventory to look for the MARK we want to
2658	* place	2545	* place
2659	*/	2546	*/
2660	for (object *tmp = inv; tmp; tmp = tmp->below)	2547	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2662	return splay (tmp);	2549	return splay (tmp);
2663		2550
2664	return 0;	2551	return 0;
2665	}	2552	}
2666		2553
2667	void	2554	object *
2668	object::force_add (const shstr name, int duration)	2555	object::force_add (shstr_tmp name, int duration)
2669	{	2556	{
2670	if (object *force = force_find (name))	2557	if (object *force = force_find (name))
2671	force->destroy ();	2558	force->destroy ();
2672		2559
2673	object *force = get_archetype (FORCE_NAME);	2560	object *force = get_archetype (FORCE_NAME);
…		…
2678		2565
2679	force->set_speed (duration ? 1.f / duration : 0.f);	2566	force->set_speed (duration ? 1.f / duration : 0.f);
2680	force->flag [FLAG_IS_USED_UP] = true;	2567	force->flag [FLAG_IS_USED_UP] = true;
2681	force->flag [FLAG_APPLIED] = true;	2568	force->flag [FLAG_APPLIED] = true;
2682		2569
2683	insert (force);	2570	return insert (force);
2684	}	2571	}
2685		2572
2686	void	2573	void
2687	object::play_sound (faceidx sound)	2574	object::play_sound (faceidx sound) const
2688	{	2575	{
2689	if (!sound)	2576	if (!sound)
2690	return;	2577	return;
2691		2578
2692	if (flag [FLAG_REMOVED])	2579	if (is_on_map ())
		2580	map->play_sound (sound, x, y);
		2581	else if (object *pl = in_player ())
		2582	pl->contr->play_sound (sound);
		2583	}
		2584
		2585	void
		2586	object::say_msg (const char *msg) const
		2587	{
		2588	if (is_on_map ())
		2589	map->say_msg (msg, x, y);
		2590	else if (object *pl = in_player ())
		2591	pl->contr->play_sound (sound);
		2592	}
		2593
		2594	void
		2595	object::make_noise ()
		2596	{
		2597	// we do not model noise in the map, so instead put
		2598	// a temporary light into the noise source
		2599	// could use the map instead, but that's less reliable for our
		2600	// goal, which is to make invisibility a bit harder to exploit
		2601
		2602	// currently only works sensibly for players
		2603	if (!is_player ())
2693	return;	2604	return;
2694		2605
2695	if (env)	2606	// find old force, or create new one
2696	{	2607	object *force = force_find (shstr_noise_force);
2697	if (object *pl = in_player ())	2608
2698	pl->contr->play_sound (sound);	2609	if (force)
2699	}	2610	force->speed_left = -1.f; // patch old speed up
2700	else	2611	else
2701	map->play_sound (sound, x, y);	2612	{
2702	}	2613	force = archetype::get (shstr_noise_force);
2703		2614
		2615	force->slaying = shstr_noise_force;
		2616	force->stats.food = 1;
		2617	force->speed_left = -1.f;
		2618
		2619	force->set_speed (1.f / 4.f);
		2620	force->flag [FLAG_IS_USED_UP] = true;
		2621	force->flag [FLAG_APPLIED] = true;
		2622
		2623	insert (force);
		2624	}
		2625	}
		2626

Diff Legend

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