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.222 by root, Wed Apr 30 05:06:36 2008 UTC vs.
Revision 1.299 by root, Sun Nov 8 20:55:39 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	*
…		…
195	bool object::can_merge_slow (object *ob1, object *ob2)	186	bool object::can_merge_slow (object *ob1, object *ob2)
196	{	187	{
197	/* A couple quicksanity checks */	188	/* A couple quicksanity checks */
198	if (ob1 == ob2	189	if (ob1 == ob2
199	|| ob1->type != ob2->type	190	|| ob1->type != ob2->type
200	|| ob1->speed != ob2->speed	191	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_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
241	|| ob1->move_block != ob2->move_block	230	|| ob1->move_block != ob2->move_block
242	|| ob1->move_allow != ob2->move_allow	231	|| ob1->move_allow != ob2->move_allow
243	|| ob1->move_on != ob2->move_on	232	|| ob1->move_on != ob2->move_on
244	|| ob1->move_off != ob2->move_off	233	|| ob1->move_off != ob2->move_off
245	|| ob1->move_slow != ob2->move_slow	234	|| ob1->move_slow != ob2->move_slow
246	|| ob1->move_slow_penalty != ob2->move_slow_penalty	235	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	236	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
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
…		…
712	* This function needs to be called whenever the speed of an object changes.	679	* This function needs to be called whenever the speed of an object changes.
713	*/	680	*/
714	void	681	void
715	object::set_speed (float speed)	682	object::set_speed (float speed)
716	{	683	{
717	if (flag [FLAG_FREED] && speed)
718	{
719	LOG (llevError, "Object %s is freed but has speed.\n", &name);
720	speed = 0;
721	}
722
723	this->speed = speed;	684	this->speed = speed;
724		685
725	if (has_active_speed ())	686	if (has_active_speed ())
726	activate ();	687	activate ();
727	else	688	else
…		…
777		738
778	if (!(m.flags_ & P_UPTODATE))	739	if (!(m.flags_ & P_UPTODATE))
779	/* nop */;	740	/* nop */;
780	else if (action == UP_OBJ_INSERT)	741	else if (action == UP_OBJ_INSERT)
781	{	742	{
		743	#if 0
782	// this is likely overkill, TODO: revisit (schmorp)	744	// this is likely overkill, TODO: revisit (schmorp)
783	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	745	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
784	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	746	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	747	|| (op->is_player () && !(m.flags_ & P_PLAYER))
786	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	748	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
787	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	749	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
788	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	750	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
789	|| (m.move_on | op->move_on ) != m.move_on	751	|| (m.move_on | op->move_on ) != m.move_on
790	|| (m.move_off | op->move_off ) != m.move_off	752	|| (m.move_off | op->move_off ) != m.move_off
791	|| (m.move_slow | op->move_slow) != m.move_slow	753	|| (m.move_slow | op->move_slow) != m.move_slow
792	/* This isn't perfect, but I don't expect a lot of objects to	754	/* This isn't perfect, but I don't expect a lot of objects to
793	* to have move_allow right now.	755	* have move_allow right now.
794	*/	756	*/
795	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	757	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		758	m.invalidate ();
		759	#else
796	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	760	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
797	m.flags_ = 0;	761	m.invalidate ();
		762	#endif
798	}	763	}
799	/* if the object is being removed, we can't make intelligent	764	/* if the object is being removed, we can't make intelligent
800	* decisions, because remove_ob can't really pass the object	765	* decisions, because remove_ob can't really pass the object
801	* that is being removed.	766	* that is being removed.
802	*/	767	*/
803	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	768	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
804	m.flags_ = 0;	769	m.invalidate ();
805	else if (action == UP_OBJ_FACE)	770	else if (action == UP_OBJ_FACE)
806	/* Nothing to do for that case */ ;	771	/* Nothing to do for that case */ ;
807	else	772	else
808	LOG (llevError, "update_object called with invalid action: %d\n", action);	773	LOG (llevError, "update_object called with invalid action: %d\n", action);
809		774
…		…
813		778
814	object::object ()	779	object::object ()
815	{	780	{
816	SET_FLAG (this, FLAG_REMOVED);	781	SET_FLAG (this, FLAG_REMOVED);
817		782
818	expmul = 1.0;	783	//expmul = 1.0; declared const for the time being
819	face = blank_face;	784	face = blank_face;
820	}	785	}
821		786
822	object::~object ()	787	object::~object ()
823	{	788	{
…		…
853	/* If already on active list, don't do anything */	818	/* If already on active list, don't do anything */
854	if (active)	819	if (active)
855	return;	820	return;
856		821
857	if (has_active_speed ())	822	if (has_active_speed ())
		823	{
		824	if (flag [FLAG_FREED])
		825	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		826
858	actives.insert (this);	827	actives.insert (this);
		828	}
859	}	829	}
860		830
861	void	831	void
862	object::activate_recursive ()	832	object::activate_recursive ()
863	{	833	{
…		…
924	* drop on that space.	894	* drop on that space.
925	*/	895	*/
926	if (!drop_to_ground	896	if (!drop_to_ground
927	|| !map	897	|| !map
928	|| map->in_memory != MAP_ACTIVE	898	|| map->in_memory != MAP_ACTIVE
929	|| map->nodrop	899	|| map->no_drop
930	|| ms ().move_block == MOVE_ALL)	900	|| ms ().move_block == MOVE_ALL)
931	{	901	{
932	while (inv)	902	while (inv)
933	{
934	inv->destroy_inv (false);
935	inv->destroy ();	903	inv->destroy ();
936	}
937	}	904	}
938	else	905	else
939	{ /* Put objects in inventory onto this space */	906	{ /* Put objects in inventory onto this space */
940	while (inv)	907	while (inv)
941	{	908	{
…		…
945	|| op->flag [FLAG_NO_DROP]	912	|| op->flag [FLAG_NO_DROP]
946	|| op->type == RUNE	913	|| op->type == RUNE
947	|| op->type == TRAP	914	|| op->type == TRAP
948	|| op->flag [FLAG_IS_A_TEMPLATE]	915	|| op->flag [FLAG_IS_A_TEMPLATE]
949	|| op->flag [FLAG_DESTROY_ON_DEATH])	916	|| op->flag [FLAG_DESTROY_ON_DEATH])
950	op->destroy (true);	917	op->destroy ();
951	else	918	else
952	map->insert (op, x, y);	919	map->insert (op, x, y);
953	}	920	}
954	}	921	}
955	}	922	}
…		…
959	object *op = new object;	926	object *op = new object;
960	op->link ();	927	op->link ();
961	return op;	928	return op;
962	}	929	}
963		930
		931	static struct freed_map : maptile
		932	{
		933	freed_map ()
		934	{
		935	path = "<freed objects map>";
		936	name = "/internal/freed_objects_map";
		937	width = 3;
		938	height = 3;
		939	no_drop = 1;
		940	no_reset = 1;
		941
		942	alloc ();
		943	in_memory = MAP_ACTIVE;
		944	}
		945
		946	~freed_map ()
		947	{
		948	destroy ();
		949	}
		950	} freed_map; // freed objects are moved here to avoid crashes
		951
964	void	952	void
965	object::do_destroy ()	953	object::do_destroy ()
966	{	954	{
967	if (flag [FLAG_IS_LINKED])	955	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	956	remove_link ();
969		957
970	if (flag [FLAG_FRIENDLY])	958	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	959	remove_friendly_object (this);
972		960
973	remove ();	961	remove ();
…		…
978	unlink ();	966	unlink ();
979		967
980	flag [FLAG_FREED] = 1;	968	flag [FLAG_FREED] = 1;
981		969
982	// hack to ensure that freed objects still have a valid map	970	// hack to ensure that freed objects still have a valid map
983	{
984	static maptile *freed_map; // freed objects are moved here to avoid crashes
985
986	if (!freed_map)
987	{
988	freed_map = new maptile;
989
990	freed_map->path = "<freed objects map>";
991	freed_map->name = "/internal/freed_objects_map";
992	freed_map->width = 3;
993	freed_map->height = 3;
994	freed_map->nodrop = 1;
995
996	freed_map->alloc ();
997	freed_map->in_memory = MAP_ACTIVE;
998	}
999
1000	map = freed_map;	971	map = &freed_map;
1001	x = 1;	972	x = 1;
1002	y = 1;	973	y = 1;
1003	}
1004		974
1005	if (more)	975	if (more)
1006	{	976	{
1007	more->destroy ();	977	more->destroy ();
1008	more = 0;	978	more = 0;
…		…
1016	attacked_by = 0;	986	attacked_by = 0;
1017	current_weapon = 0;	987	current_weapon = 0;
1018	}	988	}
1019		989
1020	void	990	void
1021	object::destroy (bool destroy_inventory)	991	object::destroy ()
1022	{	992	{
1023	if (destroyed ())	993	if (destroyed ())
1024	return;	994	return;
1025		995
1026	if (!is_head () && !head->destroyed ())	996	if (!is_head () && !head->destroyed ())
1027	{	997	{
1028	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	998	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1029	head->destroy (destroy_inventory);	999	head->destroy ();
		1000	return;
1030	}	1001	}
1031		1002
1032	destroy_inv (!destroy_inventory);	1003	destroy_inv (false);
1033		1004
1034	if (is_head ())	1005	if (is_head ())
1035	if (sound_destroy)	1006	if (sound_destroy)
1036	play_sound (sound_destroy);	1007	play_sound (sound_destroy);
1037	else if (flag [FLAG_MONSTER])	1008	else if (flag [FLAG_MONSTER])
…		…
1048	* the previous environment.	1019	* the previous environment.
1049	*/	1020	*/
1050	void	1021	void
1051	object::do_remove ()	1022	object::do_remove ()
1052	{	1023	{
1053	object *tmp, *last = 0;
1054	object *otmp;
1055
1056	if (flag [FLAG_REMOVED])	1024	if (flag [FLAG_REMOVED])
1057	return;	1025	return;
1058		1026
1059	INVOKE_OBJECT (REMOVE, this);	1027	INVOKE_OBJECT (REMOVE, this);
1060		1028
…		…
1074	esrv_del_item (pl->contr, count);	1042	esrv_del_item (pl->contr, count);
1075	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1043	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1076		1044
1077	adjust_weight (env, -total_weight ());	1045	adjust_weight (env, -total_weight ());
1078		1046
1079	*(above ? &above->below : &env->inv) = below;	1047	object *pl = in_player ();
1080
1081	if (below)
1082	below->above = above;
1083		1048
1084	/* we set up values so that it could be inserted into	1049	/* we set up values so that it could be inserted into
1085	* the map, but we don't actually do that - it is up	1050	* the map, but we don't actually do that - it is up
1086	* to the caller to decide what we want to do.	1051	* to the caller to decide what we want to do.
1087	*/	1052	*/
1088	map = env->map;	1053	map = env->map;
1089	x = env->x;	1054	x = env->x;
1090	y = env->y;	1055	y = env->y;
		1056
		1057	// make sure cmov optimisation is applicable
		1058	*(above ? &above->below : &env->inv) = below;
		1059	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1060
1091	above = 0;	1061	above = 0;
1092	below = 0;	1062	below = 0;
1093	env = 0;	1063	env = 0;
1094		1064
1095	/* NO_FIX_PLAYER is set when a great many changes are being	1065	/* NO_FIX_PLAYER is set when a great many changes are being
1096	* made to players inventory. If set, avoiding the call	1066	* made to players inventory. If set, avoiding the call
1097	* to save cpu time.	1067	* to save cpu time.
1098	*/	1068	*/
1099	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1069	if (pl)
		1070	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1071	{
1100	otmp->update_stats ();	1072	pl->update_stats ();
		1073
		1074	if (glow_radius && pl->is_on_map ())
		1075	update_all_los (pl->map, pl->x, pl->y);
		1076	}
1101	}	1077	}
1102	else if (map)	1078	else if (map)
1103	{	1079	{
1104	map->dirty = true;	1080	map->dirty = true;
1105	mapspace &ms = this->ms ();	1081	mapspace &ms = this->ms ();
1106		1082
1107	if (object *pl = ms.player ())	1083	if (object *pl = ms.player ())
1108	{	1084	{
1109	if (type == PLAYER) // this == pl(!)	1085	if (is_player ())
1110	{	1086	{
		1087	if (!flag [FLAG_WIZPASS])
		1088	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1089
1111	// leaving a spot always closes any open container on the ground	1090	// leaving a spot always closes any open container on the ground
1112	if (container && !container->env)	1091	if (container && !container->env)
1113	// this causes spurious floorbox updates, but it ensures	1092	// this causes spurious floorbox updates, but it ensures
1114	// that the CLOSE event is being sent.	1093	// that the CLOSE event is being sent.
1115	close_container ();	1094	close_container ();
1116		1095
1117	--map->players;	1096	--map->players;
1118	map->touch ();	1097	map->touch ();
1119	}	1098	}
1120	else if (pl->container == this)	1099	else if (pl->container_ () == this)
1121	{	1100	{
1122	// removing a container should close it	1101	// removing a container should close it
1123	close_container ();	1102	close_container ();
1124	}	1103	}
1125		1104
1126	esrv_del_item (pl->contr, count);	1105	esrv_del_item (pl->contr, count);
1127	}	1106	}
1128		1107
1129	/* link the object above us */	1108	/* link the object above us */
1130	if (above)	1109	// re-link, make sure compiler can easily use cmove
1131	above->below = below;	1110	*(above ? &above->below : &ms.top) = below;
1132	else	1111	*(below ? &below->above : &ms.bot) = above;
1133	ms.top = below; /* we were top, set new top */
1134
1135	/* Relink the object below us, if there is one */
1136	if (below)
1137	below->above = above;
1138	else
1139	{
1140	/* Nothing below, which means we need to relink map object for this space
1141	* use translated coordinates in case some oddness with map tiling is
1142	* evident
1143	*/
1144	if (GET_MAP_OB (map, x, y) != this)
1145	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 ());
1146
1147	ms.bot = above; /* goes on above it. */
1148	}
1149		1112
1150	above = 0;	1113	above = 0;
1151	below = 0;	1114	below = 0;
1152		1115
		1116	ms.invalidate ();
		1117
1153	if (map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1154	return;	1119	return;
1155		1120
1156	int check_walk_off = !flag [FLAG_NO_APPLY];	1121	int check_walk_off = !flag [FLAG_NO_APPLY];
1157		1122
1158	if (object *pl = ms.player ())	1123	if (object *pl = ms.player ())
1159	{	1124	{
1160	if (pl->container == this)	1125	if (pl->container_ () == this)
1161	/* If a container that the player is currently using somehow gets	1126	/* If a container that the player is currently using somehow gets
1162	* removed (most likely destroyed), update the player view	1127	* removed (most likely destroyed), update the player view
1163	* appropriately.	1128	* appropriately.
1164	*/	1129	*/
1165	pl->close_container ();	1130	pl->close_container ();
1166		1131
1167	//TODO: the floorbox prev/next might need updating	1132	//TODO: the floorbox prev/next might need updating
1168	esrv_del_item (pl->contr, count);	1133	//esrv_del_item (pl->contr, count);
		1134	//TODO: update floorbox to preserve ordering
		1135	if (pl->contr->ns)
		1136	pl->contr->ns->floorbox_update ();
1169	}	1137	}
1170		1138
		1139	if (check_walk_off)
1171	for (tmp = ms.bot; tmp; tmp = tmp->above)	1140	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1172	{	1141	{
		1142	above = tmp->above;
		1143
1173	/* No point updating the players look faces if he is the object	1144	/* No point updating the players look faces if he is the object
1174	* being removed.	1145	* being removed.
1175	*/	1146	*/
1176		1147
1177	/* See if object moving off should effect something */	1148	/* See if object moving off should effect something */
1178	if (check_walk_off
1179	&& ((move_type & tmp->move_off)	1149	if ((move_type & tmp->move_off)
1180	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1150	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1181	{
1182	move_apply (tmp, this, 0);	1151	move_apply (tmp, this, 0);
1183
1184	if (destroyed ())
1185	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1186	}	1152	}
1187		1153
1188	last = tmp;	1154	if (affects_los ())
1189	}
1190
1191	/* last == NULL if there are no objects on this space */
1192	//TODO: this makes little sense, why only update the topmost object?
1193	if (!last)
1194	map->at (x, y).flags_ = 0;
1195	else
1196	update_object (last, UP_OBJ_REMOVE);
1197
1198	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1199	update_all_los (map, x, y);	1155	update_all_los (map, x, y);
1200	}	1156	}
1201	}	1157	}
1202		1158
1203	/*	1159	/*
…		…
1227	esrv_update_item (UPD_NROF, pl, top);	1183	esrv_update_item (UPD_NROF, pl, top);
1228		1184
1229	op->weight = 0; // cancel the addition above	1185	op->weight = 0; // cancel the addition above
1230	op->carrying = 0; // must be 0 already	1186	op->carrying = 0; // must be 0 already
1231		1187
1232	op->destroy (1);	1188	op->destroy ();
1233		1189
1234	return top;	1190	return top;
1235	}	1191	}
1236		1192
1237	return 0;	1193	return 0;
…		…
1265	* job preparing multi-part monsters.	1221	* job preparing multi-part monsters.
1266	*/	1222	*/
1267	object *	1223	object *
1268	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1269	{	1225	{
		1226	op->remove ();
		1227
1270	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1228	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1271	{	1229	{
1272	tmp->x = x + tmp->arch->x;	1230	tmp->x = x + tmp->arch->x;
1273	tmp->y = y + tmp->arch->y;	1231	tmp->y = y + tmp->arch->y;
1274	}	1232	}
…		…
1297	* just 'op' otherwise	1255	* just 'op' otherwise
1298	*/	1256	*/
1299	object *	1257	object *
1300	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1258	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1301	{	1259	{
1302	assert (!op->flag [FLAG_FREED]);
1303
1304	op->remove ();	1260	op->remove ();
		1261
		1262	if (m == &freed_map)//D TODO: remove soon
		1263	{//D
		1264	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1265	}//D
1305		1266
1306	/* Ideally, the caller figures this out. However, it complicates a lot	1267	/* Ideally, the caller figures this out. However, it complicates a lot
1307	* of areas of callers (eg, anything that uses find_free_spot would now	1268	* of areas of callers (eg, anything that uses find_free_spot would now
1308	* need extra work	1269	* need extra work
1309	*/	1270	*/
		1271	maptile *newmap = m;
1310	if (!xy_normalise (m, op->x, op->y))	1272	if (!xy_normalise (newmap, op->x, op->y))
1311	{	1273	{
1312	op->destroy (1);	1274	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1313	return 0;	1275	return 0;
1314	}	1276	}
1315		1277
1316	if (object *more = op->more)	1278	if (object *more = op->more)
1317	if (!insert_ob_in_map (more, m, originator, flag))	1279	if (!insert_ob_in_map (more, m, originator, flag))
1318	return 0;	1280	return 0;
1319		1281
1320	CLEAR_FLAG (op, FLAG_REMOVED);	1282	op->flag [FLAG_REMOVED] = false;
1321		1283	op->env = 0;
1322	op->map = m;	1284	op->map = newmap;
		1285
1323	mapspace &ms = op->ms ();	1286	mapspace &ms = op->ms ();
1324		1287
1325	/* this has to be done after we translate the coordinates.	1288	/* this has to be done after we translate the coordinates.
1326	*/	1289	*/
1327	if (op->nrof && !(flag & INS_NO_MERGE))	1290	if (op->nrof && !(flag & INS_NO_MERGE))
1328	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1291	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1329	if (object::can_merge (op, tmp))	1292	if (object::can_merge (op, tmp))
1330	{	1293	{
1331	// TODO: we atcually want to update tmp, not op,	1294	// TODO: we actually want to update tmp, not op,
1332	// but some caller surely breaks when we return tmp	1295	// but some caller surely breaks when we return tmp
1333	// from here :/	1296	// from here :/
1334	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1335	tmp->destroy (1);	1298	tmp->destroy ();
1336	}	1299	}
1337		1300
1338	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1301	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1340		1303
…		…
1347	{	1310	{
1348	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1311	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1349	abort ();	1312	abort ();
1350	}	1313	}
1351		1314
		1315	if (!originator->is_on_map ())
		1316	{
		1317	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1318	op->debug_desc (), originator->debug_desc ());
		1319	abort ();
		1320	}
		1321
1352	op->above = originator;	1322	op->above = originator;
1353	op->below = originator->below;	1323	op->below = originator->below;
1354
1355	if (op->below)
1356	op->below->above = op;
1357	else
1358	ms.bot = op;
1359
1360	/* since *below* originator, no need to update top */
1361	originator->below = op;	1324	originator->below = op;
		1325
		1326	*(op->below ? &op->below->above : &ms.bot) = op;
1362	}	1327	}
1363	else	1328	else
1364	{	1329	{
1365	object *top, *floor = NULL;	1330	object *floor = 0;
1366		1331	object *top = ms.top;
1367	top = ms.bot;
1368		1332
1369	/* If there are other objects, then */	1333	/* If there are other objects, then */
1370	if (top)	1334	if (top)
1371	{	1335	{
1372	object *last = 0;
1373
1374	/*	1336	/*
1375	* If there are multiple objects on this space, we do some trickier handling.	1337	* If there are multiple objects on this space, we do some trickier handling.
1376	* We've already dealt with merging if appropriate.	1338	* We've already dealt with merging if appropriate.
1377	* Generally, we want to put the new object on top. But if	1339	* Generally, we want to put the new object on top. But if
1378	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1340	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1381	* once we get to them. This reduces the need to traverse over all of	1343	* once we get to them. This reduces the need to traverse over all of
1382	* them when adding another one - this saves quite a bit of cpu time	1344	* them when adding another one - this saves quite a bit of cpu time
1383	* when lots of spells are cast in one area. Currently, it is presumed	1345	* when lots of spells are cast in one area. Currently, it is presumed
1384	* that flying non pickable objects are spell objects.	1346	* that flying non pickable objects are spell objects.
1385	*/	1347	*/
1386	for (top = ms.bot; top; top = top->above)	1348	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1387	{	1349	{
1388	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1350	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1389	floor = top;	1351	floor = tmp;
1390		1352
1391	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1353	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1392	{	1354	{
1393	/* We insert above top, so we want this object below this */	1355	/* We insert above top, so we want this object below this */
1394	top = top->below;	1356	top = tmp->below;
1395	break;	1357	break;
1396	}	1358	}
1397		1359
1398	last = top;	1360	top = tmp;
1399	}	1361	}
1400
1401	/* Don't want top to be NULL, so set it to the last valid object */
1402	top = last;
1403		1362
1404	/* We let update_position deal with figuring out what the space	1363	/* We let update_position deal with figuring out what the space
1405	* looks like instead of lots of conditions here.	1364	* looks like instead of lots of conditions here.
1406	* makes things faster, and effectively the same result.	1365	* makes things faster, and effectively the same result.
1407	*/	1366	*/
…		…
1414	*/	1373	*/
1415	if (!(flag & INS_ON_TOP)	1374	if (!(flag & INS_ON_TOP)
1416	&& ms.flags () & P_BLOCKSVIEW	1375	&& ms.flags () & P_BLOCKSVIEW
1417	&& (op->face && !faces [op->face].visibility))	1376	&& (op->face && !faces [op->face].visibility))
1418	{	1377	{
		1378	object *last;
		1379
1419	for (last = top; last != floor; last = last->below)	1380	for (last = top; last != floor; last = last->below)
1420	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1381	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1421	break;	1382	break;
1422		1383
1423	/* Check to see if we found the object that blocks view,	1384	/* Check to see if we found the object that blocks view,
…		…
1431	} /* If objects on this space */	1392	} /* If objects on this space */
1432		1393
1433	if (flag & INS_ABOVE_FLOOR_ONLY)	1394	if (flag & INS_ABOVE_FLOOR_ONLY)
1434	top = floor;	1395	top = floor;
1435		1396
1436	/* Top is the object that our object (op) is going to get inserted above.	1397	// insert object above top, or bottom-most if top = 0
1437	*/
1438
1439	/* First object on this space */
1440	if (!top)	1398	if (!top)
1441	{	1399	{
		1400	op->below = 0;
1442	op->above = ms.bot;	1401	op->above = ms.bot;
1443
1444	if (op->above)
1445	op->above->below = op;
1446
1447	op->below = 0;
1448	ms.bot = op;	1402	ms.bot = op;
		1403
		1404	*(op->above ? &op->above->below : &ms.top) = op;
1449	}	1405	}
1450	else	1406	else
1451	{ /* get inserted into the stack above top */	1407	{
1452	op->above = top->above;	1408	op->above = top->above;
1453
1454	if (op->above)
1455	op->above->below = op;	1409	top->above = op;
1456		1410
1457	op->below = top;	1411	op->below = top;
1458	top->above = op;	1412	*(op->above ? &op->above->below : &ms.top) = op;
1459	}	1413	}
		1414	}
1460		1415
1461	if (!op->above)	1416	if (op->is_player ())
1462	ms.top = op;
1463	} /* else not INS_BELOW_ORIGINATOR */
1464
1465	if (op->type == PLAYER)
1466	{	1417	{
1467	op->contr->do_los = 1;	1418	op->contr->do_los = 1;
1468	++op->map->players;	1419	++op->map->players;
1469	op->map->touch ();	1420	op->map->touch ();
1470	}	1421	}
1471		1422
1472	op->map->dirty = true;	1423	op->map->dirty = true;
1473		1424
1474	if (object *pl = ms.player ())	1425	if (object *pl = ms.player ())
1475	//TODO: the floorbox prev/next might need updating	1426	//TODO: the floorbox prev/next might need updating
1476	esrv_send_item (pl, op);	1427	//esrv_send_item (pl, op);
		1428	//TODO: update floorbox to preserve ordering
		1429	if (pl->contr->ns)
		1430	pl->contr->ns->floorbox_update ();
1477		1431
1478	/* If this object glows, it may affect lighting conditions that are	1432	/* If this object glows, it may affect lighting conditions that are
1479	* visible to others on this map. But update_all_los is really	1433	* visible to others on this map. But update_all_los is really
1480	* an inefficient way to do this, as it means los for all players	1434	* an inefficient way to do this, as it means los for all players
1481	* on the map will get recalculated. The players could very well	1435	* on the map will get recalculated. The players could very well
1482	* be far away from this change and not affected in any way -	1436	* be far away from this change and not affected in any way -
1483	* this should get redone to only look for players within range,	1437	* this should get redone to only look for players within range,
1484	* or just updating the P_UPTODATE for spaces within this area	1438	* or just updating the P_UPTODATE for spaces within this area
1485	* of effect may be sufficient.	1439	* of effect may be sufficient.
1486	*/	1440	*/
1487	if (op->map->darkness && (op->glow_radius != 0))	1441	if (op->affects_los ())
		1442	{
		1443	op->ms ().invalidate ();
1488	update_all_los (op->map, op->x, op->y);	1444	update_all_los (op->map, op->x, op->y);
		1445	}
1489		1446
1490	/* updates flags (blocked, alive, no magic, etc) for this map space */	1447	/* updates flags (blocked, alive, no magic, etc) for this map space */
1491	update_object (op, UP_OBJ_INSERT);	1448	update_object (op, UP_OBJ_INSERT);
1492		1449
1493	INVOKE_OBJECT (INSERT, op);	1450	INVOKE_OBJECT (INSERT, op);
…		…
1500	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1501	* update_object().	1458	* update_object().
1502	*/	1459	*/
1503		1460
1504	/* if this is not the head or flag has been passed, don't check walk on status */	1461	/* if this is not the head or flag has been passed, don't check walk on status */
1505	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1462	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1506	{	1463	{
1507	if (check_move_on (op, originator))	1464	if (check_move_on (op, originator))
1508	return 0;	1465	return 0;
1509		1466
1510	/* If we are a multi part object, lets work our way through the check	1467	/* If we are a multi part object, lets work our way through the check
…		…
1521	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1522	* finds an object of its own type, it'll remove that one first.	1479	* finds an object of its own type, it'll remove that one first.
1523	* op is the object to insert it under: supplies x and the map.	1480	* op is the object to insert it under: supplies x and the map.
1524	*/	1481	*/
1525	void	1482	void
1526	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1527	{	1484	{
1528	/* first search for itself and remove any old instances */	1485	/* first search for itself and remove any old instances */
1529		1486
1530	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1487	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1531	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1488	if (tmp->arch->archname == archname) /* same archetype */
1532	tmp->destroy (1);	1489	tmp->destroy ();
1533		1490
1534	object *tmp = arch_to_object (archetype::find (arch_string));	1491	object *tmp = arch_to_object (archetype::find (archname));
1535		1492
1536	tmp->x = op->x;	1493	tmp->x = op->x;
1537	tmp->y = op->y;	1494	tmp->y = op->y;
1538		1495
1539	insert_ob_in_map (tmp, op->map, op, 0);	1496	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1544	{	1501	{
1545	if (where->env)	1502	if (where->env)
1546	return where->env->insert (this);	1503	return where->env->insert (this);
1547	else	1504	else
1548	return where->map->insert (this, where->x, where->y, originator, flags);	1505	return where->map->insert (this, where->x, where->y, originator, flags);
		1506	}
		1507
		1508	// check whether we can put this into the map, respect max_nrof, max_volume, max_items
		1509	bool
		1510	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1511	{
		1512	mapspace &ms = m->at (x, y);
		1513
		1514	int items = ms.items ();
		1515
		1516	if (!items // testing !items ensures we can drop at least one item
		1517	|| (items < m->max_items
		1518	&& ms.volume () < m->max_volume
		1519	&& nrof <= m->max_nrof))
		1520	return true;
		1521
		1522	if (originator && originator->is_player ())
		1523	originator->contr->failmsg (format (
		1524	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1525	query_name ()
		1526	));
		1527
		1528	return false;
1549	}	1529	}
1550		1530
1551	/*	1531	/*
1552	* decrease(object, number) decreases a specified number from	1532	* decrease(object, number) decreases a specified number from
1553	* the amount of an object. If the amount reaches 0, the object	1533	* the amount of an object. If the amount reaches 0, the object
…		…
1561	if (!nr)	1541	if (!nr)
1562	return true;	1542	return true;
1563		1543
1564	nr = min (nr, nrof);	1544	nr = min (nr, nrof);
1565		1545
		1546	if (nrof > nr)
		1547	{
1566	nrof -= nr;	1548	nrof -= nr;
1567
1568	if (nrof)
1569	{
1570	adjust_weight (env, -weight * nr); // carrying == 0	1549	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1571		1550
1572	if (object *pl = visible_to ())	1551	if (object *pl = visible_to ())
1573	esrv_update_item (UPD_NROF, pl, this);	1552	esrv_update_item (UPD_NROF, pl, this);
1574		1553
1575	return true;	1554	return true;
1576	}	1555	}
1577	else	1556	else
1578	{	1557	{
1579	destroy (1);	1558	destroy ();
1580	return false;	1559	return false;
1581	}	1560	}
1582	}	1561	}
1583		1562
1584	/*	1563	/*
…		…
1601	}	1580	}
1602	else	1581	else
1603	{	1582	{
1604	decrease (nr);	1583	decrease (nr);
1605		1584
1606	object *op = object_create_clone (this);	1585	object *op = deep_clone ();
1607	op->nrof = nr;	1586	op->nrof = nr;
1608	return op;	1587	return op;
1609	}	1588	}
1610	}	1589	}
1611		1590
…		…
1661	if (object *pl = tmp->visible_to ())	1640	if (object *pl = tmp->visible_to ())
1662	esrv_update_item (UPD_NROF, pl, tmp);	1641	esrv_update_item (UPD_NROF, pl, tmp);
1663		1642
1664	adjust_weight (this, op->total_weight ());	1643	adjust_weight (this, op->total_weight ());
1665		1644
1666	op->destroy (1);	1645	op->destroy ();
1667	op = tmp;	1646	op = tmp;
1668	goto inserted;	1647	goto inserted;
1669	}	1648	}
1670		1649
1671	op->owner = 0; // it's his/hers now. period.	1650	op->owner = 0; // it's his/hers now. period.
…		…
1689		1668
1690	adjust_weight (this, op->total_weight ());	1669	adjust_weight (this, op->total_weight ());
1691		1670
1692	inserted:	1671	inserted:
1693	/* reset the light list and los of the players on the map */	1672	/* reset the light list and los of the players on the map */
1694	if (op->glow_radius && map && map->darkness)	1673	if (op->glow_radius && is_on_map ())
		1674	{
		1675	update_stats ();
1695	update_all_los (map, x, y);	1676	update_all_los (map, x, y);
1696		1677	}
		1678	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1697	// if this is a player's inventory, update stats	1679	// if this is a player's inventory, update stats
1698	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1699	update_stats ();	1680	update_stats ();
1700		1681
1701	INVOKE_OBJECT (INSERT, this);	1682	INVOKE_OBJECT (INSERT, this);
1702		1683
1703	return op;	1684	return op;
…		…
1724	* on top.	1705	* on top.
1725	*/	1706	*/
1726	int	1707	int
1727	check_move_on (object *op, object *originator)	1708	check_move_on (object *op, object *originator)
1728	{	1709	{
		1710	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1711	return 0;
		1712
1729	object *tmp;	1713	object *tmp;
1730	maptile *m = op->map;	1714	maptile *m = op->map;
1731	int x = op->x, y = op->y;	1715	int x = op->x, y = op->y;
1732		1716
1733	MoveType move_on, move_slow, move_block;	1717	mapspace &ms = m->at (x, y);
1734		1718
1735	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1719	ms.update ();
1736	return 0;
1737		1720
1738	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1721	MoveType move_on = ms.move_on;
1739	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1722	MoveType move_slow = ms.move_slow;
1740	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1723	MoveType move_block = ms.move_block;
1741		1724
1742	/* if nothing on this space will slow op down or be applied,	1725	/* if nothing on this space will slow op down or be applied,
1743	* no need to do checking below. have to make sure move_type	1726	* no need to do checking below. have to make sure move_type
1744	* is set, as lots of objects don't have it set - we treat that	1727	* is set, as lots of objects don't have it set - we treat that
1745	* as walking.	1728	* as walking.
…		…
1756	return 0;	1739	return 0;
1757		1740
1758	/* The objects have to be checked from top to bottom.	1741	/* The objects have to be checked from top to bottom.
1759	* Hence, we first go to the top:	1742	* Hence, we first go to the top:
1760	*/	1743	*/
1761		1744	for (object *next, *tmp = ms.top; tmp; tmp = next)
1762	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1763	{
1764	/* Trim the search when we find the first other spell effect
1765	* this helps performance so that if a space has 50 spell objects,
1766	* we don't need to check all of them.
1767	*/
1768	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1769	break;
1770	}	1745	{
		1746	next = tmp->below;
1771		1747
1772	for (; tmp; tmp = tmp->below)
1773	{
1774	if (tmp == op)	1748	if (tmp == op)
1775	continue; /* Can't apply yourself */	1749	continue; /* Can't apply yourself */
1776		1750
1777	/* Check to see if one of the movement types should be slowed down.	1751	/* Check to see if one of the movement types should be slowed down.
1778	* Second check makes sure that the movement types not being slowed	1752	* Second check makes sure that the movement types not being slowed
…		…
1783	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1784	{	1758	{
1785	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1786	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1760	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1787	{	1761	{
1788
1789	float
1790	diff = tmp->move_slow_penalty * fabs (op->speed);	1762	float diff = tmp->move_slow_penalty * fabs (op->speed);
1791		1763
1792	if (op->type == PLAYER)	1764	if (op->is_player ())
1793	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1765	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1794	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1766	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1795	diff /= 4.0;	1767	diff /= 4.0;
1796		1768
1797	op->speed_left -= diff;	1769	op->speed_left -= diff;
1798	}	1770	}
1799	}	1771	}
…		…
1832	LOG (llevError, "Present_arch called outside map.\n");	1804	LOG (llevError, "Present_arch called outside map.\n");
1833	return NULL;	1805	return NULL;
1834	}	1806	}
1835		1807
1836	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1808	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1837	if (tmp->arch == at)	1809	if (tmp->arch->archname == at->archname)
1838	return tmp;	1810	return tmp;
1839		1811
1840	return NULL;	1812	return NULL;
1841	}	1813	}
1842		1814
…		…
1906	* The first matching object is returned, or NULL if none.	1878	* The first matching object is returned, or NULL if none.
1907	*/	1879	*/
1908	object *	1880	object *
1909	present_arch_in_ob (const archetype *at, const object *op)	1881	present_arch_in_ob (const archetype *at, const object *op)
1910	{	1882	{
1911	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1883	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1912	if (tmp->arch == at)	1884	if (tmp->arch->archname == at->archname)
1913	return tmp;	1885	return tmp;
1914		1886
1915	return NULL;	1887	return NULL;
1916	}	1888	}
1917		1889
…		…
2005	* head of the object should correspond for the entire object.	1977	* head of the object should correspond for the entire object.
2006	*/	1978	*/
2007	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1979	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2008	continue;	1980	continue;
2009		1981
2010	if (ob->blocked (m, pos.x, pos.y))	1982	if (ob->blocked (pos.m, pos.x, pos.y))
2011	continue;	1983	continue;
2012		1984
2013	altern [index++] = i;	1985	altern [index++] = i;
2014	}	1986	}
2015		1987
…		…
2083	* there is capable of.	2055	* there is capable of.
2084	*/	2056	*/
2085	int	2057	int
2086	find_dir (maptile *m, int x, int y, object *exclude)	2058	find_dir (maptile *m, int x, int y, object *exclude)
2087	{	2059	{
2088	int i, max = SIZEOFFREE, mflags;	2060	int max = SIZEOFFREE, mflags;
2089
2090	sint16 nx, ny;
2091	object *tmp;
2092	maptile *mp;
2093
2094	MoveType blocked, move_type;	2061	MoveType move_type;
2095		2062
2096	if (exclude && exclude->head_ () != exclude)	2063	if (exclude && exclude->head_ () != exclude)
2097	{	2064	{
2098	exclude = exclude->head;	2065	exclude = exclude->head;
2099	move_type = exclude->move_type;	2066	move_type = exclude->move_type;
…		…
2102	{	2069	{
2103	/* If we don't have anything, presume it can use all movement types. */	2070	/* If we don't have anything, presume it can use all movement types. */
2104	move_type = MOVE_ALL;	2071	move_type = MOVE_ALL;
2105	}	2072	}
2106		2073
2107	for (i = 1; i < max; i++)	2074	for (int i = 1; i < max; i++)
2108	{	2075	{
2109	mp = m;	2076	mapxy pos (m, x, y);
2110	nx = x + freearr_x[i];	2077	pos.move (i);
2111	ny = y + freearr_y[i];
2112		2078
2113	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2079	if (!pos.normalise ())
2114
2115	if (mflags & P_OUT_OF_MAP)
2116	max = maxfree[i];	2080	max = maxfree[i];
2117	else	2081	else
2118	{	2082	{
2119	mapspace &ms = mp->at (nx, ny);	2083	mapspace &ms = *pos;
2120		2084
2121	blocked = ms.move_block;
2122
2123	if ((move_type & blocked) == move_type)	2085	if ((move_type & ms.move_block) == move_type)
2124	max = maxfree[i];	2086	max = maxfree [i];
2125	else if (mflags & P_IS_ALIVE)	2087	else if (ms.flags () & P_IS_ALIVE)
2126	{	2088	{
2127	for (tmp = ms.bot; tmp; tmp = tmp->above)	2089	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2128	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2090	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2129	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2091	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2130	break;
2131
2132	if (tmp)
2133	return freedir[i];	2092	return freedir [i];
2134	}	2093	}
2135	}	2094	}
2136	}	2095	}
2137		2096
2138	return 0;	2097	return 0;
…		…
2213	* This basically means that if direction is 15, then it could either go	2172	* This basically means that if direction is 15, then it could either go
2214	* direction 4, 14, or 16 to get back to where we are.	2173	* direction 4, 14, or 16 to get back to where we are.
2215	* Moved from spell_util.c to object.c with the other related direction	2174	* Moved from spell_util.c to object.c with the other related direction
2216	* functions.	2175	* functions.
2217	*/	2176	*/
2218	int reduction_dir[SIZEOFFREE][3] = {	2177	static const int reduction_dir[SIZEOFFREE][3] = {
2219	{0, 0, 0}, /* 0 */	2178	{0, 0, 0}, /* 0 */
2220	{0, 0, 0}, /* 1 */	2179	{0, 0, 0}, /* 1 */
2221	{0, 0, 0}, /* 2 */	2180	{0, 0, 0}, /* 2 */
2222	{0, 0, 0}, /* 3 */	2181	{0, 0, 0}, /* 3 */
2223	{0, 0, 0}, /* 4 */	2182	{0, 0, 0}, /* 4 */
…		…
2319	int	2278	int
2320	can_pick (const object *who, const object *item)	2279	can_pick (const object *who, const object *item)
2321	{	2280	{
2322	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2281	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2323	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2282	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2324	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2283	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2325	}	2284	}
2326		2285
2327	/*	2286	/*
2328	* create clone from object to another	2287	* create clone from object to another
2329	*/	2288	*/
2330	object *	2289	object *
2331	object_create_clone (object *asrc)	2290	object::deep_clone ()
2332	{	2291	{
2333	object *dst = 0, *tmp, *src, *prev, *item;	2292	assert (("deep_clone called on non-head object", is_head ()));
2334		2293
2335	if (!asrc)	2294	object *dst = clone ();
2336	return 0;
2337		2295
2338	src = asrc->head_ ();	2296	object *prev = dst;
2339
2340	prev = 0;
2341	for (object *part = src; part; part = part->more)	2297	for (object *part = this->more; part; part = part->more)
2342	{	2298	{
2343	tmp = part->clone ();	2299	object *tmp = part->clone ();
2344	tmp->x -= src->x;
2345	tmp->y -= src->y;
2346
2347	if (!part->head)
2348	{
2349	dst = tmp;
2350	tmp->head = 0;
2351	}
2352	else
2353	tmp->head = dst;	2300	tmp->head = dst;
2354
2355	tmp->more = 0;
2356
2357	if (prev)
2358	prev->more = tmp;	2301	prev->more = tmp;
2359
2360	prev = tmp;	2302	prev = tmp;
2361	}	2303	}
2362		2304
2363	for (item = src->inv; item; item = item->below)	2305	for (object *item = inv; item; item = item->below)
2364	insert_ob_in_ob (object_create_clone (item), dst);	2306	insert_ob_in_ob (item->deep_clone (), dst);
2365		2307
2366	return dst;	2308	return dst;
2367	}	2309	}
2368		2310
2369	/* This returns the first object in who's inventory that	2311	/* This returns the first object in who's inventory that
…		…
2378	return tmp;	2320	return tmp;
2379		2321
2380	return 0;	2322	return 0;
2381	}	2323	}
2382		2324
2383	/* If ob has a field named key, return the link from the list,	2325	shstr_tmp
2384	* otherwise return NULL.	2326	object::kv_get (shstr_tmp key) const
2385	*
2386	* key must be a passed in shared string - otherwise, this won't
2387	* do the desired thing.
2388	*/
2389	key_value *
2390	get_ob_key_link (const object *ob, const char *key)
2391	{	2327	{
2392	for (key_value *link = ob->key_values; link; link = link->next)	2328	for (key_value *kv = key_values; kv; kv = kv->next)
2393	if (link->key == key)	2329	if (kv->key == key)
2394	return link;
2395
2396	return 0;
2397	}
2398
2399	/*
2400	* Returns the value of op has an extra_field for key, or NULL.
2401	*
2402	* The argument doesn't need to be a shared string.
2403	*
2404	* The returned string is shared.
2405	*/
2406	const char *
2407	get_ob_key_value (const object *op, const char *const key)
2408	{
2409	key_value *link;
2410	shstr_cmp canonical_key (key);
2411
2412	if (!canonical_key)
2413	{
2414	/* 1. There being a field named key on any object
2415	* implies there'd be a shared string to find.
2416	* 2. Since there isn't, no object has this field.
2417	* 3. Therefore, *this* object doesn't have this field.
2418	*/
2419	return 0;
2420	}
2421
2422	/* This is copied from get_ob_key_link() above -
2423	* only 4 lines, and saves the function call overhead.
2424	*/
2425	for (link = op->key_values; link; link = link->next)
2426	if (link->key == canonical_key)
2427	return link->value;	2330	return kv->value;
2428		2331
2429	return 0;	2332	return shstr ();
2430	}	2333	}
2431		2334
2432	/*	2335	void
2433	* Updates the canonical_key in op to value.	2336	object::kv_set (shstr_tmp key, shstr_tmp value)
2434	*
2435	* canonical_key is a shared string (value doesn't have to be).
2436	*
2437	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2438	* keys.
2439	*
2440	* Returns TRUE on success.
2441	*/
2442	int
2443	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2444	{	2337	{
2445	key_value *field = NULL, *last = NULL;	2338	for (key_value *kv = key_values; kv; kv = kv->next)
2446		2339	if (kv->key == key)
2447	for (field = op->key_values; field != NULL; field = field->next)
2448	{
2449	if (field->key != canonical_key)
2450	{	2340	{
2451	last = field;	2341	kv->value = value;
2452	continue;	2342	return;
2453	}	2343	}
2454		2344
2455	if (value)	2345	key_value *kv = new key_value;
2456	field->value = value;	2346
2457	else	2347	kv->next = key_values;
		2348	kv->key = key;
		2349	kv->value = value;
		2350
		2351	key_values = kv;
		2352	}
		2353
		2354	void
		2355	object::kv_del (shstr_tmp key)
		2356	{
		2357	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2358	if ((*kvp)->key == key)
2458	{	2359	{
2459	/* Basically, if the archetype has this key set,	2360	key_value *kv = *kvp;
2460	* we need to store the null value so when we save	2361	*kvp = (*kvp)->next;
2461	* it, we save the empty value so that when we load,	2362	delete kv;
2462	* we get this value back again.	2363	return;
2463	*/
2464	if (get_ob_key_link (op->arch, canonical_key))
2465	field->value = 0;
2466	else
2467	{
2468	if (last)
2469	last->next = field->next;
2470	else
2471	op->key_values = field->next;
2472
2473	delete field;
2474	}
2475	}	2364	}
2476	return TRUE;
2477	}
2478	/* IF we get here, key doesn't exist */
2479
2480	/* No field, we'll have to add it. */
2481
2482	if (!add_key)
2483	return FALSE;
2484
2485	/* There isn't any good reason to store a null
2486	* value in the key/value list. If the archetype has
2487	* this key, then we should also have it, so shouldn't
2488	* be here. If user wants to store empty strings,
2489	* should pass in ""
2490	*/
2491	if (value == NULL)
2492	return TRUE;
2493
2494	field = new key_value;
2495
2496	field->key = canonical_key;
2497	field->value = value;
2498	/* Usual prepend-addition. */
2499	field->next = op->key_values;
2500	op->key_values = field;
2501
2502	return TRUE;
2503	}
2504
2505	/*
2506	* Updates the key in op to value.
2507	*
2508	* If add_key is FALSE, this will only update existing keys,
2509	* and not add new ones.
2510	* In general, should be little reason FALSE is ever passed in for add_key
2511	*
2512	* Returns TRUE on success.
2513	*/
2514	int
2515	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2516	{
2517	shstr key_ (key);
2518
2519	return set_ob_key_value_s (op, key_, value, add_key);
2520	}	2365	}
2521		2366
2522	object::depth_iterator::depth_iterator (object *container)	2367	object::depth_iterator::depth_iterator (object *container)
2523	: iterator_base (container)	2368	: iterator_base (container)
2524	{	2369	{
…		…
2574	{	2419	{
2575	char flagdesc[512];	2420	char flagdesc[512];
2576	char info2[256 * 4];	2421	char info2[256 * 4];
2577	char *p = info;	2422	char *p = info;
2578		2423
2579	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2424	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2580	count,	2425	count,
2581	uuid.c_str (),	2426	uuid.c_str (),
2582	&name,	2427	&name,
2583	title ? "\",title:\"" : "",	2428	title ? ",title:\"" : "",
2584	title ? (const char *)title : "",	2429	title ? (const char *)title : "",
		2430	title ? "\"" : "",
2585	flag_desc (flagdesc, 512), type);	2431	flag_desc (flagdesc, 512), type);
2586		2432
2587	if (!flag[FLAG_REMOVED] && env)	2433	if (!flag[FLAG_REMOVED] && env)
2588	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2434	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2589		2435
…		…
2645	container = 0;	2491	container = 0;
2646		2492
2647	// client needs item update to make it work, client bug requires this to be separate	2493	// client needs item update to make it work, client bug requires this to be separate
2648	esrv_update_item (UPD_FLAGS, this, old_container);	2494	esrv_update_item (UPD_FLAGS, this, old_container);
2649		2495
2650	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2496	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2651	play_sound (sound_find ("chest_close"));	2497	play_sound (sound_find ("chest_close"));
2652	}	2498	}
2653		2499
2654	if (new_container)	2500	if (new_container)
2655	{	2501	{
…		…
2665	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2511	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2666	new_container->insert (closer);	2512	new_container->insert (closer);
2667	}	2513	}
2668	#endif	2514	#endif
2669		2515
2670	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2516	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2671		2517
2672	// make sure the container is available, client bug requires this to be separate	2518	// make sure the container is available, client bug requires this to be separate
2673	esrv_send_item (this, new_container);	2519	esrv_send_item (this, new_container);
2674		2520
2675	new_container->flag [FLAG_APPLIED] = true;	2521	new_container->flag [FLAG_APPLIED] = true;
…		…
2683	// else if (!old_container->env && contr && contr->ns)	2529	// else if (!old_container->env && contr && contr->ns)
2684	// contr->ns->floorbox_reset ();	2530	// contr->ns->floorbox_reset ();
2685	}	2531	}
2686		2532
2687	object *	2533	object *
2688	object::force_find (const shstr name)	2534	object::force_find (shstr_tmp name)
2689	{	2535	{
2690	/* cycle through his inventory to look for the MARK we want to	2536	/* cycle through his inventory to look for the MARK we want to
2691	* place	2537	* place
2692	*/	2538	*/
2693	for (object *tmp = inv; tmp; tmp = tmp->below)	2539	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2695	return splay (tmp);	2541	return splay (tmp);
2696		2542
2697	return 0;	2543	return 0;
2698	}	2544	}
2699		2545
		2546	//-GPL
		2547
2700	void	2548	void
		2549	object::force_set_timer (int duration)
		2550	{
		2551	this->duration = 1;
		2552	this->speed_left = -1.f;
		2553
		2554	this->set_speed (duration ? 1.f / duration : 0.f);
		2555	}
		2556
		2557	object *
2701	object::force_add (const shstr name, int duration)	2558	object::force_add (shstr_tmp name, int duration)
2702	{	2559	{
2703	if (object *force = force_find (name))	2560	if (object *force = force_find (name))
2704	force->destroy ();	2561	force->destroy ();
2705		2562
2706	object *force = get_archetype (FORCE_NAME);	2563	object *force = get_archetype (FORCE_NAME);
2707		2564
2708	force->slaying = name;	2565	force->slaying = name;
2709	force->stats.food = 1;	2566	force->force_set_timer (duration);
2710	force->speed_left = -1.f;
2711
2712	force->set_speed (duration ? 1.f / duration : 0.f);
2713	force->flag [FLAG_IS_USED_UP] = true;
2714	force->flag [FLAG_APPLIED] = true;	2567	force->flag [FLAG_APPLIED] = true;
2715		2568
2716	insert (force);	2569	return insert (force);
2717	}	2570	}
2718		2571
2719	void	2572	void
2720	object::play_sound (faceidx sound)	2573	object::play_sound (faceidx sound) const
2721	{	2574	{
2722	if (!sound)	2575	if (!sound)
2723	return;	2576	return;
2724		2577
2725	if (flag [FLAG_REMOVED])	2578	if (is_on_map ())
		2579	map->play_sound (sound, x, y);
		2580	else if (object *pl = in_player ())
		2581	pl->contr->play_sound (sound);
		2582	}
		2583
		2584	void
		2585	object::say_msg (const char *msg) const
		2586	{
		2587	if (is_on_map ())
		2588	map->say_msg (msg, x, y);
		2589	else if (object *pl = in_player ())
		2590	pl->contr->play_sound (sound);
		2591	}
		2592
		2593	void
		2594	object::make_noise ()
		2595	{
		2596	// we do not model noise in the map, so instead put
		2597	// a temporary light into the noise source
		2598	// could use the map instead, but that's less reliable for our
		2599	// goal, which is to make invisibility a bit harder to exploit
		2600
		2601	// currently only works sensibly for players
		2602	if (!is_player ())
2726	return;	2603	return;
2727		2604
2728	if (env)	2605	// find old force, or create new one
2729	{	2606	object *force = force_find (shstr_noise_force);
2730	if (object *pl = in_player ())	2607
2731	pl->contr->play_sound (sound);	2608	if (force)
2732	}	2609	force->speed_left = -1.f; // patch old speed up
2733	else	2610	else
2734	map->play_sound (sound, x, y);	2611	{
2735	}	2612	force = archetype::get (shstr_noise_force);
2736		2613
		2614	force->slaying = shstr_noise_force;
		2615	force->stats.food = 1;
		2616	force->speed_left = -1.f;
		2617
		2618	force->set_speed (1.f / 4.f);
		2619	force->flag [FLAG_IS_USED_UP] = true;
		2620	force->flag [FLAG_APPLIED] = true;
		2621
		2622	insert (force);
		2623	}
		2624	}
		2625

Diff Legend

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