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.223 by root, Wed Apr 30 08:29:31 2008 UTC vs.
Revision 1.296 by root, Fri Nov 6 13:31:47 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,
…		…
48	0,	52	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	53	-1, -1, 0, 1, 1, 1, 0, -1,
50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52	};	56	};
53	int maxfree[SIZEOFFREE] = {
54	0,
55	9, 10, 13, 14, 17, 18, 21, 22,
56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58	};
59	int freedir[SIZEOFFREE] = {	57	int freedir[SIZEOFFREE] = {
60	0,	58	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	59	1, 2, 3, 4, 5, 6, 7, 8,
62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	61	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
		62	};
		63
		64	static int maxfree[SIZEOFFREE] = {
		65	0,
		66	9, 10, 13, 14, 17, 18, 21, 22,
		67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
64	};	69	};
65		70
66	static void	71	static void
67	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
68	{	73	{
…		…
139		144
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	145	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	146	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	147	compare_ob_value_lists_one (const object *wants, const object *has)
143	{	148	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	149	/* 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	150	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	151	* different structure or at least keep the lists sorted...
149	*/	152	*/
150		153
151	/* For each field in wants, */	154	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	155	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	156	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	157	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		158
169	/* If we get here, every field in wants has a matching field in has. */	159	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	160	return true;
171	}	161	}
172		162
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	163	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	164	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	165	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	166	{
177	/* However, there may be fields in has which aren't partnered in wants,	167	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison *twice*. :(	168	* so we need to run the comparison *twice*. :(
179	*/	169	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	170	return compare_ob_value_lists_one (ob1, ob2)
		171	&& compare_ob_value_lists_one (ob2, ob1);
181	}	172	}
182		173
183	/* Function examines the 2 objects given to it, and returns true if	174	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	175	* they can be merged together.
185	*	176	*
…		…
200	|| ob1->speed != ob2->speed	191	|| ob1->speed != ob2->speed
201	|| ob1->value != ob2->value	192	|| ob1->value != ob2->value
202	|| ob1->name != ob2->name)	193	|| ob1->name != ob2->name)
203	return 0;	194	return 0;
204		195
205	/* Do not merge objects if nrof would overflow. First part checks	196	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	197	* is always 0 .. 2**31-1 */
207	* would fit into a 32 bit signed int, which is often used to hold	198	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;	199	return 0;
212		200
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	201	/* 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	202	* 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	203	* just can't ignore the been applied or identified flags, as they
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	208	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		209
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	210	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	211	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		212
225	if (ob1->arch->name != ob2->arch->name	213	if (ob1->arch->archname != ob2->arch->archname
226	|| ob1->name != ob2->name	214	|| ob1->name != ob2->name
227	|| ob1->title != ob2->title	215	|| ob1->title != ob2->title
228	|| ob1->msg != ob2->msg	216	|| ob1->msg != ob2->msg
229	|| ob1->weight != ob2->weight	217	|| ob1->weight != ob2->weight
230	|| ob1->attacktype != ob2->attacktype	218	|| ob1->attacktype != ob2->attacktype
231	|| ob1->magic != ob2->magic	219	|| ob1->magic != ob2->magic
232	|| ob1->slaying != ob2->slaying	220	|| ob1->slaying != ob2->slaying
233	|| ob1->skill != ob2->skill	221	|| ob1->skill != ob2->skill
234	|| ob1->value != ob2->value	222	|| ob1->value != ob2->value
235	|| ob1->animation_id != ob2->animation_id	223	|| ob1->animation_id != ob2->animation_id
		224	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	|| ob1->client_type != ob2->client_type	225	|| ob1->client_type != ob2->client_type
237	|| ob1->materialname != ob2->materialname	226	|| ob1->materialname != ob2->materialname
238	|| ob1->lore != ob2->lore	227	|| ob1->lore != ob2->lore
239	|| ob1->subtype != ob2->subtype	228	|| ob1->subtype != ob2->subtype
240	|| ob1->move_type != ob2->move_type	229	|| ob1->move_type != ob2->move_type
…		…
248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	237	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	238	return 0;
250		239
251	if ((ob1->flag ^ ob2->flag)	240	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	241	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	242	.reset (FLAG_REMOVED)
255	.any ())	243	.any ())
256	return 0;	244	return 0;
257		245
258	/* This is really a spellbook check - we should in general	246	/* This is really a spellbook check - we should in general
…		…
340	{	328	{
341	// see if we are in a container of sorts	329	// see if we are in a container of sorts
342	if (env)	330	if (env)
343	{	331	{
344	// the player inventory itself is always visible	332	// the player inventory itself is always visible
345	if (env->type == PLAYER)	333	if (env->is_player ())
346	return env;	334	return env;
347		335
348	// else a player could have our env open	336	// else a player could have our env open
349	object *envest = env->outer_env ();	337	object *envest = env->outer_env_or_self ();
350		338
351	// the player itself is always on a map, so we will find him here	339	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	340	// even if our inv is in a player.
353	if (envest->is_on_map ())	341	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	342	if (object *pl = envest->ms ().player ())
355	if (pl->container == env)	343	if (pl->container_ () == env)
356	return pl;	344	return pl;
357	}	345	}
358	else	346	else
359	{	347	{
360	// maybe there is a player standing on the same mapspace	348	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	349	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	350	if (object *pl = ms ().player ())
363	if (!pl->container || this == pl->container)	351	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		352	|| pl->container_ () == this)
364	return pl;	353	return pl;
365	}	354	}
366	}	355	}
367		356
368	return 0;	357	return 0;
369	}	358	}
370		359
371	// adjust weight per container type ("of holding")	360	// adjust weight per container type ("of holding")
372	static sint32	361	static sint32
373	weight_adjust (object *op, sint32 weight)	362	weight_adjust_for (object *op, sint32 weight)
374	{	363	{
375	return op->type == CONTAINER	364	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	365	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	366	: weight;
378	}	367	}
…		…
384	static void	373	static void
385	adjust_weight (object *op, sint32 weight)	374	adjust_weight (object *op, sint32 weight)
386	{	375	{
387	while (op)	376	while (op)
388	{	377	{
		378	// adjust by actual difference to account for rounding errors
		379	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	380	weight = weight_adjust_for (op, op->carrying)
		381	- weight_adjust_for (op, op->carrying - weight);
390		382
391	if (!weight)	383	if (!weight)
392	return;	384	return;
393		385
394	op->carrying += weight;	386	op->carrying += weight;
…		…
417	op->update_weight ();	409	op->update_weight ();
418		410
419	sum += op->total_weight ();	411	sum += op->total_weight ();
420	}	412	}
421		413
422	sum = weight_adjust (this, sum);	414	sum = weight_adjust_for (this, sum);
423		415
424	if (sum != carrying)	416	if (sum != carrying)
425	{	417	{
426	carrying = sum;	418	carrying = sum;
427		419
…		…
443	object_freezer freezer;	435	object_freezer freezer;
444	op->write (freezer);	436	op->write (freezer);
445	return freezer.as_string ();	437	return freezer.as_string ();
446	}	438	}
447		439
448	/*	440	char *
449	* get_nearest_part(multi-object, object 2) returns the part of the	441	object::as_string ()
450	* multi-object 1 which is closest to the second object.
451	* If it's not a multi-object, it is returned.
452	*/
453	object *
454	get_nearest_part (object *op, const object *pl)
455	{	442	{
456	object *tmp, *closest;	443	return dump_object (this);
457	int last_dist, i;
458
459	if (!op->more)
460	return op;
461
462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
463	tmp;
464	tmp = tmp->more)
465	if ((i = distance (tmp, pl)) < last_dist)
466	closest = tmp, last_dist = i;
467
468	return closest;
469	}	444	}
470		445
471	/*	446	/*
472	* Returns the object which has the count-variable equal to the argument.	447	* Returns the object which has the count-variable equal to the argument.
473	* VERRRY slow.	448	* VERRRY slow.
…		…
489	*/	464	*/
490	object *	465	object *
491	find_object_name (const char *str)	466	find_object_name (const char *str)
492	{	467	{
493	shstr_cmp str_ (str);	468	shstr_cmp str_ (str);
494	object *op;
495		469
		470	if (str_)
496	for_all_objects (op)	471	for_all_objects (op)
497	if (op->name == str_)	472	if (op->name == str_)
498	break;	473	return op;
499		474
500	return op;	475	return 0;
501	}	476	}
502		477
503	/*	478	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	479	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	480	* skill and experience objects.
…		…
567	update_stats ();	542	update_stats ();
568		543
569	new_draw_info_format (NDI_UNIQUE, 0, this,	544	new_draw_info_format (NDI_UNIQUE, 0, this,
570	"You try to balance all your items at once, "	545	"You try to balance all your items at once, "
571	"but the %s is just too much for your body. "	546	"but the %s is just too much for your body. "
572	"[You need to unapply some items first.]", &ob->name);	547	"[You need to unapply some items first - use the 'body' command to see "
		548	"how many items you cna wera on a specific body part.]", &ob->name);
573	return false;	549	return false;
574	}	550	}
575		551
576	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	552	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
577	}	553	}
…		…
603	}	579	}
604		580
605	op->key_values = 0;	581	op->key_values = 0;
606	}	582	}
607		583
608	object &	584	/*
609	object::operator =(const object &src)	585	* copy_to first frees everything allocated by the dst object,
		586	* and then copies the contents of itself into the second
		587	* object, allocating what needs to be allocated. Basically, any
		588	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		589	* if the first object is freed, the pointers in the new object
		590	* will point at garbage.
		591	*/
		592	void
		593	object::copy_to (object *dst)
610	{	594	{
611	bool is_freed = flag [FLAG_FREED];	595	dst->remove ();
612	bool is_removed = flag [FLAG_REMOVED];
613
614	*(object_copy *)this = src;	596	*(object_copy *)dst = *this;
615
616	flag [FLAG_FREED] = is_freed;
617	flag [FLAG_REMOVED] = is_removed;	597	dst->flag [FLAG_REMOVED] = true;
618		598
619	/* Copy over key_values, if any. */	599	/* Copy over key_values, if any. */
620	if (src.key_values)	600	if (key_values)
621	{	601	{
622	key_value *tail = 0;	602	key_value *tail = 0;
623	key_values = 0;	603	dst->key_values = 0;
624		604
625	for (key_value *i = src.key_values; i; i = i->next)	605	for (key_value *i = key_values; i; i = i->next)
626	{	606	{
627	key_value *new_link = new key_value;	607	key_value *new_link = new key_value;
628		608
629	new_link->next = 0;	609	new_link->next = 0;
630	new_link->key = i->key;	610	new_link->key = i->key;
631	new_link->value = i->value;	611	new_link->value = i->value;
632		612
633	/* Try and be clever here, too. */	613	/* Try and be clever here, too. */
634	if (!key_values)	614	if (!dst->key_values)
635	{	615	{
636	key_values = new_link;	616	dst->key_values = new_link;
637	tail = new_link;	617	tail = new_link;
638	}	618	}
639	else	619	else
640	{	620	{
641	tail->next = new_link;	621	tail->next = new_link;
642	tail = new_link;	622	tail = new_link;
643	}	623	}
644	}	624	}
645	}	625	}
646	}
647
648	/*
649	* copy_to first frees everything allocated by the dst object,
650	* and then copies the contents of itself into the second
651	* object, allocating what needs to be allocated. Basically, any
652	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
653	* if the first object is freed, the pointers in the new object
654	* will point at garbage.
655	*/
656	void
657	object::copy_to (object *dst)
658	{
659	*dst = *this;
660		626
661	if (speed < 0)	627	if (speed < 0)
662	dst->speed_left -= rndm ();	628	dst->speed_left -= rndm ();
663		629
664	dst->set_speed (dst->speed);	630	dst->activate ();
665	}	631	}
666		632
667	void	633	void
668	object::instantiate ()	634	object::instantiate ()
669	{	635	{
…		…
686	object *	652	object *
687	object::clone ()	653	object::clone ()
688	{	654	{
689	object *neu = create ();	655	object *neu = create ();
690	copy_to (neu);	656	copy_to (neu);
		657	neu->map = map; // not copied by copy_to
691	return neu;	658	return neu;
692	}	659	}
693		660
694	/*	661	/*
695	* If an object with the IS_TURNABLE() flag needs to be turned due	662	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
780	else if (action == UP_OBJ_INSERT)	747	else if (action == UP_OBJ_INSERT)
781	{	748	{
782	// this is likely overkill, TODO: revisit (schmorp)	749	// this is likely overkill, TODO: revisit (schmorp)
783	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	750	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
784	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	751	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	752	|| (op->is_player () && !(m.flags_ & P_PLAYER))
786	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	753	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
787	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	754	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
788	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	755	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
789	|| (m.move_on | op->move_on ) != m.move_on	756	|| (m.move_on | op->move_on ) != m.move_on
790	|| (m.move_off | op->move_off ) != m.move_off	757	|| (m.move_off | op->move_off ) != m.move_off
791	|| (m.move_slow | op->move_slow) != m.move_slow	758	|| (m.move_slow | op->move_slow) != m.move_slow
792	/* This isn't perfect, but I don't expect a lot of objects to	759	/* This isn't perfect, but I don't expect a lot of objects to
793	* to have move_allow right now.	760	* have move_allow right now.
794	*/	761	*/
795	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	762	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
796	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	763	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
797	m.flags_ = 0;	764	m.invalidate ();
798	}	765	}
799	/* if the object is being removed, we can't make intelligent	766	/* if the object is being removed, we can't make intelligent
800	* decisions, because remove_ob can't really pass the object	767	* decisions, because remove_ob can't really pass the object
801	* that is being removed.	768	* that is being removed.
802	*/	769	*/
803	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	770	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
804	m.flags_ = 0;	771	m.invalidate ();
805	else if (action == UP_OBJ_FACE)	772	else if (action == UP_OBJ_FACE)
806	/* Nothing to do for that case */ ;	773	/* Nothing to do for that case */ ;
807	else	774	else
808	LOG (llevError, "update_object called with invalid action: %d\n", action);	775	LOG (llevError, "update_object called with invalid action: %d\n", action);
809		776
…		…
813		780
814	object::object ()	781	object::object ()
815	{	782	{
816	SET_FLAG (this, FLAG_REMOVED);	783	SET_FLAG (this, FLAG_REMOVED);
817		784
818	expmul = 1.0;	785	//expmul = 1.0; declared const for the time being
819	face = blank_face;	786	face = blank_face;
820	}	787	}
821		788
822	object::~object ()	789	object::~object ()
823	{	790	{
…		…
853	/* If already on active list, don't do anything */	820	/* If already on active list, don't do anything */
854	if (active)	821	if (active)
855	return;	822	return;
856		823
857	if (has_active_speed ())	824	if (has_active_speed ())
		825	{
		826	if (flag [FLAG_FREED])
		827	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		828
858	actives.insert (this);	829	actives.insert (this);
		830	}
859	}	831	}
860		832
861	void	833	void
862	object::activate_recursive ()	834	object::activate_recursive ()
863	{	835	{
…		…
924	* drop on that space.	896	* drop on that space.
925	*/	897	*/
926	if (!drop_to_ground	898	if (!drop_to_ground
927	|| !map	899	|| !map
928	|| map->in_memory != MAP_ACTIVE	900	|| map->in_memory != MAP_ACTIVE
929	|| map->nodrop	901	|| map->no_drop
930	|| ms ().move_block == MOVE_ALL)	902	|| ms ().move_block == MOVE_ALL)
931	{	903	{
932	while (inv)	904	while (inv)
933	{
934	inv->destroy_inv (false);
935	inv->destroy ();	905	inv->destroy ();
936	}
937	}	906	}
938	else	907	else
939	{ /* Put objects in inventory onto this space */	908	{ /* Put objects in inventory onto this space */
940	while (inv)	909	while (inv)
941	{	910	{
…		…
945	|| op->flag [FLAG_NO_DROP]	914	|| op->flag [FLAG_NO_DROP]
946	|| op->type == RUNE	915	|| op->type == RUNE
947	|| op->type == TRAP	916	|| op->type == TRAP
948	|| op->flag [FLAG_IS_A_TEMPLATE]	917	|| op->flag [FLAG_IS_A_TEMPLATE]
949	|| op->flag [FLAG_DESTROY_ON_DEATH])	918	|| op->flag [FLAG_DESTROY_ON_DEATH])
950	op->destroy (true);	919	op->destroy ();
951	else	920	else
952	map->insert (op, x, y);	921	map->insert (op, x, y);
953	}	922	}
954	}	923	}
955	}	924	}
…		…
963		932
964	static struct freed_map : maptile	933	static struct freed_map : maptile
965	{	934	{
966	freed_map ()	935	freed_map ()
967	{	936	{
968	path = "<freed objects map>";	937	path = "<freed objects map>";
969	name = "/internal/freed_objects_map";	938	name = "/internal/freed_objects_map";
970	width = 3;	939	width = 3;
971	height = 3;	940	height = 3;
972	nodrop = 1;	941	no_drop = 1;
		942	no_reset = 1;
973		943
974	alloc ();	944	alloc ();
975	in_memory = MAP_ACTIVE;	945	in_memory = MAP_ACTIVE;
976	}	946	}
		947
		948	~freed_map ()
		949	{
		950	destroy ();
		951	}
977	} freed_map; // freed objects are moved here to avoid crashes	952	} freed_map; // freed objects are moved here to avoid crashes
978		953
979	void	954	void
980	object::do_destroy ()	955	object::do_destroy ()
981	{	956	{
982	if (flag [FLAG_IS_LINKED])	957	if (flag [FLAG_IS_LINKED])
983	remove_button_link (this);	958	remove_link ();
984		959
985	if (flag [FLAG_FRIENDLY])	960	if (flag [FLAG_FRIENDLY])
986	remove_friendly_object (this);	961	remove_friendly_object (this);
987		962
988	remove ();	963	remove ();
…		…
1013	attacked_by = 0;	988	attacked_by = 0;
1014	current_weapon = 0;	989	current_weapon = 0;
1015	}	990	}
1016		991
1017	void	992	void
1018	object::destroy (bool destroy_inventory)	993	object::destroy ()
1019	{	994	{
1020	if (destroyed ())	995	if (destroyed ())
1021	return;	996	return;
1022		997
1023	if (!is_head () && !head->destroyed ())	998	if (!is_head () && !head->destroyed ())
1024	{	999	{
1025	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1000	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1026	head->destroy (destroy_inventory);	1001	head->destroy ();
1027	return;	1002	return;
1028	}	1003	}
1029		1004
1030	destroy_inv (!destroy_inventory);	1005	destroy_inv (false);
1031		1006
1032	if (is_head ())	1007	if (is_head ())
1033	if (sound_destroy)	1008	if (sound_destroy)
1034	play_sound (sound_destroy);	1009	play_sound (sound_destroy);
1035	else if (flag [FLAG_MONSTER])	1010	else if (flag [FLAG_MONSTER])
…		…
1046	* the previous environment.	1021	* the previous environment.
1047	*/	1022	*/
1048	void	1023	void
1049	object::do_remove ()	1024	object::do_remove ()
1050	{	1025	{
1051	object *tmp, *last = 0;
1052	object *otmp;
1053
1054	if (flag [FLAG_REMOVED])	1026	if (flag [FLAG_REMOVED])
1055	return;	1027	return;
1056		1028
1057	INVOKE_OBJECT (REMOVE, this);	1029	INVOKE_OBJECT (REMOVE, this);
1058		1030
…		…
1072	esrv_del_item (pl->contr, count);	1044	esrv_del_item (pl->contr, count);
1073	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1045	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1074		1046
1075	adjust_weight (env, -total_weight ());	1047	adjust_weight (env, -total_weight ());
1076		1048
1077	*(above ? &above->below : &env->inv) = below;	1049	object *pl = in_player ();
1078
1079	if (below)
1080	below->above = above;
1081		1050
1082	/* we set up values so that it could be inserted into	1051	/* we set up values so that it could be inserted into
1083	* the map, but we don't actually do that - it is up	1052	* the map, but we don't actually do that - it is up
1084	* to the caller to decide what we want to do.	1053	* to the caller to decide what we want to do.
1085	*/	1054	*/
1086	map = env->map;	1055	map = env->map;
1087	x = env->x;	1056	x = env->x;
1088	y = env->y;	1057	y = env->y;
		1058
		1059	// make sure cmov optimisation is applicable
		1060	*(above ? &above->below : &env->inv) = below;
		1061	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1062
1089	above = 0;	1063	above = 0;
1090	below = 0;	1064	below = 0;
1091	env = 0;	1065	env = 0;
1092		1066
1093	/* NO_FIX_PLAYER is set when a great many changes are being	1067	/* NO_FIX_PLAYER is set when a great many changes are being
1094	* made to players inventory. If set, avoiding the call	1068	* made to players inventory. If set, avoiding the call
1095	* to save cpu time.	1069	* to save cpu time.
1096	*/	1070	*/
1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1071	if (pl)
		1072	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1073	{
1098	otmp->update_stats ();	1074	pl->update_stats ();
		1075
		1076	if (glow_radius && pl->is_on_map ())
		1077	update_all_los (pl->map, pl->x, pl->y);
		1078	}
1099	}	1079	}
1100	else if (map)	1080	else if (map)
1101	{	1081	{
1102	map->dirty = true;	1082	map->dirty = true;
1103	mapspace &ms = this->ms ();	1083	mapspace &ms = this->ms ();
1104		1084
1105	if (object *pl = ms.player ())	1085	if (object *pl = ms.player ())
1106	{	1086	{
1107	if (type == PLAYER) // this == pl(!)	1087	if (is_player ())
1108	{	1088	{
		1089	if (!flag [FLAG_WIZPASS])
		1090	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1091
1109	// leaving a spot always closes any open container on the ground	1092	// leaving a spot always closes any open container on the ground
1110	if (container && !container->env)	1093	if (container && !container->env)
1111	// this causes spurious floorbox updates, but it ensures	1094	// this causes spurious floorbox updates, but it ensures
1112	// that the CLOSE event is being sent.	1095	// that the CLOSE event is being sent.
1113	close_container ();	1096	close_container ();
1114		1097
1115	--map->players;	1098	--map->players;
1116	map->touch ();	1099	map->touch ();
1117	}	1100	}
1118	else if (pl->container == this)	1101	else if (pl->container_ () == this)
1119	{	1102	{
1120	// removing a container should close it	1103	// removing a container should close it
1121	close_container ();	1104	close_container ();
1122	}	1105	}
1123		1106
1124	esrv_del_item (pl->contr, count);	1107	esrv_del_item (pl->contr, count);
1125	}	1108	}
1126		1109
1127	/* link the object above us */	1110	/* link the object above us */
1128	if (above)	1111	// re-link, make sure compiler can easily use cmove
1129	above->below = below;	1112	*(above ? &above->below : &ms.top) = below;
1130	else	1113	*(below ? &below->above : &ms.bot) = above;
1131	ms.top = below; /* we were top, set new top */
1132
1133	/* Relink the object below us, if there is one */
1134	if (below)
1135	below->above = above;
1136	else
1137	{
1138	/* Nothing below, which means we need to relink map object for this space
1139	* use translated coordinates in case some oddness with map tiling is
1140	* evident
1141	*/
1142	if (GET_MAP_OB (map, x, y) != this)
1143	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 ());
1144
1145	ms.bot = above; /* goes on above it. */
1146	}
1147		1114
1148	above = 0;	1115	above = 0;
1149	below = 0;	1116	below = 0;
1150		1117
		1118	ms.invalidate ();
		1119
1151	if (map->in_memory == MAP_SAVING)	1120	if (map->in_memory == MAP_SAVING)
1152	return;	1121	return;
1153		1122
1154	int check_walk_off = !flag [FLAG_NO_APPLY];	1123	int check_walk_off = !flag [FLAG_NO_APPLY];
1155		1124
1156	if (object *pl = ms.player ())	1125	if (object *pl = ms.player ())
1157	{	1126	{
1158	if (pl->container == this)	1127	if (pl->container_ () == this)
1159	/* If a container that the player is currently using somehow gets	1128	/* If a container that the player is currently using somehow gets
1160	* removed (most likely destroyed), update the player view	1129	* removed (most likely destroyed), update the player view
1161	* appropriately.	1130	* appropriately.
1162	*/	1131	*/
1163	pl->close_container ();	1132	pl->close_container ();
1164		1133
1165	//TODO: the floorbox prev/next might need updating	1134	//TODO: the floorbox prev/next might need updating
1166	esrv_del_item (pl->contr, count);	1135	//esrv_del_item (pl->contr, count);
		1136	//TODO: update floorbox to preserve ordering
		1137	if (pl->contr->ns)
		1138	pl->contr->ns->floorbox_update ();
1167	}	1139	}
1168		1140
		1141	if (check_walk_off)
1169	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1170	{	1143	{
		1144	above = tmp->above;
		1145
1171	/* No point updating the players look faces if he is the object	1146	/* No point updating the players look faces if he is the object
1172	* being removed.	1147	* being removed.
1173	*/	1148	*/
1174		1149
1175	/* See if object moving off should effect something */	1150	/* See if object moving off should effect something */
1176	if (check_walk_off
1177	&& ((move_type & tmp->move_off)	1151	if ((move_type & tmp->move_off)
1178	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1152	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1179	{
1180	move_apply (tmp, this, 0);	1153	move_apply (tmp, this, 0);
1181
1182	if (destroyed ())
1183	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1184	}	1154	}
1185		1155
1186	last = tmp;	1156	if (affects_los ())
1187	}
1188
1189	/* last == NULL if there are no objects on this space */
1190	//TODO: this makes little sense, why only update the topmost object?
1191	if (!last)
1192	map->at (x, y).flags_ = 0;
1193	else
1194	update_object (last, UP_OBJ_REMOVE);
1195
1196	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1197	update_all_los (map, x, y);	1157	update_all_los (map, x, y);
1198	}	1158	}
1199	}	1159	}
1200		1160
1201	/*	1161	/*
…		…
1225	esrv_update_item (UPD_NROF, pl, top);	1185	esrv_update_item (UPD_NROF, pl, top);
1226		1186
1227	op->weight = 0; // cancel the addition above	1187	op->weight = 0; // cancel the addition above
1228	op->carrying = 0; // must be 0 already	1188	op->carrying = 0; // must be 0 already
1229		1189
1230	op->destroy (1);	1190	op->destroy ();
1231		1191
1232	return top;	1192	return top;
1233	}	1193	}
1234		1194
1235	return 0;	1195	return 0;
…		…
1263	* job preparing multi-part monsters.	1223	* job preparing multi-part monsters.
1264	*/	1224	*/
1265	object *	1225	object *
1266	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1226	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1267	{	1227	{
		1228	op->remove ();
		1229
1268	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1230	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1269	{	1231	{
1270	tmp->x = x + tmp->arch->x;	1232	tmp->x = x + tmp->arch->x;
1271	tmp->y = y + tmp->arch->y;	1233	tmp->y = y + tmp->arch->y;
1272	}	1234	}
…		…
1295	* just 'op' otherwise	1257	* just 'op' otherwise
1296	*/	1258	*/
1297	object *	1259	object *
1298	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1260	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1299	{	1261	{
1300	assert (!op->flag [FLAG_FREED]);
1301
1302	op->remove ();	1262	op->remove ();
		1263
		1264	if (m == &freed_map)//D TODO: remove soon
		1265	{//D
		1266	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1267	}//D
1303		1268
1304	/* Ideally, the caller figures this out. However, it complicates a lot	1269	/* Ideally, the caller figures this out. However, it complicates a lot
1305	* of areas of callers (eg, anything that uses find_free_spot would now	1270	* of areas of callers (eg, anything that uses find_free_spot would now
1306	* need extra work	1271	* need extra work
1307	*/	1272	*/
		1273	maptile *newmap = m;
1308	if (!xy_normalise (m, op->x, op->y))	1274	if (!xy_normalise (newmap, op->x, op->y))
1309	{	1275	{
1310	op->destroy (1);	1276	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1311	return 0;	1277	return 0;
1312	}	1278	}
1313		1279
1314	if (object *more = op->more)	1280	if (object *more = op->more)
1315	if (!insert_ob_in_map (more, m, originator, flag))	1281	if (!insert_ob_in_map (more, m, originator, flag))
1316	return 0;	1282	return 0;
1317		1283
1318	CLEAR_FLAG (op, FLAG_REMOVED);	1284	op->flag [FLAG_REMOVED] = false;
1319		1285	op->env = 0;
1320	op->map = m;	1286	op->map = newmap;
		1287
1321	mapspace &ms = op->ms ();	1288	mapspace &ms = op->ms ();
1322		1289
1323	/* this has to be done after we translate the coordinates.	1290	/* this has to be done after we translate the coordinates.
1324	*/	1291	*/
1325	if (op->nrof && !(flag & INS_NO_MERGE))	1292	if (op->nrof && !(flag & INS_NO_MERGE))
1326	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1293	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1327	if (object::can_merge (op, tmp))	1294	if (object::can_merge (op, tmp))
1328	{	1295	{
1329	// TODO: we atcually want to update tmp, not op,	1296	// TODO: we actually want to update tmp, not op,
1330	// but some caller surely breaks when we return tmp	1297	// but some caller surely breaks when we return tmp
1331	// from here :/	1298	// from here :/
1332	op->nrof += tmp->nrof;	1299	op->nrof += tmp->nrof;
1333	tmp->destroy (1);	1300	tmp->destroy ();
1334	}	1301	}
1335		1302
1336	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1303	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1337	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1304	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1338		1305
…		…
1345	{	1312	{
1346	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1313	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1347	abort ();	1314	abort ();
1348	}	1315	}
1349		1316
		1317	if (!originator->is_on_map ())
		1318	{
		1319	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1320	op->debug_desc (), originator->debug_desc ());
		1321	abort ();
		1322	}
		1323
1350	op->above = originator;	1324	op->above = originator;
1351	op->below = originator->below;	1325	op->below = originator->below;
1352
1353	if (op->below)
1354	op->below->above = op;
1355	else
1356	ms.bot = op;
1357
1358	/* since *below* originator, no need to update top */
1359	originator->below = op;	1326	originator->below = op;
		1327
		1328	*(op->below ? &op->below->above : &ms.bot) = op;
1360	}	1329	}
1361	else	1330	else
1362	{	1331	{
1363	object *top, *floor = NULL;	1332	object *floor = 0;
1364		1333	object *top = ms.top;
1365	top = ms.bot;
1366		1334
1367	/* If there are other objects, then */	1335	/* If there are other objects, then */
1368	if (top)	1336	if (top)
1369	{	1337	{
1370	object *last = 0;
1371
1372	/*	1338	/*
1373	* If there are multiple objects on this space, we do some trickier handling.	1339	* If there are multiple objects on this space, we do some trickier handling.
1374	* We've already dealt with merging if appropriate.	1340	* We've already dealt with merging if appropriate.
1375	* Generally, we want to put the new object on top. But if	1341	* Generally, we want to put the new object on top. But if
1376	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1342	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1379	* once we get to them. This reduces the need to traverse over all of	1345	* once we get to them. This reduces the need to traverse over all of
1380	* them when adding another one - this saves quite a bit of cpu time	1346	* them when adding another one - this saves quite a bit of cpu time
1381	* when lots of spells are cast in one area. Currently, it is presumed	1347	* when lots of spells are cast in one area. Currently, it is presumed
1382	* that flying non pickable objects are spell objects.	1348	* that flying non pickable objects are spell objects.
1383	*/	1349	*/
1384	for (top = ms.bot; top; top = top->above)	1350	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1385	{	1351	{
1386	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1352	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1387	floor = top;	1353	floor = tmp;
1388		1354
1389	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1355	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1390	{	1356	{
1391	/* We insert above top, so we want this object below this */	1357	/* We insert above top, so we want this object below this */
1392	top = top->below;	1358	top = tmp->below;
1393	break;	1359	break;
1394	}	1360	}
1395		1361
1396	last = top;	1362	top = tmp;
1397	}	1363	}
1398
1399	/* Don't want top to be NULL, so set it to the last valid object */
1400	top = last;
1401		1364
1402	/* We let update_position deal with figuring out what the space	1365	/* We let update_position deal with figuring out what the space
1403	* looks like instead of lots of conditions here.	1366	* looks like instead of lots of conditions here.
1404	* makes things faster, and effectively the same result.	1367	* makes things faster, and effectively the same result.
1405	*/	1368	*/
…		…
1412	*/	1375	*/
1413	if (!(flag & INS_ON_TOP)	1376	if (!(flag & INS_ON_TOP)
1414	&& ms.flags () & P_BLOCKSVIEW	1377	&& ms.flags () & P_BLOCKSVIEW
1415	&& (op->face && !faces [op->face].visibility))	1378	&& (op->face && !faces [op->face].visibility))
1416	{	1379	{
		1380	object *last;
		1381
1417	for (last = top; last != floor; last = last->below)	1382	for (last = top; last != floor; last = last->below)
1418	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1383	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1419	break;	1384	break;
1420		1385
1421	/* Check to see if we found the object that blocks view,	1386	/* Check to see if we found the object that blocks view,
…		…
1429	} /* If objects on this space */	1394	} /* If objects on this space */
1430		1395
1431	if (flag & INS_ABOVE_FLOOR_ONLY)	1396	if (flag & INS_ABOVE_FLOOR_ONLY)
1432	top = floor;	1397	top = floor;
1433		1398
1434	/* Top is the object that our object (op) is going to get inserted above.	1399	// insert object above top, or bottom-most if top = 0
1435	*/
1436
1437	/* First object on this space */
1438	if (!top)	1400	if (!top)
1439	{	1401	{
		1402	op->below = 0;
1440	op->above = ms.bot;	1403	op->above = ms.bot;
1441
1442	if (op->above)
1443	op->above->below = op;
1444
1445	op->below = 0;
1446	ms.bot = op;	1404	ms.bot = op;
		1405
		1406	*(op->above ? &op->above->below : &ms.top) = op;
1447	}	1407	}
1448	else	1408	else
1449	{ /* get inserted into the stack above top */	1409	{
1450	op->above = top->above;	1410	op->above = top->above;
1451
1452	if (op->above)
1453	op->above->below = op;	1411	top->above = op;
1454		1412
1455	op->below = top;	1413	op->below = top;
1456	top->above = op;	1414	*(op->above ? &op->above->below : &ms.top) = op;
1457	}	1415	}
		1416	}
1458		1417
1459	if (!op->above)	1418	if (op->is_player ())
1460	ms.top = op;
1461	} /* else not INS_BELOW_ORIGINATOR */
1462
1463	if (op->type == PLAYER)
1464	{	1419	{
1465	op->contr->do_los = 1;	1420	op->contr->do_los = 1;
1466	++op->map->players;	1421	++op->map->players;
1467	op->map->touch ();	1422	op->map->touch ();
1468	}	1423	}
1469		1424
1470	op->map->dirty = true;	1425	op->map->dirty = true;
1471		1426
1472	if (object *pl = ms.player ())	1427	if (object *pl = ms.player ())
1473	//TODO: the floorbox prev/next might need updating	1428	//TODO: the floorbox prev/next might need updating
1474	esrv_send_item (pl, op);	1429	//esrv_send_item (pl, op);
		1430	//TODO: update floorbox to preserve ordering
		1431	if (pl->contr->ns)
		1432	pl->contr->ns->floorbox_update ();
1475		1433
1476	/* If this object glows, it may affect lighting conditions that are	1434	/* If this object glows, it may affect lighting conditions that are
1477	* visible to others on this map. But update_all_los is really	1435	* visible to others on this map. But update_all_los is really
1478	* an inefficient way to do this, as it means los for all players	1436	* an inefficient way to do this, as it means los for all players
1479	* on the map will get recalculated. The players could very well	1437	* on the map will get recalculated. The players could very well
1480	* be far away from this change and not affected in any way -	1438	* be far away from this change and not affected in any way -
1481	* this should get redone to only look for players within range,	1439	* this should get redone to only look for players within range,
1482	* or just updating the P_UPTODATE for spaces within this area	1440	* or just updating the P_UPTODATE for spaces within this area
1483	* of effect may be sufficient.	1441	* of effect may be sufficient.
1484	*/	1442	*/
1485	if (op->map->darkness && (op->glow_radius != 0))	1443	if (op->affects_los ())
		1444	{
		1445	op->ms ().invalidate ();
1486	update_all_los (op->map, op->x, op->y);	1446	update_all_los (op->map, op->x, op->y);
		1447	}
1487		1448
1488	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1489	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1490		1451
1491	INVOKE_OBJECT (INSERT, op);	1452	INVOKE_OBJECT (INSERT, op);
…		…
1498	* blocked() and wall() work properly), and these flags are updated by	1459	* blocked() and wall() work properly), and these flags are updated by
1499	* update_object().	1460	* update_object().
1500	*/	1461	*/
1501		1462
1502	/* if this is not the head or flag has been passed, don't check walk on status */	1463	/* if this is not the head or flag has been passed, don't check walk on status */
1503	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1464	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1504	{	1465	{
1505	if (check_move_on (op, originator))	1466	if (check_move_on (op, originator))
1506	return 0;	1467	return 0;
1507		1468
1508	/* If we are a multi part object, lets work our way through the check	1469	/* If we are a multi part object, lets work our way through the check
…		…
1519	/* this function inserts an object in the map, but if it	1480	/* this function inserts an object in the map, but if it
1520	* finds an object of its own type, it'll remove that one first.	1481	* finds an object of its own type, it'll remove that one first.
1521	* op is the object to insert it under: supplies x and the map.	1482	* op is the object to insert it under: supplies x and the map.
1522	*/	1483	*/
1523	void	1484	void
1524	replace_insert_ob_in_map (const char *arch_string, object *op)	1485	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1525	{	1486	{
1526	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1527		1488
1528	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1489	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1529	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1490	if (tmp->arch->archname == archname) /* same archetype */
1530	tmp->destroy (1);	1491	tmp->destroy ();
1531		1492
1532	object *tmp = arch_to_object (archetype::find (arch_string));	1493	object *tmp = arch_to_object (archetype::find (archname));
1533		1494
1534	tmp->x = op->x;	1495	tmp->x = op->x;
1535	tmp->y = op->y;	1496	tmp->y = op->y;
1536		1497
1537	insert_ob_in_map (tmp, op->map, op, 0);	1498	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1559	if (!nr)	1520	if (!nr)
1560	return true;	1521	return true;
1561		1522
1562	nr = min (nr, nrof);	1523	nr = min (nr, nrof);
1563		1524
		1525	if (nrof > nr)
		1526	{
1564	nrof -= nr;	1527	nrof -= nr;
1565
1566	if (nrof)
1567	{
1568	adjust_weight (env, -weight * nr); // carrying == 0	1528	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1569		1529
1570	if (object *pl = visible_to ())	1530	if (object *pl = visible_to ())
1571	esrv_update_item (UPD_NROF, pl, this);	1531	esrv_update_item (UPD_NROF, pl, this);
1572		1532
1573	return true;	1533	return true;
1574	}	1534	}
1575	else	1535	else
1576	{	1536	{
1577	destroy (1);	1537	destroy ();
1578	return false;	1538	return false;
1579	}	1539	}
1580	}	1540	}
1581		1541
1582	/*	1542	/*
…		…
1599	}	1559	}
1600	else	1560	else
1601	{	1561	{
1602	decrease (nr);	1562	decrease (nr);
1603		1563
1604	object *op = object_create_clone (this);	1564	object *op = deep_clone ();
1605	op->nrof = nr;	1565	op->nrof = nr;
1606	return op;	1566	return op;
1607	}	1567	}
1608	}	1568	}
1609		1569
…		…
1659	if (object *pl = tmp->visible_to ())	1619	if (object *pl = tmp->visible_to ())
1660	esrv_update_item (UPD_NROF, pl, tmp);	1620	esrv_update_item (UPD_NROF, pl, tmp);
1661		1621
1662	adjust_weight (this, op->total_weight ());	1622	adjust_weight (this, op->total_weight ());
1663		1623
1664	op->destroy (1);	1624	op->destroy ();
1665	op = tmp;	1625	op = tmp;
1666	goto inserted;	1626	goto inserted;
1667	}	1627	}
1668		1628
1669	op->owner = 0; // it's his/hers now. period.	1629	op->owner = 0; // it's his/hers now. period.
…		…
1687		1647
1688	adjust_weight (this, op->total_weight ());	1648	adjust_weight (this, op->total_weight ());
1689		1649
1690	inserted:	1650	inserted:
1691	/* reset the light list and los of the players on the map */	1651	/* reset the light list and los of the players on the map */
1692	if (op->glow_radius && map && map->darkness)	1652	if (op->glow_radius && is_on_map ())
		1653	{
		1654	update_stats ();
1693	update_all_los (map, x, y);	1655	update_all_los (map, x, y);
1694		1656	}
		1657	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1695	// if this is a player's inventory, update stats	1658	// if this is a player's inventory, update stats
1696	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1697	update_stats ();	1659	update_stats ();
1698		1660
1699	INVOKE_OBJECT (INSERT, this);	1661	INVOKE_OBJECT (INSERT, this);
1700		1662
1701	return op;	1663	return op;
…		…
1722	* on top.	1684	* on top.
1723	*/	1685	*/
1724	int	1686	int
1725	check_move_on (object *op, object *originator)	1687	check_move_on (object *op, object *originator)
1726	{	1688	{
		1689	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1690	return 0;
		1691
1727	object *tmp;	1692	object *tmp;
1728	maptile *m = op->map;	1693	maptile *m = op->map;
1729	int x = op->x, y = op->y;	1694	int x = op->x, y = op->y;
1730		1695
1731	MoveType move_on, move_slow, move_block;	1696	mapspace &ms = m->at (x, y);
1732		1697
1733	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1698	ms.update ();
1734	return 0;
1735		1699
1736	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1700	MoveType move_on = ms.move_on;
1737	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1701	MoveType move_slow = ms.move_slow;
1738	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1702	MoveType move_block = ms.move_block;
1739		1703
1740	/* if nothing on this space will slow op down or be applied,	1704	/* if nothing on this space will slow op down or be applied,
1741	* no need to do checking below. have to make sure move_type	1705	* no need to do checking below. have to make sure move_type
1742	* is set, as lots of objects don't have it set - we treat that	1706	* is set, as lots of objects don't have it set - we treat that
1743	* as walking.	1707	* as walking.
…		…
1754	return 0;	1718	return 0;
1755		1719
1756	/* The objects have to be checked from top to bottom.	1720	/* The objects have to be checked from top to bottom.
1757	* Hence, we first go to the top:	1721	* Hence, we first go to the top:
1758	*/	1722	*/
1759		1723	for (object *next, *tmp = ms.top; tmp; tmp = next)
1760	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1761	{
1762	/* Trim the search when we find the first other spell effect
1763	* this helps performance so that if a space has 50 spell objects,
1764	* we don't need to check all of them.
1765	*/
1766	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1767	break;
1768	}	1724	{
		1725	next = tmp->below;
1769		1726
1770	for (; tmp; tmp = tmp->below)
1771	{
1772	if (tmp == op)	1727	if (tmp == op)
1773	continue; /* Can't apply yourself */	1728	continue; /* Can't apply yourself */
1774		1729
1775	/* Check to see if one of the movement types should be slowed down.	1730	/* Check to see if one of the movement types should be slowed down.
1776	* Second check makes sure that the movement types not being slowed	1731	* Second check makes sure that the movement types not being slowed
…		…
1781	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1736	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1782	{	1737	{
1783	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1738	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1784	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1739	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1785	{	1740	{
1786
1787	float
1788	diff = tmp->move_slow_penalty * fabs (op->speed);	1741	float diff = tmp->move_slow_penalty * fabs (op->speed);
1789		1742
1790	if (op->type == PLAYER)	1743	if (op->is_player ())
1791	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1744	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1792	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1745	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1793	diff /= 4.0;	1746	diff /= 4.0;
1794		1747
1795	op->speed_left -= diff;	1748	op->speed_left -= diff;
1796	}	1749	}
1797	}	1750	}
…		…
1830	LOG (llevError, "Present_arch called outside map.\n");	1783	LOG (llevError, "Present_arch called outside map.\n");
1831	return NULL;	1784	return NULL;
1832	}	1785	}
1833		1786
1834	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1787	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1835	if (tmp->arch == at)	1788	if (tmp->arch->archname == at->archname)
1836	return tmp;	1789	return tmp;
1837		1790
1838	return NULL;	1791	return NULL;
1839	}	1792	}
1840		1793
…		…
1904	* The first matching object is returned, or NULL if none.	1857	* The first matching object is returned, or NULL if none.
1905	*/	1858	*/
1906	object *	1859	object *
1907	present_arch_in_ob (const archetype *at, const object *op)	1860	present_arch_in_ob (const archetype *at, const object *op)
1908	{	1861	{
1909	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1862	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1910	if (tmp->arch == at)	1863	if (tmp->arch->archname == at->archname)
1911	return tmp;	1864	return tmp;
1912		1865
1913	return NULL;	1866	return NULL;
1914	}	1867	}
1915		1868
…		…
2003	* head of the object should correspond for the entire object.	1956	* head of the object should correspond for the entire object.
2004	*/	1957	*/
2005	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1958	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2006	continue;	1959	continue;
2007		1960
2008	if (ob->blocked (m, pos.x, pos.y))	1961	if (ob->blocked (pos.m, pos.x, pos.y))
2009	continue;	1962	continue;
2010		1963
2011	altern [index++] = i;	1964	altern [index++] = i;
2012	}	1965	}
2013		1966
…		…
2081	* there is capable of.	2034	* there is capable of.
2082	*/	2035	*/
2083	int	2036	int
2084	find_dir (maptile *m, int x, int y, object *exclude)	2037	find_dir (maptile *m, int x, int y, object *exclude)
2085	{	2038	{
2086	int i, max = SIZEOFFREE, mflags;	2039	int max = SIZEOFFREE, mflags;
2087
2088	sint16 nx, ny;
2089	object *tmp;
2090	maptile *mp;
2091
2092	MoveType blocked, move_type;	2040	MoveType move_type;
2093		2041
2094	if (exclude && exclude->head_ () != exclude)	2042	if (exclude && exclude->head_ () != exclude)
2095	{	2043	{
2096	exclude = exclude->head;	2044	exclude = exclude->head;
2097	move_type = exclude->move_type;	2045	move_type = exclude->move_type;
…		…
2100	{	2048	{
2101	/* If we don't have anything, presume it can use all movement types. */	2049	/* If we don't have anything, presume it can use all movement types. */
2102	move_type = MOVE_ALL;	2050	move_type = MOVE_ALL;
2103	}	2051	}
2104		2052
2105	for (i = 1; i < max; i++)	2053	for (int i = 1; i < max; i++)
2106	{	2054	{
2107	mp = m;	2055	mapxy pos (m, x, y);
2108	nx = x + freearr_x[i];	2056	pos.move (i);
2109	ny = y + freearr_y[i];
2110		2057
2111	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2058	if (!pos.normalise ())
2112
2113	if (mflags & P_OUT_OF_MAP)
2114	max = maxfree[i];	2059	max = maxfree[i];
2115	else	2060	else
2116	{	2061	{
2117	mapspace &ms = mp->at (nx, ny);	2062	mapspace &ms = *pos;
2118		2063
2119	blocked = ms.move_block;
2120
2121	if ((move_type & blocked) == move_type)	2064	if ((move_type & ms.move_block) == move_type)
2122	max = maxfree[i];	2065	max = maxfree [i];
2123	else if (mflags & P_IS_ALIVE)	2066	else if (ms.flags () & P_IS_ALIVE)
2124	{	2067	{
2125	for (tmp = ms.bot; tmp; tmp = tmp->above)	2068	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2126	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2069	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2127	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2070	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2128	break;
2129
2130	if (tmp)
2131	return freedir[i];	2071	return freedir [i];
2132	}	2072	}
2133	}	2073	}
2134	}	2074	}
2135		2075
2136	return 0;	2076	return 0;
…		…
2211	* This basically means that if direction is 15, then it could either go	2151	* This basically means that if direction is 15, then it could either go
2212	* direction 4, 14, or 16 to get back to where we are.	2152	* direction 4, 14, or 16 to get back to where we are.
2213	* Moved from spell_util.c to object.c with the other related direction	2153	* Moved from spell_util.c to object.c with the other related direction
2214	* functions.	2154	* functions.
2215	*/	2155	*/
2216	int reduction_dir[SIZEOFFREE][3] = {	2156	static const int reduction_dir[SIZEOFFREE][3] = {
2217	{0, 0, 0}, /* 0 */	2157	{0, 0, 0}, /* 0 */
2218	{0, 0, 0}, /* 1 */	2158	{0, 0, 0}, /* 1 */
2219	{0, 0, 0}, /* 2 */	2159	{0, 0, 0}, /* 2 */
2220	{0, 0, 0}, /* 3 */	2160	{0, 0, 0}, /* 3 */
2221	{0, 0, 0}, /* 4 */	2161	{0, 0, 0}, /* 4 */
…		…
2317	int	2257	int
2318	can_pick (const object *who, const object *item)	2258	can_pick (const object *who, const object *item)
2319	{	2259	{
2320	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2260	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2321	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2261	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2322	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2262	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2323	}	2263	}
2324		2264
2325	/*	2265	/*
2326	* create clone from object to another	2266	* create clone from object to another
2327	*/	2267	*/
2328	object *	2268	object *
2329	object_create_clone (object *asrc)	2269	object::deep_clone ()
2330	{	2270	{
2331	object *dst = 0, *tmp, *src, *prev, *item;	2271	assert (("deep_clone called on non-head object", is_head ()));
2332		2272
2333	if (!asrc)	2273	object *dst = clone ();
2334	return 0;
2335		2274
2336	src = asrc->head_ ();	2275	object *prev = dst;
2337
2338	prev = 0;
2339	for (object *part = src; part; part = part->more)	2276	for (object *part = this->more; part; part = part->more)
2340	{	2277	{
2341	tmp = part->clone ();	2278	object *tmp = part->clone ();
2342	tmp->x -= src->x;
2343	tmp->y -= src->y;
2344
2345	if (!part->head)
2346	{
2347	dst = tmp;
2348	tmp->head = 0;
2349	}
2350	else
2351	tmp->head = dst;	2279	tmp->head = dst;
2352
2353	tmp->more = 0;
2354
2355	if (prev)
2356	prev->more = tmp;	2280	prev->more = tmp;
2357
2358	prev = tmp;	2281	prev = tmp;
2359	}	2282	}
2360		2283
2361	for (item = src->inv; item; item = item->below)	2284	for (object *item = inv; item; item = item->below)
2362	insert_ob_in_ob (object_create_clone (item), dst);	2285	insert_ob_in_ob (item->deep_clone (), dst);
2363		2286
2364	return dst;	2287	return dst;
2365	}	2288	}
2366		2289
2367	/* This returns the first object in who's inventory that	2290	/* This returns the first object in who's inventory that
…		…
2376	return tmp;	2299	return tmp;
2377		2300
2378	return 0;	2301	return 0;
2379	}	2302	}
2380		2303
2381	/* If ob has a field named key, return the link from the list,	2304	shstr_tmp
2382	* otherwise return NULL.	2305	object::kv_get (shstr_tmp key) const
2383	*
2384	* key must be a passed in shared string - otherwise, this won't
2385	* do the desired thing.
2386	*/
2387	key_value *
2388	get_ob_key_link (const object *ob, const char *key)
2389	{	2306	{
2390	for (key_value *link = ob->key_values; link; link = link->next)	2307	for (key_value *kv = key_values; kv; kv = kv->next)
2391	if (link->key == key)	2308	if (kv->key == key)
2392	return link;
2393
2394	return 0;
2395	}
2396
2397	/*
2398	* Returns the value of op has an extra_field for key, or NULL.
2399	*
2400	* The argument doesn't need to be a shared string.
2401	*
2402	* The returned string is shared.
2403	*/
2404	const char *
2405	get_ob_key_value (const object *op, const char *const key)
2406	{
2407	key_value *link;
2408	shstr_cmp canonical_key (key);
2409
2410	if (!canonical_key)
2411	{
2412	/* 1. There being a field named key on any object
2413	* implies there'd be a shared string to find.
2414	* 2. Since there isn't, no object has this field.
2415	* 3. Therefore, *this* object doesn't have this field.
2416	*/
2417	return 0;
2418	}
2419
2420	/* This is copied from get_ob_key_link() above -
2421	* only 4 lines, and saves the function call overhead.
2422	*/
2423	for (link = op->key_values; link; link = link->next)
2424	if (link->key == canonical_key)
2425	return link->value;	2309	return kv->value;
2426		2310
2427	return 0;	2311	return shstr ();
2428	}	2312	}
2429		2313
2430	/*	2314	void
2431	* Updates the canonical_key in op to value.	2315	object::kv_set (shstr_tmp key, shstr_tmp value)
2432	*
2433	* canonical_key is a shared string (value doesn't have to be).
2434	*
2435	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2436	* keys.
2437	*
2438	* Returns TRUE on success.
2439	*/
2440	int
2441	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2442	{	2316	{
2443	key_value *field = NULL, *last = NULL;	2317	for (key_value *kv = key_values; kv; kv = kv->next)
2444		2318	if (kv->key == key)
2445	for (field = op->key_values; field != NULL; field = field->next)
2446	{
2447	if (field->key != canonical_key)
2448	{	2319	{
2449	last = field;	2320	kv->value = value;
2450	continue;	2321	return;
2451	}	2322	}
2452		2323
2453	if (value)	2324	key_value *kv = new key_value;
2454	field->value = value;	2325
2455	else	2326	kv->next = key_values;
		2327	kv->key = key;
		2328	kv->value = value;
		2329
		2330	key_values = kv;
		2331	}
		2332
		2333	void
		2334	object::kv_del (shstr_tmp key)
		2335	{
		2336	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2337	if ((*kvp)->key == key)
2456	{	2338	{
2457	/* Basically, if the archetype has this key set,	2339	key_value *kv = *kvp;
2458	* we need to store the null value so when we save	2340	*kvp = (*kvp)->next;
2459	* it, we save the empty value so that when we load,	2341	delete kv;
2460	* we get this value back again.	2342	return;
2461	*/
2462	if (get_ob_key_link (op->arch, canonical_key))
2463	field->value = 0;
2464	else
2465	{
2466	if (last)
2467	last->next = field->next;
2468	else
2469	op->key_values = field->next;
2470
2471	delete field;
2472	}
2473	}	2343	}
2474	return TRUE;
2475	}
2476	/* IF we get here, key doesn't exist */
2477
2478	/* No field, we'll have to add it. */
2479
2480	if (!add_key)
2481	return FALSE;
2482
2483	/* There isn't any good reason to store a null
2484	* value in the key/value list. If the archetype has
2485	* this key, then we should also have it, so shouldn't
2486	* be here. If user wants to store empty strings,
2487	* should pass in ""
2488	*/
2489	if (value == NULL)
2490	return TRUE;
2491
2492	field = new key_value;
2493
2494	field->key = canonical_key;
2495	field->value = value;
2496	/* Usual prepend-addition. */
2497	field->next = op->key_values;
2498	op->key_values = field;
2499
2500	return TRUE;
2501	}
2502
2503	/*
2504	* Updates the key in op to value.
2505	*
2506	* If add_key is FALSE, this will only update existing keys,
2507	* and not add new ones.
2508	* In general, should be little reason FALSE is ever passed in for add_key
2509	*
2510	* Returns TRUE on success.
2511	*/
2512	int
2513	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2514	{
2515	shstr key_ (key);
2516
2517	return set_ob_key_value_s (op, key_, value, add_key);
2518	}	2344	}
2519		2345
2520	object::depth_iterator::depth_iterator (object *container)	2346	object::depth_iterator::depth_iterator (object *container)
2521	: iterator_base (container)	2347	: iterator_base (container)
2522	{	2348	{
…		…
2572	{	2398	{
2573	char flagdesc[512];	2399	char flagdesc[512];
2574	char info2[256 * 4];	2400	char info2[256 * 4];
2575	char *p = info;	2401	char *p = info;
2576		2402
2577	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2403	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2578	count,	2404	count,
2579	uuid.c_str (),	2405	uuid.c_str (),
2580	&name,	2406	&name,
2581	title ? "\",title:\"" : "",	2407	title ? ",title:\"" : "",
2582	title ? (const char *)title : "",	2408	title ? (const char *)title : "",
		2409	title ? "\"" : "",
2583	flag_desc (flagdesc, 512), type);	2410	flag_desc (flagdesc, 512), type);
2584		2411
2585	if (!flag[FLAG_REMOVED] && env)	2412	if (!flag[FLAG_REMOVED] && env)
2586	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2413	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2587		2414
…		…
2643	container = 0;	2470	container = 0;
2644		2471
2645	// client needs item update to make it work, client bug requires this to be separate	2472	// client needs item update to make it work, client bug requires this to be separate
2646	esrv_update_item (UPD_FLAGS, this, old_container);	2473	esrv_update_item (UPD_FLAGS, this, old_container);
2647		2474
2648	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2475	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2649	play_sound (sound_find ("chest_close"));	2476	play_sound (sound_find ("chest_close"));
2650	}	2477	}
2651		2478
2652	if (new_container)	2479	if (new_container)
2653	{	2480	{
…		…
2663	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2490	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2664	new_container->insert (closer);	2491	new_container->insert (closer);
2665	}	2492	}
2666	#endif	2493	#endif
2667		2494
2668	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2495	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2669		2496
2670	// make sure the container is available, client bug requires this to be separate	2497	// make sure the container is available, client bug requires this to be separate
2671	esrv_send_item (this, new_container);	2498	esrv_send_item (this, new_container);
2672		2499
2673	new_container->flag [FLAG_APPLIED] = true;	2500	new_container->flag [FLAG_APPLIED] = true;
…		…
2681	// else if (!old_container->env && contr && contr->ns)	2508	// else if (!old_container->env && contr && contr->ns)
2682	// contr->ns->floorbox_reset ();	2509	// contr->ns->floorbox_reset ();
2683	}	2510	}
2684		2511
2685	object *	2512	object *
2686	object::force_find (const shstr name)	2513	object::force_find (shstr_tmp name)
2687	{	2514	{
2688	/* cycle through his inventory to look for the MARK we want to	2515	/* cycle through his inventory to look for the MARK we want to
2689	* place	2516	* place
2690	*/	2517	*/
2691	for (object *tmp = inv; tmp; tmp = tmp->below)	2518	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2693	return splay (tmp);	2520	return splay (tmp);
2694		2521
2695	return 0;	2522	return 0;
2696	}	2523	}
2697		2524
		2525	//-GPL
		2526
2698	void	2527	void
		2528	object::force_set_timer (int duration)
		2529	{
		2530	this->duration = 1;
		2531	this->speed_left = -1.f;
		2532
		2533	this->set_speed (duration ? 1.f / duration : 0.f);
		2534	}
		2535
		2536	object *
2699	object::force_add (const shstr name, int duration)	2537	object::force_add (shstr_tmp name, int duration)
2700	{	2538	{
2701	if (object *force = force_find (name))	2539	if (object *force = force_find (name))
2702	force->destroy ();	2540	force->destroy ();
2703		2541
2704	object *force = get_archetype (FORCE_NAME);	2542	object *force = get_archetype (FORCE_NAME);
2705		2543
2706	force->slaying = name;	2544	force->slaying = name;
2707	force->stats.food = 1;	2545	force->force_set_timer (duration);
2708	force->speed_left = -1.f;
2709
2710	force->set_speed (duration ? 1.f / duration : 0.f);
2711	force->flag [FLAG_IS_USED_UP] = true;
2712	force->flag [FLAG_APPLIED] = true;	2546	force->flag [FLAG_APPLIED] = true;
2713		2547
2714	insert (force);	2548	return insert (force);
2715	}	2549	}
2716		2550
2717	void	2551	void
2718	object::play_sound (faceidx sound)	2552	object::play_sound (faceidx sound) const
2719	{	2553	{
2720	if (!sound)	2554	if (!sound)
2721	return;	2555	return;
2722		2556
2723	if (flag [FLAG_REMOVED])	2557	if (is_on_map ())
		2558	map->play_sound (sound, x, y);
		2559	else if (object *pl = in_player ())
		2560	pl->contr->play_sound (sound);
		2561	}
		2562
		2563	void
		2564	object::say_msg (const char *msg) const
		2565	{
		2566	if (is_on_map ())
		2567	map->say_msg (msg, x, y);
		2568	else if (object *pl = in_player ())
		2569	pl->contr->play_sound (sound);
		2570	}
		2571
		2572	void
		2573	object::make_noise ()
		2574	{
		2575	// we do not model noise in the map, so instead put
		2576	// a temporary light into the noise source
		2577	// could use the map instead, but that's less reliable for our
		2578	// goal, which is to make invisibility a bit harder to exploit
		2579
		2580	// currently only works sensibly for players
		2581	if (!is_player ())
2724	return;	2582	return;
2725		2583
2726	if (env)	2584	// find old force, or create new one
2727	{	2585	object *force = force_find (shstr_noise_force);
2728	if (object *pl = in_player ())	2586
2729	pl->contr->play_sound (sound);	2587	if (force)
2730	}	2588	force->speed_left = -1.f; // patch old speed up
2731	else	2589	else
2732	map->play_sound (sound, x, y);	2590	{
2733	}	2591	force = archetype::get (shstr_noise_force);
2734		2592
		2593	force->slaying = shstr_noise_force;
		2594	force->stats.food = 1;
		2595	force->speed_left = -1.f;
		2596
		2597	force->set_speed (1.f / 4.f);
		2598	force->flag [FLAG_IS_USED_UP] = true;
		2599	force->flag [FLAG_APPLIED] = true;
		2600
		2601	insert (force);
		2602	}
		2603	}
		2604

Diff Legend

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