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

Diff Legend

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