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.217 by root, Wed Apr 23 07:13:23 2008 UTC vs.
Revision 1.287 by root, Sat Oct 3 20:11:12 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
…		…
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
40		41
41	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
139		140
140	/* 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. */
141	static bool	142	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	143	compare_ob_value_lists_one (const object *wants, const object *has)
143	{	144	{
144	key_value *wants_field;
145
146	/* 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
147	* 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
148	* different structure or at least keep the lists sorted...	147	* different structure or at least keep the lists sorted...
149	*/	148	*/
150		149
151	/* For each field in wants, */	150	/* For each field in wants, */
152	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)
153	{	152	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	153	return false;
155
156	/* Look for a field in has with the same key. */
157	has_field = get_ob_key_link (has, wants_field->key);
158
159	if (!has_field)
160	return 0; /* No field with that name. */
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	return 0; /* Values don't match, so this half of the comparison is false. */
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		154
169	/* 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. */
170	return 1;	156	return true;
171	}	157	}
172		158
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	159	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	160	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	161	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	162	{
177	/* 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,
178	* so we need to run the comparison *twice*. :(	164	* so we need to run the comparison *twice*. :(
179	*/	165	*/
180	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);
181	}	168	}
182		169
183	/* 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
184	* they can be merged together.	171	* they can be merged together.
185	*	172	*
…		…
200	|| ob1->speed != ob2->speed	187	|| ob1->speed != ob2->speed
201	|| ob1->value != ob2->value	188	|| ob1->value != ob2->value
202	|| ob1->name != ob2->name)	189	|| ob1->name != ob2->name)
203	return 0;	190	return 0;
204		191
205	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	193	* is always 0 .. 2**31-1 */
207	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
208	* nrof values.
209	*/
210	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
211	return 0;	195	return 0;
212		196
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
214	* 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
215	* 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
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		205
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		208
225	if (ob1->arch->name != ob2->arch->name	209	if (ob1->arch->archname != ob2->arch->archname
226	|| ob1->name != ob2->name	210	|| ob1->name != ob2->name
227	|| ob1->title != ob2->title	211	|| ob1->title != ob2->title
228	|| ob1->msg != ob2->msg	212	|| ob1->msg != ob2->msg
229	|| ob1->weight != ob2->weight	213	|| ob1->weight != ob2->weight
230	|| ob1->attacktype != ob2->attacktype	214	|| ob1->attacktype != ob2->attacktype
231	|| ob1->magic != ob2->magic	215	|| ob1->magic != ob2->magic
232	|| ob1->slaying != ob2->slaying	216	|| ob1->slaying != ob2->slaying
233	|| ob1->skill != ob2->skill	217	|| ob1->skill != ob2->skill
234	|| ob1->value != ob2->value	218	|| ob1->value != ob2->value
235	|| 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
236	|| ob1->client_type != ob2->client_type	221	|| ob1->client_type != ob2->client_type
237	|| ob1->materialname != ob2->materialname	222	|| ob1->materialname != ob2->materialname
238	|| ob1->lore != ob2->lore	223	|| ob1->lore != ob2->lore
239	|| ob1->subtype != ob2->subtype	224	|| ob1->subtype != ob2->subtype
240	|| ob1->move_type != ob2->move_type	225	|| ob1->move_type != ob2->move_type
…		…
248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	234	return 0;
250		235
251	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
255	.any ())	239	.any ())
256	return 0;	240	return 0;
257		241
258	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
334		318
335	// find player who can see this object	319	// find player who can see this object
336	object *	320	object *
337	object::visible_to () const	321	object::visible_to () const
338	{	322	{
339	if (!flag [FLAG_REMOVED])	323	if (client_visible () && !flag [FLAG_REMOVED])
340	{	324	{
341	// see if we are in a container of sorts	325	// see if we are in a container of sorts
342	if (env)	326	if (env)
343	{	327	{
344	// the player inventory itself is always visible	328	// the player inventory itself is always visible
345	if (env->type == PLAYER)	329	if (env->is_player ())
346	return env;	330	return env;
347		331
348	// else a player could have our env open	332	// else a player could have our env open
349	object *envest = env->outer_env ();	333	object *envest = env->outer_env_or_self ();
350		334
351	// the player itself is always on a map, so we will find him here	335	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	336	// even if our inv is in a player.
353	if (envest->is_on_map ())	337	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	338	if (object *pl = envest->ms ().player ())
…		…
358	else	342	else
359	{	343	{
360	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		348	|| this == pl->container)
363	return pl;	349	return pl;
364	}	350	}
365	}	351	}
366		352
367	return 0;	353	return 0;
368	}	354	}
369		355
370	// adjust weight per container type ("of holding")	356	// adjust weight per container type ("of holding")
371	static sint32	357	static sint32
372	weight_adjust (object *op, sint32 weight)	358	weight_adjust_for (object *op, sint32 weight)
373	{	359	{
374	return op->type == CONTAINER	360	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	362	: weight;
377	}	363	}
…		…
383	static void	369	static void
384	adjust_weight (object *op, sint32 weight)	370	adjust_weight (object *op, sint32 weight)
385	{	371	{
386	while (op)	372	while (op)
387	{	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
388	weight = weight_adjust (op, weight);	376	weight = weight_adjust_for (op, op->carrying)
		377	- weight_adjust_for (op, op->carrying - weight);
389		378
390	if (!weight)	379	if (!weight)
391	return;	380	return;
392		381
393	op->carrying += weight;	382	op->carrying += weight;
…		…
416	op->update_weight ();	405	op->update_weight ();
417		406
418	sum += op->total_weight ();	407	sum += op->total_weight ();
419	}	408	}
420		409
421	sum = weight_adjust (this, sum);	410	sum = weight_adjust_for (this, sum);
422		411
423	if (sum != carrying)	412	if (sum != carrying)
424	{	413	{
425	carrying = sum;	414	carrying = sum;
426		415
…		…
488	*/	477	*/
489	object *	478	object *
490	find_object_name (const char *str)	479	find_object_name (const char *str)
491	{	480	{
492	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
493	object *op;
494		482
		483	if (str_)
495	for_all_objects (op)	484	for_all_objects (op)
496	if (op->name == str_)	485	if (op->name == str_)
497	break;	486	return op;
498		487
499	return op;	488	return 0;
500	}	489	}
501		490
502	/*	491	/*
503	* 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
504	* skill and experience objects.	493	* skill and experience objects.
…		…
602	}	591	}
603		592
604	op->key_values = 0;	593	op->key_values = 0;
605	}	594	}
606		595
607	object &	596	/*
608	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)
609	{	606	{
610	bool is_freed = flag [FLAG_FREED];	607	dst->remove ();
611	bool is_removed = flag [FLAG_REMOVED];
612
613	*(object_copy *)this = src;	608	*(object_copy *)dst = *this;
614
615	flag [FLAG_FREED] = is_freed;
616	flag [FLAG_REMOVED] = is_removed;	609	dst->flag [FLAG_REMOVED] = true;
617		610
618	/* Copy over key_values, if any. */	611	/* Copy over key_values, if any. */
619	if (src.key_values)	612	if (key_values)
620	{	613	{
621	key_value *tail = 0;	614	key_value *tail = 0;
622	key_values = 0;	615	dst->key_values = 0;
623		616
624	for (key_value *i = src.key_values; i; i = i->next)	617	for (key_value *i = key_values; i; i = i->next)
625	{	618	{
626	key_value *new_link = new key_value;	619	key_value *new_link = new key_value;
627		620
628	new_link->next = 0;	621	new_link->next = 0;
629	new_link->key = i->key;	622	new_link->key = i->key;
630	new_link->value = i->value;	623	new_link->value = i->value;
631		624
632	/* Try and be clever here, too. */	625	/* Try and be clever here, too. */
633	if (!key_values)	626	if (!dst->key_values)
634	{	627	{
635	key_values = new_link;	628	dst->key_values = new_link;
636	tail = new_link;	629	tail = new_link;
637	}	630	}
638	else	631	else
639	{	632	{
640	tail->next = new_link;	633	tail->next = new_link;
641	tail = new_link;	634	tail = new_link;
642	}	635	}
643	}	636	}
644	}	637	}
645	}
646
647	/*
648	* copy_to first frees everything allocated by the dst object,
649	* and then copies the contents of itself into the second
650	* object, allocating what needs to be allocated. Basically, any
651	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
652	* if the first object is freed, the pointers in the new object
653	* will point at garbage.
654	*/
655	void
656	object::copy_to (object *dst)
657	{
658	*dst = *this;
659		638
660	if (speed < 0)	639	if (speed < 0)
661	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
662		641
663	dst->set_speed (dst->speed);	642	dst->activate ();
664	}	643	}
665		644
666	void	645	void
667	object::instantiate ()	646	object::instantiate ()
668	{	647	{
…		…
685	object *	664	object *
686	object::clone ()	665	object::clone ()
687	{	666	{
688	object *neu = create ();	667	object *neu = create ();
689	copy_to (neu);	668	copy_to (neu);
		669	neu->map = map; // not copied by copy_to
690	return neu;	670	return neu;
691	}	671	}
692		672
693	/*	673	/*
694	* 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
…		…
745	* UP_OBJ_FACE: only the objects face has changed.	725	* UP_OBJ_FACE: only the objects face has changed.
746	*/	726	*/
747	void	727	void
748	update_object (object *op, int action)	728	update_object (object *op, int action)
749	{	729	{
750	if (op == NULL)	730	if (!op)
751	{	731	{
752	/* this should never happen */	732	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	733	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
754	return;	734	return;
755	}	735	}
756		736
757	if (op->env)	737	if (!op->is_on_map ())
758	{	738	{
759	/* Animation is currently handled by client, so nothing	739	/* Animation is currently handled by client, so nothing
760	* to do in this case.	740	* to do in this case.
761	*/	741	*/
762	return;	742	return;
763	}	743	}
764
765	/* If the map is saving, don't do anything as everything is
766	* going to get freed anyways.
767	*/
768	if (!op->map || op->map->in_memory == MAP_SAVING)
769	return;
770		744
771	/* make sure the object is within map boundaries */	745	/* make sure the object is within map boundaries */
772	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)
773	{	747	{
774	LOG (llevError, "update_object() called for object out of map!\n");	748	LOG (llevError, "update_object() called for object out of map!\n");
…		…
785	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
786	{	760	{
787	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
788	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
789	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
790	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	|| (op->is_player () && !(m.flags_ & P_PLAYER))
791	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
792	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
793	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
794	|| (m.move_on | op->move_on ) != m.move_on	768	|| (m.move_on | op->move_on ) != m.move_on
795	|| (m.move_off | op->move_off ) != m.move_off	769	|| (m.move_off | op->move_off ) != m.move_off
796	|| (m.move_slow | op->move_slow) != m.move_slow	770	|| (m.move_slow | op->move_slow) != m.move_slow
797	/* 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
798	* to have move_allow right now.	772	* have move_allow right now.
799	*/	773	*/
800	|| ((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
801	|| 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)
802	m.flags_ = 0;	776	m.invalidate ();
803	}	777	}
804	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
805	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
806	* that is being removed.	780	* that is being removed.
807	*/	781	*/
808	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
809	m.flags_ = 0;	783	m.invalidate ();
810	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
811	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
812	else	786	else
813	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
814		788
…		…
818		792
819	object::object ()	793	object::object ()
820	{	794	{
821	SET_FLAG (this, FLAG_REMOVED);	795	SET_FLAG (this, FLAG_REMOVED);
822		796
823	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
824	face = blank_face;	798	face = blank_face;
825	}	799	}
826		800
827	object::~object ()	801	object::~object ()
828	{	802	{
…		…
858	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
859	if (active)	833	if (active)
860	return;	834	return;
861		835
862	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
863	actives.insert (this);	841	actives.insert (this);
		842	}
864	}	843	}
865		844
866	void	845	void
867	object::activate_recursive ()	846	object::activate_recursive ()
868	{	847	{
…		…
929	* drop on that space.	908	* drop on that space.
930	*/	909	*/
931	if (!drop_to_ground	910	if (!drop_to_ground
932	|| !map	911	|| !map
933	|| map->in_memory != MAP_ACTIVE	912	|| map->in_memory != MAP_ACTIVE
934	|| map->nodrop	913	|| map->no_drop
935	|| ms ().move_block == MOVE_ALL)	914	|| ms ().move_block == MOVE_ALL)
936	{	915	{
937	while (inv)	916	while (inv)
938	{
939	inv->destroy_inv (false);
940	inv->destroy ();	917	inv->destroy ();
941	}
942	}	918	}
943	else	919	else
944	{ /* Put objects in inventory onto this space */	920	{ /* Put objects in inventory onto this space */
945	while (inv)	921	while (inv)
946	{	922	{
…		…
950	|| op->flag [FLAG_NO_DROP]	926	|| op->flag [FLAG_NO_DROP]
951	|| op->type == RUNE	927	|| op->type == RUNE
952	|| op->type == TRAP	928	|| op->type == TRAP
953	|| op->flag [FLAG_IS_A_TEMPLATE]	929	|| op->flag [FLAG_IS_A_TEMPLATE]
954	|| op->flag [FLAG_DESTROY_ON_DEATH])	930	|| op->flag [FLAG_DESTROY_ON_DEATH])
955	op->destroy (true);	931	op->destroy ();
956	else	932	else
957	map->insert (op, x, y);	933	map->insert (op, x, y);
958	}	934	}
959	}	935	}
960	}	936	}
…		…
964	object *op = new object;	940	object *op = new object;
965	op->link ();	941	op->link ();
966	return op;	942	return op;
967	}	943	}
968		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
969	void	966	void
970	object::do_destroy ()	967	object::do_destroy ()
971	{	968	{
972	if (flag [FLAG_IS_LINKED])	969	if (flag [FLAG_IS_LINKED])
973	remove_button_link (this);	970	remove_link ();
974		971
975	if (flag [FLAG_FRIENDLY])	972	if (flag [FLAG_FRIENDLY])
976	remove_friendly_object (this);	973	remove_friendly_object (this);
977		974
978	remove ();	975	remove ();
…		…
983	unlink ();	980	unlink ();
984		981
985	flag [FLAG_FREED] = 1;	982	flag [FLAG_FREED] = 1;
986		983
987	// hack to ensure that freed objects still have a valid map	984	// hack to ensure that freed objects still have a valid map
988	{
989	static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991	if (!freed_map)
992	{
993	freed_map = new maptile;
994
995	freed_map->path = "<freed objects map>";
996	freed_map->name = "/internal/freed_objects_map";
997	freed_map->width = 3;
998	freed_map->height = 3;
999	freed_map->nodrop = 1;
1000
1001	freed_map->alloc ();
1002	freed_map->in_memory = MAP_ACTIVE;
1003	}
1004
1005	map = freed_map;	985	map = &freed_map;
1006	x = 1;	986	x = 1;
1007	y = 1;	987	y = 1;
1008	}
1009		988
1010	if (more)	989	if (more)
1011	{	990	{
1012	more->destroy ();	991	more->destroy ();
1013	more = 0;	992	more = 0;
…		…
1021	attacked_by = 0;	1000	attacked_by = 0;
1022	current_weapon = 0;	1001	current_weapon = 0;
1023	}	1002	}
1024		1003
1025	void	1004	void
1026	object::destroy (bool destroy_inventory)	1005	object::destroy ()
1027	{	1006	{
1028	if (destroyed ())	1007	if (destroyed ())
1029	return;	1008	return;
1030		1009
1031	destroy_inv (!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
		1017	destroy_inv (false);
1032		1018
1033	if (is_head ())	1019	if (is_head ())
1034	if (sound_destroy)	1020	if (sound_destroy)
1035	play_sound (sound_destroy);	1021	play_sound (sound_destroy);
1036	else if (flag [FLAG_MONSTER])	1022	else if (flag [FLAG_MONSTER])
…		…
1055	if (flag [FLAG_REMOVED])	1041	if (flag [FLAG_REMOVED])
1056	return;	1042	return;
1057		1043
1058	INVOKE_OBJECT (REMOVE, this);	1044	INVOKE_OBJECT (REMOVE, this);
1059		1045
1060	if (object *pl = visible_to ())
1061	esrv_del_item (pl->contr, count);
1062
1063	flag [FLAG_REMOVED] = true;	1046	flag [FLAG_REMOVED] = true;
1064		1047
1065	if (more)	1048	if (more)
1066	more->remove ();	1049	more->remove ();
1067		1050
…		…
1069	* In this case, the object to be removed is in someones	1052	* In this case, the object to be removed is in someones
1070	* inventory.	1053	* inventory.
1071	*/	1054	*/
1072	if (env)	1055	if (env)
1073	{	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
1074	adjust_weight (env, -total_weight ());	1062	adjust_weight (env, -total_weight ());
1075		1063
1076	*(above ? &above->below : &env->inv) = below;	1064	object *pl = in_player ();
1077
1078	if (below)
1079	below->above = above;
1080		1065
1081	/* we set up values so that it could be inserted into	1066	/* we set up values so that it could be inserted into
1082	* 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
1083	* to the caller to decide what we want to do.	1068	* to the caller to decide what we want to do.
1084	*/	1069	*/
1085	map = env->map;	1070	map = env->map;
1086	x = env->x;	1071	x = env->x;
1087	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
1088	above = 0;	1078	above = 0;
1089	below = 0;	1079	below = 0;
1090	env = 0;	1080	env = 0;
1091		1081
1092	/* 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
1093	* made to players inventory. If set, avoiding the call	1083	* made to players inventory. If set, avoiding the call
1094	* to save cpu time.	1084	* to save cpu time.
1095	*/	1085	*/
1096	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	{
1097	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	}
1098	}	1094	}
1099	else if (map)	1095	else if (map)
1100	{	1096	{
1101	if (type == PLAYER)
1102	{
1103	// leaving a spot always closes any open container on the ground
1104	if (container && !container->env)
1105	// this causes spurious floorbox updates, but it ensures
1106	// that the CLOSE event is being sent.
1107	close_container ();
1108
1109	--map->players;
1110	map->touch ();
1111	}
1112
1113	map->dirty = true;	1097	map->dirty = true;
1114	mapspace &ms = this->ms ();	1098	mapspace &ms = this->ms ();
1115		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
1116	/* link the object above us */	1125	/* link the object above us */
1117	if (above)	1126	// re-link, make sure compiler can easily use cmove
1118	above->below = below;	1127	*(above ? &above->below : &ms.top) = below;
1119	else	1128	*(below ? &below->above : &ms.bot) = above;
1120	ms.top = below; /* we were top, set new top */
1121
1122	/* Relink the object below us, if there is one */
1123	if (below)
1124	below->above = above;
1125	else
1126	{
1127	/* Nothing below, which means we need to relink map object for this space
1128	* use translated coordinates in case some oddness with map tiling is
1129	* evident
1130	*/
1131	if (GET_MAP_OB (map, x, y) != this)
1132	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 ());
1133
1134	ms.bot = above; /* goes on above it. */
1135	}
1136		1129
1137	above = 0;	1130	above = 0;
1138	below = 0;	1131	below = 0;
		1132
		1133	ms.invalidate ();
1139		1134
1140	if (map->in_memory == MAP_SAVING)	1135	if (map->in_memory == MAP_SAVING)
1141	return;	1136	return;
1142		1137
1143	int check_walk_off = !flag [FLAG_NO_APPLY];	1138	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1149	* removed (most likely destroyed), update the player view	1144	* removed (most likely destroyed), update the player view
1150	* appropriately.	1145	* appropriately.
1151	*/	1146	*/
1152	pl->close_container ();	1147	pl->close_container ();
1153		1148
		1149	//TODO: the floorbox prev/next might need updating
1154	esrv_del_item (pl, count);	1150	//esrv_del_item (pl->contr, count);
		1151	//TODO: update floorbox to preserve ordering
		1152	if (pl->contr->ns)
		1153	pl->contr->ns->floorbox_update ();
1155	}	1154	}
1156		1155
1157	for (tmp = ms.bot; tmp; tmp = tmp->above)	1156	for (tmp = ms.bot; tmp; tmp = tmp->above)
1158	{	1157	{
1159	/* 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
…		…
1172	}	1171	}
1173		1172
1174	last = tmp;	1173	last = tmp;
1175	}	1174	}
1176		1175
1177	/* last == NULL if there are no objects on this space */	1176	if (affects_los ())
1178	//TODO: this makes little sense, why only update the topmost object?
1179	if (!last)
1180	map->at (x, y).flags_ = 0;
1181	else
1182	update_object (last, UP_OBJ_REMOVE);
1183
1184	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1185	update_all_los (map, x, y);	1177	update_all_los (map, x, y);
1186	}	1178	}
1187	}	1179	}
1188		1180
1189	/*	1181	/*
…		…
1213	esrv_update_item (UPD_NROF, pl, top);	1205	esrv_update_item (UPD_NROF, pl, top);
1214		1206
1215	op->weight = 0; // cancel the addition above	1207	op->weight = 0; // cancel the addition above
1216	op->carrying = 0; // must be 0 already	1208	op->carrying = 0; // must be 0 already
1217		1209
1218	op->destroy (1);	1210	op->destroy ();
1219		1211
1220	return top;	1212	return top;
1221	}	1213	}
1222		1214
1223	return 0;	1215	return 0;
…		…
1251	* job preparing multi-part monsters.	1243	* job preparing multi-part monsters.
1252	*/	1244	*/
1253	object *	1245	object *
1254	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)
1255	{	1247	{
		1248	op->remove ();
		1249
1256	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1250	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1257	{	1251	{
1258	tmp->x = x + tmp->arch->x;	1252	tmp->x = x + tmp->arch->x;
1259	tmp->y = y + tmp->arch->y;	1253	tmp->y = y + tmp->arch->y;
1260	}	1254	}
…		…
1283	* just 'op' otherwise	1277	* just 'op' otherwise
1284	*/	1278	*/
1285	object *	1279	object *
1286	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)
1287	{	1281	{
1288	assert (!op->flag [FLAG_FREED]);
1289
1290	object *top, *floor = NULL;
1291
1292	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
1293		1288
1294	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1295	* 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
1296	* need extra work	1291	* need extra work
1297	*/	1292	*/
		1293	maptile *newmap = m;
1298	if (!xy_normalise (m, op->x, op->y))	1294	if (!xy_normalise (newmap, op->x, op->y))
1299	{	1295	{
1300	op->destroy (1);	1296	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1301	return 0;	1297	return 0;
1302	}	1298	}
1303		1299
1304	if (object *more = op->more)	1300	if (object *more = op->more)
1305	if (!insert_ob_in_map (more, m, originator, flag))	1301	if (!insert_ob_in_map (more, m, originator, flag))
1306	return 0;	1302	return 0;
1307		1303
1308	CLEAR_FLAG (op, FLAG_REMOVED);	1304	op->flag [FLAG_REMOVED] = false;
1309		1305	op->env = 0;
1310	op->map = m;	1306	op->map = newmap;
		1307
1311	mapspace &ms = op->ms ();	1308	mapspace &ms = op->ms ();
1312		1309
1313	/* this has to be done after we translate the coordinates.	1310	/* this has to be done after we translate the coordinates.
1314	*/	1311	*/
1315	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
1316	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1313	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1317	if (object::can_merge (op, tmp))	1314	if (object::can_merge (op, tmp))
1318	{	1315	{
		1316	// TODO: we actually want to update tmp, not op,
		1317	// but some caller surely breaks when we return tmp
		1318	// from here :/
1319	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1320	tmp->destroy (1);	1320	tmp->destroy ();
1321	}	1321	}
1322		1322
1323	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 */
1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1325		1325
…		…
1332	{	1332	{
1333	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");
1334	abort ();	1334	abort ();
1335	}	1335	}
1336		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
1337	op->above = originator;	1344	op->above = originator;
1338	op->below = originator->below;	1345	op->below = originator->below;
1339
1340	if (op->below)
1341	op->below->above = op;
1342	else
1343	ms.bot = op;
1344
1345	/* since *below* originator, no need to update top */
1346	originator->below = op;	1346	originator->below = op;
		1347
		1348	*(op->below ? &op->below->above : &ms.bot) = op;
1347	}	1349	}
1348	else	1350	else
1349	{	1351	{
1350	top = ms.bot;	1352	object *floor = 0;
		1353	object *top = ms.top;
1351		1354
1352	/* If there are other objects, then */	1355	/* If there are other objects, then */
1353	if (top)	1356	if (top)
1354	{	1357	{
1355	object *last = 0;
1356
1357	/*	1358	/*
1358	* 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.
1359	* We've already dealt with merging if appropriate.	1360	* We've already dealt with merging if appropriate.
1360	* 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
1361	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1364	* 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
1365	* 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
1366	* 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
1367	* that flying non pickable objects are spell objects.	1368	* that flying non pickable objects are spell objects.
1368	*/	1369	*/
1369	for (top = ms.bot; top; top = top->above)	1370	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370	{	1371	{
1371	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))
1372	floor = top;	1373	floor = tmp;
1373		1374
1374	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))
1375	{	1376	{
1376	/* We insert above top, so we want this object below this */	1377	/* We insert above top, so we want this object below this */
1377	top = top->below;	1378	top = tmp->below;
1378	break;	1379	break;
1379	}	1380	}
1380		1381
1381	last = top;	1382	top = tmp;
1382	}	1383	}
1383
1384	/* Don't want top to be NULL, so set it to the last valid object */
1385	top = last;
1386		1384
1387	/* We let update_position deal with figuring out what the space	1385	/* We let update_position deal with figuring out what the space
1388	* looks like instead of lots of conditions here.	1386	* looks like instead of lots of conditions here.
1389	* makes things faster, and effectively the same result.	1387	* makes things faster, and effectively the same result.
1390	*/	1388	*/
…		…
1397	*/	1395	*/
1398	if (!(flag & INS_ON_TOP)	1396	if (!(flag & INS_ON_TOP)
1399	&& ms.flags () & P_BLOCKSVIEW	1397	&& ms.flags () & P_BLOCKSVIEW
1400	&& (op->face && !faces [op->face].visibility))	1398	&& (op->face && !faces [op->face].visibility))
1401	{	1399	{
		1400	object *last;
		1401
1402	for (last = top; last != floor; last = last->below)	1402	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1404	break;	1404	break;
1405		1405
1406	/* Check to see if we found the object that blocks view,	1406	/* Check to see if we found the object that blocks view,
…		…
1414	} /* If objects on this space */	1414	} /* If objects on this space */
1415		1415
1416	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1417	top = floor;	1417	top = floor;
1418		1418
1419	/* 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
1420	*/
1421
1422	/* First object on this space */
1423	if (!top)	1420	if (!top)
1424	{	1421	{
		1422	op->below = 0;
1425	op->above = ms.bot;	1423	op->above = ms.bot;
1426
1427	if (op->above)
1428	op->above->below = op;
1429
1430	op->below = 0;
1431	ms.bot = op;	1424	ms.bot = op;
		1425
		1426	*(op->above ? &op->above->below : &ms.top) = op;
1432	}	1427	}
1433	else	1428	else
1434	{ /* get inserted into the stack above top */	1429	{
1435	op->above = top->above;	1430	op->above = top->above;
1436
1437	if (op->above)
1438	op->above->below = op;	1431	top->above = op;
1439		1432
1440	op->below = top;	1433	op->below = top;
1441	top->above = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1442	}	1435	}
		1436	}
1443		1437
1444	if (!op->above)	1438	if (op->is_player ())
1445	ms.top = op;
1446	} /* else not INS_BELOW_ORIGINATOR */
1447
1448	if (op->type == PLAYER)
1449	{	1439	{
1450	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1451	++op->map->players;	1441	++op->map->players;
1452	op->map->touch ();	1442	op->map->touch ();
1453	}	1443	}
1454		1444
1455	op->map->dirty = true;	1445	op->map->dirty = true;
1456		1446
1457	if (object *pl = ms.player ())	1447	if (object *pl = ms.player ())
		1448	//TODO: the floorbox prev/next might need updating
1458	esrv_send_item (pl, op);	1449	//esrv_send_item (pl, op);
		1450	//TODO: update floorbox to preserve ordering
		1451	if (pl->contr->ns)
		1452	pl->contr->ns->floorbox_update ();
1459		1453
1460	/* If this object glows, it may affect lighting conditions that are	1454	/* If this object glows, it may affect lighting conditions that are
1461	* 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
1462	* 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
1463	* on the map will get recalculated. The players could very well	1457	* on the map will get recalculated. The players could very well
1464	* 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 -
1465	* this should get redone to only look for players within range,	1459	* this should get redone to only look for players within range,
1466	* or just updating the P_UPTODATE for spaces within this area	1460	* or just updating the P_UPTODATE for spaces within this area
1467	* of effect may be sufficient.	1461	* of effect may be sufficient.
1468	*/	1462	*/
1469	if (op->map->darkness && (op->glow_radius != 0))	1463	if (op->affects_los ())
		1464	{
		1465	op->ms ().invalidate ();
1470	update_all_los (op->map, op->x, op->y);	1466	update_all_los (op->map, op->x, op->y);
		1467	}
1471		1468
1472	/* updates flags (blocked, alive, no magic, etc) for this map space */	1469	/* updates flags (blocked, alive, no magic, etc) for this map space */
1473	update_object (op, UP_OBJ_INSERT);	1470	update_object (op, UP_OBJ_INSERT);
1474		1471
1475	INVOKE_OBJECT (INSERT, op);	1472	INVOKE_OBJECT (INSERT, op);
…		…
1482	* blocked() and wall() work properly), and these flags are updated by	1479	* blocked() and wall() work properly), and these flags are updated by
1483	* update_object().	1480	* update_object().
1484	*/	1481	*/
1485		1482
1486	/* if this is not the head or flag has been passed, don't check walk on status */	1483	/* if this is not the head or flag has been passed, don't check walk on status */
1487	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1484	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1488	{	1485	{
1489	if (check_move_on (op, originator))	1486	if (check_move_on (op, originator))
1490	return 0;	1487	return 0;
1491		1488
1492	/* If we are a multi part object, lets work our way through the check	1489	/* If we are a multi part object, lets work our way through the check
…		…
1503	/* this function inserts an object in the map, but if it	1500	/* this function inserts an object in the map, but if it
1504	* 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.
1505	* 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.
1506	*/	1503	*/
1507	void	1504	void
1508	replace_insert_ob_in_map (const char *arch_string, object *op)	1505	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1509	{	1506	{
1510	/* first search for itself and remove any old instances */	1507	/* first search for itself and remove any old instances */
1511		1508
1512	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1513	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1510	if (tmp->arch->archname == archname) /* same archetype */
1514	tmp->destroy (1);	1511	tmp->destroy ();
1515		1512
1516	object *tmp = arch_to_object (archetype::find (arch_string));	1513	object *tmp = arch_to_object (archetype::find (archname));
1517		1514
1518	tmp->x = op->x;	1515	tmp->x = op->x;
1519	tmp->y = op->y;	1516	tmp->y = op->y;
1520		1517
1521	insert_ob_in_map (tmp, op->map, op, 0);	1518	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1543	if (!nr)	1540	if (!nr)
1544	return true;	1541	return true;
1545		1542
1546	nr = min (nr, nrof);	1543	nr = min (nr, nrof);
1547		1544
		1545	if (nrof > nr)
		1546	{
1548	nrof -= nr;	1547	nrof -= nr;
1549
1550	if (nrof)
1551	{
1552	adjust_weight (env, -weight * nr); // carrying == 0	1548	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1553		1549
1554	if (object *pl = visible_to ())	1550	if (object *pl = visible_to ())
1555	esrv_update_item (UPD_NROF, pl, this);	1551	esrv_update_item (UPD_NROF, pl, this);
1556		1552
1557	return true;	1553	return true;
1558	}	1554	}
1559	else	1555	else
1560	{	1556	{
1561	destroy (1);	1557	destroy ();
1562	return false;	1558	return false;
1563	}	1559	}
1564	}	1560	}
1565		1561
1566	/*	1562	/*
…		…
1583	}	1579	}
1584	else	1580	else
1585	{	1581	{
1586	decrease (nr);	1582	decrease (nr);
1587		1583
1588	object *op = object_create_clone (this);	1584	object *op = deep_clone ();
1589	op->nrof = nr;	1585	op->nrof = nr;
1590	return op;	1586	return op;
1591	}	1587	}
1592	}	1588	}
1593		1589
…		…
1643	if (object *pl = tmp->visible_to ())	1639	if (object *pl = tmp->visible_to ())
1644	esrv_update_item (UPD_NROF, pl, tmp);	1640	esrv_update_item (UPD_NROF, pl, tmp);
1645		1641
1646	adjust_weight (this, op->total_weight ());	1642	adjust_weight (this, op->total_weight ());
1647		1643
1648	op->destroy (1);	1644	op->destroy ();
1649	op = tmp;	1645	op = tmp;
1650	goto inserted;	1646	goto inserted;
1651	}	1647	}
1652		1648
1653	op->owner = 0; // it's his/hers now. period.	1649	op->owner = 0; // it's his/hers now. period.
…		…
1671		1667
1672	adjust_weight (this, op->total_weight ());	1668	adjust_weight (this, op->total_weight ());
1673		1669
1674	inserted:	1670	inserted:
1675	/* 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 */
1676	if (op->glow_radius && map && map->darkness)	1672	if (op->glow_radius && is_on_map ())
		1673	{
		1674	update_stats ();
1677	update_all_los (map, x, y);	1675	update_all_los (map, x, y);
1678		1676	}
		1677	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1679	// if this is a player's inventory, update stats	1678	// if this is a player's inventory, update stats
1680	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1681	update_stats ();	1679	update_stats ();
1682		1680
1683	INVOKE_OBJECT (INSERT, this);	1681	INVOKE_OBJECT (INSERT, this);
1684		1682
1685	return op;	1683	return op;
…		…
1706	* on top.	1704	* on top.
1707	*/	1705	*/
1708	int	1706	int
1709	check_move_on (object *op, object *originator)	1707	check_move_on (object *op, object *originator)
1710	{	1708	{
		1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1710	return 0;
		1711
1711	object *tmp;	1712	object *tmp;
1712	maptile *m = op->map;	1713	maptile *m = op->map;
1713	int x = op->x, y = op->y;	1714	int x = op->x, y = op->y;
1714		1715
1715	MoveType move_on, move_slow, move_block;	1716	mapspace &ms = m->at (x, y);
1716		1717
1717	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1718	ms.update ();
1718	return 0;
1719		1719
1720	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1720	MoveType move_on = ms.move_on;
1721	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1721	MoveType move_slow = ms.move_slow;
1722	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1722	MoveType move_block = ms.move_block;
1723		1723
1724	/* if nothing on this space will slow op down or be applied,	1724	/* if nothing on this space will slow op down or be applied,
1725	* no need to do checking below. have to make sure move_type	1725	* no need to do checking below. have to make sure move_type
1726	* is set, as lots of objects don't have it set - we treat that	1726	* is set, as lots of objects don't have it set - we treat that
1727	* as walking.	1727	* as walking.
…		…
1738	return 0;	1738	return 0;
1739		1739
1740	/* The objects have to be checked from top to bottom.	1740	/* The objects have to be checked from top to bottom.
1741	* Hence, we first go to the top:	1741	* Hence, we first go to the top:
1742	*/	1742	*/
1743		1743	for (object *next, *tmp = ms.top; tmp; tmp = next)
1744	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1745	{
1746	/* Trim the search when we find the first other spell effect
1747	* this helps performance so that if a space has 50 spell objects,
1748	* we don't need to check all of them.
1749	*/
1750	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1751	break;
1752	}	1744	{
		1745	next = tmp->below;
1753		1746
1754	for (; tmp; tmp = tmp->below)
1755	{
1756	if (tmp == op)	1747	if (tmp == op)
1757	continue; /* Can't apply yourself */	1748	continue; /* Can't apply yourself */
1758		1749
1759	/* Check to see if one of the movement types should be slowed down.	1750	/* Check to see if one of the movement types should be slowed down.
1760	* Second check makes sure that the movement types not being slowed	1751	* Second check makes sure that the movement types not being slowed
…		…
1765	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1756	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1766	{	1757	{
1767	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1768	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1759	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1769	{	1760	{
1770
1771	float
1772	diff = tmp->move_slow_penalty * fabs (op->speed);	1761	float diff = tmp->move_slow_penalty * fabs (op->speed);
1773		1762
1774	if (op->type == PLAYER)	1763	if (op->is_player ())
1775	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1764	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1776	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1765	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1777	diff /= 4.0;	1766	diff /= 4.0;
1778		1767
1779	op->speed_left -= diff;	1768	op->speed_left -= diff;
1780	}	1769	}
1781	}	1770	}
…		…
1814	LOG (llevError, "Present_arch called outside map.\n");	1803	LOG (llevError, "Present_arch called outside map.\n");
1815	return NULL;	1804	return NULL;
1816	}	1805	}
1817		1806
1818	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1807	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1819	if (tmp->arch == at)	1808	if (tmp->arch->archname == at->archname)
1820	return tmp;	1809	return tmp;
1821		1810
1822	return NULL;	1811	return NULL;
1823	}	1812	}
1824		1813
…		…
1888	* The first matching object is returned, or NULL if none.	1877	* The first matching object is returned, or NULL if none.
1889	*/	1878	*/
1890	object *	1879	object *
1891	present_arch_in_ob (const archetype *at, const object *op)	1880	present_arch_in_ob (const archetype *at, const object *op)
1892	{	1881	{
1893	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1882	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1894	if (tmp->arch == at)	1883	if (tmp->arch->archname == at->archname)
1895	return tmp;	1884	return tmp;
1896		1885
1897	return NULL;	1886	return NULL;
1898	}	1887	}
1899		1888
…		…
1987	* head of the object should correspond for the entire object.	1976	* head of the object should correspond for the entire object.
1988	*/	1977	*/
1989	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1978	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1990	continue;	1979	continue;
1991		1980
1992	if (ob->blocked (m, pos.x, pos.y))	1981	if (ob->blocked (pos.m, pos.x, pos.y))
1993	continue;	1982	continue;
1994		1983
1995	altern [index++] = i;	1984	altern [index++] = i;
1996	}	1985	}
1997		1986
…		…
2065	* there is capable of.	2054	* there is capable of.
2066	*/	2055	*/
2067	int	2056	int
2068	find_dir (maptile *m, int x, int y, object *exclude)	2057	find_dir (maptile *m, int x, int y, object *exclude)
2069	{	2058	{
2070	int i, max = SIZEOFFREE, mflags;	2059	int max = SIZEOFFREE, mflags;
2071
2072	sint16 nx, ny;
2073	object *tmp;
2074	maptile *mp;
2075
2076	MoveType blocked, move_type;	2060	MoveType move_type;
2077		2061
2078	if (exclude && exclude->head_ () != exclude)	2062	if (exclude && exclude->head_ () != exclude)
2079	{	2063	{
2080	exclude = exclude->head;	2064	exclude = exclude->head;
2081	move_type = exclude->move_type;	2065	move_type = exclude->move_type;
…		…
2084	{	2068	{
2085	/* If we don't have anything, presume it can use all movement types. */	2069	/* If we don't have anything, presume it can use all movement types. */
2086	move_type = MOVE_ALL;	2070	move_type = MOVE_ALL;
2087	}	2071	}
2088		2072
2089	for (i = 1; i < max; i++)	2073	for (int i = 1; i < max; i++)
2090	{	2074	{
2091	mp = m;	2075	mapxy pos (m, x, y);
2092	nx = x + freearr_x[i];	2076	pos.move (i);
2093	ny = y + freearr_y[i];
2094		2077
2095	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2078	if (!pos.normalise ())
2096
2097	if (mflags & P_OUT_OF_MAP)
2098	max = maxfree[i];	2079	max = maxfree[i];
2099	else	2080	else
2100	{	2081	{
2101	mapspace &ms = mp->at (nx, ny);	2082	mapspace &ms = *pos;
2102		2083
2103	blocked = ms.move_block;
2104
2105	if ((move_type & blocked) == move_type)	2084	if ((move_type & ms.move_block) == move_type)
2106	max = maxfree[i];	2085	max = maxfree [i];
2107	else if (mflags & P_IS_ALIVE)	2086	else if (ms.flags () & P_IS_ALIVE)
2108	{	2087	{
2109	for (tmp = ms.bot; tmp; tmp = tmp->above)	2088	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2110	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2089	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2111	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2090	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2112	break;
2113
2114	if (tmp)
2115	return freedir[i];	2091	return freedir [i];
2116	}	2092	}
2117	}	2093	}
2118	}	2094	}
2119		2095
2120	return 0;	2096	return 0;
…		…
2195	* This basically means that if direction is 15, then it could either go	2171	* This basically means that if direction is 15, then it could either go
2196	* direction 4, 14, or 16 to get back to where we are.	2172	* direction 4, 14, or 16 to get back to where we are.
2197	* Moved from spell_util.c to object.c with the other related direction	2173	* Moved from spell_util.c to object.c with the other related direction
2198	* functions.	2174	* functions.
2199	*/	2175	*/
2200	int reduction_dir[SIZEOFFREE][3] = {	2176	const int reduction_dir[SIZEOFFREE][3] = {
2201	{0, 0, 0}, /* 0 */	2177	{0, 0, 0}, /* 0 */
2202	{0, 0, 0}, /* 1 */	2178	{0, 0, 0}, /* 1 */
2203	{0, 0, 0}, /* 2 */	2179	{0, 0, 0}, /* 2 */
2204	{0, 0, 0}, /* 3 */	2180	{0, 0, 0}, /* 3 */
2205	{0, 0, 0}, /* 4 */	2181	{0, 0, 0}, /* 4 */
…		…
2301	int	2277	int
2302	can_pick (const object *who, const object *item)	2278	can_pick (const object *who, const object *item)
2303	{	2279	{
2304	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2280	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2305	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2281	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2306	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2282	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2307	}	2283	}
2308		2284
2309	/*	2285	/*
2310	* create clone from object to another	2286	* create clone from object to another
2311	*/	2287	*/
2312	object *	2288	object *
2313	object_create_clone (object *asrc)	2289	object::deep_clone ()
2314	{	2290	{
2315	object *dst = 0, *tmp, *src, *prev, *item;	2291	assert (("deep_clone called on non-head object", is_head ()));
2316		2292
2317	if (!asrc)	2293	object *dst = clone ();
2318	return 0;
2319		2294
2320	src = asrc->head_ ();	2295	object *prev = dst;
2321
2322	prev = 0;
2323	for (object *part = src; part; part = part->more)	2296	for (object *part = this->more; part; part = part->more)
2324	{	2297	{
2325	tmp = part->clone ();	2298	object *tmp = part->clone ();
2326	tmp->x -= src->x;
2327	tmp->y -= src->y;
2328
2329	if (!part->head)
2330	{
2331	dst = tmp;
2332	tmp->head = 0;
2333	}
2334	else
2335	tmp->head = dst;	2299	tmp->head = dst;
2336
2337	tmp->more = 0;
2338
2339	if (prev)
2340	prev->more = tmp;	2300	prev->more = tmp;
2341
2342	prev = tmp;	2301	prev = tmp;
2343	}	2302	}
2344		2303
2345	for (item = src->inv; item; item = item->below)	2304	for (object *item = inv; item; item = item->below)
2346	insert_ob_in_ob (object_create_clone (item), dst);	2305	insert_ob_in_ob (item->deep_clone (), dst);
2347		2306
2348	return dst;	2307	return dst;
2349	}	2308	}
2350		2309
2351	/* This returns the first object in who's inventory that	2310	/* This returns the first object in who's inventory that
…		…
2360	return tmp;	2319	return tmp;
2361		2320
2362	return 0;	2321	return 0;
2363	}	2322	}
2364		2323
2365	/* If ob has a field named key, return the link from the list,	2324	shstr_tmp
2366	* otherwise return NULL.	2325	object::kv_get (shstr_tmp key) const
2367	*
2368	* key must be a passed in shared string - otherwise, this won't
2369	* do the desired thing.
2370	*/
2371	key_value *
2372	get_ob_key_link (const object *ob, const char *key)
2373	{	2326	{
2374	for (key_value *link = ob->key_values; link; link = link->next)	2327	for (key_value *kv = key_values; kv; kv = kv->next)
2375	if (link->key == key)	2328	if (kv->key == key)
2376	return link;
2377
2378	return 0;
2379	}
2380
2381	/*
2382	* Returns the value of op has an extra_field for key, or NULL.
2383	*
2384	* The argument doesn't need to be a shared string.
2385	*
2386	* The returned string is shared.
2387	*/
2388	const char *
2389	get_ob_key_value (const object *op, const char *const key)
2390	{
2391	key_value *link;
2392	shstr_cmp canonical_key (key);
2393
2394	if (!canonical_key)
2395	{
2396	/* 1. There being a field named key on any object
2397	* implies there'd be a shared string to find.
2398	* 2. Since there isn't, no object has this field.
2399	* 3. Therefore, *this* object doesn't have this field.
2400	*/
2401	return 0;
2402	}
2403
2404	/* This is copied from get_ob_key_link() above -
2405	* only 4 lines, and saves the function call overhead.
2406	*/
2407	for (link = op->key_values; link; link = link->next)
2408	if (link->key == canonical_key)
2409	return link->value;	2329	return kv->value;
2410		2330
2411	return 0;	2331	return shstr ();
2412	}	2332	}
2413		2333
2414	/*	2334	void
2415	* Updates the canonical_key in op to value.	2335	object::kv_set (shstr_tmp key, shstr_tmp value)
2416	*
2417	* canonical_key is a shared string (value doesn't have to be).
2418	*
2419	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2420	* keys.
2421	*
2422	* Returns TRUE on success.
2423	*/
2424	int
2425	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2426	{	2336	{
2427	key_value *field = NULL, *last = NULL;	2337	for (key_value *kv = key_values; kv; kv = kv->next)
2428		2338	if (kv->key == key)
2429	for (field = op->key_values; field != NULL; field = field->next)
2430	{
2431	if (field->key != canonical_key)
2432	{	2339	{
2433	last = field;	2340	kv->value = value;
2434	continue;	2341	return;
2435	}	2342	}
2436		2343
2437	if (value)	2344	key_value *kv = new key_value;
2438	field->value = value;	2345
2439	else	2346	kv->next = key_values;
		2347	kv->key = key;
		2348	kv->value = value;
		2349
		2350	key_values = kv;
		2351	}
		2352
		2353	void
		2354	object::kv_del (shstr_tmp key)
		2355	{
		2356	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2357	if ((*kvp)->key == key)
2440	{	2358	{
2441	/* Basically, if the archetype has this key set,	2359	key_value *kv = *kvp;
2442	* we need to store the null value so when we save	2360	*kvp = (*kvp)->next;
2443	* it, we save the empty value so that when we load,	2361	delete kv;
2444	* we get this value back again.	2362	return;
2445	*/
2446	if (get_ob_key_link (op->arch, canonical_key))
2447	field->value = 0;
2448	else
2449	{
2450	if (last)
2451	last->next = field->next;
2452	else
2453	op->key_values = field->next;
2454
2455	delete field;
2456	}
2457	}	2363	}
2458	return TRUE;
2459	}
2460	/* IF we get here, key doesn't exist */
2461
2462	/* No field, we'll have to add it. */
2463
2464	if (!add_key)
2465	return FALSE;
2466
2467	/* There isn't any good reason to store a null
2468	* value in the key/value list. If the archetype has
2469	* this key, then we should also have it, so shouldn't
2470	* be here. If user wants to store empty strings,
2471	* should pass in ""
2472	*/
2473	if (value == NULL)
2474	return TRUE;
2475
2476	field = new key_value;
2477
2478	field->key = canonical_key;
2479	field->value = value;
2480	/* Usual prepend-addition. */
2481	field->next = op->key_values;
2482	op->key_values = field;
2483
2484	return TRUE;
2485	}
2486
2487	/*
2488	* Updates the key in op to value.
2489	*
2490	* If add_key is FALSE, this will only update existing keys,
2491	* and not add new ones.
2492	* In general, should be little reason FALSE is ever passed in for add_key
2493	*
2494	* Returns TRUE on success.
2495	*/
2496	int
2497	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2498	{
2499	shstr key_ (key);
2500
2501	return set_ob_key_value_s (op, key_, value, add_key);
2502	}	2364	}
2503		2365
2504	object::depth_iterator::depth_iterator (object *container)	2366	object::depth_iterator::depth_iterator (object *container)
2505	: iterator_base (container)	2367	: iterator_base (container)
2506	{	2368	{
…		…
2556	{	2418	{
2557	char flagdesc[512];	2419	char flagdesc[512];
2558	char info2[256 * 4];	2420	char info2[256 * 4];
2559	char *p = info;	2421	char *p = info;
2560		2422
2561	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2423	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2562	count,	2424	count,
2563	uuid.c_str (),	2425	uuid.c_str (),
2564	&name,	2426	&name,
2565	title ? "\",title:\"" : "",	2427	title ? ",title:\"" : "",
2566	title ? (const char *)title : "",	2428	title ? (const char *)title : "",
		2429	title ? "\"" : "",
2567	flag_desc (flagdesc, 512), type);	2430	flag_desc (flagdesc, 512), type);
2568		2431
2569	if (!flag[FLAG_REMOVED] && env)	2432	if (!flag[FLAG_REMOVED] && env)
2570	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2433	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2571		2434
…		…
2604	object::open_container (object *new_container)	2467	object::open_container (object *new_container)
2605	{	2468	{
2606	if (container == new_container)	2469	if (container == new_container)
2607	return;	2470	return;
2608		2471
2609	if (object *old_container = container)	2472	object *old_container = container;
		2473
		2474	if (old_container)
2610	{	2475	{
2611	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2476	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2612	return;	2477	return;
2613		2478
2614	#if 0	2479	#if 0
…		…
2616	if (object *closer = old_container->inv)	2481	if (object *closer = old_container->inv)
2617	if (closer->type == CLOSE_CON)	2482	if (closer->type == CLOSE_CON)
2618	closer->destroy ();	2483	closer->destroy ();
2619	#endif	2484	#endif
2620		2485
		2486	// make sure the container is available
		2487	esrv_send_item (this, old_container);
		2488
2621	old_container->flag [FLAG_APPLIED] = false;	2489	old_container->flag [FLAG_APPLIED] = false;
2622	container = 0;	2490	container = 0;
2623		2491
		2492	// client needs item update to make it work, client bug requires this to be separate
2624	esrv_update_item (UPD_FLAGS, this, old_container);	2493	esrv_update_item (UPD_FLAGS, this, old_container);
		2494
2625	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2495	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2626	play_sound (sound_find ("chest_close"));	2496	play_sound (sound_find ("chest_close"));
2627	}	2497	}
2628		2498
2629	if (new_container)	2499	if (new_container)
2630	{	2500	{
…		…
2640	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2510	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2641	new_container->insert (closer);	2511	new_container->insert (closer);
2642	}	2512	}
2643	#endif	2513	#endif
2644		2514
2645	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2515	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
		2516
		2517	// make sure the container is available, client bug requires this to be separate
		2518	esrv_send_item (this, new_container);
2646		2519
2647	new_container->flag [FLAG_APPLIED] = true;	2520	new_container->flag [FLAG_APPLIED] = true;
2648	container = new_container;	2521	container = new_container;
2649		2522
		2523	// client needs flag change
2650	esrv_update_item (UPD_FLAGS, this, new_container);	2524	esrv_update_item (UPD_FLAGS, this, new_container);
2651	esrv_send_inventory (this, new_container);	2525	esrv_send_inventory (this, new_container);
2652	play_sound (sound_find ("chest_open"));	2526	play_sound (sound_find ("chest_open"));
2653	}	2527	}
		2528	// else if (!old_container->env && contr && contr->ns)
		2529	// contr->ns->floorbox_reset ();
2654	}	2530	}
2655		2531
2656	object *	2532	object *
2657	object::force_find (const shstr name)	2533	object::force_find (shstr_tmp name)
2658	{	2534	{
2659	/* cycle through his inventory to look for the MARK we want to	2535	/* cycle through his inventory to look for the MARK we want to
2660	* place	2536	* place
2661	*/	2537	*/
2662	for (object *tmp = inv; tmp; tmp = tmp->below)	2538	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2664	return splay (tmp);	2540	return splay (tmp);
2665		2541
2666	return 0;	2542	return 0;
2667	}	2543	}
2668		2544
2669	void	2545	object *
2670	object::force_add (const shstr name, int duration)	2546	object::force_add (shstr_tmp name, int duration)
2671	{	2547	{
2672	if (object *force = force_find (name))	2548	if (object *force = force_find (name))
2673	force->destroy ();	2549	force->destroy ();
2674		2550
2675	object *force = get_archetype (FORCE_NAME);	2551	object *force = get_archetype (FORCE_NAME);
…		…
2680		2556
2681	force->set_speed (duration ? 1.f / duration : 0.f);	2557	force->set_speed (duration ? 1.f / duration : 0.f);
2682	force->flag [FLAG_IS_USED_UP] = true;	2558	force->flag [FLAG_IS_USED_UP] = true;
2683	force->flag [FLAG_APPLIED] = true;	2559	force->flag [FLAG_APPLIED] = true;
2684		2560
2685	insert (force);	2561	return insert (force);
2686	}	2562	}
2687		2563
2688	void	2564	void
2689	object::play_sound (faceidx sound)	2565	object::play_sound (faceidx sound) const
2690	{	2566	{
2691	if (!sound)	2567	if (!sound)
2692	return;	2568	return;
2693		2569
2694	if (flag [FLAG_REMOVED])	2570	if (is_on_map ())
		2571	map->play_sound (sound, x, y);
		2572	else if (object *pl = in_player ())
		2573	pl->contr->play_sound (sound);
		2574	}
		2575
		2576	void
		2577	object::say_msg (const char *msg) const
		2578	{
		2579	if (is_on_map ())
		2580	map->say_msg (msg, x, y);
		2581	else if (object *pl = in_player ())
		2582	pl->contr->play_sound (sound);
		2583	}
		2584
		2585	void
		2586	object::make_noise ()
		2587	{
		2588	// we do not model noise in the map, so instead put
		2589	// a temporary light into the noise source
		2590	// could use the map instead, but that's less reliable for our
		2591	// goal, which is to make invisibility a bit harder to exploit
		2592
		2593	// currently only works sensibly for players
		2594	if (!is_player ())
2695	return;	2595	return;
2696		2596
2697	if (env)	2597	// find old force, or create new one
2698	{	2598	object *force = force_find (shstr_noise_force);
2699	if (object *pl = in_player ())	2599
2700	pl->contr->play_sound (sound);	2600	if (force)
2701	}	2601	force->speed_left = -1.f; // patch old speed up
2702	else	2602	else
2703	map->play_sound (sound, x, y);	2603	{
2704	}	2604	force = archetype::get (shstr_noise_force);
2705		2605
		2606	force->slaying = shstr_noise_force;
		2607	force->stats.food = 1;
		2608	force->speed_left = -1.f;
		2609
		2610	force->set_speed (1.f / 4.f);
		2611	force->flag [FLAG_IS_USED_UP] = true;
		2612	force->flag [FLAG_APPLIED] = true;
		2613
		2614	insert (force);
		2615	}
		2616	}
		2617

Diff Legend

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