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.215 by root, Tue Apr 22 07:28:05 2008 UTC vs.
Revision 1.292 by root, Mon Oct 19 21:48:49 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 it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
…		…
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
37		39
38	objectvec objects;	40	objectvec objects;
39	activevec actives;	41	activevec actives;
40		42
41	short freearr_x[SIZEOFFREE] = {	43	short freearr_x[SIZEOFFREE] = {
…		…
139		141
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	142	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	143	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	144	compare_ob_value_lists_one (const object *wants, const object *has)
143	{	145	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* 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	147	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	148	* different structure or at least keep the lists sorted...
149	*/	149	*/
150		150
151	/* For each field in wants, */	151	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	152	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	153	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	154	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		155
169	/* If we get here, every field in wants has a matching field in has. */	156	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	157	return true;
171	}	158	}
172		159
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	160	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	161	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	162	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	163	{
177	/* However, there may be fields in has which aren't partnered in wants,	164	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison *twice*. :(	165	* so we need to run the comparison *twice*. :(
179	*/	166	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	167	return compare_ob_value_lists_one (ob1, ob2)
		168	&& compare_ob_value_lists_one (ob2, ob1);
181	}	169	}
182		170
183	/* Function examines the 2 objects given to it, and returns true if	171	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	172	* they can be merged together.
185	*	173	*
…		…
200	|| ob1->speed != ob2->speed	188	|| ob1->speed != ob2->speed
201	|| ob1->value != ob2->value	189	|| ob1->value != ob2->value
202	|| ob1->name != ob2->name)	190	|| ob1->name != ob2->name)
203	return 0;	191	return 0;
204		192
205	/* Do not merge objects if nrof would overflow. First part checks	193	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	194	* is always 0 .. 2**31-1 */
207	* would fit into a 32 bit signed int, which is often used to hold	195	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;	196	return 0;
212		197
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	198	/* 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	199	* 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	200	* just can't ignore the been applied or identified flags, as they
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	205	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		206
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	207	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	208	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		209
225	if (ob1->arch->name != ob2->arch->name	210	if (ob1->arch->archname != ob2->arch->archname
226	|| ob1->name != ob2->name	211	|| ob1->name != ob2->name
227	|| ob1->title != ob2->title	212	|| ob1->title != ob2->title
228	|| ob1->msg != ob2->msg	213	|| ob1->msg != ob2->msg
229	|| ob1->weight != ob2->weight	214	|| ob1->weight != ob2->weight
230	|| ob1->attacktype != ob2->attacktype	215	|| ob1->attacktype != ob2->attacktype
231	|| ob1->magic != ob2->magic	216	|| ob1->magic != ob2->magic
232	|| ob1->slaying != ob2->slaying	217	|| ob1->slaying != ob2->slaying
233	|| ob1->skill != ob2->skill	218	|| ob1->skill != ob2->skill
234	|| ob1->value != ob2->value	219	|| ob1->value != ob2->value
235	|| ob1->animation_id != ob2->animation_id	220	|| ob1->animation_id != ob2->animation_id
		221	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	|| ob1->client_type != ob2->client_type	222	|| ob1->client_type != ob2->client_type
237	|| ob1->materialname != ob2->materialname	223	|| ob1->materialname != ob2->materialname
238	|| ob1->lore != ob2->lore	224	|| ob1->lore != ob2->lore
239	|| ob1->subtype != ob2->subtype	225	|| ob1->subtype != ob2->subtype
240	|| ob1->move_type != ob2->move_type	226	|| ob1->move_type != ob2->move_type
…		…
248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	235	return 0;
250		236
251	if ((ob1->flag ^ ob2->flag)	237	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	238	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	239	.reset (FLAG_REMOVED)
255	.any ())	240	.any ())
256	return 0;	241	return 0;
257		242
258	/* This is really a spellbook check - we should in general	243	/* This is really a spellbook check - we should in general
…		…
334		319
335	// find player who can see this object	320	// find player who can see this object
336	object *	321	object *
337	object::visible_to () const	322	object::visible_to () const
338	{	323	{
339	if (!flag [FLAG_REMOVED])	324	if (client_visible () && !flag [FLAG_REMOVED])
340	{	325	{
341	// see if we are in a container of sorts	326	// see if we are in a container of sorts
342	if (env)	327	if (env)
343	{	328	{
344	// the player inventory itself is always visible	329	// the player inventory itself is always visible
345	if (env->type == PLAYER)	330	if (env->is_player ())
346	return env;	331	return env;
347		332
348	// else a player could have our env open	333	// else a player could have our env open
349	object *envest = env->outer_env ();	334	object *envest = env->outer_env_or_self ();
350		335
351	// the player itself is always on a map, so we will find him here	336	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	337	// even if our inv is in a player.
353	if (envest->is_on_map ())	338	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	339	if (object *pl = envest->ms ().player ())
355	if (pl->container == env)	340	if (pl->container_ () == env)
356	return pl;	341	return pl;
357	}	342	}
358	else	343	else
359	{	344	{
360	// maybe there is a player standing on the same mapspace	345	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	346	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	347	if (object *pl = ms ().player ())
		348	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		349	|| pl->container_ () == this)
363	return pl;	350	return pl;
364	}	351	}
365	}	352	}
366		353
367	return 0;	354	return 0;
368	}	355	}
369		356
370	// adjust weight per container type ("of holding")	357	// adjust weight per container type ("of holding")
371	static sint32	358	static sint32
372	weight_adjust (object *op, sint32 weight)	359	weight_adjust_for (object *op, sint32 weight)
373	{	360	{
374	return op->type == CONTAINER	361	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	363	: weight;
377	}	364	}
…		…
383	static void	370	static void
384	adjust_weight (object *op, sint32 weight)	371	adjust_weight (object *op, sint32 weight)
385	{	372	{
386	while (op)	373	while (op)
387	{	374	{
		375	// adjust by actual difference to account for rounding errors
		376	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388	weight = weight_adjust (op, weight);	377	weight = weight_adjust_for (op, op->carrying)
		378	- weight_adjust_for (op, op->carrying - weight);
389		379
390	if (!weight)	380	if (!weight)
391	return;	381	return;
392		382
393	op->carrying += weight;	383	op->carrying += weight;
…		…
416	op->update_weight ();	406	op->update_weight ();
417		407
418	sum += op->total_weight ();	408	sum += op->total_weight ();
419	}	409	}
420		410
421	sum = weight_adjust (this, sum);	411	sum = weight_adjust_for (this, sum);
422		412
423	if (sum != carrying)	413	if (sum != carrying)
424	{	414	{
425	carrying = sum;	415	carrying = sum;
426		416
…		…
440	return strdup ("[NULLOBJ]");	430	return strdup ("[NULLOBJ]");
441		431
442	object_freezer freezer;	432	object_freezer freezer;
443	op->write (freezer);	433	op->write (freezer);
444	return freezer.as_string ();	434	return freezer.as_string ();
		435	}
		436
		437	char *
		438	object::as_string ()
		439	{
		440	return dump_object (this);
445	}	441	}
446		442
447	/*	443	/*
448	* get_nearest_part(multi-object, object 2) returns the part of the	444	* get_nearest_part(multi-object, object 2) returns the part of the
449	* multi-object 1 which is closest to the second object.	445	* multi-object 1 which is closest to the second object.
…		…
488	*/	484	*/
489	object *	485	object *
490	find_object_name (const char *str)	486	find_object_name (const char *str)
491	{	487	{
492	shstr_cmp str_ (str);	488	shstr_cmp str_ (str);
493	object *op;
494		489
		490	if (str_)
495	for_all_objects (op)	491	for_all_objects (op)
496	if (op->name == str_)	492	if (op->name == str_)
497	break;	493	return op;
498		494
499	return op;	495	return 0;
500	}	496	}
501		497
502	/*	498	/*
503	* Sets the owner and sets the skill and exp pointers to owner's current	499	* Sets the owner and sets the skill and exp pointers to owner's current
504	* skill and experience objects.	500	* skill and experience objects.
…		…
566	update_stats ();	562	update_stats ();
567		563
568	new_draw_info_format (NDI_UNIQUE, 0, this,	564	new_draw_info_format (NDI_UNIQUE, 0, this,
569	"You try to balance all your items at once, "	565	"You try to balance all your items at once, "
570	"but the %s is just too much for your body. "	566	"but the %s is just too much for your body. "
571	"[You need to unapply some items first.]", &ob->name);	567	"[You need to unapply some items first - use the 'body' command to see "
		568	"how many items you cna wera on a specific body part.]", &ob->name);
572	return false;	569	return false;
573	}	570	}
574		571
575	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	572	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
576	}	573	}
…		…
602	}	599	}
603		600
604	op->key_values = 0;	601	op->key_values = 0;
605	}	602	}
606		603
607	object &	604	/*
608	object::operator =(const object &src)	605	* copy_to first frees everything allocated by the dst object,
		606	* and then copies the contents of itself into the second
		607	* object, allocating what needs to be allocated. Basically, any
		608	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		609	* if the first object is freed, the pointers in the new object
		610	* will point at garbage.
		611	*/
		612	void
		613	object::copy_to (object *dst)
609	{	614	{
610	bool is_freed = flag [FLAG_FREED];	615	dst->remove ();
611	bool is_removed = flag [FLAG_REMOVED];
612
613	*(object_copy *)this = src;	616	*(object_copy *)dst = *this;
614
615	flag [FLAG_FREED] = is_freed;
616	flag [FLAG_REMOVED] = is_removed;	617	dst->flag [FLAG_REMOVED] = true;
617		618
618	/* Copy over key_values, if any. */	619	/* Copy over key_values, if any. */
619	if (src.key_values)	620	if (key_values)
620	{	621	{
621	key_value *tail = 0;	622	key_value *tail = 0;
622	key_values = 0;	623	dst->key_values = 0;
623		624
624	for (key_value *i = src.key_values; i; i = i->next)	625	for (key_value *i = key_values; i; i = i->next)
625	{	626	{
626	key_value *new_link = new key_value;	627	key_value *new_link = new key_value;
627		628
628	new_link->next = 0;	629	new_link->next = 0;
629	new_link->key = i->key;	630	new_link->key = i->key;
630	new_link->value = i->value;	631	new_link->value = i->value;
631		632
632	/* Try and be clever here, too. */	633	/* Try and be clever here, too. */
633	if (!key_values)	634	if (!dst->key_values)
634	{	635	{
635	key_values = new_link;	636	dst->key_values = new_link;
636	tail = new_link;	637	tail = new_link;
637	}	638	}
638	else	639	else
639	{	640	{
640	tail->next = new_link;	641	tail->next = new_link;
641	tail = new_link;	642	tail = new_link;
642	}	643	}
643	}	644	}
644	}	645	}
645	}
646
647	/*
648	* copy_to first frees everything allocated by the dst object,
649	* and then copies the contents of itself into the second
650	* object, allocating what needs to be allocated. Basically, any
651	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
652	* if the first object is freed, the pointers in the new object
653	* will point at garbage.
654	*/
655	void
656	object::copy_to (object *dst)
657	{
658	*dst = *this;
659		646
660	if (speed < 0)	647	if (speed < 0)
661	dst->speed_left -= rndm ();	648	dst->speed_left -= rndm ();
662		649
663	dst->set_speed (dst->speed);	650	dst->activate ();
664	}	651	}
665		652
666	void	653	void
667	object::instantiate ()	654	object::instantiate ()
668	{	655	{
…		…
685	object *	672	object *
686	object::clone ()	673	object::clone ()
687	{	674	{
688	object *neu = create ();	675	object *neu = create ();
689	copy_to (neu);	676	copy_to (neu);
		677	neu->map = map; // not copied by copy_to
690	return neu;	678	return neu;
691	}	679	}
692		680
693	/*	681	/*
694	* If an object with the IS_TURNABLE() flag needs to be turned due	682	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
745	* UP_OBJ_FACE: only the objects face has changed.	733	* UP_OBJ_FACE: only the objects face has changed.
746	*/	734	*/
747	void	735	void
748	update_object (object *op, int action)	736	update_object (object *op, int action)
749	{	737	{
750	if (op == NULL)	738	if (!op)
751	{	739	{
752	/* this should never happen */	740	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	741	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
754	return;	742	return;
755	}	743	}
756		744
757	if (op->env)	745	if (!op->is_on_map ())
758	{	746	{
759	/* Animation is currently handled by client, so nothing	747	/* Animation is currently handled by client, so nothing
760	* to do in this case.	748	* to do in this case.
761	*/	749	*/
762	return;	750	return;
763	}	751	}
764
765	/* If the map is saving, don't do anything as everything is
766	* going to get freed anyways.
767	*/
768	if (!op->map || op->map->in_memory == MAP_SAVING)
769	return;
770		752
771	/* make sure the object is within map boundaries */	753	/* make sure the object is within map boundaries */
772	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	754	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
773	{	755	{
774	LOG (llevError, "update_object() called for object out of map!\n");	756	LOG (llevError, "update_object() called for object out of map!\n");
…		…
785	else if (action == UP_OBJ_INSERT)	767	else if (action == UP_OBJ_INSERT)
786	{	768	{
787	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
788	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
789	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
790	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	772	|| (op->is_player () && !(m.flags_ & P_PLAYER))
791	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
792	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
793	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
794	|| (m.move_on | op->move_on ) != m.move_on	776	|| (m.move_on | op->move_on ) != m.move_on
795	|| (m.move_off | op->move_off ) != m.move_off	777	|| (m.move_off | op->move_off ) != m.move_off
796	|| (m.move_slow | op->move_slow) != m.move_slow	778	|| (m.move_slow | op->move_slow) != m.move_slow
797	/* This isn't perfect, but I don't expect a lot of objects to	779	/* This isn't perfect, but I don't expect a lot of objects to
798	* to have move_allow right now.	780	* have move_allow right now.
799	*/	781	*/
800	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	782	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
801	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	783	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
802	m.flags_ = 0;	784	m.invalidate ();
803	}	785	}
804	/* if the object is being removed, we can't make intelligent	786	/* if the object is being removed, we can't make intelligent
805	* decisions, because remove_ob can't really pass the object	787	* decisions, because remove_ob can't really pass the object
806	* that is being removed.	788	* that is being removed.
807	*/	789	*/
808	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	790	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
809	m.flags_ = 0;	791	m.invalidate ();
810	else if (action == UP_OBJ_FACE)	792	else if (action == UP_OBJ_FACE)
811	/* Nothing to do for that case */ ;	793	/* Nothing to do for that case */ ;
812	else	794	else
813	LOG (llevError, "update_object called with invalid action: %d\n", action);	795	LOG (llevError, "update_object called with invalid action: %d\n", action);
814		796
…		…
818		800
819	object::object ()	801	object::object ()
820	{	802	{
821	SET_FLAG (this, FLAG_REMOVED);	803	SET_FLAG (this, FLAG_REMOVED);
822		804
823	expmul = 1.0;	805	//expmul = 1.0; declared const for the time being
824	face = blank_face;	806	face = blank_face;
825	}	807	}
826		808
827	object::~object ()	809	object::~object ()
828	{	810	{
…		…
858	/* If already on active list, don't do anything */	840	/* If already on active list, don't do anything */
859	if (active)	841	if (active)
860	return;	842	return;
861		843
862	if (has_active_speed ())	844	if (has_active_speed ())
		845	{
		846	if (flag [FLAG_FREED])
		847	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		848
863	actives.insert (this);	849	actives.insert (this);
		850	}
864	}	851	}
865		852
866	void	853	void
867	object::activate_recursive ()	854	object::activate_recursive ()
868	{	855	{
…		…
917	object::destroy_inv (bool drop_to_ground)	904	object::destroy_inv (bool drop_to_ground)
918	{	905	{
919	// need to check first, because the checks below might segfault	906	// need to check first, because the checks below might segfault
920	// as we might be on an invalid mapspace and crossfire code	907	// as we might be on an invalid mapspace and crossfire code
921	// is too buggy to ensure that the inventory is empty.	908	// is too buggy to ensure that the inventory is empty.
922	// corollary: if you create arrows etc. with stuff in tis inventory,	909	// corollary: if you create arrows etc. with stuff in its inventory,
923	// cf will crash below with off-map x and y	910	// cf will crash below with off-map x and y
924	if (!inv)	911	if (!inv)
925	return;	912	return;
926		913
927	/* Only if the space blocks everything do we not process -	914	/* Only if the space blocks everything do we not process -
…		…
929	* drop on that space.	916	* drop on that space.
930	*/	917	*/
931	if (!drop_to_ground	918	if (!drop_to_ground
932	|| !map	919	|| !map
933	|| map->in_memory != MAP_ACTIVE	920	|| map->in_memory != MAP_ACTIVE
934	|| map->nodrop	921	|| map->no_drop
935	|| ms ().move_block == MOVE_ALL)	922	|| ms ().move_block == MOVE_ALL)
936	{	923	{
937	while (inv)	924	while (inv)
938	{
939	inv->destroy_inv (drop_to_ground);
940	inv->destroy ();	925	inv->destroy ();
941	}
942	}	926	}
943	else	927	else
944	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
945	while (inv)	929	while (inv)
946	{	930	{
…		…
964	object *op = new object;	948	object *op = new object;
965	op->link ();	949	op->link ();
966	return op;	950	return op;
967	}	951	}
968		952
		953	static struct freed_map : maptile
		954	{
		955	freed_map ()
		956	{
		957	path = "<freed objects map>";
		958	name = "/internal/freed_objects_map";
		959	width = 3;
		960	height = 3;
		961	no_drop = 1;
		962	no_reset = 1;
		963
		964	alloc ();
		965	in_memory = MAP_ACTIVE;
		966	}
		967
		968	~freed_map ()
		969	{
		970	destroy ();
		971	}
		972	} freed_map; // freed objects are moved here to avoid crashes
		973
969	void	974	void
970	object::do_destroy ()	975	object::do_destroy ()
971	{	976	{
972	if (flag [FLAG_IS_LINKED])	977	if (flag [FLAG_IS_LINKED])
973	remove_button_link (this);	978	remove_link ();
974		979
975	if (flag [FLAG_FRIENDLY])	980	if (flag [FLAG_FRIENDLY])
976	remove_friendly_object (this);	981	remove_friendly_object (this);
977		982
978	remove ();	983	remove ();
979		984
980	attachable::do_destroy ();	985	attachable::do_destroy ();
981		986
982	destroy_inv (true);
983
984	deactivate ();	987	deactivate ();
985	unlink ();	988	unlink ();
986		989
987	flag [FLAG_FREED] = 1;	990	flag [FLAG_FREED] = 1;
988		991
989	// hack to ensure that freed objects still have a valid map	992	// hack to ensure that freed objects still have a valid map
990	{
991	static maptile *freed_map; // freed objects are moved here to avoid crashes
992
993	if (!freed_map)
994	{
995	freed_map = new maptile;
996
997	freed_map->path = "<freed objects map>";
998	freed_map->name = "/internal/freed_objects_map";
999	freed_map->width = 3;
1000	freed_map->height = 3;
1001	freed_map->nodrop = 1;
1002
1003	freed_map->alloc ();
1004	freed_map->in_memory = MAP_ACTIVE;
1005	}
1006
1007	map = freed_map;	993	map = &freed_map;
1008	x = 1;	994	x = 1;
1009	y = 1;	995	y = 1;
1010	}
1011		996
1012	if (more)	997	if (more)
1013	{	998	{
1014	more->destroy ();	999	more->destroy ();
1015	more = 0;	1000	more = 0;
…		…
1023	attacked_by = 0;	1008	attacked_by = 0;
1024	current_weapon = 0;	1009	current_weapon = 0;
1025	}	1010	}
1026		1011
1027	void	1012	void
1028	object::destroy (bool destroy_inventory)	1013	object::destroy ()
1029	{	1014	{
1030	if (destroyed ())	1015	if (destroyed ())
1031	return;	1016	return;
1032		1017
1033	if (destroy_inventory)	1018	if (!is_head () && !head->destroyed ())
		1019	{
		1020	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1021	head->destroy ();
		1022	return;
		1023	}
		1024
1034	destroy_inv (false);	1025	destroy_inv (false);
1035		1026
1036	if (is_head ())	1027	if (is_head ())
1037	if (sound_destroy)	1028	if (sound_destroy)
1038	play_sound (sound_destroy);	1029	play_sound (sound_destroy);
1039	else if (flag [FLAG_MONSTER])	1030	else if (flag [FLAG_MONSTER])
…		…
1058	if (flag [FLAG_REMOVED])	1049	if (flag [FLAG_REMOVED])
1059	return;	1050	return;
1060		1051
1061	INVOKE_OBJECT (REMOVE, this);	1052	INVOKE_OBJECT (REMOVE, this);
1062		1053
1063	if (object *pl = visible_to ())
1064	esrv_del_item (pl->contr, count);
1065
1066	flag [FLAG_REMOVED] = true;	1054	flag [FLAG_REMOVED] = true;
1067		1055
1068	if (more)	1056	if (more)
1069	more->remove ();	1057	more->remove ();
1070		1058
…		…
1072	* In this case, the object to be removed is in someones	1060	* In this case, the object to be removed is in someones
1073	* inventory.	1061	* inventory.
1074	*/	1062	*/
1075	if (env)	1063	if (env)
1076	{	1064	{
		1065	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1066	if (object *pl = visible_to ())
		1067	esrv_del_item (pl->contr, count);
		1068	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1069
1077	adjust_weight (env, -total_weight ());	1070	adjust_weight (env, -total_weight ());
1078		1071
1079	*(above ? &above->below : &env->inv) = below;	1072	object *pl = in_player ();
1080
1081	if (below)
1082	below->above = above;
1083		1073
1084	/* we set up values so that it could be inserted into	1074	/* we set up values so that it could be inserted into
1085	* the map, but we don't actually do that - it is up	1075	* the map, but we don't actually do that - it is up
1086	* to the caller to decide what we want to do.	1076	* to the caller to decide what we want to do.
1087	*/	1077	*/
1088	map = env->map;	1078	map = env->map;
1089	x = env->x;	1079	x = env->x;
1090	y = env->y;	1080	y = env->y;
		1081
		1082	// make sure cmov optimisation is applicable
		1083	*(above ? &above->below : &env->inv) = below;
		1084	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1085
1091	above = 0;	1086	above = 0;
1092	below = 0;	1087	below = 0;
1093	env = 0;	1088	env = 0;
1094		1089
1095	/* NO_FIX_PLAYER is set when a great many changes are being	1090	/* NO_FIX_PLAYER is set when a great many changes are being
1096	* made to players inventory. If set, avoiding the call	1091	* made to players inventory. If set, avoiding the call
1097	* to save cpu time.	1092	* to save cpu time.
1098	*/	1093	*/
1099	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1094	if (pl)
		1095	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1096	{
1100	otmp->update_stats ();	1097	pl->update_stats ();
		1098
		1099	if (glow_radius && pl->is_on_map ())
		1100	update_all_los (pl->map, pl->x, pl->y);
		1101	}
1101	}	1102	}
1102	else if (map)	1103	else if (map)
1103	{	1104	{
1104	if (type == PLAYER)
1105	{
1106	// leaving a spot always closes any open container on the ground
1107	if (container && !container->env)
1108	// this causes spurious floorbox updates, but it ensures
1109	// that the CLOSE event is being sent.
1110	close_container ();
1111
1112	--map->players;
1113	map->touch ();
1114	}
1115
1116	map->dirty = true;	1105	map->dirty = true;
1117	mapspace &ms = this->ms ();	1106	mapspace &ms = this->ms ();
1118		1107
		1108	if (object *pl = ms.player ())
		1109	{
		1110	if (is_player ())
		1111	{
		1112	if (!flag [FLAG_WIZPASS])
		1113	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1114
		1115	// leaving a spot always closes any open container on the ground
		1116	if (container && !container->env)
		1117	// this causes spurious floorbox updates, but it ensures
		1118	// that the CLOSE event is being sent.
		1119	close_container ();
		1120
		1121	--map->players;
		1122	map->touch ();
		1123	}
		1124	else if (pl->container_ () == this)
		1125	{
		1126	// removing a container should close it
		1127	close_container ();
		1128	}
		1129
		1130	esrv_del_item (pl->contr, count);
		1131	}
		1132
1119	/* link the object above us */	1133	/* link the object above us */
1120	if (above)	1134	// re-link, make sure compiler can easily use cmove
1121	above->below = below;	1135	*(above ? &above->below : &ms.top) = below;
1122	else	1136	*(below ? &below->above : &ms.bot) = above;
1123	ms.top = below; /* we were top, set new top */
1124
1125	/* Relink the object below us, if there is one */
1126	if (below)
1127	below->above = above;
1128	else
1129	{
1130	/* Nothing below, which means we need to relink map object for this space
1131	* use translated coordinates in case some oddness with map tiling is
1132	* evident
1133	*/
1134	if (GET_MAP_OB (map, x, y) != this)
1135	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 ());
1136
1137	ms.bot = above; /* goes on above it. */
1138	}
1139		1137
1140	above = 0;	1138	above = 0;
1141	below = 0;	1139	below = 0;
1142		1140
		1141	ms.invalidate ();
		1142
1143	if (map->in_memory == MAP_SAVING)	1143	if (map->in_memory == MAP_SAVING)
1144	return;	1144	return;
1145		1145
1146	int check_walk_off = !flag [FLAG_NO_APPLY];	1146	int check_walk_off = !flag [FLAG_NO_APPLY];
1147		1147
1148	if (object *pl = ms.player ())	1148	if (object *pl = ms.player ())
1149	{	1149	{
1150	if (pl->container == this)	1150	if (pl->container_ () == this)
1151	/* If a container that the player is currently using somehow gets	1151	/* If a container that the player is currently using somehow gets
1152	* removed (most likely destroyed), update the player view	1152	* removed (most likely destroyed), update the player view
1153	* appropriately.	1153	* appropriately.
1154	*/	1154	*/
1155	pl->close_container ();	1155	pl->close_container ();
1156		1156
		1157	//TODO: the floorbox prev/next might need updating
		1158	//esrv_del_item (pl->contr, count);
		1159	//TODO: update floorbox to preserve ordering
		1160	if (pl->contr->ns)
1157	pl->contr->ns->floorbox_update ();	1161	pl->contr->ns->floorbox_update ();
1158	}	1162	}
1159		1163
1160	for (tmp = ms.bot; tmp; tmp = tmp->above)	1164	for (tmp = ms.bot; tmp; tmp = tmp->above)
1161	{	1165	{
1162	/* No point updating the players look faces if he is the object	1166	/* No point updating the players look faces if he is the object
…		…
1175	}	1179	}
1176		1180
1177	last = tmp;	1181	last = tmp;
1178	}	1182	}
1179		1183
1180	/* last == NULL if there are no objects on this space */	1184	if (affects_los ())
1181	//TODO: this makes little sense, why only update the topmost object?
1182	if (!last)
1183	map->at (x, y).flags_ = 0;
1184	else
1185	update_object (last, UP_OBJ_REMOVE);
1186
1187	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1188	update_all_los (map, x, y);	1185	update_all_los (map, x, y);
1189	}	1186	}
1190	}	1187	}
1191		1188
1192	/*	1189	/*
…		…
1216	esrv_update_item (UPD_NROF, pl, top);	1213	esrv_update_item (UPD_NROF, pl, top);
1217		1214
1218	op->weight = 0; // cancel the addition above	1215	op->weight = 0; // cancel the addition above
1219	op->carrying = 0; // must be 0 already	1216	op->carrying = 0; // must be 0 already
1220		1217
1221	op->destroy (1);	1218	op->destroy ();
1222		1219
1223	return top;	1220	return top;
1224	}	1221	}
1225		1222
1226	return 0;	1223	return 0;
…		…
1254	* job preparing multi-part monsters.	1251	* job preparing multi-part monsters.
1255	*/	1252	*/
1256	object *	1253	object *
1257	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1254	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1258	{	1255	{
		1256	op->remove ();
		1257
1259	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1258	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1260	{	1259	{
1261	tmp->x = x + tmp->arch->x;	1260	tmp->x = x + tmp->arch->x;
1262	tmp->y = y + tmp->arch->y;	1261	tmp->y = y + tmp->arch->y;
1263	}	1262	}
…		…
1286	* just 'op' otherwise	1285	* just 'op' otherwise
1287	*/	1286	*/
1288	object *	1287	object *
1289	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1288	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1290	{	1289	{
1291	assert (!op->flag [FLAG_FREED]);
1292
1293	object *top, *floor = NULL;
1294
1295	op->remove ();	1290	op->remove ();
		1291
		1292	if (m == &freed_map)//D TODO: remove soon
		1293	{//D
		1294	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1295	}//D
1296		1296
1297	/* Ideally, the caller figures this out. However, it complicates a lot	1297	/* Ideally, the caller figures this out. However, it complicates a lot
1298	* of areas of callers (eg, anything that uses find_free_spot would now	1298	* of areas of callers (eg, anything that uses find_free_spot would now
1299	* need extra work	1299	* need extra work
1300	*/	1300	*/
		1301	maptile *newmap = m;
1301	if (!xy_normalise (m, op->x, op->y))	1302	if (!xy_normalise (newmap, op->x, op->y))
1302	{	1303	{
1303	op->destroy ();	1304	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1304	return 0;	1305	return 0;
1305	}	1306	}
1306		1307
1307	if (object *more = op->more)	1308	if (object *more = op->more)
1308	if (!insert_ob_in_map (more, m, originator, flag))	1309	if (!insert_ob_in_map (more, m, originator, flag))
1309	return 0;	1310	return 0;
1310		1311
1311	CLEAR_FLAG (op, FLAG_REMOVED);	1312	op->flag [FLAG_REMOVED] = false;
1312		1313	op->env = 0;
1313	op->map = m;	1314	op->map = newmap;
		1315
1314	mapspace &ms = op->ms ();	1316	mapspace &ms = op->ms ();
1315		1317
1316	/* this has to be done after we translate the coordinates.	1318	/* this has to be done after we translate the coordinates.
1317	*/	1319	*/
1318	if (op->nrof && !(flag & INS_NO_MERGE))	1320	if (op->nrof && !(flag & INS_NO_MERGE))
1319	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1321	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1320	if (object::can_merge (op, tmp))	1322	if (object::can_merge (op, tmp))
1321	{	1323	{
		1324	// TODO: we actually want to update tmp, not op,
		1325	// but some caller surely breaks when we return tmp
		1326	// from here :/
1322	op->nrof += tmp->nrof;	1327	op->nrof += tmp->nrof;
1323	tmp->destroy (1);	1328	tmp->destroy ();
1324	}	1329	}
1325		1330
1326	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1331	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1327	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1332	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1328		1333
…		…
1335	{	1340	{
1336	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1341	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1337	abort ();	1342	abort ();
1338	}	1343	}
1339		1344
		1345	if (!originator->is_on_map ())
		1346	{
		1347	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1348	op->debug_desc (), originator->debug_desc ());
		1349	abort ();
		1350	}
		1351
1340	op->above = originator;	1352	op->above = originator;
1341	op->below = originator->below;	1353	op->below = originator->below;
1342
1343	if (op->below)
1344	op->below->above = op;
1345	else
1346	ms.bot = op;
1347
1348	/* since *below* originator, no need to update top */
1349	originator->below = op;	1354	originator->below = op;
		1355
		1356	*(op->below ? &op->below->above : &ms.bot) = op;
1350	}	1357	}
1351	else	1358	else
1352	{	1359	{
1353	top = ms.bot;	1360	object *floor = 0;
		1361	object *top = ms.top;
1354		1362
1355	/* If there are other objects, then */	1363	/* If there are other objects, then */
1356	if (top)	1364	if (top)
1357	{	1365	{
1358	object *last = 0;
1359
1360	/*	1366	/*
1361	* If there are multiple objects on this space, we do some trickier handling.	1367	* If there are multiple objects on this space, we do some trickier handling.
1362	* We've already dealt with merging if appropriate.	1368	* We've already dealt with merging if appropriate.
1363	* Generally, we want to put the new object on top. But if	1369	* Generally, we want to put the new object on top. But if
1364	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1370	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1367	* once we get to them. This reduces the need to traverse over all of	1373	* once we get to them. This reduces the need to traverse over all of
1368	* them when adding another one - this saves quite a bit of cpu time	1374	* them when adding another one - this saves quite a bit of cpu time
1369	* when lots of spells are cast in one area. Currently, it is presumed	1375	* when lots of spells are cast in one area. Currently, it is presumed
1370	* that flying non pickable objects are spell objects.	1376	* that flying non pickable objects are spell objects.
1371	*/	1377	*/
1372	for (top = ms.bot; top; top = top->above)	1378	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1373	{	1379	{
1374	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1380	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1375	floor = top;	1381	floor = tmp;
1376		1382
1377	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1383	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1378	{	1384	{
1379	/* We insert above top, so we want this object below this */	1385	/* We insert above top, so we want this object below this */
1380	top = top->below;	1386	top = tmp->below;
1381	break;	1387	break;
1382	}	1388	}
1383		1389
1384	last = top;	1390	top = tmp;
1385	}	1391	}
1386
1387	/* Don't want top to be NULL, so set it to the last valid object */
1388	top = last;
1389		1392
1390	/* We let update_position deal with figuring out what the space	1393	/* We let update_position deal with figuring out what the space
1391	* looks like instead of lots of conditions here.	1394	* looks like instead of lots of conditions here.
1392	* makes things faster, and effectively the same result.	1395	* makes things faster, and effectively the same result.
1393	*/	1396	*/
…		…
1400	*/	1403	*/
1401	if (!(flag & INS_ON_TOP)	1404	if (!(flag & INS_ON_TOP)
1402	&& ms.flags () & P_BLOCKSVIEW	1405	&& ms.flags () & P_BLOCKSVIEW
1403	&& (op->face && !faces [op->face].visibility))	1406	&& (op->face && !faces [op->face].visibility))
1404	{	1407	{
		1408	object *last;
		1409
1405	for (last = top; last != floor; last = last->below)	1410	for (last = top; last != floor; last = last->below)
1406	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1411	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1407	break;	1412	break;
1408		1413
1409	/* Check to see if we found the object that blocks view,	1414	/* Check to see if we found the object that blocks view,
…		…
1417	} /* If objects on this space */	1422	} /* If objects on this space */
1418		1423
1419	if (flag & INS_ABOVE_FLOOR_ONLY)	1424	if (flag & INS_ABOVE_FLOOR_ONLY)
1420	top = floor;	1425	top = floor;
1421		1426
1422	/* Top is the object that our object (op) is going to get inserted above.	1427	// insert object above top, or bottom-most if top = 0
1423	*/
1424
1425	/* First object on this space */
1426	if (!top)	1428	if (!top)
1427	{	1429	{
		1430	op->below = 0;
1428	op->above = ms.bot;	1431	op->above = ms.bot;
1429
1430	if (op->above)
1431	op->above->below = op;
1432
1433	op->below = 0;
1434	ms.bot = op;	1432	ms.bot = op;
		1433
		1434	*(op->above ? &op->above->below : &ms.top) = op;
1435	}	1435	}
1436	else	1436	else
1437	{ /* get inserted into the stack above top */	1437	{
1438	op->above = top->above;	1438	op->above = top->above;
1439
1440	if (op->above)
1441	op->above->below = op;	1439	top->above = op;
1442		1440
1443	op->below = top;	1441	op->below = top;
1444	top->above = op;	1442	*(op->above ? &op->above->below : &ms.top) = op;
1445	}	1443	}
		1444	}
1446		1445
1447	if (!op->above)	1446	if (op->is_player ())
1448	ms.top = op;
1449	} /* else not INS_BELOW_ORIGINATOR */
1450
1451	if (op->type == PLAYER)
1452	{	1447	{
1453	op->contr->do_los = 1;	1448	op->contr->do_los = 1;
1454	++op->map->players;	1449	++op->map->players;
1455	op->map->touch ();	1450	op->map->touch ();
1456	}	1451	}
1457		1452
1458	op->map->dirty = true;	1453	op->map->dirty = true;
1459		1454
1460	if (object *pl = ms.player ())	1455	if (object *pl = ms.player ())
		1456	//TODO: the floorbox prev/next might need updating
		1457	//esrv_send_item (pl, op);
		1458	//TODO: update floorbox to preserve ordering
		1459	if (pl->contr->ns)
1461	pl->contr->ns->floorbox_update ();	1460	pl->contr->ns->floorbox_update ();
1462		1461
1463	/* If this object glows, it may affect lighting conditions that are	1462	/* If this object glows, it may affect lighting conditions that are
1464	* visible to others on this map. But update_all_los is really	1463	* visible to others on this map. But update_all_los is really
1465	* an inefficient way to do this, as it means los for all players	1464	* an inefficient way to do this, as it means los for all players
1466	* on the map will get recalculated. The players could very well	1465	* on the map will get recalculated. The players could very well
1467	* be far away from this change and not affected in any way -	1466	* be far away from this change and not affected in any way -
1468	* this should get redone to only look for players within range,	1467	* this should get redone to only look for players within range,
1469	* or just updating the P_UPTODATE for spaces within this area	1468	* or just updating the P_UPTODATE for spaces within this area
1470	* of effect may be sufficient.	1469	* of effect may be sufficient.
1471	*/	1470	*/
1472	if (op->map->darkness && (op->glow_radius != 0))	1471	if (op->affects_los ())
		1472	{
		1473	op->ms ().invalidate ();
1473	update_all_los (op->map, op->x, op->y);	1474	update_all_los (op->map, op->x, op->y);
		1475	}
1474		1476
1475	/* updates flags (blocked, alive, no magic, etc) for this map space */	1477	/* updates flags (blocked, alive, no magic, etc) for this map space */
1476	update_object (op, UP_OBJ_INSERT);	1478	update_object (op, UP_OBJ_INSERT);
1477		1479
1478	INVOKE_OBJECT (INSERT, op);	1480	INVOKE_OBJECT (INSERT, op);
…		…
1485	* blocked() and wall() work properly), and these flags are updated by	1487	* blocked() and wall() work properly), and these flags are updated by
1486	* update_object().	1488	* update_object().
1487	*/	1489	*/
1488		1490
1489	/* if this is not the head or flag has been passed, don't check walk on status */	1491	/* if this is not the head or flag has been passed, don't check walk on status */
1490	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1492	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1491	{	1493	{
1492	if (check_move_on (op, originator))	1494	if (check_move_on (op, originator))
1493	return 0;	1495	return 0;
1494		1496
1495	/* If we are a multi part object, lets work our way through the check	1497	/* If we are a multi part object, lets work our way through the check
…		…
1506	/* this function inserts an object in the map, but if it	1508	/* this function inserts an object in the map, but if it
1507	* finds an object of its own type, it'll remove that one first.	1509	* finds an object of its own type, it'll remove that one first.
1508	* op is the object to insert it under: supplies x and the map.	1510	* op is the object to insert it under: supplies x and the map.
1509	*/	1511	*/
1510	void	1512	void
1511	replace_insert_ob_in_map (const char *arch_string, object *op)	1513	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1512	{	1514	{
1513	/* first search for itself and remove any old instances */	1515	/* first search for itself and remove any old instances */
1514		1516
1515	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1516	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1518	if (tmp->arch->archname == archname) /* same archetype */
1517	tmp->destroy (1);	1519	tmp->destroy ();
1518		1520
1519	object *tmp = arch_to_object (archetype::find (arch_string));	1521	object *tmp = arch_to_object (archetype::find (archname));
1520		1522
1521	tmp->x = op->x;	1523	tmp->x = op->x;
1522	tmp->y = op->y;	1524	tmp->y = op->y;
1523		1525
1524	insert_ob_in_map (tmp, op->map, op, 0);	1526	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1546	if (!nr)	1548	if (!nr)
1547	return true;	1549	return true;
1548		1550
1549	nr = min (nr, nrof);	1551	nr = min (nr, nrof);
1550		1552
		1553	if (nrof > nr)
		1554	{
1551	nrof -= nr;	1555	nrof -= nr;
1552
1553	if (nrof)
1554	{
1555	adjust_weight (env, -weight * nr); // carrying == 0	1556	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1556		1557
1557	if (object *pl = visible_to ())	1558	if (object *pl = visible_to ())
1558	esrv_update_item (UPD_NROF, pl, this);	1559	esrv_update_item (UPD_NROF, pl, this);
1559		1560
1560	return true;	1561	return true;
1561	}	1562	}
1562	else	1563	else
1563	{	1564	{
1564	destroy (1);	1565	destroy ();
1565	return false;	1566	return false;
1566	}	1567	}
1567	}	1568	}
1568		1569
1569	/*	1570	/*
…		…
1586	}	1587	}
1587	else	1588	else
1588	{	1589	{
1589	decrease (nr);	1590	decrease (nr);
1590		1591
1591	object *op = object_create_clone (this);	1592	object *op = deep_clone ();
1592	op->nrof = nr;	1593	op->nrof = nr;
1593	return op;	1594	return op;
1594	}	1595	}
1595	}	1596	}
1596		1597
…		…
1646	if (object *pl = tmp->visible_to ())	1647	if (object *pl = tmp->visible_to ())
1647	esrv_update_item (UPD_NROF, pl, tmp);	1648	esrv_update_item (UPD_NROF, pl, tmp);
1648		1649
1649	adjust_weight (this, op->total_weight ());	1650	adjust_weight (this, op->total_weight ());
1650		1651
1651	op->destroy (1);	1652	op->destroy ();
1652	op = tmp;	1653	op = tmp;
1653	goto inserted;	1654	goto inserted;
1654	}	1655	}
1655		1656
1656	op->owner = 0; // it's his/hers now. period.	1657	op->owner = 0; // it's his/hers now. period.
…		…
1674		1675
1675	adjust_weight (this, op->total_weight ());	1676	adjust_weight (this, op->total_weight ());
1676		1677
1677	inserted:	1678	inserted:
1678	/* reset the light list and los of the players on the map */	1679	/* reset the light list and los of the players on the map */
1679	if (op->glow_radius && map && map->darkness)	1680	if (op->glow_radius && is_on_map ())
		1681	{
		1682	update_stats ();
1680	update_all_los (map, x, y);	1683	update_all_los (map, x, y);
1681		1684	}
		1685	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1682	// if this is a player's inventory, update stats	1686	// if this is a player's inventory, update stats
1683	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1684	update_stats ();	1687	update_stats ();
1685		1688
1686	INVOKE_OBJECT (INSERT, this);	1689	INVOKE_OBJECT (INSERT, this);
1687		1690
1688	return op;	1691	return op;
…		…
1709	* on top.	1712	* on top.
1710	*/	1713	*/
1711	int	1714	int
1712	check_move_on (object *op, object *originator)	1715	check_move_on (object *op, object *originator)
1713	{	1716	{
		1717	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1718	return 0;
		1719
1714	object *tmp;	1720	object *tmp;
1715	maptile *m = op->map;	1721	maptile *m = op->map;
1716	int x = op->x, y = op->y;	1722	int x = op->x, y = op->y;
1717		1723
1718	MoveType move_on, move_slow, move_block;	1724	mapspace &ms = m->at (x, y);
1719		1725
1720	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1726	ms.update ();
1721	return 0;
1722		1727
1723	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1728	MoveType move_on = ms.move_on;
1724	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1729	MoveType move_slow = ms.move_slow;
1725	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1730	MoveType move_block = ms.move_block;
1726		1731
1727	/* if nothing on this space will slow op down or be applied,	1732	/* if nothing on this space will slow op down or be applied,
1728	* no need to do checking below. have to make sure move_type	1733	* no need to do checking below. have to make sure move_type
1729	* is set, as lots of objects don't have it set - we treat that	1734	* is set, as lots of objects don't have it set - we treat that
1730	* as walking.	1735	* as walking.
…		…
1741	return 0;	1746	return 0;
1742		1747
1743	/* The objects have to be checked from top to bottom.	1748	/* The objects have to be checked from top to bottom.
1744	* Hence, we first go to the top:	1749	* Hence, we first go to the top:
1745	*/	1750	*/
1746		1751	for (object *next, *tmp = ms.top; tmp; tmp = next)
1747	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1748	{
1749	/* Trim the search when we find the first other spell effect
1750	* this helps performance so that if a space has 50 spell objects,
1751	* we don't need to check all of them.
1752	*/
1753	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1754	break;
1755	}	1752	{
		1753	next = tmp->below;
1756		1754
1757	for (; tmp; tmp = tmp->below)
1758	{
1759	if (tmp == op)	1755	if (tmp == op)
1760	continue; /* Can't apply yourself */	1756	continue; /* Can't apply yourself */
1761		1757
1762	/* Check to see if one of the movement types should be slowed down.	1758	/* Check to see if one of the movement types should be slowed down.
1763	* Second check makes sure that the movement types not being slowed	1759	* Second check makes sure that the movement types not being slowed
…		…
1768	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1764	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1769	{	1765	{
1770	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1771	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1772	{	1768	{
1773
1774	float
1775	diff = tmp->move_slow_penalty * fabs (op->speed);	1769	float diff = tmp->move_slow_penalty * fabs (op->speed);
1776		1770
1777	if (op->type == PLAYER)	1771	if (op->is_player ())
1778	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1772	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1779	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1773	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1780	diff /= 4.0;	1774	diff /= 4.0;
1781		1775
1782	op->speed_left -= diff;	1776	op->speed_left -= diff;
1783	}	1777	}
1784	}	1778	}
…		…
1817	LOG (llevError, "Present_arch called outside map.\n");	1811	LOG (llevError, "Present_arch called outside map.\n");
1818	return NULL;	1812	return NULL;
1819	}	1813	}
1820		1814
1821	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1815	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1822	if (tmp->arch == at)	1816	if (tmp->arch->archname == at->archname)
1823	return tmp;	1817	return tmp;
1824		1818
1825	return NULL;	1819	return NULL;
1826	}	1820	}
1827		1821
…		…
1891	* The first matching object is returned, or NULL if none.	1885	* The first matching object is returned, or NULL if none.
1892	*/	1886	*/
1893	object *	1887	object *
1894	present_arch_in_ob (const archetype *at, const object *op)	1888	present_arch_in_ob (const archetype *at, const object *op)
1895	{	1889	{
1896	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1890	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1897	if (tmp->arch == at)	1891	if (tmp->arch->archname == at->archname)
1898	return tmp;	1892	return tmp;
1899		1893
1900	return NULL;	1894	return NULL;
1901	}	1895	}
1902		1896
…		…
1990	* head of the object should correspond for the entire object.	1984	* head of the object should correspond for the entire object.
1991	*/	1985	*/
1992	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1986	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1993	continue;	1987	continue;
1994		1988
1995	if (ob->blocked (m, pos.x, pos.y))	1989	if (ob->blocked (pos.m, pos.x, pos.y))
1996	continue;	1990	continue;
1997		1991
1998	altern [index++] = i;	1992	altern [index++] = i;
1999	}	1993	}
2000		1994
…		…
2068	* there is capable of.	2062	* there is capable of.
2069	*/	2063	*/
2070	int	2064	int
2071	find_dir (maptile *m, int x, int y, object *exclude)	2065	find_dir (maptile *m, int x, int y, object *exclude)
2072	{	2066	{
2073	int i, max = SIZEOFFREE, mflags;	2067	int max = SIZEOFFREE, mflags;
2074
2075	sint16 nx, ny;
2076	object *tmp;
2077	maptile *mp;
2078
2079	MoveType blocked, move_type;	2068	MoveType move_type;
2080		2069
2081	if (exclude && exclude->head_ () != exclude)	2070	if (exclude && exclude->head_ () != exclude)
2082	{	2071	{
2083	exclude = exclude->head;	2072	exclude = exclude->head;
2084	move_type = exclude->move_type;	2073	move_type = exclude->move_type;
…		…
2087	{	2076	{
2088	/* If we don't have anything, presume it can use all movement types. */	2077	/* If we don't have anything, presume it can use all movement types. */
2089	move_type = MOVE_ALL;	2078	move_type = MOVE_ALL;
2090	}	2079	}
2091		2080
2092	for (i = 1; i < max; i++)	2081	for (int i = 1; i < max; i++)
2093	{	2082	{
2094	mp = m;	2083	mapxy pos (m, x, y);
2095	nx = x + freearr_x[i];	2084	pos.move (i);
2096	ny = y + freearr_y[i];
2097		2085
2098	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2086	if (!pos.normalise ())
2099
2100	if (mflags & P_OUT_OF_MAP)
2101	max = maxfree[i];	2087	max = maxfree[i];
2102	else	2088	else
2103	{	2089	{
2104	mapspace &ms = mp->at (nx, ny);	2090	mapspace &ms = *pos;
2105		2091
2106	blocked = ms.move_block;
2107
2108	if ((move_type & blocked) == move_type)	2092	if ((move_type & ms.move_block) == move_type)
2109	max = maxfree[i];	2093	max = maxfree [i];
2110	else if (mflags & P_IS_ALIVE)	2094	else if (ms.flags () & P_IS_ALIVE)
2111	{	2095	{
2112	for (tmp = ms.bot; tmp; tmp = tmp->above)	2096	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2113	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2097	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2114	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2098	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2115	break;
2116
2117	if (tmp)
2118	return freedir[i];	2099	return freedir [i];
2119	}	2100	}
2120	}	2101	}
2121	}	2102	}
2122		2103
2123	return 0;	2104	return 0;
…		…
2198	* This basically means that if direction is 15, then it could either go	2179	* This basically means that if direction is 15, then it could either go
2199	* direction 4, 14, or 16 to get back to where we are.	2180	* direction 4, 14, or 16 to get back to where we are.
2200	* Moved from spell_util.c to object.c with the other related direction	2181	* Moved from spell_util.c to object.c with the other related direction
2201	* functions.	2182	* functions.
2202	*/	2183	*/
2203	int reduction_dir[SIZEOFFREE][3] = {	2184	const int reduction_dir[SIZEOFFREE][3] = {
2204	{0, 0, 0}, /* 0 */	2185	{0, 0, 0}, /* 0 */
2205	{0, 0, 0}, /* 1 */	2186	{0, 0, 0}, /* 1 */
2206	{0, 0, 0}, /* 2 */	2187	{0, 0, 0}, /* 2 */
2207	{0, 0, 0}, /* 3 */	2188	{0, 0, 0}, /* 3 */
2208	{0, 0, 0}, /* 4 */	2189	{0, 0, 0}, /* 4 */
…		…
2304	int	2285	int
2305	can_pick (const object *who, const object *item)	2286	can_pick (const object *who, const object *item)
2306	{	2287	{
2307	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2288	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2308	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2289	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2309	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2290	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2310	}	2291	}
2311		2292
2312	/*	2293	/*
2313	* create clone from object to another	2294	* create clone from object to another
2314	*/	2295	*/
2315	object *	2296	object *
2316	object_create_clone (object *asrc)	2297	object::deep_clone ()
2317	{	2298	{
2318	object *dst = 0, *tmp, *src, *prev, *item;	2299	assert (("deep_clone called on non-head object", is_head ()));
2319		2300
2320	if (!asrc)	2301	object *dst = clone ();
2321	return 0;
2322		2302
2323	src = asrc->head_ ();	2303	object *prev = dst;
2324
2325	prev = 0;
2326	for (object *part = src; part; part = part->more)	2304	for (object *part = this->more; part; part = part->more)
2327	{	2305	{
2328	tmp = part->clone ();	2306	object *tmp = part->clone ();
2329	tmp->x -= src->x;
2330	tmp->y -= src->y;
2331
2332	if (!part->head)
2333	{
2334	dst = tmp;
2335	tmp->head = 0;
2336	}
2337	else
2338	tmp->head = dst;	2307	tmp->head = dst;
2339
2340	tmp->more = 0;
2341
2342	if (prev)
2343	prev->more = tmp;	2308	prev->more = tmp;
2344
2345	prev = tmp;	2309	prev = tmp;
2346	}	2310	}
2347		2311
2348	for (item = src->inv; item; item = item->below)	2312	for (object *item = inv; item; item = item->below)
2349	insert_ob_in_ob (object_create_clone (item), dst);	2313	insert_ob_in_ob (item->deep_clone (), dst);
2350		2314
2351	return dst;	2315	return dst;
2352	}	2316	}
2353		2317
2354	/* This returns the first object in who's inventory that	2318	/* This returns the first object in who's inventory that
…		…
2363	return tmp;	2327	return tmp;
2364		2328
2365	return 0;	2329	return 0;
2366	}	2330	}
2367		2331
2368	/* If ob has a field named key, return the link from the list,	2332	shstr_tmp
2369	* otherwise return NULL.	2333	object::kv_get (shstr_tmp key) const
2370	*
2371	* key must be a passed in shared string - otherwise, this won't
2372	* do the desired thing.
2373	*/
2374	key_value *
2375	get_ob_key_link (const object *ob, const char *key)
2376	{	2334	{
2377	for (key_value *link = ob->key_values; link; link = link->next)	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2378	if (link->key == key)	2336	if (kv->key == key)
2379	return link;
2380
2381	return 0;
2382	}
2383
2384	/*
2385	* Returns the value of op has an extra_field for key, or NULL.
2386	*
2387	* The argument doesn't need to be a shared string.
2388	*
2389	* The returned string is shared.
2390	*/
2391	const char *
2392	get_ob_key_value (const object *op, const char *const key)
2393	{
2394	key_value *link;
2395	shstr_cmp canonical_key (key);
2396
2397	if (!canonical_key)
2398	{
2399	/* 1. There being a field named key on any object
2400	* implies there'd be a shared string to find.
2401	* 2. Since there isn't, no object has this field.
2402	* 3. Therefore, *this* object doesn't have this field.
2403	*/
2404	return 0;
2405	}
2406
2407	/* This is copied from get_ob_key_link() above -
2408	* only 4 lines, and saves the function call overhead.
2409	*/
2410	for (link = op->key_values; link; link = link->next)
2411	if (link->key == canonical_key)
2412	return link->value;	2337	return kv->value;
2413		2338
2414	return 0;	2339	return shstr ();
2415	}	2340	}
2416		2341
2417	/*	2342	void
2418	* Updates the canonical_key in op to value.	2343	object::kv_set (shstr_tmp key, shstr_tmp value)
2419	*
2420	* canonical_key is a shared string (value doesn't have to be).
2421	*
2422	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2423	* keys.
2424	*
2425	* Returns TRUE on success.
2426	*/
2427	int
2428	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2429	{	2344	{
2430	key_value *field = NULL, *last = NULL;	2345	for (key_value *kv = key_values; kv; kv = kv->next)
2431		2346	if (kv->key == key)
2432	for (field = op->key_values; field != NULL; field = field->next)
2433	{
2434	if (field->key != canonical_key)
2435	{	2347	{
2436	last = field;	2348	kv->value = value;
2437	continue;	2349	return;
2438	}	2350	}
2439		2351
2440	if (value)	2352	key_value *kv = new key_value;
2441	field->value = value;	2353
2442	else	2354	kv->next = key_values;
		2355	kv->key = key;
		2356	kv->value = value;
		2357
		2358	key_values = kv;
		2359	}
		2360
		2361	void
		2362	object::kv_del (shstr_tmp key)
		2363	{
		2364	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2365	if ((*kvp)->key == key)
2443	{	2366	{
2444	/* Basically, if the archetype has this key set,	2367	key_value *kv = *kvp;
2445	* we need to store the null value so when we save	2368	*kvp = (*kvp)->next;
2446	* it, we save the empty value so that when we load,	2369	delete kv;
2447	* we get this value back again.	2370	return;
2448	*/
2449	if (get_ob_key_link (op->arch, canonical_key))
2450	field->value = 0;
2451	else
2452	{
2453	if (last)
2454	last->next = field->next;
2455	else
2456	op->key_values = field->next;
2457
2458	delete field;
2459	}
2460	}	2371	}
2461	return TRUE;
2462	}
2463	/* IF we get here, key doesn't exist */
2464
2465	/* No field, we'll have to add it. */
2466
2467	if (!add_key)
2468	return FALSE;
2469
2470	/* There isn't any good reason to store a null
2471	* value in the key/value list. If the archetype has
2472	* this key, then we should also have it, so shouldn't
2473	* be here. If user wants to store empty strings,
2474	* should pass in ""
2475	*/
2476	if (value == NULL)
2477	return TRUE;
2478
2479	field = new key_value;
2480
2481	field->key = canonical_key;
2482	field->value = value;
2483	/* Usual prepend-addition. */
2484	field->next = op->key_values;
2485	op->key_values = field;
2486
2487	return TRUE;
2488	}
2489
2490	/*
2491	* Updates the key in op to value.
2492	*
2493	* If add_key is FALSE, this will only update existing keys,
2494	* and not add new ones.
2495	* In general, should be little reason FALSE is ever passed in for add_key
2496	*
2497	* Returns TRUE on success.
2498	*/
2499	int
2500	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2501	{
2502	shstr key_ (key);
2503
2504	return set_ob_key_value_s (op, key_, value, add_key);
2505	}	2372	}
2506		2373
2507	object::depth_iterator::depth_iterator (object *container)	2374	object::depth_iterator::depth_iterator (object *container)
2508	: iterator_base (container)	2375	: iterator_base (container)
2509	{	2376	{
…		…
2559	{	2426	{
2560	char flagdesc[512];	2427	char flagdesc[512];
2561	char info2[256 * 4];	2428	char info2[256 * 4];
2562	char *p = info;	2429	char *p = info;
2563		2430
2564	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2431	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2565	count,	2432	count,
2566	uuid.c_str (),	2433	uuid.c_str (),
2567	&name,	2434	&name,
2568	title ? "\",title:\"" : "",	2435	title ? ",title:\"" : "",
2569	title ? (const char *)title : "",	2436	title ? (const char *)title : "",
		2437	title ? "\"" : "",
2570	flag_desc (flagdesc, 512), type);	2438	flag_desc (flagdesc, 512), type);
2571		2439
2572	if (!this->flag[FLAG_REMOVED] && env)	2440	if (!flag[FLAG_REMOVED] && env)
2573	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2441	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2574		2442
2575	if (map)	2443	if (map)
2576	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2444	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2577		2445
…		…
2607	object::open_container (object *new_container)	2475	object::open_container (object *new_container)
2608	{	2476	{
2609	if (container == new_container)	2477	if (container == new_container)
2610	return;	2478	return;
2611		2479
2612	if (object *old_container = container)	2480	object *old_container = container;
		2481
		2482	if (old_container)
2613	{	2483	{
2614	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2484	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2615	return;	2485	return;
2616		2486
2617	#if 0	2487	#if 0
…		…
2619	if (object *closer = old_container->inv)	2489	if (object *closer = old_container->inv)
2620	if (closer->type == CLOSE_CON)	2490	if (closer->type == CLOSE_CON)
2621	closer->destroy ();	2491	closer->destroy ();
2622	#endif	2492	#endif
2623		2493
		2494	// make sure the container is available
		2495	esrv_send_item (this, old_container);
		2496
2624	old_container->flag [FLAG_APPLIED] = 0;	2497	old_container->flag [FLAG_APPLIED] = false;
2625	container = 0;	2498	container = 0;
2626		2499
		2500	// client needs item update to make it work, client bug requires this to be separate
2627	esrv_update_item (UPD_FLAGS, this, old_container);	2501	esrv_update_item (UPD_FLAGS, this, old_container);
		2502
2628	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2503	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2629	play_sound (sound_find ("chest_close"));	2504	play_sound (sound_find ("chest_close"));
2630	}	2505	}
2631		2506
2632	if (new_container)	2507	if (new_container)
2633	{	2508	{
…		…
2643	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2518	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2644	new_container->insert (closer);	2519	new_container->insert (closer);
2645	}	2520	}
2646	#endif	2521	#endif
2647		2522
2648	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2523	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2649		2524
		2525	// make sure the container is available, client bug requires this to be separate
		2526	esrv_send_item (this, new_container);
		2527
2650	new_container->flag [FLAG_APPLIED] = 1;	2528	new_container->flag [FLAG_APPLIED] = true;
2651	container = new_container;	2529	container = new_container;
2652		2530
		2531	// client needs flag change
2653	esrv_update_item (UPD_FLAGS, this, new_container);	2532	esrv_update_item (UPD_FLAGS, this, new_container);
2654	esrv_send_inventory (this, new_container);	2533	esrv_send_inventory (this, new_container);
2655	play_sound (sound_find ("chest_open"));	2534	play_sound (sound_find ("chest_open"));
2656	}	2535	}
		2536	// else if (!old_container->env && contr && contr->ns)
		2537	// contr->ns->floorbox_reset ();
2657	}	2538	}
2658		2539
2659	object *	2540	object *
2660	object::force_find (const shstr name)	2541	object::force_find (shstr_tmp name)
2661	{	2542	{
2662	/* cycle through his inventory to look for the MARK we want to	2543	/* cycle through his inventory to look for the MARK we want to
2663	* place	2544	* place
2664	*/	2545	*/
2665	for (object *tmp = inv; tmp; tmp = tmp->below)	2546	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2668		2549
2669	return 0;	2550	return 0;
2670	}	2551	}
2671		2552
2672	void	2553	void
		2554	object::force_set_timer (int duration)
		2555	{
		2556	this->duration = 1;
		2557	this->speed_left = -1.f;
		2558
		2559	this->set_speed (duration ? 1.f / duration : 0.f);
		2560	}
		2561
		2562	object *
2673	object::force_add (const shstr name, int duration)	2563	object::force_add (shstr_tmp name, int duration)
2674	{	2564	{
2675	if (object *force = force_find (name))	2565	if (object *force = force_find (name))
2676	force->destroy ();	2566	force->destroy ();
2677		2567
2678	object *force = get_archetype (FORCE_NAME);	2568	object *force = get_archetype (FORCE_NAME);
2679		2569
2680	force->slaying = name;	2570	force->slaying = name;
2681	force->stats.food = 1;
2682	force->speed_left = -1.f;
2683		2571
2684	force->set_speed (duration ? 1.f / duration : 0.f);	2572	force->force_set_timer (duration);
2685	force->flag [FLAG_IS_USED_UP] = true;	2573
2686	force->flag [FLAG_APPLIED] = true;	2574	force->flag [FLAG_APPLIED] = true;
2687		2575
2688	insert (force);	2576	return insert (force);
2689	}	2577	}
2690		2578
2691	void	2579	void
2692	object::play_sound (faceidx sound)	2580	object::play_sound (faceidx sound) const
2693	{	2581	{
2694	if (!sound)	2582	if (!sound)
2695	return;	2583	return;
2696		2584
2697	if (flag [FLAG_REMOVED])	2585	if (is_on_map ())
		2586	map->play_sound (sound, x, y);
		2587	else if (object *pl = in_player ())
		2588	pl->contr->play_sound (sound);
		2589	}
		2590
		2591	void
		2592	object::say_msg (const char *msg) const
		2593	{
		2594	if (is_on_map ())
		2595	map->say_msg (msg, x, y);
		2596	else if (object *pl = in_player ())
		2597	pl->contr->play_sound (sound);
		2598	}
		2599
		2600	void
		2601	object::make_noise ()
		2602	{
		2603	// we do not model noise in the map, so instead put
		2604	// a temporary light into the noise source
		2605	// could use the map instead, but that's less reliable for our
		2606	// goal, which is to make invisibility a bit harder to exploit
		2607
		2608	// currently only works sensibly for players
		2609	if (!is_player ())
2698	return;	2610	return;
2699		2611
2700	if (env)	2612	// find old force, or create new one
2701	{	2613	object *force = force_find (shstr_noise_force);
2702	if (object *pl = in_player ())	2614
2703	pl->contr->play_sound (sound);	2615	if (force)
2704	}	2616	force->speed_left = -1.f; // patch old speed up
2705	else	2617	else
2706	map->play_sound (sound, x, y);	2618	{
2707	}	2619	force = archetype::get (shstr_noise_force);
2708		2620
		2621	force->slaying = shstr_noise_force;
		2622	force->stats.food = 1;
		2623	force->speed_left = -1.f;
		2624
		2625	force->set_speed (1.f / 4.f);
		2626	force->flag [FLAG_IS_USED_UP] = true;
		2627	force->flag [FLAG_APPLIED] = true;
		2628
		2629	insert (force);
		2630	}
		2631	}
		2632

Diff Legend

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