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

Diff Legend

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