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.220 by root, Thu Apr 24 00:30:52 2008 UTC vs.
Revision 1.290 by sf-marcmagus, Sun Oct 11 05:43:35 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
…		…
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)
363	if (!pl->container || this == pl->container)	348	|| this == pl->container)
364	return pl;	349	return pl;
365	}	350	}
366	}	351	}
367		352
368	return 0;	353	return 0;
369	}	354	}
370		355
371	// adjust weight per container type ("of holding")	356	// adjust weight per container type ("of holding")
372	static sint32	357	static sint32
373	weight_adjust (object *op, sint32 weight)	358	weight_adjust_for (object *op, sint32 weight)
374	{	359	{
375	return op->type == CONTAINER	360	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	362	: weight;
378	}	363	}
…		…
384	static void	369	static void
385	adjust_weight (object *op, sint32 weight)	370	adjust_weight (object *op, sint32 weight)
386	{	371	{
387	while (op)	372	while (op)
388	{	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
389	weight = weight_adjust (op, weight);	376	weight = weight_adjust_for (op, op->carrying)
		377	- weight_adjust_for (op, op->carrying - weight);
390		378
391	if (!weight)	379	if (!weight)
392	return;	380	return;
393		381
394	op->carrying += weight;	382	op->carrying += weight;
…		…
417	op->update_weight ();	405	op->update_weight ();
418		406
419	sum += op->total_weight ();	407	sum += op->total_weight ();
420	}	408	}
421		409
422	sum = weight_adjust (this, sum);	410	sum = weight_adjust_for (this, sum);
423		411
424	if (sum != carrying)	412	if (sum != carrying)
425	{	413	{
426	carrying = sum;	414	carrying = sum;
427		415
…		…
441	return strdup ("[NULLOBJ]");	429	return strdup ("[NULLOBJ]");
442		430
443	object_freezer freezer;	431	object_freezer freezer;
444	op->write (freezer);	432	op->write (freezer);
445	return freezer.as_string ();	433	return freezer.as_string ();
		434	}
		435
		436	char *
		437	object::as_string ()
		438	{
		439	return dump_object (this);
446	}	440	}
447		441
448	/*	442	/*
449	* get_nearest_part(multi-object, object 2) returns the part of the	443	* get_nearest_part(multi-object, object 2) returns the part of the
450	* multi-object 1 which is closest to the second object.	444	* multi-object 1 which is closest to the second object.
…		…
489	*/	483	*/
490	object *	484	object *
491	find_object_name (const char *str)	485	find_object_name (const char *str)
492	{	486	{
493	shstr_cmp str_ (str);	487	shstr_cmp str_ (str);
494	object *op;
495		488
		489	if (str_)
496	for_all_objects (op)	490	for_all_objects (op)
497	if (op->name == str_)	491	if (op->name == str_)
498	break;	492	return op;
499		493
500	return op;	494	return 0;
501	}	495	}
502		496
503	/*	497	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	498	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	499	* skill and experience objects.
…		…
567	update_stats ();	561	update_stats ();
568		562
569	new_draw_info_format (NDI_UNIQUE, 0, this,	563	new_draw_info_format (NDI_UNIQUE, 0, this,
570	"You try to balance all your items at once, "	564	"You try to balance all your items at once, "
571	"but the %s is just too much for your body. "	565	"but the %s is just too much for your body. "
572	"[You need to unapply some items first.]", &ob->name);	566	"[You need to unapply some items first - use the 'body' command to see "
		567	"how many items you cna wera on a specific body part.]", &ob->name);
573	return false;	568	return false;
574	}	569	}
575		570
576	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	571	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
577	}	572	}
…		…
603	}	598	}
604		599
605	op->key_values = 0;	600	op->key_values = 0;
606	}	601	}
607		602
608	object &	603	/*
609	object::operator =(const object &src)	604	* copy_to first frees everything allocated by the dst object,
		605	* and then copies the contents of itself into the second
		606	* object, allocating what needs to be allocated. Basically, any
		607	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		608	* if the first object is freed, the pointers in the new object
		609	* will point at garbage.
		610	*/
		611	void
		612	object::copy_to (object *dst)
610	{	613	{
611	bool is_freed = flag [FLAG_FREED];	614	dst->remove ();
612	bool is_removed = flag [FLAG_REMOVED];
613
614	*(object_copy *)this = src;	615	*(object_copy *)dst = *this;
615
616	flag [FLAG_FREED] = is_freed;
617	flag [FLAG_REMOVED] = is_removed;	616	dst->flag [FLAG_REMOVED] = true;
618		617
619	/* Copy over key_values, if any. */	618	/* Copy over key_values, if any. */
620	if (src.key_values)	619	if (key_values)
621	{	620	{
622	key_value *tail = 0;	621	key_value *tail = 0;
623	key_values = 0;	622	dst->key_values = 0;
624		623
625	for (key_value *i = src.key_values; i; i = i->next)	624	for (key_value *i = key_values; i; i = i->next)
626	{	625	{
627	key_value *new_link = new key_value;	626	key_value *new_link = new key_value;
628		627
629	new_link->next = 0;	628	new_link->next = 0;
630	new_link->key = i->key;	629	new_link->key = i->key;
631	new_link->value = i->value;	630	new_link->value = i->value;
632		631
633	/* Try and be clever here, too. */	632	/* Try and be clever here, too. */
634	if (!key_values)	633	if (!dst->key_values)
635	{	634	{
636	key_values = new_link;	635	dst->key_values = new_link;
637	tail = new_link;	636	tail = new_link;
638	}	637	}
639	else	638	else
640	{	639	{
641	tail->next = new_link;	640	tail->next = new_link;
642	tail = new_link;	641	tail = new_link;
643	}	642	}
644	}	643	}
645	}	644	}
646	}
647
648	/*
649	* copy_to first frees everything allocated by the dst object,
650	* and then copies the contents of itself into the second
651	* object, allocating what needs to be allocated. Basically, any
652	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
653	* if the first object is freed, the pointers in the new object
654	* will point at garbage.
655	*/
656	void
657	object::copy_to (object *dst)
658	{
659	*dst = *this;
660		645
661	if (speed < 0)	646	if (speed < 0)
662	dst->speed_left -= rndm ();	647	dst->speed_left -= rndm ();
663		648
664	dst->set_speed (dst->speed);	649	dst->activate ();
665	}	650	}
666		651
667	void	652	void
668	object::instantiate ()	653	object::instantiate ()
669	{	654	{
…		…
686	object *	671	object *
687	object::clone ()	672	object::clone ()
688	{	673	{
689	object *neu = create ();	674	object *neu = create ();
690	copy_to (neu);	675	copy_to (neu);
		676	neu->map = map; // not copied by copy_to
691	return neu;	677	return neu;
692	}	678	}
693		679
694	/*	680	/*
695	* If an object with the IS_TURNABLE() flag needs to be turned due	681	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
746	* UP_OBJ_FACE: only the objects face has changed.	732	* UP_OBJ_FACE: only the objects face has changed.
747	*/	733	*/
748	void	734	void
749	update_object (object *op, int action)	735	update_object (object *op, int action)
750	{	736	{
751	if (op == NULL)	737	if (!op)
752	{	738	{
753	/* this should never happen */	739	/* this should never happen */
754	LOG (llevDebug, "update_object() called for NULL object.\n");	740	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
755	return;	741	return;
756	}	742	}
757		743
758	if (op->env)	744	if (!op->is_on_map ())
759	{	745	{
760	/* Animation is currently handled by client, so nothing	746	/* Animation is currently handled by client, so nothing
761	* to do in this case.	747	* to do in this case.
762	*/	748	*/
763	return;	749	return;
764	}	750	}
765
766	/* If the map is saving, don't do anything as everything is
767	* going to get freed anyways.
768	*/
769	if (!op->map || op->map->in_memory == MAP_SAVING)
770	return;
771		751
772	/* make sure the object is within map boundaries */	752	/* make sure the object is within map boundaries */
773	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	753	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
774	{	754	{
775	LOG (llevError, "update_object() called for object out of map!\n");	755	LOG (llevError, "update_object() called for object out of map!\n");
…		…
786	else if (action == UP_OBJ_INSERT)	766	else if (action == UP_OBJ_INSERT)
787	{	767	{
788	// this is likely overkill, TODO: revisit (schmorp)	768	// this is likely overkill, TODO: revisit (schmorp)
789	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	769	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
790	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	770	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
791	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	771	|| (op->is_player () && !(m.flags_ & P_PLAYER))
792	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	772	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
793	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	773	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
794	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	774	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
795	|| (m.move_on | op->move_on ) != m.move_on	775	|| (m.move_on | op->move_on ) != m.move_on
796	|| (m.move_off | op->move_off ) != m.move_off	776	|| (m.move_off | op->move_off ) != m.move_off
797	|| (m.move_slow | op->move_slow) != m.move_slow	777	|| (m.move_slow | op->move_slow) != m.move_slow
798	/* This isn't perfect, but I don't expect a lot of objects to	778	/* This isn't perfect, but I don't expect a lot of objects to
799	* to have move_allow right now.	779	* have move_allow right now.
800	*/	780	*/
801	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	781	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
802	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	782	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
803	m.flags_ = 0;	783	m.invalidate ();
804	}	784	}
805	/* if the object is being removed, we can't make intelligent	785	/* if the object is being removed, we can't make intelligent
806	* decisions, because remove_ob can't really pass the object	786	* decisions, because remove_ob can't really pass the object
807	* that is being removed.	787	* that is being removed.
808	*/	788	*/
809	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	789	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
810	m.flags_ = 0;	790	m.invalidate ();
811	else if (action == UP_OBJ_FACE)	791	else if (action == UP_OBJ_FACE)
812	/* Nothing to do for that case */ ;	792	/* Nothing to do for that case */ ;
813	else	793	else
814	LOG (llevError, "update_object called with invalid action: %d\n", action);	794	LOG (llevError, "update_object called with invalid action: %d\n", action);
815		795
…		…
819		799
820	object::object ()	800	object::object ()
821	{	801	{
822	SET_FLAG (this, FLAG_REMOVED);	802	SET_FLAG (this, FLAG_REMOVED);
823		803
824	expmul = 1.0;	804	//expmul = 1.0; declared const for the time being
825	face = blank_face;	805	face = blank_face;
826	}	806	}
827		807
828	object::~object ()	808	object::~object ()
829	{	809	{
…		…
859	/* If already on active list, don't do anything */	839	/* If already on active list, don't do anything */
860	if (active)	840	if (active)
861	return;	841	return;
862		842
863	if (has_active_speed ())	843	if (has_active_speed ())
		844	{
		845	if (flag [FLAG_FREED])
		846	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		847
864	actives.insert (this);	848	actives.insert (this);
		849	}
865	}	850	}
866		851
867	void	852	void
868	object::activate_recursive ()	853	object::activate_recursive ()
869	{	854	{
…		…
930	* drop on that space.	915	* drop on that space.
931	*/	916	*/
932	if (!drop_to_ground	917	if (!drop_to_ground
933	|| !map	918	|| !map
934	|| map->in_memory != MAP_ACTIVE	919	|| map->in_memory != MAP_ACTIVE
935	|| map->nodrop	920	|| map->no_drop
936	|| ms ().move_block == MOVE_ALL)	921	|| ms ().move_block == MOVE_ALL)
937	{	922	{
938	while (inv)	923	while (inv)
939	{
940	inv->destroy_inv (false);
941	inv->destroy ();	924	inv->destroy ();
942	}
943	}	925	}
944	else	926	else
945	{ /* Put objects in inventory onto this space */	927	{ /* Put objects in inventory onto this space */
946	while (inv)	928	while (inv)
947	{	929	{
…		…
951	|| op->flag [FLAG_NO_DROP]	933	|| op->flag [FLAG_NO_DROP]
952	|| op->type == RUNE	934	|| op->type == RUNE
953	|| op->type == TRAP	935	|| op->type == TRAP
954	|| op->flag [FLAG_IS_A_TEMPLATE]	936	|| op->flag [FLAG_IS_A_TEMPLATE]
955	|| op->flag [FLAG_DESTROY_ON_DEATH])	937	|| op->flag [FLAG_DESTROY_ON_DEATH])
956	op->destroy (true);	938	op->destroy ();
957	else	939	else
958	map->insert (op, x, y);	940	map->insert (op, x, y);
959	}	941	}
960	}	942	}
961	}	943	}
…		…
965	object *op = new object;	947	object *op = new object;
966	op->link ();	948	op->link ();
967	return op;	949	return op;
968	}	950	}
969		951
		952	static struct freed_map : maptile
		953	{
		954	freed_map ()
		955	{
		956	path = "<freed objects map>";
		957	name = "/internal/freed_objects_map";
		958	width = 3;
		959	height = 3;
		960	no_drop = 1;
		961	no_reset = 1;
		962
		963	alloc ();
		964	in_memory = MAP_ACTIVE;
		965	}
		966
		967	~freed_map ()
		968	{
		969	destroy ();
		970	}
		971	} freed_map; // freed objects are moved here to avoid crashes
		972
970	void	973	void
971	object::do_destroy ()	974	object::do_destroy ()
972	{	975	{
973	if (flag [FLAG_IS_LINKED])	976	if (flag [FLAG_IS_LINKED])
974	remove_button_link (this);	977	remove_link ();
975		978
976	if (flag [FLAG_FRIENDLY])	979	if (flag [FLAG_FRIENDLY])
977	remove_friendly_object (this);	980	remove_friendly_object (this);
978		981
979	remove ();	982	remove ();
…		…
984	unlink ();	987	unlink ();
985		988
986	flag [FLAG_FREED] = 1;	989	flag [FLAG_FREED] = 1;
987		990
988	// hack to ensure that freed objects still have a valid map	991	// hack to ensure that freed objects still have a valid map
989	{
990	static maptile *freed_map; // freed objects are moved here to avoid crashes
991
992	if (!freed_map)
993	{
994	freed_map = new maptile;
995
996	freed_map->path = "<freed objects map>";
997	freed_map->name = "/internal/freed_objects_map";
998	freed_map->width = 3;
999	freed_map->height = 3;
1000	freed_map->nodrop = 1;
1001
1002	freed_map->alloc ();
1003	freed_map->in_memory = MAP_ACTIVE;
1004	}
1005
1006	map = freed_map;	992	map = &freed_map;
1007	x = 1;	993	x = 1;
1008	y = 1;	994	y = 1;
1009	}
1010		995
1011	if (more)	996	if (more)
1012	{	997	{
1013	more->destroy ();	998	more->destroy ();
1014	more = 0;	999	more = 0;
…		…
1022	attacked_by = 0;	1007	attacked_by = 0;
1023	current_weapon = 0;	1008	current_weapon = 0;
1024	}	1009	}
1025		1010
1026	void	1011	void
1027	object::destroy (bool destroy_inventory)	1012	object::destroy ()
1028	{	1013	{
1029	if (destroyed ())	1014	if (destroyed ())
1030	return;	1015	return;
1031		1016
1032	if (!is_head () && !head->destroyed ())	1017	if (!is_head () && !head->destroyed ())
1033	{	1018	{
1034	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1019	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1035	head->destroy (destroy_inventory);	1020	head->destroy ();
		1021	return;
1036	}	1022	}
1037		1023
1038	destroy_inv (!destroy_inventory);	1024	destroy_inv (false);
1039		1025
1040	if (is_head ())	1026	if (is_head ())
1041	if (sound_destroy)	1027	if (sound_destroy)
1042	play_sound (sound_destroy);	1028	play_sound (sound_destroy);
1043	else if (flag [FLAG_MONSTER])	1029	else if (flag [FLAG_MONSTER])
…		…
1073	* In this case, the object to be removed is in someones	1059	* In this case, the object to be removed is in someones
1074	* inventory.	1060	* inventory.
1075	*/	1061	*/
1076	if (env)	1062	if (env)
1077	{	1063	{
		1064	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1078	if (object *pl = visible_to ())	1065	if (object *pl = visible_to ())
1079	esrv_del_item (pl->contr, count);	1066	esrv_del_item (pl->contr, count);
		1067	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1080		1068
1081	adjust_weight (env, -total_weight ());	1069	adjust_weight (env, -total_weight ());
1082		1070
1083	*(above ? &above->below : &env->inv) = below;	1071	object *pl = in_player ();
1084
1085	if (below)
1086	below->above = above;
1087		1072
1088	/* we set up values so that it could be inserted into	1073	/* we set up values so that it could be inserted into
1089	* the map, but we don't actually do that - it is up	1074	* the map, but we don't actually do that - it is up
1090	* to the caller to decide what we want to do.	1075	* to the caller to decide what we want to do.
1091	*/	1076	*/
1092	map = env->map;	1077	map = env->map;
1093	x = env->x;	1078	x = env->x;
1094	y = env->y;	1079	y = env->y;
		1080
		1081	// make sure cmov optimisation is applicable
		1082	*(above ? &above->below : &env->inv) = below;
		1083	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1084
1095	above = 0;	1085	above = 0;
1096	below = 0;	1086	below = 0;
1097	env = 0;	1087	env = 0;
1098		1088
1099	/* NO_FIX_PLAYER is set when a great many changes are being	1089	/* NO_FIX_PLAYER is set when a great many changes are being
1100	* made to players inventory. If set, avoiding the call	1090	* made to players inventory. If set, avoiding the call
1101	* to save cpu time.	1091	* to save cpu time.
1102	*/	1092	*/
1103	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1093	if (pl)
		1094	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1095	{
1104	otmp->update_stats ();	1096	pl->update_stats ();
		1097
		1098	if (glow_radius && pl->is_on_map ())
		1099	update_all_los (pl->map, pl->x, pl->y);
		1100	}
1105	}	1101	}
1106	else if (map)	1102	else if (map)
1107	{	1103	{
1108	map->dirty = true;	1104	map->dirty = true;
1109	mapspace &ms = this->ms ();	1105	mapspace &ms = this->ms ();
1110		1106
1111	if (object *pl = ms.player ())	1107	if (object *pl = ms.player ())
1112	{	1108	{
1113	if (type == PLAYER) // this == pl(!)	1109	if (is_player ())
1114	{	1110	{
		1111	if (!flag [FLAG_WIZPASS])
		1112	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1113
1115	// leaving a spot always closes any open container on the ground	1114	// leaving a spot always closes any open container on the ground
1116	if (container && !container->env)	1115	if (container && !container->env)
1117	// this causes spurious floorbox updates, but it ensures	1116	// this causes spurious floorbox updates, but it ensures
1118	// that the CLOSE event is being sent.	1117	// that the CLOSE event is being sent.
1119	close_container ();	1118	close_container ();
…		…
1129		1128
1130	esrv_del_item (pl->contr, count);	1129	esrv_del_item (pl->contr, count);
1131	}	1130	}
1132		1131
1133	/* link the object above us */	1132	/* link the object above us */
1134	if (above)	1133	// re-link, make sure compiler can easily use cmove
1135	above->below = below;	1134	*(above ? &above->below : &ms.top) = below;
1136	else	1135	*(below ? &below->above : &ms.bot) = above;
1137	ms.top = below; /* we were top, set new top */
1138
1139	/* Relink the object below us, if there is one */
1140	if (below)
1141	below->above = above;
1142	else
1143	{
1144	/* Nothing below, which means we need to relink map object for this space
1145	* use translated coordinates in case some oddness with map tiling is
1146	* evident
1147	*/
1148	if (GET_MAP_OB (map, x, y) != this)
1149	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 ());
1150
1151	ms.bot = above; /* goes on above it. */
1152	}
1153		1136
1154	above = 0;	1137	above = 0;
1155	below = 0;	1138	below = 0;
		1139
		1140	ms.invalidate ();
1156		1141
1157	if (map->in_memory == MAP_SAVING)	1142	if (map->in_memory == MAP_SAVING)
1158	return;	1143	return;
1159		1144
1160	int check_walk_off = !flag [FLAG_NO_APPLY];	1145	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1167	* appropriately.	1152	* appropriately.
1168	*/	1153	*/
1169	pl->close_container ();	1154	pl->close_container ();
1170		1155
1171	//TODO: the floorbox prev/next might need updating	1156	//TODO: the floorbox prev/next might need updating
1172	esrv_del_item (pl->contr, count);	1157	//esrv_del_item (pl->contr, count);
		1158	//TODO: update floorbox to preserve ordering
		1159	if (pl->contr->ns)
		1160	pl->contr->ns->floorbox_update ();
1173	}	1161	}
1174		1162
1175	for (tmp = ms.bot; tmp; tmp = tmp->above)	1163	for (tmp = ms.bot; tmp; tmp = tmp->above)
1176	{	1164	{
1177	/* No point updating the players look faces if he is the object	1165	/* No point updating the players look faces if he is the object
…		…
1190	}	1178	}
1191		1179
1192	last = tmp;	1180	last = tmp;
1193	}	1181	}
1194		1182
1195	/* last == NULL if there are no objects on this space */	1183	if (affects_los ())
1196	//TODO: this makes little sense, why only update the topmost object?
1197	if (!last)
1198	map->at (x, y).flags_ = 0;
1199	else
1200	update_object (last, UP_OBJ_REMOVE);
1201
1202	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1203	update_all_los (map, x, y);	1184	update_all_los (map, x, y);
1204	}	1185	}
1205	}	1186	}
1206		1187
1207	/*	1188	/*
…		…
1231	esrv_update_item (UPD_NROF, pl, top);	1212	esrv_update_item (UPD_NROF, pl, top);
1232		1213
1233	op->weight = 0; // cancel the addition above	1214	op->weight = 0; // cancel the addition above
1234	op->carrying = 0; // must be 0 already	1215	op->carrying = 0; // must be 0 already
1235		1216
1236	op->destroy (1);	1217	op->destroy ();
1237		1218
1238	return top;	1219	return top;
1239	}	1220	}
1240		1221
1241	return 0;	1222	return 0;
…		…
1269	* job preparing multi-part monsters.	1250	* job preparing multi-part monsters.
1270	*/	1251	*/
1271	object *	1252	object *
1272	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1253	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1273	{	1254	{
		1255	op->remove ();
		1256
1274	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1275	{	1258	{
1276	tmp->x = x + tmp->arch->x;	1259	tmp->x = x + tmp->arch->x;
1277	tmp->y = y + tmp->arch->y;	1260	tmp->y = y + tmp->arch->y;
1278	}	1261	}
…		…
1301	* just 'op' otherwise	1284	* just 'op' otherwise
1302	*/	1285	*/
1303	object *	1286	object *
1304	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1287	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1305	{	1288	{
1306	assert (!op->flag [FLAG_FREED]);
1307
1308	op->remove ();	1289	op->remove ();
		1290
		1291	if (m == &freed_map)//D TODO: remove soon
		1292	{//D
		1293	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1294	}//D
1309		1295
1310	/* Ideally, the caller figures this out. However, it complicates a lot	1296	/* Ideally, the caller figures this out. However, it complicates a lot
1311	* of areas of callers (eg, anything that uses find_free_spot would now	1297	* of areas of callers (eg, anything that uses find_free_spot would now
1312	* need extra work	1298	* need extra work
1313	*/	1299	*/
		1300	maptile *newmap = m;
1314	if (!xy_normalise (m, op->x, op->y))	1301	if (!xy_normalise (newmap, op->x, op->y))
1315	{	1302	{
1316	op->destroy (1);	1303	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1317	return 0;	1304	return 0;
1318	}	1305	}
1319		1306
1320	if (object *more = op->more)	1307	if (object *more = op->more)
1321	if (!insert_ob_in_map (more, m, originator, flag))	1308	if (!insert_ob_in_map (more, m, originator, flag))
1322	return 0;	1309	return 0;
1323		1310
1324	CLEAR_FLAG (op, FLAG_REMOVED);	1311	op->flag [FLAG_REMOVED] = false;
1325		1312	op->env = 0;
1326	op->map = m;	1313	op->map = newmap;
		1314
1327	mapspace &ms = op->ms ();	1315	mapspace &ms = op->ms ();
1328		1316
1329	/* this has to be done after we translate the coordinates.	1317	/* this has to be done after we translate the coordinates.
1330	*/	1318	*/
1331	if (op->nrof && !(flag & INS_NO_MERGE))	1319	if (op->nrof && !(flag & INS_NO_MERGE))
1332	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1333	if (object::can_merge (op, tmp))	1321	if (object::can_merge (op, tmp))
1334	{	1322	{
1335	// TODO: we atcually want to update tmp, not op,	1323	// TODO: we actually want to update tmp, not op,
1336	// but some caller surely breaks when we return tmp	1324	// but some caller surely breaks when we return tmp
1337	// from here :/	1325	// from here :/
1338	op->nrof += tmp->nrof;	1326	op->nrof += tmp->nrof;
1339	tmp->destroy (1);	1327	tmp->destroy ();
1340	}	1328	}
1341		1329
1342	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1330	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1343	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1331	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1344		1332
…		…
1351	{	1339	{
1352	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1353	abort ();	1341	abort ();
1354	}	1342	}
1355		1343
		1344	if (!originator->is_on_map ())
		1345	{
		1346	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1347	op->debug_desc (), originator->debug_desc ());
		1348	abort ();
		1349	}
		1350
1356	op->above = originator;	1351	op->above = originator;
1357	op->below = originator->below;	1352	op->below = originator->below;
1358
1359	if (op->below)
1360	op->below->above = op;
1361	else
1362	ms.bot = op;
1363
1364	/* since *below* originator, no need to update top */
1365	originator->below = op;	1353	originator->below = op;
		1354
		1355	*(op->below ? &op->below->above : &ms.bot) = op;
1366	}	1356	}
1367	else	1357	else
1368	{	1358	{
1369	object *top, *floor = NULL;	1359	object *floor = 0;
1370		1360	object *top = ms.top;
1371	top = ms.bot;
1372		1361
1373	/* If there are other objects, then */	1362	/* If there are other objects, then */
1374	if (top)	1363	if (top)
1375	{	1364	{
1376	object *last = 0;
1377
1378	/*	1365	/*
1379	* If there are multiple objects on this space, we do some trickier handling.	1366	* If there are multiple objects on this space, we do some trickier handling.
1380	* We've already dealt with merging if appropriate.	1367	* We've already dealt with merging if appropriate.
1381	* Generally, we want to put the new object on top. But if	1368	* Generally, we want to put the new object on top. But if
1382	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1369	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1385	* once we get to them. This reduces the need to traverse over all of	1372	* once we get to them. This reduces the need to traverse over all of
1386	* them when adding another one - this saves quite a bit of cpu time	1373	* them when adding another one - this saves quite a bit of cpu time
1387	* when lots of spells are cast in one area. Currently, it is presumed	1374	* when lots of spells are cast in one area. Currently, it is presumed
1388	* that flying non pickable objects are spell objects.	1375	* that flying non pickable objects are spell objects.
1389	*/	1376	*/
1390	for (top = ms.bot; top; top = top->above)	1377	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1391	{	1378	{
1392	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1379	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1393	floor = top;	1380	floor = tmp;
1394		1381
1395	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1382	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1396	{	1383	{
1397	/* We insert above top, so we want this object below this */	1384	/* We insert above top, so we want this object below this */
1398	top = top->below;	1385	top = tmp->below;
1399	break;	1386	break;
1400	}	1387	}
1401		1388
1402	last = top;	1389	top = tmp;
1403	}	1390	}
1404
1405	/* Don't want top to be NULL, so set it to the last valid object */
1406	top = last;
1407		1391
1408	/* We let update_position deal with figuring out what the space	1392	/* We let update_position deal with figuring out what the space
1409	* looks like instead of lots of conditions here.	1393	* looks like instead of lots of conditions here.
1410	* makes things faster, and effectively the same result.	1394	* makes things faster, and effectively the same result.
1411	*/	1395	*/
…		…
1418	*/	1402	*/
1419	if (!(flag & INS_ON_TOP)	1403	if (!(flag & INS_ON_TOP)
1420	&& ms.flags () & P_BLOCKSVIEW	1404	&& ms.flags () & P_BLOCKSVIEW
1421	&& (op->face && !faces [op->face].visibility))	1405	&& (op->face && !faces [op->face].visibility))
1422	{	1406	{
		1407	object *last;
		1408
1423	for (last = top; last != floor; last = last->below)	1409	for (last = top; last != floor; last = last->below)
1424	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1410	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1425	break;	1411	break;
1426		1412
1427	/* Check to see if we found the object that blocks view,	1413	/* Check to see if we found the object that blocks view,
…		…
1435	} /* If objects on this space */	1421	} /* If objects on this space */
1436		1422
1437	if (flag & INS_ABOVE_FLOOR_ONLY)	1423	if (flag & INS_ABOVE_FLOOR_ONLY)
1438	top = floor;	1424	top = floor;
1439		1425
1440	/* Top is the object that our object (op) is going to get inserted above.	1426	// insert object above top, or bottom-most if top = 0
1441	*/
1442
1443	/* First object on this space */
1444	if (!top)	1427	if (!top)
1445	{	1428	{
		1429	op->below = 0;
1446	op->above = ms.bot;	1430	op->above = ms.bot;
1447
1448	if (op->above)
1449	op->above->below = op;
1450
1451	op->below = 0;
1452	ms.bot = op;	1431	ms.bot = op;
		1432
		1433	*(op->above ? &op->above->below : &ms.top) = op;
1453	}	1434	}
1454	else	1435	else
1455	{ /* get inserted into the stack above top */	1436	{
1456	op->above = top->above;	1437	op->above = top->above;
1457
1458	if (op->above)
1459	op->above->below = op;	1438	top->above = op;
1460		1439
1461	op->below = top;	1440	op->below = top;
1462	top->above = op;	1441	*(op->above ? &op->above->below : &ms.top) = op;
1463	}	1442	}
		1443	}
1464		1444
1465	if (!op->above)	1445	if (op->is_player ())
1466	ms.top = op;
1467	} /* else not INS_BELOW_ORIGINATOR */
1468
1469	if (op->type == PLAYER)
1470	{	1446	{
1471	op->contr->do_los = 1;	1447	op->contr->do_los = 1;
1472	++op->map->players;	1448	++op->map->players;
1473	op->map->touch ();	1449	op->map->touch ();
1474	}	1450	}
1475		1451
1476	op->map->dirty = true;	1452	op->map->dirty = true;
1477		1453
1478	if (object *pl = ms.player ())	1454	if (object *pl = ms.player ())
1479	//TODO: the floorbox prev/next might need updating	1455	//TODO: the floorbox prev/next might need updating
1480	esrv_send_item (pl, op);	1456	//esrv_send_item (pl, op);
		1457	//TODO: update floorbox to preserve ordering
		1458	if (pl->contr->ns)
		1459	pl->contr->ns->floorbox_update ();
1481		1460
1482	/* If this object glows, it may affect lighting conditions that are	1461	/* If this object glows, it may affect lighting conditions that are
1483	* visible to others on this map. But update_all_los is really	1462	* visible to others on this map. But update_all_los is really
1484	* an inefficient way to do this, as it means los for all players	1463	* an inefficient way to do this, as it means los for all players
1485	* on the map will get recalculated. The players could very well	1464	* on the map will get recalculated. The players could very well
1486	* be far away from this change and not affected in any way -	1465	* be far away from this change and not affected in any way -
1487	* this should get redone to only look for players within range,	1466	* this should get redone to only look for players within range,
1488	* or just updating the P_UPTODATE for spaces within this area	1467	* or just updating the P_UPTODATE for spaces within this area
1489	* of effect may be sufficient.	1468	* of effect may be sufficient.
1490	*/	1469	*/
1491	if (op->map->darkness && (op->glow_radius != 0))	1470	if (op->affects_los ())
		1471	{
		1472	op->ms ().invalidate ();
1492	update_all_los (op->map, op->x, op->y);	1473	update_all_los (op->map, op->x, op->y);
		1474	}
1493		1475
1494	/* updates flags (blocked, alive, no magic, etc) for this map space */	1476	/* updates flags (blocked, alive, no magic, etc) for this map space */
1495	update_object (op, UP_OBJ_INSERT);	1477	update_object (op, UP_OBJ_INSERT);
1496		1478
1497	INVOKE_OBJECT (INSERT, op);	1479	INVOKE_OBJECT (INSERT, op);
…		…
1504	* blocked() and wall() work properly), and these flags are updated by	1486	* blocked() and wall() work properly), and these flags are updated by
1505	* update_object().	1487	* update_object().
1506	*/	1488	*/
1507		1489
1508	/* if this is not the head or flag has been passed, don't check walk on status */	1490	/* if this is not the head or flag has been passed, don't check walk on status */
1509	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1491	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1510	{	1492	{
1511	if (check_move_on (op, originator))	1493	if (check_move_on (op, originator))
1512	return 0;	1494	return 0;
1513		1495
1514	/* If we are a multi part object, lets work our way through the check	1496	/* If we are a multi part object, lets work our way through the check
…		…
1525	/* this function inserts an object in the map, but if it	1507	/* this function inserts an object in the map, but if it
1526	* finds an object of its own type, it'll remove that one first.	1508	* finds an object of its own type, it'll remove that one first.
1527	* op is the object to insert it under: supplies x and the map.	1509	* op is the object to insert it under: supplies x and the map.
1528	*/	1510	*/
1529	void	1511	void
1530	replace_insert_ob_in_map (const char *arch_string, object *op)	1512	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1531	{	1513	{
1532	/* first search for itself and remove any old instances */	1514	/* first search for itself and remove any old instances */
1533		1515
1534	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1535	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1517	if (tmp->arch->archname == archname) /* same archetype */
1536	tmp->destroy (1);	1518	tmp->destroy ();
1537		1519
1538	object *tmp = arch_to_object (archetype::find (arch_string));	1520	object *tmp = arch_to_object (archetype::find (archname));
1539		1521
1540	tmp->x = op->x;	1522	tmp->x = op->x;
1541	tmp->y = op->y;	1523	tmp->y = op->y;
1542		1524
1543	insert_ob_in_map (tmp, op->map, op, 0);	1525	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1565	if (!nr)	1547	if (!nr)
1566	return true;	1548	return true;
1567		1549
1568	nr = min (nr, nrof);	1550	nr = min (nr, nrof);
1569		1551
		1552	if (nrof > nr)
		1553	{
1570	nrof -= nr;	1554	nrof -= nr;
1571
1572	if (nrof)
1573	{
1574	adjust_weight (env, -weight * nr); // carrying == 0	1555	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1575		1556
1576	if (object *pl = visible_to ())	1557	if (object *pl = visible_to ())
1577	esrv_update_item (UPD_NROF, pl, this);	1558	esrv_update_item (UPD_NROF, pl, this);
1578		1559
1579	return true;	1560	return true;
1580	}	1561	}
1581	else	1562	else
1582	{	1563	{
1583	destroy (1);	1564	destroy ();
1584	return false;	1565	return false;
1585	}	1566	}
1586	}	1567	}
1587		1568
1588	/*	1569	/*
…		…
1605	}	1586	}
1606	else	1587	else
1607	{	1588	{
1608	decrease (nr);	1589	decrease (nr);
1609		1590
1610	object *op = object_create_clone (this);	1591	object *op = deep_clone ();
1611	op->nrof = nr;	1592	op->nrof = nr;
1612	return op;	1593	return op;
1613	}	1594	}
1614	}	1595	}
1615		1596
…		…
1665	if (object *pl = tmp->visible_to ())	1646	if (object *pl = tmp->visible_to ())
1666	esrv_update_item (UPD_NROF, pl, tmp);	1647	esrv_update_item (UPD_NROF, pl, tmp);
1667		1648
1668	adjust_weight (this, op->total_weight ());	1649	adjust_weight (this, op->total_weight ());
1669		1650
1670	op->destroy (1);	1651	op->destroy ();
1671	op = tmp;	1652	op = tmp;
1672	goto inserted;	1653	goto inserted;
1673	}	1654	}
1674		1655
1675	op->owner = 0; // it's his/hers now. period.	1656	op->owner = 0; // it's his/hers now. period.
…		…
1693		1674
1694	adjust_weight (this, op->total_weight ());	1675	adjust_weight (this, op->total_weight ());
1695		1676
1696	inserted:	1677	inserted:
1697	/* reset the light list and los of the players on the map */	1678	/* reset the light list and los of the players on the map */
1698	if (op->glow_radius && map && map->darkness)	1679	if (op->glow_radius && is_on_map ())
		1680	{
		1681	update_stats ();
1699	update_all_los (map, x, y);	1682	update_all_los (map, x, y);
1700		1683	}
		1684	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1701	// if this is a player's inventory, update stats	1685	// if this is a player's inventory, update stats
1702	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1703	update_stats ();	1686	update_stats ();
1704		1687
1705	INVOKE_OBJECT (INSERT, this);	1688	INVOKE_OBJECT (INSERT, this);
1706		1689
1707	return op;	1690	return op;
…		…
1728	* on top.	1711	* on top.
1729	*/	1712	*/
1730	int	1713	int
1731	check_move_on (object *op, object *originator)	1714	check_move_on (object *op, object *originator)
1732	{	1715	{
		1716	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1717	return 0;
		1718
1733	object *tmp;	1719	object *tmp;
1734	maptile *m = op->map;	1720	maptile *m = op->map;
1735	int x = op->x, y = op->y;	1721	int x = op->x, y = op->y;
1736		1722
1737	MoveType move_on, move_slow, move_block;	1723	mapspace &ms = m->at (x, y);
1738		1724
1739	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1725	ms.update ();
1740	return 0;
1741		1726
1742	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1727	MoveType move_on = ms.move_on;
1743	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1728	MoveType move_slow = ms.move_slow;
1744	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1729	MoveType move_block = ms.move_block;
1745		1730
1746	/* if nothing on this space will slow op down or be applied,	1731	/* if nothing on this space will slow op down or be applied,
1747	* no need to do checking below. have to make sure move_type	1732	* no need to do checking below. have to make sure move_type
1748	* is set, as lots of objects don't have it set - we treat that	1733	* is set, as lots of objects don't have it set - we treat that
1749	* as walking.	1734	* as walking.
…		…
1760	return 0;	1745	return 0;
1761		1746
1762	/* The objects have to be checked from top to bottom.	1747	/* The objects have to be checked from top to bottom.
1763	* Hence, we first go to the top:	1748	* Hence, we first go to the top:
1764	*/	1749	*/
1765		1750	for (object *next, *tmp = ms.top; tmp; tmp = next)
1766	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1767	{
1768	/* Trim the search when we find the first other spell effect
1769	* this helps performance so that if a space has 50 spell objects,
1770	* we don't need to check all of them.
1771	*/
1772	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1773	break;
1774	}	1751	{
		1752	next = tmp->below;
1775		1753
1776	for (; tmp; tmp = tmp->below)
1777	{
1778	if (tmp == op)	1754	if (tmp == op)
1779	continue; /* Can't apply yourself */	1755	continue; /* Can't apply yourself */
1780		1756
1781	/* Check to see if one of the movement types should be slowed down.	1757	/* Check to see if one of the movement types should be slowed down.
1782	* Second check makes sure that the movement types not being slowed	1758	* Second check makes sure that the movement types not being slowed
…		…
1787	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1763	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1788	{	1764	{
1789	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1765	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1790	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1766	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1791	{	1767	{
1792
1793	float
1794	diff = tmp->move_slow_penalty * fabs (op->speed);	1768	float diff = tmp->move_slow_penalty * fabs (op->speed);
1795		1769
1796	if (op->type == PLAYER)	1770	if (op->is_player ())
1797	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1771	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1798	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1772	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1799	diff /= 4.0;	1773	diff /= 4.0;
1800		1774
1801	op->speed_left -= diff;	1775	op->speed_left -= diff;
1802	}	1776	}
1803	}	1777	}
…		…
1836	LOG (llevError, "Present_arch called outside map.\n");	1810	LOG (llevError, "Present_arch called outside map.\n");
1837	return NULL;	1811	return NULL;
1838	}	1812	}
1839		1813
1840	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1814	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1841	if (tmp->arch == at)	1815	if (tmp->arch->archname == at->archname)
1842	return tmp;	1816	return tmp;
1843		1817
1844	return NULL;	1818	return NULL;
1845	}	1819	}
1846		1820
…		…
1910	* The first matching object is returned, or NULL if none.	1884	* The first matching object is returned, or NULL if none.
1911	*/	1885	*/
1912	object *	1886	object *
1913	present_arch_in_ob (const archetype *at, const object *op)	1887	present_arch_in_ob (const archetype *at, const object *op)
1914	{	1888	{
1915	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1889	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1916	if (tmp->arch == at)	1890	if (tmp->arch->archname == at->archname)
1917	return tmp;	1891	return tmp;
1918		1892
1919	return NULL;	1893	return NULL;
1920	}	1894	}
1921		1895
…		…
2009	* head of the object should correspond for the entire object.	1983	* head of the object should correspond for the entire object.
2010	*/	1984	*/
2011	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1985	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2012	continue;	1986	continue;
2013		1987
2014	if (ob->blocked (m, pos.x, pos.y))	1988	if (ob->blocked (pos.m, pos.x, pos.y))
2015	continue;	1989	continue;
2016		1990
2017	altern [index++] = i;	1991	altern [index++] = i;
2018	}	1992	}
2019		1993
…		…
2087	* there is capable of.	2061	* there is capable of.
2088	*/	2062	*/
2089	int	2063	int
2090	find_dir (maptile *m, int x, int y, object *exclude)	2064	find_dir (maptile *m, int x, int y, object *exclude)
2091	{	2065	{
2092	int i, max = SIZEOFFREE, mflags;	2066	int max = SIZEOFFREE, mflags;
2093
2094	sint16 nx, ny;
2095	object *tmp;
2096	maptile *mp;
2097
2098	MoveType blocked, move_type;	2067	MoveType move_type;
2099		2068
2100	if (exclude && exclude->head_ () != exclude)	2069	if (exclude && exclude->head_ () != exclude)
2101	{	2070	{
2102	exclude = exclude->head;	2071	exclude = exclude->head;
2103	move_type = exclude->move_type;	2072	move_type = exclude->move_type;
…		…
2106	{	2075	{
2107	/* If we don't have anything, presume it can use all movement types. */	2076	/* If we don't have anything, presume it can use all movement types. */
2108	move_type = MOVE_ALL;	2077	move_type = MOVE_ALL;
2109	}	2078	}
2110		2079
2111	for (i = 1; i < max; i++)	2080	for (int i = 1; i < max; i++)
2112	{	2081	{
2113	mp = m;	2082	mapxy pos (m, x, y);
2114	nx = x + freearr_x[i];	2083	pos.move (i);
2115	ny = y + freearr_y[i];
2116		2084
2117	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2085	if (!pos.normalise ())
2118
2119	if (mflags & P_OUT_OF_MAP)
2120	max = maxfree[i];	2086	max = maxfree[i];
2121	else	2087	else
2122	{	2088	{
2123	mapspace &ms = mp->at (nx, ny);	2089	mapspace &ms = *pos;
2124		2090
2125	blocked = ms.move_block;
2126
2127	if ((move_type & blocked) == move_type)	2091	if ((move_type & ms.move_block) == move_type)
2128	max = maxfree[i];	2092	max = maxfree [i];
2129	else if (mflags & P_IS_ALIVE)	2093	else if (ms.flags () & P_IS_ALIVE)
2130	{	2094	{
2131	for (tmp = ms.bot; tmp; tmp = tmp->above)	2095	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2132	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2096	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2133	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2097	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2134	break;
2135
2136	if (tmp)
2137	return freedir[i];	2098	return freedir [i];
2138	}	2099	}
2139	}	2100	}
2140	}	2101	}
2141		2102
2142	return 0;	2103	return 0;
…		…
2217	* This basically means that if direction is 15, then it could either go	2178	* This basically means that if direction is 15, then it could either go
2218	* direction 4, 14, or 16 to get back to where we are.	2179	* direction 4, 14, or 16 to get back to where we are.
2219	* Moved from spell_util.c to object.c with the other related direction	2180	* Moved from spell_util.c to object.c with the other related direction
2220	* functions.	2181	* functions.
2221	*/	2182	*/
2222	int reduction_dir[SIZEOFFREE][3] = {	2183	const int reduction_dir[SIZEOFFREE][3] = {
2223	{0, 0, 0}, /* 0 */	2184	{0, 0, 0}, /* 0 */
2224	{0, 0, 0}, /* 1 */	2185	{0, 0, 0}, /* 1 */
2225	{0, 0, 0}, /* 2 */	2186	{0, 0, 0}, /* 2 */
2226	{0, 0, 0}, /* 3 */	2187	{0, 0, 0}, /* 3 */
2227	{0, 0, 0}, /* 4 */	2188	{0, 0, 0}, /* 4 */
…		…
2323	int	2284	int
2324	can_pick (const object *who, const object *item)	2285	can_pick (const object *who, const object *item)
2325	{	2286	{
2326	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2287	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2327	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2288	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2328	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2289	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2329	}	2290	}
2330		2291
2331	/*	2292	/*
2332	* create clone from object to another	2293	* create clone from object to another
2333	*/	2294	*/
2334	object *	2295	object *
2335	object_create_clone (object *asrc)	2296	object::deep_clone ()
2336	{	2297	{
2337	object *dst = 0, *tmp, *src, *prev, *item;	2298	assert (("deep_clone called on non-head object", is_head ()));
2338		2299
2339	if (!asrc)	2300	object *dst = clone ();
2340	return 0;
2341		2301
2342	src = asrc->head_ ();	2302	object *prev = dst;
2343
2344	prev = 0;
2345	for (object *part = src; part; part = part->more)	2303	for (object *part = this->more; part; part = part->more)
2346	{	2304	{
2347	tmp = part->clone ();	2305	object *tmp = part->clone ();
2348	tmp->x -= src->x;
2349	tmp->y -= src->y;
2350
2351	if (!part->head)
2352	{
2353	dst = tmp;
2354	tmp->head = 0;
2355	}
2356	else
2357	tmp->head = dst;	2306	tmp->head = dst;
2358
2359	tmp->more = 0;
2360
2361	if (prev)
2362	prev->more = tmp;	2307	prev->more = tmp;
2363
2364	prev = tmp;	2308	prev = tmp;
2365	}	2309	}
2366		2310
2367	for (item = src->inv; item; item = item->below)	2311	for (object *item = inv; item; item = item->below)
2368	insert_ob_in_ob (object_create_clone (item), dst);	2312	insert_ob_in_ob (item->deep_clone (), dst);
2369		2313
2370	return dst;	2314	return dst;
2371	}	2315	}
2372		2316
2373	/* This returns the first object in who's inventory that	2317	/* This returns the first object in who's inventory that
…		…
2382	return tmp;	2326	return tmp;
2383		2327
2384	return 0;	2328	return 0;
2385	}	2329	}
2386		2330
2387	/* If ob has a field named key, return the link from the list,	2331	shstr_tmp
2388	* otherwise return NULL.	2332	object::kv_get (shstr_tmp key) const
2389	*
2390	* key must be a passed in shared string - otherwise, this won't
2391	* do the desired thing.
2392	*/
2393	key_value *
2394	get_ob_key_link (const object *ob, const char *key)
2395	{	2333	{
2396	for (key_value *link = ob->key_values; link; link = link->next)	2334	for (key_value *kv = key_values; kv; kv = kv->next)
2397	if (link->key == key)	2335	if (kv->key == key)
2398	return link;
2399
2400	return 0;
2401	}
2402
2403	/*
2404	* Returns the value of op has an extra_field for key, or NULL.
2405	*
2406	* The argument doesn't need to be a shared string.
2407	*
2408	* The returned string is shared.
2409	*/
2410	const char *
2411	get_ob_key_value (const object *op, const char *const key)
2412	{
2413	key_value *link;
2414	shstr_cmp canonical_key (key);
2415
2416	if (!canonical_key)
2417	{
2418	/* 1. There being a field named key on any object
2419	* implies there'd be a shared string to find.
2420	* 2. Since there isn't, no object has this field.
2421	* 3. Therefore, *this* object doesn't have this field.
2422	*/
2423	return 0;
2424	}
2425
2426	/* This is copied from get_ob_key_link() above -
2427	* only 4 lines, and saves the function call overhead.
2428	*/
2429	for (link = op->key_values; link; link = link->next)
2430	if (link->key == canonical_key)
2431	return link->value;	2336	return kv->value;
2432		2337
2433	return 0;	2338	return shstr ();
2434	}	2339	}
2435		2340
2436	/*	2341	void
2437	* Updates the canonical_key in op to value.	2342	object::kv_set (shstr_tmp key, shstr_tmp value)
2438	*
2439	* canonical_key is a shared string (value doesn't have to be).
2440	*
2441	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2442	* keys.
2443	*
2444	* Returns TRUE on success.
2445	*/
2446	int
2447	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2448	{	2343	{
2449	key_value *field = NULL, *last = NULL;	2344	for (key_value *kv = key_values; kv; kv = kv->next)
2450		2345	if (kv->key == key)
2451	for (field = op->key_values; field != NULL; field = field->next)
2452	{
2453	if (field->key != canonical_key)
2454	{	2346	{
2455	last = field;	2347	kv->value = value;
2456	continue;	2348	return;
2457	}	2349	}
2458		2350
2459	if (value)	2351	key_value *kv = new key_value;
2460	field->value = value;	2352
2461	else	2353	kv->next = key_values;
		2354	kv->key = key;
		2355	kv->value = value;
		2356
		2357	key_values = kv;
		2358	}
		2359
		2360	void
		2361	object::kv_del (shstr_tmp key)
		2362	{
		2363	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2364	if ((*kvp)->key == key)
2462	{	2365	{
2463	/* Basically, if the archetype has this key set,	2366	key_value *kv = *kvp;
2464	* we need to store the null value so when we save	2367	*kvp = (*kvp)->next;
2465	* it, we save the empty value so that when we load,	2368	delete kv;
2466	* we get this value back again.	2369	return;
2467	*/
2468	if (get_ob_key_link (op->arch, canonical_key))
2469	field->value = 0;
2470	else
2471	{
2472	if (last)
2473	last->next = field->next;
2474	else
2475	op->key_values = field->next;
2476
2477	delete field;
2478	}
2479	}	2370	}
2480	return TRUE;
2481	}
2482	/* IF we get here, key doesn't exist */
2483
2484	/* No field, we'll have to add it. */
2485
2486	if (!add_key)
2487	return FALSE;
2488
2489	/* There isn't any good reason to store a null
2490	* value in the key/value list. If the archetype has
2491	* this key, then we should also have it, so shouldn't
2492	* be here. If user wants to store empty strings,
2493	* should pass in ""
2494	*/
2495	if (value == NULL)
2496	return TRUE;
2497
2498	field = new key_value;
2499
2500	field->key = canonical_key;
2501	field->value = value;
2502	/* Usual prepend-addition. */
2503	field->next = op->key_values;
2504	op->key_values = field;
2505
2506	return TRUE;
2507	}
2508
2509	/*
2510	* Updates the key in op to value.
2511	*
2512	* If add_key is FALSE, this will only update existing keys,
2513	* and not add new ones.
2514	* In general, should be little reason FALSE is ever passed in for add_key
2515	*
2516	* Returns TRUE on success.
2517	*/
2518	int
2519	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2520	{
2521	shstr key_ (key);
2522
2523	return set_ob_key_value_s (op, key_, value, add_key);
2524	}	2371	}
2525		2372
2526	object::depth_iterator::depth_iterator (object *container)	2373	object::depth_iterator::depth_iterator (object *container)
2527	: iterator_base (container)	2374	: iterator_base (container)
2528	{	2375	{
…		…
2578	{	2425	{
2579	char flagdesc[512];	2426	char flagdesc[512];
2580	char info2[256 * 4];	2427	char info2[256 * 4];
2581	char *p = info;	2428	char *p = info;
2582		2429
2583	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2430	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2584	count,	2431	count,
2585	uuid.c_str (),	2432	uuid.c_str (),
2586	&name,	2433	&name,
2587	title ? "\",title:\"" : "",	2434	title ? ",title:\"" : "",
2588	title ? (const char *)title : "",	2435	title ? (const char *)title : "",
		2436	title ? "\"" : "",
2589	flag_desc (flagdesc, 512), type);	2437	flag_desc (flagdesc, 512), type);
2590		2438
2591	if (!flag[FLAG_REMOVED] && env)	2439	if (!flag[FLAG_REMOVED] && env)
2592	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2440	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2593		2441
…		…
2649	container = 0;	2497	container = 0;
2650		2498
2651	// client needs item update to make it work, client bug requires this to be separate	2499	// client needs item update to make it work, client bug requires this to be separate
2652	esrv_update_item (UPD_FLAGS, this, old_container);	2500	esrv_update_item (UPD_FLAGS, this, old_container);
2653		2501
2654	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2502	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2655	play_sound (sound_find ("chest_close"));	2503	play_sound (sound_find ("chest_close"));
2656	}	2504	}
2657		2505
2658	if (new_container)	2506	if (new_container)
2659	{	2507	{
…		…
2669	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2517	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2670	new_container->insert (closer);	2518	new_container->insert (closer);
2671	}	2519	}
2672	#endif	2520	#endif
2673		2521
2674	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2675		2523
2676	// make sure the container is available, client bug requires this to be separate	2524	// make sure the container is available, client bug requires this to be separate
2677	esrv_send_item (this, new_container);	2525	esrv_send_item (this, new_container);
2678		2526
2679	new_container->flag [FLAG_APPLIED] = true;	2527	new_container->flag [FLAG_APPLIED] = true;
…		…
2687	// else if (!old_container->env && contr && contr->ns)	2535	// else if (!old_container->env && contr && contr->ns)
2688	// contr->ns->floorbox_reset ();	2536	// contr->ns->floorbox_reset ();
2689	}	2537	}
2690		2538
2691	object *	2539	object *
2692	object::force_find (const shstr name)	2540	object::force_find (shstr_tmp name)
2693	{	2541	{
2694	/* cycle through his inventory to look for the MARK we want to	2542	/* cycle through his inventory to look for the MARK we want to
2695	* place	2543	* place
2696	*/	2544	*/
2697	for (object *tmp = inv; tmp; tmp = tmp->below)	2545	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2700		2548
2701	return 0;	2549	return 0;
2702	}	2550	}
2703		2551
2704	void	2552	void
		2553	object::force_set_timer (int duration)
		2554	{
		2555	this->duration = 1;
		2556	this->speed_left = -1.f;
		2557
		2558	this->set_speed (duration ? 1.f / duration : 0.f);
		2559	}
		2560
		2561	object *
2705	object::force_add (const shstr name, int duration)	2562	object::force_add (shstr_tmp name, int duration)
2706	{	2563	{
2707	if (object *force = force_find (name))	2564	if (object *force = force_find (name))
2708	force->destroy ();	2565	force->destroy ();
2709		2566
2710	object *force = get_archetype (FORCE_NAME);	2567	object *force = get_archetype (FORCE_NAME);
2711		2568
2712	force->slaying = name;	2569	force->slaying = name;
2713	force->stats.food = 1;
2714	force->speed_left = -1.f;
2715		2570
2716	force->set_speed (duration ? 1.f / duration : 0.f);	2571	force->force_set_timer (duration);
2717	force->flag [FLAG_IS_USED_UP] = true;	2572
2718	force->flag [FLAG_APPLIED] = true;	2573	force->flag [FLAG_APPLIED] = true;
2719		2574
2720	insert (force);	2575	return insert (force);
2721	}	2576	}
2722		2577
2723	void	2578	void
2724	object::play_sound (faceidx sound)	2579	object::play_sound (faceidx sound) const
2725	{	2580	{
2726	if (!sound)	2581	if (!sound)
2727	return;	2582	return;
2728		2583
2729	if (flag [FLAG_REMOVED])	2584	if (is_on_map ())
		2585	map->play_sound (sound, x, y);
		2586	else if (object *pl = in_player ())
		2587	pl->contr->play_sound (sound);
		2588	}
		2589
		2590	void
		2591	object::say_msg (const char *msg) const
		2592	{
		2593	if (is_on_map ())
		2594	map->say_msg (msg, x, y);
		2595	else if (object *pl = in_player ())
		2596	pl->contr->play_sound (sound);
		2597	}
		2598
		2599	void
		2600	object::make_noise ()
		2601	{
		2602	// we do not model noise in the map, so instead put
		2603	// a temporary light into the noise source
		2604	// could use the map instead, but that's less reliable for our
		2605	// goal, which is to make invisibility a bit harder to exploit
		2606
		2607	// currently only works sensibly for players
		2608	if (!is_player ())
2730	return;	2609	return;
2731		2610
2732	if (env)	2611	// find old force, or create new one
2733	{	2612	object *force = force_find (shstr_noise_force);
2734	if (object *pl = in_player ())	2613
2735	pl->contr->play_sound (sound);	2614	if (force)
2736	}	2615	force->speed_left = -1.f; // patch old speed up
2737	else	2616	else
2738	map->play_sound (sound, x, y);	2617	{
2739	}	2618	force = archetype::get (shstr_noise_force);
2740		2619
		2620	force->slaying = shstr_noise_force;
		2621	force->stats.food = 1;
		2622	force->speed_left = -1.f;
		2623
		2624	force->set_speed (1.f / 4.f);
		2625	force->flag [FLAG_IS_USED_UP] = true;
		2626	force->flag [FLAG_APPLIED] = true;
		2627
		2628	insert (force);
		2629	}
		2630	}
		2631

Diff Legend

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