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.214 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.325 by root, Wed Apr 14 21:36:31 2010 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,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 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>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <sproto.h>	30	#include <sproto.h>
30	#include <loader.h>
31		31
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
		41
		42	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
		47
		48	//+GPL
40		49
41	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
42	0,	51	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	52	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,	53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	57	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	58	-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,	59	-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	60	-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	};	61	};
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] = {	62	int freedir[SIZEOFFREE] = {
60	0,	63	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	64	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,	65	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	66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
64	};	67	};
65		68
		69	static int maxfree[SIZEOFFREE] = {
		70	0,
		71	9, 10, 13, 14, 17, 18, 21, 22,
		72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		74	};
		75
66	static void	76	static void
67	write_uuid (uval64 skip, bool sync)	77	write_uuid (uval64 skip, bool sync)
68	{	78	{
69	CALL_BEGIN (2);	79	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	80	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	82	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	83	CALL_END;
74	}	84	}
75		85
76	static void	86	static void
77	read_uuid (void)	87	read_uuid ()
78	{	88	{
79	char filename[MAX_BUF];	89	char filename[MAX_BUF];
80		90
81	sprintf (filename, "%s/uuid", settings.localdir);	91	sprintf (filename, "%s/uuid", settings.localdir);
82		92
…		…
96		106
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	107	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	108	_exit (1);
99	}	109	}
100		110
101	UUID::BUF buf;	111	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	112	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	113	fgets (buf, sizeof (buf), fp);
104		114
105	if (!UUID::cur.parse (buf))	115	if (!UUID::cur.parse (buf))
106	{	116	{
…		…
133		143
134	void	144	void
135	UUID::init ()	145	UUID::init ()
136	{	146	{
137	read_uuid ();	147	read_uuid ();
		148	}
		149
		150	bool
		151	UUID::parse (const char *s)
		152	{
		153	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		154	return false;
		155
		156	seq = 0;
		157
		158	while (*s != '>')
		159	{
		160	if (*s < '0')
		161	return false;
		162
		163	// this gives nice branchless code with gcc
		164	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		165	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		166
		167	seq = (seq << 4) | digit;
		168
		169	++s;
		170	}
		171
		172	return true;
		173	}
		174
		175	char *
		176	UUID::append (char *buf) const
		177	{
		178	*buf++ = '<';
		179	*buf++ = '1';
		180	*buf++ = '.';
		181
		182	uint64_t seq = this->seq;
		183	const int bits = 64;
		184	char nz = 0;
		185	static const char tohex [] = "0123456789abcdef";
		186
		187	// assert (len >= 3 + bits / 4 + 1 + 1);
		188	for (int i = bits / 4; --i; )
		189	{
		190	uint8_t digit = seq >> (bits - 4);
		191
		192	*buf = tohex [digit];
		193	nz |= digit;
		194	buf += nz ? 1 : 0;
		195	seq <<= 4;
		196	}
		197
		198	// last digit is special - always emit
		199	uint8_t digit = seq >> (bits - 4);
		200	*buf++ = tohex [digit];
		201
		202	*buf++ = '>';
		203
		204	return buf;
		205	}
		206
		207	char *
		208	UUID::c_str () const
		209	{
		210	static char buf [MAX_LEN];
		211	*append (buf) = 0;
		212	return buf;
138	}	213	}
139		214
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	215	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	216	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	217	compare_ob_value_lists_one (const object *wants, const object *has)
143	{	218	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	219	/* 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	220	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	221	* different structure or at least keep the lists sorted...
149	*/	222	*/
150		223
151	/* For each field in wants, */	224	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	225	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	226	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	227	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		228
169	/* If we get here, every field in wants has a matching field in has. */	229	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	230	return true;
171	}	231	}
172		232
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	233	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	234	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	235	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	236	{
177	/* However, there may be fields in has which aren't partnered in wants,	237	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison *twice*. :(	238	* so we need to run the comparison *twice*. :(
179	*/	239	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	240	return compare_ob_value_lists_one (ob1, ob2)
		241	&& compare_ob_value_lists_one (ob2, ob1);
181	}	242	}
182		243
183	/* Function examines the 2 objects given to it, and returns true if	244	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	245	* they can be merged together.
185	*	246	*
…		…
192	* Improvements made with merge: Better checking on potion, and also	253	* Improvements made with merge: Better checking on potion, and also
193	* check weight	254	* check weight
194	*/	255	*/
195	bool object::can_merge_slow (object *ob1, object *ob2)	256	bool object::can_merge_slow (object *ob1, object *ob2)
196	{	257	{
197	/* A couple quicksanity checks */	258	/* A couple quick sanity checks */
198	if (ob1 == ob2	259	if (ob1 == ob2
199	|| ob1->type != ob2->type	260	|| ob1->type != ob2->type
200	|| ob1->speed != ob2->speed
201	|| ob1->value != ob2->value	261	|| ob1->value != ob2->value
202	|| ob1->name != ob2->name)	262	|| ob1->name != ob2->name
		263	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
203	return 0;	264	return 0;
204		265
205	/* Do not merge objects if nrof would overflow. First part checks	266	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	267	* is always 0 .. 2**31-1 */
207	* would fit into a 32 bit signed int, which is often used to hold	268	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;	269	return 0;
212		270
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	271	/* 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	272	* 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	273	* just can't ignore the been applied or identified flags, as they
216	* are not equal - just if it has been identified, the been_applied	274	* are not equal - just if it has been identified, the been_applied
217	* flags lose any meaning.	275	* flags lose any meaning.
218	*/	276	*/
219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	277	if (ob1->flag [FLAG_IDENTIFIED])
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	278	ob1->set_flag (FLAG_BEEN_APPLIED);
221		279
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	280	if (ob2->flag [FLAG_IDENTIFIED])
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	281	ob2->set_flag (FLAG_BEEN_APPLIED);
224		282
225	if (ob1->arch->name != ob2->arch->name	283	if (ob1->arch->archname != ob2->arch->archname
226	|| ob1->name != ob2->name	284	|| ob1->name != ob2->name
227	|| ob1->title != ob2->title	285	|| ob1->title != ob2->title
228	|| ob1->msg != ob2->msg	286	|| ob1->msg != ob2->msg
229	|| ob1->weight != ob2->weight	287	|| ob1->weight != ob2->weight
230	|| ob1->attacktype != ob2->attacktype	288	|| ob1->attacktype != ob2->attacktype
231	|| ob1->magic != ob2->magic	289	|| ob1->magic != ob2->magic
232	|| ob1->slaying != ob2->slaying	290	|| ob1->slaying != ob2->slaying
233	|| ob1->skill != ob2->skill	291	|| ob1->skill != ob2->skill
234	|| ob1->value != ob2->value	292	|| ob1->value != ob2->value
235	|| ob1->animation_id != ob2->animation_id	293	|| ob1->animation_id != ob2->animation_id
		294	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
236	|| ob1->client_type != ob2->client_type	295	|| ob1->client_type != ob2->client_type
237	|| ob1->materialname != ob2->materialname	296	|| ob1->material != ob2->material
238	|| ob1->lore != ob2->lore	297	|| ob1->lore != ob2->lore
239	|| ob1->subtype != ob2->subtype	298	|| ob1->subtype != ob2->subtype
240	|| ob1->move_type != ob2->move_type	299	|| ob1->move_type != ob2->move_type
241	|| ob1->move_block != ob2->move_block	300	|| ob1->move_block != ob2->move_block
242	|| ob1->move_allow != ob2->move_allow	301	|| ob1->move_allow != ob2->move_allow
243	|| ob1->move_on != ob2->move_on	302	|| ob1->move_on != ob2->move_on
244	|| ob1->move_off != ob2->move_off	303	|| ob1->move_off != ob2->move_off
245	|| ob1->move_slow != ob2->move_slow	304	|| ob1->move_slow != ob2->move_slow
246	|| ob1->move_slow_penalty != ob2->move_slow_penalty	305	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	306	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	307	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	308	return 0;
250		309
251	if ((ob1->flag ^ ob2->flag)	310	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	311	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	312	.reset (FLAG_REMOVED)
255	.any ())	313	.any ())
256	return 0;	314	return 0;
257		315
258	/* This is really a spellbook check - we should in general	316	/* This is really a spellbook check - we should in general
…		…
277		335
278	/* Don't merge objects that are applied. With the new 'body' code,	336	/* Don't merge objects that are applied. With the new 'body' code,
279	* it is possible for most any character to have more than one of	337	* it is possible for most any character to have more than one of
280	* some items equipped, and we don't want those to merge.	338	* some items equipped, and we don't want those to merge.
281	*/	339	*/
282	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	340	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
283	return 0;	341	return 0;
284		342
285	/* Note sure why the following is the case - either the object has to	343	/* Note sure why the following is the case - either the object has to
286	* be animated or have a very low speed. Is this an attempted monster	344	* be animated or have a very low speed. Is this an attempted monster
287	* check?	345	* check?
288	*/	346	*/
289	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	347	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
290	return 0;	348	return 0;
291		349
292	switch (ob1->type)	350	switch (ob1->type)
293	{	351	{
294	case SCROLL:	352	case SCROLL:
…		…
334		392
335	// find player who can see this object	393	// find player who can see this object
336	object *	394	object *
337	object::visible_to () const	395	object::visible_to () const
338	{	396	{
339	if (!flag [FLAG_REMOVED])	397	if (client_visible () && !flag [FLAG_REMOVED])
340	{	398	{
341	// see if we are in a container of sorts	399	// see if we are in a container of sorts
342	if (env)	400	if (env)
343	{	401	{
344	// the player inventory itself is always visible	402	// the player inventory itself is always visible
345	if (env->type == PLAYER)	403	if (env->is_player ())
346	return env;	404	return env;
347		405
348	// else a player could have our env open	406	// else a player could have our env open
349	object *envest = env->outer_env ();	407	object *envest = env->outer_env_or_self ();
350		408
351	// the player itself is always on a map, so we will find him here	409	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	410	// even if our inv is in a player.
353	if (envest->is_on_map ())	411	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	412	if (object *pl = envest->ms ().player ())
355	if (pl->container == env)	413	if (pl->container_ () == env)
356	return pl;	414	return pl;
357	}	415	}
358	else	416	else
359	{	417	{
360	// maybe there is a player standing on the same mapspace	418	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	419	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	420	if (object *pl = ms ().player ())
		421	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		422	|| pl->container_ () == this)
363	return pl;	423	return pl;
364	}	424	}
365	}	425	}
366		426
367	return 0;	427	return 0;
368	}	428	}
369		429
370	// adjust weight per container type ("of holding")	430	// adjust weight per container type ("of holding")
371	static sint32	431	static sint32
372	weight_adjust (object *op, sint32 weight)	432	weight_adjust_for (object *op, sint32 weight)
373	{	433	{
374	return op->type == CONTAINER	434	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	435	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	436	: weight;
377	}	437	}
…		…
383	static void	443	static void
384	adjust_weight (object *op, sint32 weight)	444	adjust_weight (object *op, sint32 weight)
385	{	445	{
386	while (op)	446	while (op)
387	{	447	{
		448	// adjust by actual difference to account for rounding errors
		449	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388	weight = weight_adjust (op, weight);	450	weight = weight_adjust_for (op, op->carrying)
		451	- weight_adjust_for (op, op->carrying - weight);
389		452
390	if (!weight)	453	if (!weight)
391	return;	454	return;
392		455
393	op->carrying += weight;	456	op->carrying += weight;
394		457
395	if (object *pl = op->visible_to ())	458	if (object *pl = op->visible_to ())
		459	if (pl != op) // player is handled lazily
396	esrv_update_item (UPD_WEIGHT, pl, op);	460	esrv_update_item (UPD_WEIGHT, pl, op);
397		461
398	op = op->env;	462	op = op->env;
399	}	463	}
400	}	464	}
401		465
…		…
415	op->update_weight ();	479	op->update_weight ();
416		480
417	sum += op->total_weight ();	481	sum += op->total_weight ();
418	}	482	}
419		483
420	sum = weight_adjust (this, sum);	484	sum = weight_adjust_for (this, sum);
421		485
422	if (sum != carrying)	486	if (sum != carrying)
423	{	487	{
424	carrying = sum;	488	carrying = sum;
425		489
426	if (object *pl = visible_to ())	490	if (object *pl = visible_to ())
		491	if (pl != this) // player is handled lazily
427	esrv_update_item (UPD_WEIGHT, pl, this);	492	esrv_update_item (UPD_WEIGHT, pl, this);
428	}	493	}
429	}	494	}
430		495
431	/*	496	/*
432	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	497	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
440	object_freezer freezer;	505	object_freezer freezer;
441	op->write (freezer);	506	op->write (freezer);
442	return freezer.as_string ();	507	return freezer.as_string ();
443	}	508	}
444		509
445	/*	510	char *
446	* get_nearest_part(multi-object, object 2) returns the part of the	511	object::as_string ()
447	* multi-object 1 which is closest to the second object.
448	* If it's not a multi-object, it is returned.
449	*/
450	object *
451	get_nearest_part (object *op, const object *pl)
452	{	512	{
453	object *tmp, *closest;	513	return dump_object (this);
454	int last_dist, i;
455
456	if (!op->more)
457	return op;
458
459	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
460	tmp;
461	tmp = tmp->more)
462	if ((i = distance (tmp, pl)) < last_dist)
463	closest = tmp, last_dist = i;
464
465	return closest;
466	}	514	}
467		515
468	/*	516	/*
469	* Returns the object which has the count-variable equal to the argument.	517	* Returns the object which has the count-variable equal to the argument.
470	* VERRRY slow.	518	* VERRRY slow.
…		…
478		526
479	return 0;	527	return 0;
480	}	528	}
481		529
482	/*	530	/*
		531	* Returns the object which has the uuid equal to the argument.
		532	* MOAR VERRRY slow.
		533	*/
		534
		535	object *
		536	find_object_uuid (UUID i)
		537	{
		538	for_all_objects (op)
		539	if (op->uuid == i)
		540	return op;
		541
		542	return 0;
		543	}
		544
		545	/*
483	* Returns the first object which has a name equal to the argument.	546	* Returns the first object which has a name equal to the argument.
484	* Used only by the patch command, but not all that useful.	547	* Used only by the patch command, but not all that useful.
485	* Enables features like "patch <name-of-other-player> food 999"	548	* Enables features like "patch <name-of-other-player> food 999"
486	*/	549	*/
487	object *	550	object *
488	find_object_name (const char *str)	551	find_object_name (const char *str)
489	{	552	{
490	shstr_cmp str_ (str);	553	shstr_cmp str_ (str);
491	object *op;
492		554
		555	if (str_)
493	for_all_objects (op)	556	for_all_objects (op)
494	if (op->name == str_)	557	if (op->name == str_)
495	break;	558	return op;
496		559
497	return op;	560	return 0;
498	}	561	}
499		562
500	/*	563	/*
501	* Sets the owner and sets the skill and exp pointers to owner's current	564	* Sets the owner and sets the skill and exp pointers to owner's current
502	* skill and experience objects.	565	* skill and experience objects.
…		…
517	}	580	}
518		581
519	this->owner = owner;	582	this->owner = owner;
520	}	583	}
521		584
522	int
523	object::slottype () const
524	{
525	if (type == SKILL)
526	{
527	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
528	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
529	}
530	else
531	{
532	if (slot [body_combat].info) return slot_combat;
533	if (slot [body_range ].info) return slot_ranged;
534	}
535
536	return slot_none;
537	}
538
539	bool
540	object::change_weapon (object *ob)
541	{
542	if (current_weapon == ob)
543	return true;
544
545	if (chosen_skill)
546	chosen_skill->flag [FLAG_APPLIED] = false;
547
548	current_weapon = ob;
549	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
550
551	if (chosen_skill)
552	chosen_skill->flag [FLAG_APPLIED] = true;
553
554	update_stats ();
555
556	if (ob)
557	{
558	// now check wether any body locations became invalid, in which case
559	// we cannot apply the weapon at the moment.
560	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
561	if (slot[i].used < 0)
562	{
563	current_weapon = chosen_skill = 0;
564	update_stats ();
565
566	new_draw_info_format (NDI_UNIQUE, 0, this,
567	"You try to balance all your items at once, "
568	"but the %s is just too much for your body. "
569	"[You need to unapply some items first.]", &ob->name);
570	return false;
571	}
572
573	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
574	}
575	else
576	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
577
578	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
579	{
580	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
581	&name, ob->debug_desc ());
582	return false;
583	}
584
585	return true;
586	}
587
588	/* Zero the key_values on op, decrementing the shared-string	585	/* Zero the key_values on op, decrementing the shared-string
589	* refcounts and freeing the links.	586	* refcounts and freeing the links.
590	*/	587	*/
591	static void	588	static void
592	free_key_values (object *op)	589	free_key_values (object *op)
…		…
600	}	597	}
601		598
602	op->key_values = 0;	599	op->key_values = 0;
603	}	600	}
604		601
605	object &	602	/*
606	object::operator =(const object &src)	603	* copy_to first frees everything allocated by the dst object,
		604	* and then copies the contents of itself into the second
		605	* object, allocating what needs to be allocated. Basically, any
		606	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		607	* if the first object is freed, the pointers in the new object
		608	* will point at garbage.
		609	*/
		610	void
		611	object::copy_to (object *dst)
607	{	612	{
608	bool is_freed = flag [FLAG_FREED];	613	dst->remove ();
609	bool is_removed = flag [FLAG_REMOVED];
610
611	*(object_copy *)this = src;	614	*(object_copy *)dst = *this;
612
613	flag [FLAG_FREED] = is_freed;
614	flag [FLAG_REMOVED] = is_removed;	615	dst->flag [FLAG_REMOVED] = true;
615		616
616	/* Copy over key_values, if any. */	617	/* Copy over key_values, if any. */
617	if (src.key_values)	618	if (key_values)
618	{	619	{
619	key_value *tail = 0;	620	key_value *tail = 0;
620	key_values = 0;	621	dst->key_values = 0;
621		622
622	for (key_value *i = src.key_values; i; i = i->next)	623	for (key_value *i = key_values; i; i = i->next)
623	{	624	{
624	key_value *new_link = new key_value;	625	key_value *new_link = new key_value;
625		626
626	new_link->next = 0;	627	new_link->next = 0;
627	new_link->key = i->key;	628	new_link->key = i->key;
628	new_link->value = i->value;	629	new_link->value = i->value;
629		630
630	/* Try and be clever here, too. */	631	/* Try and be clever here, too. */
631	if (!key_values)	632	if (!dst->key_values)
632	{	633	{
633	key_values = new_link;	634	dst->key_values = new_link;
634	tail = new_link;	635	tail = new_link;
635	}	636	}
636	else	637	else
637	{	638	{
638	tail->next = new_link;	639	tail->next = new_link;
639	tail = new_link;	640	tail = new_link;
640	}	641	}
641	}	642	}
642	}	643	}
643	}
644		644
645	/*	645	dst->activate ();
646	* copy_to first frees everything allocated by the dst object,
647	* and then copies the contents of itself into the second
648	* object, allocating what needs to be allocated. Basically, any
649	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
650	* if the first object is freed, the pointers in the new object
651	* will point at garbage.
652	*/
653	void
654	object::copy_to (object *dst)
655	{
656	*dst = *this;
657
658	if (speed < 0)
659	dst->speed_left -= rndm ();
660
661	dst->set_speed (dst->speed);
662	}	646	}
663		647
664	void	648	void
665	object::instantiate ()	649	object::instantiate ()
666	{	650	{
667	if (!uuid.seq) // HACK	651	if (!uuid.seq) // HACK
668	uuid = UUID::gen ();	652	uuid = UUID::gen ();
669		653
		654	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		655	if (flag [FLAG_RANDOM_SPEED] && speed)
		656	speed_left = - speed - rndm (); // TODO animation
		657	else
670	speed_left = -0.1f;	658	speed_left = -1.;
		659
671	/* copy the body_info to the body_used - this is only really	660	/* copy the body_info to the body_used - this is only really
672	* need for monsters, but doesn't hurt to do it for everything.	661	* need for monsters, but doesn't hurt to do it for everything.
673	* by doing so, when a monster is created, it has good starting	662	* by doing so, when a monster is created, it has good starting
674	* values for the body_used info, so when items are created	663	* values for the body_used info, so when items are created
675	* for it, they can be properly equipped.	664	* for it, they can be properly equipped.
…		…
683	object *	672	object *
684	object::clone ()	673	object::clone ()
685	{	674	{
686	object *neu = create ();	675	object *neu = create ();
687	copy_to (neu);	676	copy_to (neu);
		677
		678	// TODO: unclean state changes, should not be done in clone AND instantiate
		679	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		680	neu->speed_left = - neu->speed - rndm (); // TODO animation
		681
		682	neu->map = map; // not copied by copy_to
688	return neu;	683	return neu;
689	}	684	}
690		685
691	/*	686	/*
692	* If an object with the IS_TURNABLE() flag needs to be turned due	687	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
694	* be called to update the face variable, _and_ how it looks on the map.	689	* be called to update the face variable, _and_ how it looks on the map.
695	*/	690	*/
696	void	691	void
697	update_turn_face (object *op)	692	update_turn_face (object *op)
698	{	693	{
699	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	694	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
700	return;	695	return;
701		696
702	SET_ANIMATION (op, op->direction);	697	SET_ANIMATION (op, op->direction);
703	update_object (op, UP_OBJ_FACE);	698	update_object (op, UP_OBJ_FACE);
704	}	699	}
…		…
709	* This function needs to be called whenever the speed of an object changes.	704	* This function needs to be called whenever the speed of an object changes.
710	*/	705	*/
711	void	706	void
712	object::set_speed (float speed)	707	object::set_speed (float speed)
713	{	708	{
714	if (flag [FLAG_FREED] && speed)
715	{
716	LOG (llevError, "Object %s is freed but has speed.\n", &name);
717	speed = 0;
718	}
719
720	this->speed = speed;	709	this->speed = speed;
721		710
722	if (has_active_speed ())	711	if (has_active_speed ())
723	activate ();	712	activate ();
724	else	713	else
…		…
743	* UP_OBJ_FACE: only the objects face has changed.	732	* UP_OBJ_FACE: only the objects face has changed.
744	*/	733	*/
745	void	734	void
746	update_object (object *op, int action)	735	update_object (object *op, int action)
747	{	736	{
748	if (op == NULL)	737	if (!op)
749	{	738	{
750	/* this should never happen */	739	/* this should never happen */
751	LOG (llevDebug, "update_object() called for NULL object.\n");	740	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
752	return;	741	return;
753	}	742	}
754		743
755	if (op->env)	744	if (!op->is_on_map ())
756	{	745	{
757	/* Animation is currently handled by client, so nothing	746	/* Animation is currently handled by client, so nothing
758	* to do in this case.	747	* to do in this case.
759	*/	748	*/
760	return;	749	return;
761	}	750	}
762
763	/* If the map is saving, don't do anything as everything is
764	* going to get freed anyways.
765	*/
766	if (!op->map || op->map->in_memory == MAP_SAVING)
767	return;
768		751
769	/* make sure the object is within map boundaries */	752	/* make sure the object is within map boundaries */
770	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	753	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
771	{	754	{
772	LOG (llevError, "update_object() called for object out of map!\n");	755	LOG (llevError, "update_object() called for object out of map!\n");
…		…
780		763
781	if (!(m.flags_ & P_UPTODATE))	764	if (!(m.flags_ & P_UPTODATE))
782	/* nop */;	765	/* nop */;
783	else if (action == UP_OBJ_INSERT)	766	else if (action == UP_OBJ_INSERT)
784	{	767	{
		768	#if 0
785	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
786	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
787	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
788	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	772	|| (op->is_player () && !(m.flags_ & P_PLAYER))
789	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
790	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
791	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
792	|| (m.move_on | op->move_on ) != m.move_on	776	|| (m.move_on | op->move_on ) != m.move_on
793	|| (m.move_off | op->move_off ) != m.move_off	777	|| (m.move_off | op->move_off ) != m.move_off
794	|| (m.move_slow | op->move_slow) != m.move_slow	778	|| (m.move_slow | op->move_slow) != m.move_slow
795	/* This isn't perfect, but I don't expect a lot of objects to	779	/* This isn't perfect, but I don't expect a lot of objects to
796	* to have move_allow right now.	780	* have move_allow right now.
797	*/	781	*/
798	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	782	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		783	m.invalidate ();
		784	#else
799	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	785	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
800	m.flags_ = 0;	786	m.invalidate ();
		787	#endif
801	}	788	}
802	/* if the object is being removed, we can't make intelligent	789	/* if the object is being removed, we can't make intelligent
803	* decisions, because remove_ob can't really pass the object	790	* decisions, because remove_ob can't really pass the object
804	* that is being removed.	791	* that is being removed.
805	*/	792	*/
806	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	793	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
807	m.flags_ = 0;	794	m.invalidate ();
808	else if (action == UP_OBJ_FACE)	795	else if (action == UP_OBJ_FACE)
809	/* Nothing to do for that case */ ;	796	/* Nothing to do for that case */ ;
810	else	797	else
811	LOG (llevError, "update_object called with invalid action: %d\n", action);	798	LOG (llevError, "update_object called with invalid action: %d\n", action);
812		799
…		…
814	update_object (op->more, action);	801	update_object (op->more, action);
815	}	802	}
816		803
817	object::object ()	804	object::object ()
818	{	805	{
819	SET_FLAG (this, FLAG_REMOVED);	806	this->set_flag (FLAG_REMOVED);
820		807
821	expmul = 1.0;	808	//expmul = 1.0; declared const for the time being
822	face = blank_face;	809	face = blank_face;
		810	material = MATERIAL_NULL;
823	}	811	}
824		812
825	object::~object ()	813	object::~object ()
826	{	814	{
827	unlink ();	815	unlink ();
828		816
829	free_key_values (this);	817	free_key_values (this);
830	}	818	}
831
832	static int object_count;
833		819
834	void object::link ()	820	void object::link ()
835	{	821	{
836	assert (!index);//D	822	assert (!index);//D
837	uuid = UUID::gen ();	823	uuid = UUID::gen ();
838	count = ++object_count;
839		824
840	refcnt_inc ();	825	refcnt_inc ();
841	objects.insert (this);	826	objects.insert (this);
		827
		828	++create_count;
		829
842	}	830	}
843		831
844	void object::unlink ()	832	void object::unlink ()
845	{	833	{
846	if (!index)	834	if (!index)
847	return;	835	return;
		836
		837	++destroy_count;
848		838
849	objects.erase (this);	839	objects.erase (this);
850	refcnt_dec ();	840	refcnt_dec ();
851	}	841	}
852		842
…		…
856	/* If already on active list, don't do anything */	846	/* If already on active list, don't do anything */
857	if (active)	847	if (active)
858	return;	848	return;
859		849
860	if (has_active_speed ())	850	if (has_active_speed ())
		851	{
		852	if (flag [FLAG_FREED])
		853	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		854
861	actives.insert (this);	855	actives.insert (this);
		856	}
862	}	857	}
863		858
864	void	859	void
865	object::activate_recursive ()	860	object::activate_recursive ()
866	{	861	{
…		…
915	object::destroy_inv (bool drop_to_ground)	910	object::destroy_inv (bool drop_to_ground)
916	{	911	{
917	// need to check first, because the checks below might segfault	912	// need to check first, because the checks below might segfault
918	// as we might be on an invalid mapspace and crossfire code	913	// as we might be on an invalid mapspace and crossfire code
919	// is too buggy to ensure that the inventory is empty.	914	// is too buggy to ensure that the inventory is empty.
920	// corollary: if you create arrows etc. with stuff in tis inventory,	915	// corollary: if you create arrows etc. with stuff in its inventory,
921	// cf will crash below with off-map x and y	916	// cf will crash below with off-map x and y
922	if (!inv)	917	if (!inv)
923	return;	918	return;
924		919
925	/* Only if the space blocks everything do we not process -	920	/* Only if the space blocks everything do we not process -
…		…
927	* drop on that space.	922	* drop on that space.
928	*/	923	*/
929	if (!drop_to_ground	924	if (!drop_to_ground
930	|| !map	925	|| !map
931	|| map->in_memory != MAP_ACTIVE	926	|| map->in_memory != MAP_ACTIVE
932	|| map->nodrop	927	|| map->no_drop
933	|| ms ().move_block == MOVE_ALL)	928	|| ms ().move_block == MOVE_ALL)
934	{	929	{
935	while (inv)	930	while (inv)
936	{
937	inv->destroy_inv (drop_to_ground);
938	inv->destroy ();	931	inv->destroy ();
939	}
940	}	932	}
941	else	933	else
942	{ /* Put objects in inventory onto this space */	934	{ /* Put objects in inventory onto this space */
943	while (inv)	935	while (inv)
944	{	936	{
…		…
955	map->insert (op, x, y);	947	map->insert (op, x, y);
956	}	948	}
957	}	949	}
958	}	950	}
959		951
		952	/*
		953	* Remove and free all objects in the inventory of the given object.
		954	* Unlike destroy_inv, this assumes the *this is destroyed as well
		955	* well, so we can (and have to!) take shortcuts.
		956	*/
		957	void
		958	object::destroy_inv_fast ()
		959	{
		960	while (object *op = inv)
		961	{
		962	// remove from object the fast way
		963	op->flag [FLAG_REMOVED] = true;
		964	op->env = 0;
		965	if ((inv = inv->below))
		966	inv->above = 0;
		967
		968	// then destroy
		969	op->destroy ();
		970	}
		971	}
		972
		973	void
		974	object::freelist_free (int count)
		975	{
		976	while (count-- && freelist)
		977	{
		978	freelist_item *next = freelist->next;
		979	// count is being "destroyed"
		980
		981	sfree ((char *)freelist, sizeof (object));
		982
		983	freelist = next;
		984	--free_count;
		985	}
		986	}
		987
		988	object *
960	object *object::create ()	989	object::create ()
961	{	990	{
962	object *op = new object;	991	object *op;
		992
		993	if (freelist)
		994	{
		995	freelist_item li = *freelist;
		996	memset (freelist, 0, sizeof (object));
		997
		998	op = new (freelist) object;
		999	op->count = li.count;
		1000
		1001	freelist = li.next;
		1002	--free_count;
		1003	}
		1004	else
		1005	{
		1006	void *ni = salloc0<char> (sizeof (object));
		1007
		1008	op = new(ni) object;
		1009
		1010	op->count = ++object_count;
		1011	}
		1012
963	op->link ();	1013	op->link ();
		1014
964	return op;	1015	return op;
965	}	1016	}
966		1017
967	void	1018	void
		1019	object::do_delete ()
		1020	{
		1021	uint32_t count = this->count;
		1022
		1023	this->~object ();
		1024
		1025	freelist_item *li = (freelist_item *)this;
		1026	li->next = freelist;
		1027	li->count = count;
		1028
		1029	freelist = li;
		1030	++free_count;
		1031	}
		1032
		1033	static struct freed_map : maptile
		1034	{
		1035	freed_map ()
		1036	{
		1037	path = "<freed objects map>";
		1038	name = "/internal/freed_objects_map";
		1039	width = 3;
		1040	height = 3;
		1041	no_drop = 1;
		1042	no_reset = 1;
		1043
		1044	alloc ();
		1045	in_memory = MAP_ACTIVE;
		1046	}
		1047
		1048	~freed_map ()
		1049	{
		1050	destroy ();
		1051	}
		1052	} freed_map; // freed objects are moved here to avoid crashes
		1053
		1054	void
968	object::do_destroy ()	1055	object::do_destroy ()
969	{	1056	{
970	if (flag [FLAG_IS_LINKED])	1057	if (flag [FLAG_IS_LINKED])
971	remove_button_link (this);	1058	remove_link ();
972		1059
973	if (flag [FLAG_FRIENDLY])	1060	if (flag [FLAG_FRIENDLY])
974	remove_friendly_object (this);	1061	remove_friendly_object (this);
975		1062
976	remove ();	1063	remove ();
977		1064
978	attachable::do_destroy ();	1065	attachable::do_destroy ();
979		1066
980	destroy_inv (true);
981
982	deactivate ();	1067	deactivate ();
983	unlink ();	1068	unlink ();
984		1069
985	flag [FLAG_FREED] = 1;	1070	flag [FLAG_FREED] = 1;
986		1071
987	// hack to ensure that freed objects still have a valid map	1072	// hack to ensure that freed objects still have a valid map
988	{
989	static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991	if (!freed_map)
992	{
993	freed_map = new maptile;
994
995	freed_map->path = "<freed objects map>";
996	freed_map->name = "/internal/freed_objects_map";
997	freed_map->width = 3;
998	freed_map->height = 3;
999	freed_map->nodrop = 1;
1000
1001	freed_map->alloc ();
1002	freed_map->in_memory = MAP_ACTIVE;
1003	}
1004
1005	map = freed_map;	1073	map = &freed_map;
1006	x = 1;	1074	x = 1;
1007	y = 1;	1075	y = 1;
1008	}
1009		1076
1010	if (more)	1077	if (more)
1011	{	1078	{
1012	more->destroy ();	1079	more->destroy ();
1013	more = 0;	1080	more = 0;
…		…
1021	attacked_by = 0;	1088	attacked_by = 0;
1022	current_weapon = 0;	1089	current_weapon = 0;
1023	}	1090	}
1024		1091
1025	void	1092	void
1026	object::destroy (bool destroy_inventory)	1093	object::destroy ()
1027	{	1094	{
1028	if (destroyed ())	1095	if (destroyed ())
1029	return;	1096	return;
1030		1097
1031	if (destroy_inventory)	1098	if (!is_head () && !head->destroyed ())
		1099	{
		1100	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1101	head->destroy ();
		1102	return;
		1103	}
		1104
1032	destroy_inv (false);	1105	destroy_inv_fast ();
1033		1106
1034	if (is_head ())	1107	if (is_head ())
1035	if (sound_destroy)	1108	if (sound_destroy)
1036	play_sound (sound_destroy);	1109	play_sound (sound_destroy);
1037	else if (flag [FLAG_MONSTER])	1110	else if (flag [FLAG_MONSTER])
…		…
1048	* the previous environment.	1121	* the previous environment.
1049	*/	1122	*/
1050	void	1123	void
1051	object::do_remove ()	1124	object::do_remove ()
1052	{	1125	{
1053	object *tmp, *last = 0;
1054	object *otmp;
1055
1056	if (flag [FLAG_REMOVED])	1126	if (flag [FLAG_REMOVED])
1057	return;	1127	return;
1058		1128
1059	INVOKE_OBJECT (REMOVE, this);	1129	INVOKE_OBJECT (REMOVE, this);
1060
1061	if (object *pl = visible_to ())
1062	esrv_del_item (pl->contr, count);
1063		1130
1064	flag [FLAG_REMOVED] = true;	1131	flag [FLAG_REMOVED] = true;
1065		1132
1066	if (more)	1133	if (more)
1067	more->remove ();	1134	more->remove ();
…		…
1070	* In this case, the object to be removed is in someones	1137	* In this case, the object to be removed is in someones
1071	* inventory.	1138	* inventory.
1072	*/	1139	*/
1073	if (env)	1140	if (env)
1074	{	1141	{
		1142	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1143	if (object *pl = visible_to ())
		1144	esrv_del_item (pl->contr, count);
		1145	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1146
1075	adjust_weight (env, -total_weight ());	1147	adjust_weight (env, -total_weight ());
1076		1148
1077	*(above ? &above->below : &env->inv) = below;	1149	object *pl = in_player ();
1078
1079	if (below)
1080	below->above = above;
1081		1150
1082	/* we set up values so that it could be inserted into	1151	/* we set up values so that it could be inserted into
1083	* the map, but we don't actually do that - it is up	1152	* the map, but we don't actually do that - it is up
1084	* to the caller to decide what we want to do.	1153	* to the caller to decide what we want to do.
1085	*/	1154	*/
1086	map = env->map;	1155	map = env->map;
1087	x = env->x;	1156	x = env->x;
1088	y = env->y;	1157	y = env->y;
		1158
		1159	// make sure cmov optimisation is applicable
		1160	*(above ? &above->below : &env->inv) = below;
		1161	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1162
1089	above = 0;	1163	above = 0;
1090	below = 0;	1164	below = 0;
1091	env = 0;	1165	env = 0;
1092		1166
1093	/* NO_FIX_PLAYER is set when a great many changes are being	1167	if (pl && pl->is_player ())
1094	* made to players inventory. If set, avoiding the call
1095	* to save cpu time.
1096	*/	1168	{
1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1169	if (expect_false (pl->contr->combat_ob == this))
1098	otmp->update_stats ();	1170	{
		1171	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1172	pl->contr->combat_ob = 0;
		1173	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1174	}
		1175
		1176	if (expect_false (pl->contr->ranged_ob == this))
		1177	{
		1178	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1179	pl->contr->ranged_ob = 0;
		1180	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1181	}
		1182
		1183	pl->contr->queue_stats_update ();
		1184
		1185	if (expect_false (glow_radius) && pl->is_on_map ())
		1186	update_all_los (pl->map, pl->x, pl->y);
		1187	}
1099	}	1188	}
1100	else if (map)	1189	else if (map)
1101	{	1190	{
1102	if (type == PLAYER)
1103	{
1104	// leaving a spot always closes any open container on the ground
1105	if (container && !container->env)
1106	// this causes spurious floorbox updates, but it ensures
1107	// that the CLOSE event is being sent.
1108	close_container ();
1109
1110	--map->players;
1111	map->touch ();
1112	}
1113
1114	map->dirty = true;	1191	map->dirty = true;
1115	mapspace &ms = this->ms ();	1192	mapspace &ms = this->ms ();
1116		1193
		1194	if (object *pl = ms.player ())
		1195	{
		1196	if (is_player ())
		1197	{
		1198	if (!flag [FLAG_WIZPASS])
		1199	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1200
		1201	// leaving a spot always closes any open container on the ground
		1202	if (container && !container->env)
		1203	// this causes spurious floorbox updates, but it ensures
		1204	// that the CLOSE event is being sent.
		1205	close_container ();
		1206
		1207	--map->players;
		1208	map->touch ();
		1209	}
		1210	else if (pl->container_ () == this)
		1211	{
		1212	// removing a container should close it
		1213	close_container ();
		1214	}
		1215	else
		1216	esrv_del_item (pl->contr, count);
		1217	}
		1218
1117	/* link the object above us */	1219	/* link the object above us */
1118	if (above)	1220	// re-link, make sure compiler can easily use cmove
1119	above->below = below;	1221	*(above ? &above->below : &ms.top) = below;
1120	else	1222	*(below ? &below->above : &ms.bot) = above;
1121	ms.top = below; /* we were top, set new top */
1122
1123	/* Relink the object below us, if there is one */
1124	if (below)
1125	below->above = above;
1126	else
1127	{
1128	/* Nothing below, which means we need to relink map object for this space
1129	* use translated coordinates in case some oddness with map tiling is
1130	* evident
1131	*/
1132	if (GET_MAP_OB (map, x, y) != this)
1133	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 ());
1134
1135	ms.bot = above; /* goes on above it. */
1136	}
1137		1223
1138	above = 0;	1224	above = 0;
1139	below = 0;	1225	below = 0;
1140		1226
		1227	ms.invalidate ();
		1228
1141	if (map->in_memory == MAP_SAVING)	1229	if (map->in_memory == MAP_SAVING)
1142	return;	1230	return;
1143		1231
1144	int check_walk_off = !flag [FLAG_NO_APPLY];	1232	int check_walk_off = !flag [FLAG_NO_APPLY];
1145		1233
1146	if (object *pl = ms.player ())	1234	if (object *pl = ms.player ())
1147	{	1235	{
1148	if (pl->container == this)	1236	if (pl->container_ () == this)
1149	/* If a container that the player is currently using somehow gets	1237	/* If a container that the player is currently using somehow gets
1150	* removed (most likely destroyed), update the player view	1238	* removed (most likely destroyed), update the player view
1151	* appropriately.	1239	* appropriately.
1152	*/	1240	*/
1153	pl->close_container ();	1241	pl->close_container ();
1154		1242
		1243	//TODO: the floorbox prev/next might need updating
		1244	//esrv_del_item (pl->contr, count);
		1245	//TODO: update floorbox to preserve ordering
		1246	if (pl->contr->ns)
1155	pl->contr->ns->floorbox_update ();	1247	pl->contr->ns->floorbox_update ();
1156	}	1248	}
1157		1249
		1250	if (check_walk_off)
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1251	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1159	{	1252	{
		1253	above = tmp->above;
		1254
1160	/* No point updating the players look faces if he is the object	1255	/* No point updating the players look faces if he is the object
1161	* being removed.	1256	* being removed.
1162	*/	1257	*/
1163		1258
1164	/* See if object moving off should effect something */	1259	/* See if object moving off should effect something */
1165	if (check_walk_off
1166	&& ((move_type & tmp->move_off)	1260	if ((move_type & tmp->move_off)
1167	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1261	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1168	{
1169	move_apply (tmp, this, 0);	1262	move_apply (tmp, this, 0);
1170
1171	if (destroyed ())
1172	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1173	}	1263	}
1174		1264
1175	last = tmp;	1265	if (affects_los ())
1176	}
1177
1178	/* last == NULL if there are no objects on this space */
1179	//TODO: this makes little sense, why only update the topmost object?
1180	if (!last)
1181	map->at (x, y).flags_ = 0;
1182	else
1183	update_object (last, UP_OBJ_REMOVE);
1184
1185	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1186	update_all_los (map, x, y);	1266	update_all_los (map, x, y);
1187	}	1267	}
1188	}	1268	}
1189		1269
1190	/*	1270	/*
…		…
1214	esrv_update_item (UPD_NROF, pl, top);	1294	esrv_update_item (UPD_NROF, pl, top);
1215		1295
1216	op->weight = 0; // cancel the addition above	1296	op->weight = 0; // cancel the addition above
1217	op->carrying = 0; // must be 0 already	1297	op->carrying = 0; // must be 0 already
1218		1298
1219	op->destroy (1);	1299	op->destroy ();
1220		1300
1221	return top;	1301	return top;
1222	}	1302	}
1223		1303
1224	return 0;	1304	return 0;
…		…
1232		1312
1233	object *prev = this;	1313	object *prev = this;
1234		1314
1235	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1315	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1236	{	1316	{
1237	object *op = arch_to_object (at);	1317	object *op = at->instance ();
1238		1318
1239	op->name = name;	1319	op->name = name;
1240	op->name_pl = name_pl;	1320	op->name_pl = name_pl;
1241	op->title = title;	1321	op->title = title;
1242		1322
…		…
1252	* job preparing multi-part monsters.	1332	* job preparing multi-part monsters.
1253	*/	1333	*/
1254	object *	1334	object *
1255	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1335	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1256	{	1336	{
		1337	op->remove ();
		1338
1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1339	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1258	{	1340	{
1259	tmp->x = x + tmp->arch->x;	1341	tmp->x = x + tmp->arch->x;
1260	tmp->y = y + tmp->arch->y;	1342	tmp->y = y + tmp->arch->y;
1261	}	1343	}
…		…
1278	* Passing 0 for flag gives proper default values, so flag really only needs	1360	* Passing 0 for flag gives proper default values, so flag really only needs
1279	* to be set if special handling is needed.	1361	* to be set if special handling is needed.
1280	*	1362	*
1281	* Return value:	1363	* Return value:
1282	* new object if 'op' was merged with other object	1364	* new object if 'op' was merged with other object
1283	* NULL if 'op' was destroyed	1365	* NULL if there was an error (destroyed, blocked etc.)
1284	* just 'op' otherwise	1366	* just 'op' otherwise
1285	*/	1367	*/
1286	object *	1368	object *
1287	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1369	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1288	{	1370	{
1289	assert (!op->flag [FLAG_FREED]);
1290
1291	object *top, *floor = NULL;
1292
1293	op->remove ();	1371	op->remove ();
		1372
		1373	if (m == &freed_map)//D TODO: remove soon
		1374	{//D
		1375	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1376	}//D
1294		1377
1295	/* Ideally, the caller figures this out. However, it complicates a lot	1378	/* Ideally, the caller figures this out. However, it complicates a lot
1296	* of areas of callers (eg, anything that uses find_free_spot would now	1379	* of areas of callers (eg, anything that uses find_free_spot would now
1297	* need extra work	1380	* need extra work
1298	*/	1381	*/
		1382	maptile *newmap = m;
1299	if (!xy_normalise (m, op->x, op->y))	1383	if (!xy_normalise (newmap, op->x, op->y))
1300	{	1384	{
1301	op->destroy ();	1385	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1302	return 0;	1386	return 0;
1303	}	1387	}
1304		1388
1305	if (object *more = op->more)	1389	if (object *more = op->more)
1306	if (!insert_ob_in_map (more, m, originator, flag))	1390	if (!insert_ob_in_map (more, m, originator, flag))
1307	return 0;	1391	return 0;
1308		1392
1309	CLEAR_FLAG (op, FLAG_REMOVED);	1393	op->flag [FLAG_REMOVED] = false;
1310		1394	op->env = 0;
1311	op->map = m;	1395	op->map = newmap;
		1396
1312	mapspace &ms = op->ms ();	1397	mapspace &ms = op->ms ();
1313		1398
1314	/* this has to be done after we translate the coordinates.	1399	/* this has to be done after we translate the coordinates.
1315	*/	1400	*/
1316	if (op->nrof && !(flag & INS_NO_MERGE))	1401	if (op->nrof && !(flag & INS_NO_MERGE))
1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1402	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1318	if (object::can_merge (op, tmp))	1403	if (object::can_merge (op, tmp))
1319	{	1404	{
		1405	// TODO: we actually want to update tmp, not op,
		1406	// but some caller surely breaks when we return tmp
		1407	// from here :/
1320	op->nrof += tmp->nrof;	1408	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1409	tmp->destroy ();
1322	}	1410	}
1323		1411
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1412	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1413	op->clr_flag (FLAG_INV_LOCKED);
1326		1414
1327	if (!QUERY_FLAG (op, FLAG_ALIVE))	1415	if (!op->flag [FLAG_ALIVE])
1328	CLEAR_FLAG (op, FLAG_NO_STEAL);	1416	op->clr_flag (FLAG_NO_STEAL);
1329		1417
1330	if (flag & INS_BELOW_ORIGINATOR)	1418	if (flag & INS_BELOW_ORIGINATOR)
1331	{	1419	{
1332	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1420	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1333	{	1421	{
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1422	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1423	abort ();
1336	}	1424	}
1337		1425
		1426	if (!originator->is_on_map ())
		1427	{
		1428	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1429	op->debug_desc (), originator->debug_desc ());
		1430	abort ();
		1431	}
		1432
1338	op->above = originator;	1433	op->above = originator;
1339	op->below = originator->below;	1434	op->below = originator->below;
1340
1341	if (op->below)
1342	op->below->above = op;
1343	else
1344	ms.bot = op;
1345
1346	/* since *below* originator, no need to update top */
1347	originator->below = op;	1435	originator->below = op;
		1436
		1437	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1438	}
1349	else	1439	else
1350	{	1440	{
1351	top = ms.bot;	1441	object *floor = 0;
		1442	object *top = ms.top;
1352		1443
1353	/* If there are other objects, then */	1444	/* If there are other objects, then */
1354	if (top)	1445	if (top)
1355	{	1446	{
1356	object *last = 0;
1357
1358	/*	1447	/*
1359	* If there are multiple objects on this space, we do some trickier handling.	1448	* If there are multiple objects on this space, we do some trickier handling.
1360	* We've already dealt with merging if appropriate.	1449	* We've already dealt with merging if appropriate.
1361	* Generally, we want to put the new object on top. But if	1450	* Generally, we want to put the new object on top. But if
1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1451	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1365	* once we get to them. This reduces the need to traverse over all of	1454	* once we get to them. This reduces the need to traverse over all of
1366	* them when adding another one - this saves quite a bit of cpu time	1455	* them when adding another one - this saves quite a bit of cpu time
1367	* when lots of spells are cast in one area. Currently, it is presumed	1456	* when lots of spells are cast in one area. Currently, it is presumed
1368	* that flying non pickable objects are spell objects.	1457	* that flying non pickable objects are spell objects.
1369	*/	1458	*/
1370	for (top = ms.bot; top; top = top->above)	1459	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1371	{	1460	{
1372	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1461	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1373	floor = top;	1462	floor = tmp;
1374		1463
1375	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1464	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1376	{	1465	{
1377	/* We insert above top, so we want this object below this */	1466	/* We insert above top, so we want this object below this */
1378	top = top->below;	1467	top = tmp->below;
1379	break;	1468	break;
1380	}	1469	}
1381		1470
1382	last = top;	1471	top = tmp;
1383	}	1472	}
1384
1385	/* Don't want top to be NULL, so set it to the last valid object */
1386	top = last;
1387		1473
1388	/* We let update_position deal with figuring out what the space	1474	/* We let update_position deal with figuring out what the space
1389	* looks like instead of lots of conditions here.	1475	* looks like instead of lots of conditions here.
1390	* makes things faster, and effectively the same result.	1476	* makes things faster, and effectively the same result.
1391	*/	1477	*/
…		…
1398	*/	1484	*/
1399	if (!(flag & INS_ON_TOP)	1485	if (!(flag & INS_ON_TOP)
1400	&& ms.flags () & P_BLOCKSVIEW	1486	&& ms.flags () & P_BLOCKSVIEW
1401	&& (op->face && !faces [op->face].visibility))	1487	&& (op->face && !faces [op->face].visibility))
1402	{	1488	{
		1489	object *last;
		1490
1403	for (last = top; last != floor; last = last->below)	1491	for (last = top; last != floor; last = last->below)
1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1492	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1405	break;	1493	break;
1406		1494
1407	/* Check to see if we found the object that blocks view,	1495	/* Check to see if we found the object that blocks view,
1408	* and make sure we have a below pointer for it so that	1496	* and make sure we have a below pointer for it so that
1409	* we can get inserted below this one, which requires we	1497	* we can get inserted below this one, which requires we
…		…
1415	} /* If objects on this space */	1503	} /* If objects on this space */
1416		1504
1417	if (flag & INS_ABOVE_FLOOR_ONLY)	1505	if (flag & INS_ABOVE_FLOOR_ONLY)
1418	top = floor;	1506	top = floor;
1419		1507
1420	/* Top is the object that our object (op) is going to get inserted above.	1508	// insert object above top, or bottom-most if top = 0
1421	*/
1422
1423	/* First object on this space */
1424	if (!top)	1509	if (!top)
1425	{	1510	{
		1511	op->below = 0;
1426	op->above = ms.bot;	1512	op->above = ms.bot;
1427
1428	if (op->above)
1429	op->above->below = op;
1430
1431	op->below = 0;
1432	ms.bot = op;	1513	ms.bot = op;
		1514
		1515	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1516	}
1434	else	1517	else
1435	{ /* get inserted into the stack above top */	1518	{
1436	op->above = top->above;	1519	op->above = top->above;
1437
1438	if (op->above)
1439	op->above->below = op;	1520	top->above = op;
1440		1521
1441	op->below = top;	1522	op->below = top;
1442	top->above = op;	1523	*(op->above ? &op->above->below : &ms.top) = op;
1443	}	1524	}
		1525	}
1444		1526
1445	if (!op->above)	1527	if (op->is_player ())
1446	ms.top = op;
1447	} /* else not INS_BELOW_ORIGINATOR */
1448
1449	if (op->type == PLAYER)
1450	{	1528	{
1451	op->contr->do_los = 1;	1529	op->contr->do_los = 1;
1452	++op->map->players;	1530	++op->map->players;
1453	op->map->touch ();	1531	op->map->touch ();
1454	}	1532	}
1455		1533
1456	op->map->dirty = true;	1534	op->map->dirty = true;
1457		1535
1458	if (object *pl = ms.player ())	1536	if (object *pl = ms.player ())
		1537	//TODO: the floorbox prev/next might need updating
		1538	//esrv_send_item (pl, op);
		1539	//TODO: update floorbox to preserve ordering
		1540	if (pl->contr->ns)
1459	pl->contr->ns->floorbox_update ();	1541	pl->contr->ns->floorbox_update ();
1460		1542
1461	/* If this object glows, it may affect lighting conditions that are	1543	/* If this object glows, it may affect lighting conditions that are
1462	* visible to others on this map. But update_all_los is really	1544	* visible to others on this map. But update_all_los is really
1463	* an inefficient way to do this, as it means los for all players	1545	* an inefficient way to do this, as it means los for all players
1464	* on the map will get recalculated. The players could very well	1546	* on the map will get recalculated. The players could very well
1465	* be far away from this change and not affected in any way -	1547	* be far away from this change and not affected in any way -
1466	* this should get redone to only look for players within range,	1548	* this should get redone to only look for players within range,
1467	* or just updating the P_UPTODATE for spaces within this area	1549	* or just updating the P_UPTODATE for spaces within this area
1468	* of effect may be sufficient.	1550	* of effect may be sufficient.
1469	*/	1551	*/
1470	if (op->map->darkness && (op->glow_radius != 0))	1552	if (op->affects_los ())
		1553	{
		1554	op->ms ().invalidate ();
1471	update_all_los (op->map, op->x, op->y);	1555	update_all_los (op->map, op->x, op->y);
		1556	}
1472		1557
1473	/* updates flags (blocked, alive, no magic, etc) for this map space */	1558	/* updates flags (blocked, alive, no magic, etc) for this map space */
1474	update_object (op, UP_OBJ_INSERT);	1559	update_object (op, UP_OBJ_INSERT);
1475		1560
1476	INVOKE_OBJECT (INSERT, op);	1561	INVOKE_OBJECT (INSERT, op);
…		…
1483	* blocked() and wall() work properly), and these flags are updated by	1568	* blocked() and wall() work properly), and these flags are updated by
1484	* update_object().	1569	* update_object().
1485	*/	1570	*/
1486		1571
1487	/* if this is not the head or flag has been passed, don't check walk on status */	1572	/* if this is not the head or flag has been passed, don't check walk on status */
1488	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1573	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1489	{	1574	{
1490	if (check_move_on (op, originator))	1575	if (check_move_on (op, originator))
1491	return 0;	1576	return 0;
1492		1577
1493	/* If we are a multi part object, lets work our way through the check	1578	/* If we are a multi part object, lets work our way through the check
…		…
1504	/* this function inserts an object in the map, but if it	1589	/* this function inserts an object in the map, but if it
1505	* finds an object of its own type, it'll remove that one first.	1590	* finds an object of its own type, it'll remove that one first.
1506	* op is the object to insert it under: supplies x and the map.	1591	* op is the object to insert it under: supplies x and the map.
1507	*/	1592	*/
1508	void	1593	void
1509	replace_insert_ob_in_map (const char *arch_string, object *op)	1594	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1510	{	1595	{
1511	/* first search for itself and remove any old instances */	1596	/* first search for itself and remove any old instances */
1512		1597
1513	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1598	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1514	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1599	if (tmp->arch->archname == archname) /* same archetype */
1515	tmp->destroy (1);	1600	tmp->destroy ();
1516		1601
1517	object *tmp = arch_to_object (archetype::find (arch_string));	1602	object *tmp = archetype::find (archname)->instance ();
1518		1603
1519	tmp->x = op->x;	1604	tmp->x = op->x;
1520	tmp->y = op->y;	1605	tmp->y = op->y;
1521		1606
1522	insert_ob_in_map (tmp, op->map, op, 0);	1607	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1527	{	1612	{
1528	if (where->env)	1613	if (where->env)
1529	return where->env->insert (this);	1614	return where->env->insert (this);
1530	else	1615	else
1531	return where->map->insert (this, where->x, where->y, originator, flags);	1616	return where->map->insert (this, where->x, where->y, originator, flags);
		1617	}
		1618
		1619	// check whether we can put this into the map, respect max_volume, max_items
		1620	bool
		1621	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1622	{
		1623	mapspace &ms = m->at (x, y);
		1624
		1625	int items = ms.items ();
		1626
		1627	if (!items // testing !items ensures we can drop at least one item
		1628	|| (items < m->max_items
		1629	&& ms.volume () < m->max_volume))
		1630	return true;
		1631
		1632	if (originator && originator->is_player ())
		1633	originator->contr->failmsgf (
		1634	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1635	query_name ()
		1636	);
		1637
		1638	return false;
1532	}	1639	}
1533		1640
1534	/*	1641	/*
1535	* decrease(object, number) decreases a specified number from	1642	* decrease(object, number) decreases a specified number from
1536	* the amount of an object. If the amount reaches 0, the object	1643	* the amount of an object. If the amount reaches 0, the object
…		…
1544	if (!nr)	1651	if (!nr)
1545	return true;	1652	return true;
1546		1653
1547	nr = min (nr, nrof);	1654	nr = min (nr, nrof);
1548		1655
		1656	if (nrof > nr)
		1657	{
1549	nrof -= nr;	1658	nrof -= nr;
1550
1551	if (nrof)
1552	{
1553	adjust_weight (env, -weight * nr); // carrying == 0	1659	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1554		1660
1555	if (object *pl = visible_to ())	1661	if (object *pl = visible_to ())
1556	esrv_update_item (UPD_NROF, pl, this);	1662	esrv_update_item (UPD_NROF, pl, this);
1557		1663
1558	return true;	1664	return true;
1559	}	1665	}
1560	else	1666	else
1561	{	1667	{
1562	destroy (1);	1668	destroy ();
1563	return false;	1669	return false;
1564	}	1670	}
1565	}	1671	}
1566		1672
1567	/*	1673	/*
…		…
1584	}	1690	}
1585	else	1691	else
1586	{	1692	{
1587	decrease (nr);	1693	decrease (nr);
1588		1694
1589	object *op = object_create_clone (this);	1695	object *op = deep_clone ();
1590	op->nrof = nr;	1696	op->nrof = nr;
1591	return op;	1697	return op;
1592	}	1698	}
1593	}	1699	}
1594		1700
…		…
1644	if (object *pl = tmp->visible_to ())	1750	if (object *pl = tmp->visible_to ())
1645	esrv_update_item (UPD_NROF, pl, tmp);	1751	esrv_update_item (UPD_NROF, pl, tmp);
1646		1752
1647	adjust_weight (this, op->total_weight ());	1753	adjust_weight (this, op->total_weight ());
1648		1754
1649	op->destroy (1);	1755	op->destroy ();
1650	op = tmp;	1756	op = tmp;
1651	goto inserted;	1757	goto inserted;
1652	}	1758	}
1653		1759
1654	op->owner = 0; // it's his/hers now. period.	1760	op->owner = 0; // it's his/hers now. period.
…		…
1672		1778
1673	adjust_weight (this, op->total_weight ());	1779	adjust_weight (this, op->total_weight ());
1674		1780
1675	inserted:	1781	inserted:
1676	/* reset the light list and los of the players on the map */	1782	/* reset the light list and los of the players on the map */
1677	if (op->glow_radius && map && map->darkness)	1783	if (op->glow_radius && is_on_map ())
		1784	{
		1785	update_stats ();
1678	update_all_los (map, x, y);	1786	update_all_los (map, x, y);
1679		1787	}
		1788	else if (is_player ())
1680	// if this is a player's inventory, update stats	1789	// if this is a player's inventory, update stats
1681	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1790	contr->queue_stats_update ();
1682	update_stats ();
1683		1791
1684	INVOKE_OBJECT (INSERT, this);	1792	INVOKE_OBJECT (INSERT, this);
1685		1793
1686	return op;	1794	return op;
1687	}	1795	}
…		…
1707	* on top.	1815	* on top.
1708	*/	1816	*/
1709	int	1817	int
1710	check_move_on (object *op, object *originator)	1818	check_move_on (object *op, object *originator)
1711	{	1819	{
		1820	if (op->flag [FLAG_NO_APPLY])
		1821	return 0;
		1822
1712	object *tmp;	1823	object *tmp;
1713	maptile *m = op->map;	1824	maptile *m = op->map;
1714	int x = op->x, y = op->y;	1825	int x = op->x, y = op->y;
1715		1826
1716	MoveType move_on, move_slow, move_block;	1827	mapspace &ms = m->at (x, y);
1717		1828
1718	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1829	ms.update ();
1719	return 0;
1720		1830
1721	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1831	MoveType move_on = ms.move_on;
1722	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1832	MoveType move_slow = ms.move_slow;
1723	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1833	MoveType move_block = ms.move_block;
1724		1834
1725	/* if nothing on this space will slow op down or be applied,	1835	/* if nothing on this space will slow op down or be applied,
1726	* no need to do checking below. have to make sure move_type	1836	* no need to do checking below. have to make sure move_type
1727	* is set, as lots of objects don't have it set - we treat that	1837	* is set, as lots of objects don't have it set - we treat that
1728	* as walking.	1838	* as walking.
…		…
1739	return 0;	1849	return 0;
1740		1850
1741	/* The objects have to be checked from top to bottom.	1851	/* The objects have to be checked from top to bottom.
1742	* Hence, we first go to the top:	1852	* Hence, we first go to the top:
1743	*/	1853	*/
1744		1854	for (object *next, *tmp = ms.top; tmp; tmp = next)
1745	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1746	{
1747	/* Trim the search when we find the first other spell effect
1748	* this helps performance so that if a space has 50 spell objects,
1749	* we don't need to check all of them.
1750	*/
1751	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1752	break;
1753	}	1855	{
		1856	next = tmp->below;
1754		1857
1755	for (; tmp; tmp = tmp->below)
1756	{
1757	if (tmp == op)	1858	if (tmp == op)
1758	continue; /* Can't apply yourself */	1859	continue; /* Can't apply yourself */
1759		1860
1760	/* Check to see if one of the movement types should be slowed down.	1861	/* Check to see if one of the movement types should be slowed down.
1761	* Second check makes sure that the movement types not being slowed	1862	* Second check makes sure that the movement types not being slowed
1762	* (~slow_move) is not blocked on this space - just because the	1863	* (~slow_move) is not blocked on this space - just because the
1763	* space doesn't slow down swimming (for example), if you can't actually	1864	* space doesn't slow down swimming (for example), if you can't actually
1764	* swim on that space, can't use it to avoid the penalty.	1865	* swim on that space, can't use it to avoid the penalty.
1765	*/	1866	*/
1766	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1867	if (!op->flag [FLAG_WIZPASS])
1767	{	1868	{
1768	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1869	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1769	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1870	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1770	{	1871	{
1771
1772	float
1773	diff = tmp->move_slow_penalty * fabs (op->speed);	1872	float diff = tmp->move_slow_penalty * fabs (op->speed);
1774		1873
1775	if (op->type == PLAYER)	1874	if (op->is_player ())
1776	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1875	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1777	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1876	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1778	diff /= 4.0;	1877	diff /= 4.0;
1779		1878
1780	op->speed_left -= diff;	1879	op->speed_left -= diff;
1781	}	1880	}
1782	}	1881	}
…		…
1815	LOG (llevError, "Present_arch called outside map.\n");	1914	LOG (llevError, "Present_arch called outside map.\n");
1816	return NULL;	1915	return NULL;
1817	}	1916	}
1818		1917
1819	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1918	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1820	if (tmp->arch == at)	1919	if (tmp->arch->archname == at->archname)
1821	return tmp;	1920	return tmp;
1822		1921
1823	return NULL;	1922	return NULL;
1824	}	1923	}
1825		1924
…		…
1889	* The first matching object is returned, or NULL if none.	1988	* The first matching object is returned, or NULL if none.
1890	*/	1989	*/
1891	object *	1990	object *
1892	present_arch_in_ob (const archetype *at, const object *op)	1991	present_arch_in_ob (const archetype *at, const object *op)
1893	{	1992	{
1894	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1993	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1895	if (tmp->arch == at)	1994	if (tmp->arch->archname == at->archname)
1896	return tmp;	1995	return tmp;
1897		1996
1898	return NULL;	1997	return NULL;
1899	}	1998	}
1900		1999
…		…
1904	void	2003	void
1905	flag_inv (object *op, int flag)	2004	flag_inv (object *op, int flag)
1906	{	2005	{
1907	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2006	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1908	{	2007	{
1909	SET_FLAG (tmp, flag);	2008	tmp->set_flag (flag);
1910	flag_inv (tmp, flag);	2009	flag_inv (tmp, flag);
1911	}	2010	}
1912	}	2011	}
1913		2012
1914	/*	2013	/*
…		…
1917	void	2016	void
1918	unflag_inv (object *op, int flag)	2017	unflag_inv (object *op, int flag)
1919	{	2018	{
1920	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2019	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1921	{	2020	{
1922	CLEAR_FLAG (tmp, flag);	2021	tmp->clr_flag (flag);
1923	unflag_inv (tmp, flag);	2022	unflag_inv (tmp, flag);
1924	}	2023	}
1925	}	2024	}
1926		2025
1927	/*	2026	/*
…		…
1988	* head of the object should correspond for the entire object.	2087	* head of the object should correspond for the entire object.
1989	*/	2088	*/
1990	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2089	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1991	continue;	2090	continue;
1992		2091
1993	if (ob->blocked (m, pos.x, pos.y))	2092	if (ob->blocked (pos.m, pos.x, pos.y))
1994	continue;	2093	continue;
1995		2094
1996	altern [index++] = i;	2095	altern [index++] = i;
1997	}	2096	}
1998		2097
…		…
2066	* there is capable of.	2165	* there is capable of.
2067	*/	2166	*/
2068	int	2167	int
2069	find_dir (maptile *m, int x, int y, object *exclude)	2168	find_dir (maptile *m, int x, int y, object *exclude)
2070	{	2169	{
2071	int i, max = SIZEOFFREE, mflags;	2170	int max = SIZEOFFREE, mflags;
2072
2073	sint16 nx, ny;
2074	object *tmp;
2075	maptile *mp;
2076
2077	MoveType blocked, move_type;	2171	MoveType move_type;
2078		2172
2079	if (exclude && exclude->head_ () != exclude)	2173	if (exclude && exclude->head_ () != exclude)
2080	{	2174	{
2081	exclude = exclude->head;	2175	exclude = exclude->head;
2082	move_type = exclude->move_type;	2176	move_type = exclude->move_type;
…		…
2085	{	2179	{
2086	/* If we don't have anything, presume it can use all movement types. */	2180	/* If we don't have anything, presume it can use all movement types. */
2087	move_type = MOVE_ALL;	2181	move_type = MOVE_ALL;
2088	}	2182	}
2089		2183
2090	for (i = 1; i < max; i++)	2184	for (int i = 1; i < max; i++)
2091	{	2185	{
2092	mp = m;	2186	mapxy pos (m, x, y);
2093	nx = x + freearr_x[i];	2187	pos.move (i);
2094	ny = y + freearr_y[i];
2095		2188
2096	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2189	if (!pos.normalise ())
2097
2098	if (mflags & P_OUT_OF_MAP)
2099	max = maxfree[i];	2190	max = maxfree[i];
2100	else	2191	else
2101	{	2192	{
2102	mapspace &ms = mp->at (nx, ny);	2193	mapspace &ms = *pos;
2103		2194
2104	blocked = ms.move_block;
2105
2106	if ((move_type & blocked) == move_type)	2195	if ((move_type & ms.move_block) == move_type)
2107	max = maxfree[i];	2196	max = maxfree [i];
2108	else if (mflags & P_IS_ALIVE)	2197	else if (ms.flags () & P_IS_ALIVE)
2109	{	2198	{
2110	for (tmp = ms.bot; tmp; tmp = tmp->above)	2199	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2111	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2200	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2112	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2201	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2113	break;
2114
2115	if (tmp)
2116	return freedir[i];	2202	return freedir [i];
2117	}	2203	}
2118	}	2204	}
2119	}	2205	}
2120		2206
2121	return 0;	2207	return 0;
…		…
2196	* This basically means that if direction is 15, then it could either go	2282	* This basically means that if direction is 15, then it could either go
2197	* direction 4, 14, or 16 to get back to where we are.	2283	* direction 4, 14, or 16 to get back to where we are.
2198	* Moved from spell_util.c to object.c with the other related direction	2284	* Moved from spell_util.c to object.c with the other related direction
2199	* functions.	2285	* functions.
2200	*/	2286	*/
2201	int reduction_dir[SIZEOFFREE][3] = {	2287	static const int reduction_dir[SIZEOFFREE][3] = {
2202	{0, 0, 0}, /* 0 */	2288	{0, 0, 0}, /* 0 */
2203	{0, 0, 0}, /* 1 */	2289	{0, 0, 0}, /* 1 */
2204	{0, 0, 0}, /* 2 */	2290	{0, 0, 0}, /* 2 */
2205	{0, 0, 0}, /* 3 */	2291	{0, 0, 0}, /* 3 */
2206	{0, 0, 0}, /* 4 */	2292	{0, 0, 0}, /* 4 */
…		…
2300	* Add a check so we can't pick up invisible objects (0.93.8)	2386	* Add a check so we can't pick up invisible objects (0.93.8)
2301	*/	2387	*/
2302	int	2388	int
2303	can_pick (const object *who, const object *item)	2389	can_pick (const object *who, const object *item)
2304	{	2390	{
2305	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2391	return /*who->flag [FLAG_WIZ]|| */
2306	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2392	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2307	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2393	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2308	}	2394	}
2309		2395
2310	/*	2396	/*
2311	* create clone from object to another	2397	* create clone from object to another
2312	*/	2398	*/
2313	object *	2399	object *
2314	object_create_clone (object *asrc)	2400	object::deep_clone ()
2315	{	2401	{
2316	object *dst = 0, *tmp, *src, *prev, *item;	2402	assert (("deep_clone called on non-head object", is_head ()));
2317		2403
2318	if (!asrc)	2404	object *dst = clone ();
2319	return 0;
2320		2405
2321	src = asrc->head_ ();	2406	object *prev = dst;
2322
2323	prev = 0;
2324	for (object *part = src; part; part = part->more)	2407	for (object *part = this->more; part; part = part->more)
2325	{	2408	{
2326	tmp = part->clone ();	2409	object *tmp = part->clone ();
2327	tmp->x -= src->x;
2328	tmp->y -= src->y;
2329
2330	if (!part->head)
2331	{
2332	dst = tmp;
2333	tmp->head = 0;
2334	}
2335	else
2336	tmp->head = dst;	2410	tmp->head = dst;
2337
2338	tmp->more = 0;
2339
2340	if (prev)
2341	prev->more = tmp;	2411	prev->more = tmp;
2342
2343	prev = tmp;	2412	prev = tmp;
2344	}	2413	}
2345		2414
2346	for (item = src->inv; item; item = item->below)	2415	for (object *item = inv; item; item = item->below)
2347	insert_ob_in_ob (object_create_clone (item), dst);	2416	insert_ob_in_ob (item->deep_clone (), dst);
2348		2417
2349	return dst;	2418	return dst;
2350	}	2419	}
2351		2420
2352	/* This returns the first object in who's inventory that	2421	/* This returns the first object in who's inventory that
…		…
2361	return tmp;	2430	return tmp;
2362		2431
2363	return 0;	2432	return 0;
2364	}	2433	}
2365		2434
2366	/* If ob has a field named key, return the link from the list,	2435	shstr_tmp
2367	* otherwise return NULL.	2436	object::kv_get (shstr_tmp key) const
2368	*
2369	* key must be a passed in shared string - otherwise, this won't
2370	* do the desired thing.
2371	*/
2372	key_value *
2373	get_ob_key_link (const object *ob, const char *key)
2374	{	2437	{
2375	for (key_value *link = ob->key_values; link; link = link->next)	2438	for (key_value *kv = key_values; kv; kv = kv->next)
2376	if (link->key == key)	2439	if (kv->key == key)
2377	return link;
2378
2379	return 0;
2380	}
2381
2382	/*
2383	* Returns the value of op has an extra_field for key, or NULL.
2384	*
2385	* The argument doesn't need to be a shared string.
2386	*
2387	* The returned string is shared.
2388	*/
2389	const char *
2390	get_ob_key_value (const object *op, const char *const key)
2391	{
2392	key_value *link;
2393	shstr_cmp canonical_key (key);
2394
2395	if (!canonical_key)
2396	{
2397	/* 1. There being a field named key on any object
2398	* implies there'd be a shared string to find.
2399	* 2. Since there isn't, no object has this field.
2400	* 3. Therefore, *this* object doesn't have this field.
2401	*/
2402	return 0;
2403	}
2404
2405	/* This is copied from get_ob_key_link() above -
2406	* only 4 lines, and saves the function call overhead.
2407	*/
2408	for (link = op->key_values; link; link = link->next)
2409	if (link->key == canonical_key)
2410	return link->value;	2440	return kv->value;
2411		2441
2412	return 0;	2442	return shstr ();
2413	}	2443	}
2414		2444
2415	/*	2445	void
2416	* Updates the canonical_key in op to value.	2446	object::kv_set (shstr_tmp key, shstr_tmp value)
2417	*
2418	* canonical_key is a shared string (value doesn't have to be).
2419	*
2420	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2421	* keys.
2422	*
2423	* Returns TRUE on success.
2424	*/
2425	int
2426	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2427	{	2447	{
2428	key_value *field = NULL, *last = NULL;	2448	for (key_value *kv = key_values; kv; kv = kv->next)
2429		2449	if (kv->key == key)
2430	for (field = op->key_values; field != NULL; field = field->next)
2431	{
2432	if (field->key != canonical_key)
2433	{	2450	{
2434	last = field;	2451	kv->value = value;
2435	continue;	2452	return;
2436	}	2453	}
2437		2454
2438	if (value)	2455	key_value *kv = new key_value;
2439	field->value = value;	2456
2440	else	2457	kv->next = key_values;
		2458	kv->key = key;
		2459	kv->value = value;
		2460
		2461	key_values = kv;
		2462	}
		2463
		2464	void
		2465	object::kv_del (shstr_tmp key)
		2466	{
		2467	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2468	if ((*kvp)->key == key)
2441	{	2469	{
2442	/* Basically, if the archetype has this key set,	2470	key_value *kv = *kvp;
2443	* we need to store the null value so when we save	2471	*kvp = (*kvp)->next;
2444	* it, we save the empty value so that when we load,	2472	delete kv;
2445	* we get this value back again.	2473	return;
2446	*/
2447	if (get_ob_key_link (op->arch, canonical_key))
2448	field->value = 0;
2449	else
2450	{
2451	if (last)
2452	last->next = field->next;
2453	else
2454	op->key_values = field->next;
2455
2456	delete field;
2457	}
2458	}	2474	}
2459	return TRUE;
2460	}
2461	/* IF we get here, key doesn't exist */
2462
2463	/* No field, we'll have to add it. */
2464
2465	if (!add_key)
2466	return FALSE;
2467
2468	/* There isn't any good reason to store a null
2469	* value in the key/value list. If the archetype has
2470	* this key, then we should also have it, so shouldn't
2471	* be here. If user wants to store empty strings,
2472	* should pass in ""
2473	*/
2474	if (value == NULL)
2475	return TRUE;
2476
2477	field = new key_value;
2478
2479	field->key = canonical_key;
2480	field->value = value;
2481	/* Usual prepend-addition. */
2482	field->next = op->key_values;
2483	op->key_values = field;
2484
2485	return TRUE;
2486	}
2487
2488	/*
2489	* Updates the key in op to value.
2490	*
2491	* If add_key is FALSE, this will only update existing keys,
2492	* and not add new ones.
2493	* In general, should be little reason FALSE is ever passed in for add_key
2494	*
2495	* Returns TRUE on success.
2496	*/
2497	int
2498	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2499	{
2500	shstr key_ (key);
2501
2502	return set_ob_key_value_s (op, key_, value, add_key);
2503	}	2475	}
2504		2476
2505	object::depth_iterator::depth_iterator (object *container)	2477	object::depth_iterator::depth_iterator (object *container)
2506	: iterator_base (container)	2478	: iterator_base (container)
2507	{	2479	{
…		…
2557	{	2529	{
2558	char flagdesc[512];	2530	char flagdesc[512];
2559	char info2[256 * 4];	2531	char info2[256 * 4];
2560	char *p = info;	2532	char *p = info;
2561		2533
2562	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2534	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2563	count,	2535	count,
2564	uuid.c_str (),	2536	uuid.c_str (),
2565	&name,	2537	&name,
2566	title ? "\",title:\"" : "",	2538	title ? ",title:\"" : "",
2567	title ? (const char *)title : "",	2539	title ? (const char *)title : "",
		2540	title ? "\"" : "",
2568	flag_desc (flagdesc, 512), type);	2541	flag_desc (flagdesc, 512), type);
2569		2542
2570	if (!this->flag[FLAG_REMOVED] && env)	2543	if (!flag[FLAG_REMOVED] && env)
2571	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2544	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2572		2545
2573	if (map)	2546	if (map)
2574	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2547	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2575		2548
…		…
2590	{	2563	{
2591	return map ? map->region (x, y)	2564	return map ? map->region (x, y)
2592	: region::default_region ();	2565	: region::default_region ();
2593	}	2566	}
2594		2567
2595	const materialtype_t *
2596	object::dominant_material () const
2597	{
2598	if (materialtype_t *mt = name_to_material (materialname))
2599	return mt;
2600
2601	return name_to_material (shstr_unknown);
2602	}
2603
2604	void	2568	void
2605	object::open_container (object *new_container)	2569	object::open_container (object *new_container)
2606	{	2570	{
2607	if (container == new_container)	2571	if (container == new_container)
2608	return;	2572	return;
2609		2573
2610	if (object *old_container = container)	2574	object *old_container = container;
		2575
		2576	if (old_container)
2611	{	2577	{
2612	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2578	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2613	return;	2579	return;
2614		2580
2615	#if 0	2581	#if 0
…		…
2617	if (object *closer = old_container->inv)	2583	if (object *closer = old_container->inv)
2618	if (closer->type == CLOSE_CON)	2584	if (closer->type == CLOSE_CON)
2619	closer->destroy ();	2585	closer->destroy ();
2620	#endif	2586	#endif
2621		2587
		2588	// make sure the container is available
		2589	esrv_send_item (this, old_container);
		2590
2622	old_container->flag [FLAG_APPLIED] = 0;	2591	old_container->flag [FLAG_APPLIED] = false;
2623	container = 0;	2592	container = 0;
2624		2593
		2594	// client needs item update to make it work, client bug requires this to be separate
2625	esrv_update_item (UPD_FLAGS, this, old_container);	2595	esrv_update_item (UPD_FLAGS, this, old_container);
		2596
2626	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2597	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2627	play_sound (sound_find ("chest_close"));	2598	play_sound (sound_find ("chest_close"));
2628	}	2599	}
2629		2600
2630	if (new_container)	2601	if (new_container)
2631	{	2602	{
…		…
2635	// TODO: this does not seem to serve any purpose anymore?	2606	// TODO: this does not seem to serve any purpose anymore?
2636	#if 0	2607	#if 0
2637	// insert the "Close Container" object.	2608	// insert the "Close Container" object.
2638	if (archetype *closer = new_container->other_arch)	2609	if (archetype *closer = new_container->other_arch)
2639	{	2610	{
2640	object *closer = arch_to_object (new_container->other_arch);	2611	object *closer = new_container->other_arch->instance ();
2641	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2612	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2642	new_container->insert (closer);	2613	new_container->insert (closer);
2643	}	2614	}
2644	#endif	2615	#endif
2645		2616
2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2617	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2647		2618
		2619	// make sure the container is available, client bug requires this to be separate
		2620	esrv_send_item (this, new_container);
		2621
2648	new_container->flag [FLAG_APPLIED] = 1;	2622	new_container->flag [FLAG_APPLIED] = true;
2649	container = new_container;	2623	container = new_container;
2650		2624
		2625	// client needs flag change
2651	esrv_update_item (UPD_FLAGS, this, new_container);	2626	esrv_update_item (UPD_FLAGS, this, new_container);
2652	esrv_send_inventory (this, new_container);	2627	esrv_send_inventory (this, new_container);
2653	play_sound (sound_find ("chest_open"));	2628	play_sound (sound_find ("chest_open"));
2654	}	2629	}
		2630	// else if (!old_container->env && contr && contr->ns)
		2631	// contr->ns->floorbox_reset ();
2655	}	2632	}
2656		2633
2657	object *	2634	object *
2658	object::force_find (const shstr name)	2635	object::force_find (shstr_tmp name)
2659	{	2636	{
2660	/* cycle through his inventory to look for the MARK we want to	2637	/* cycle through his inventory to look for the MARK we want to
2661	* place	2638	* place
2662	*/	2639	*/
2663	for (object *tmp = inv; tmp; tmp = tmp->below)	2640	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2665	return splay (tmp);	2642	return splay (tmp);
2666		2643
2667	return 0;	2644	return 0;
2668	}	2645	}
2669		2646
		2647	//-GPL
		2648
2670	void	2649	void
		2650	object::force_set_timer (int duration)
		2651	{
		2652	this->duration = 1;
		2653	this->speed_left = -1.f;
		2654
		2655	this->set_speed (duration ? 1.f / duration : 0.f);
		2656	}
		2657
		2658	object *
2671	object::force_add (const shstr name, int duration)	2659	object::force_add (shstr_tmp name, int duration)
2672	{	2660	{
2673	if (object *force = force_find (name))	2661	if (object *force = force_find (name))
2674	force->destroy ();	2662	force->destroy ();
2675		2663
2676	object *force = get_archetype (FORCE_NAME);	2664	object *force = get_archetype (FORCE_NAME);
2677		2665
2678	force->slaying = name;	2666	force->slaying = name;
2679	force->stats.food = 1;	2667	force->force_set_timer (duration);
2680	force->speed_left = -1.f;
2681
2682	force->set_speed (duration ? 1.f / duration : 0.f);
2683	force->flag [FLAG_IS_USED_UP] = true;
2684	force->flag [FLAG_APPLIED] = true;	2668	force->flag [FLAG_APPLIED] = true;
2685		2669
2686	insert (force);	2670	return insert (force);
2687	}	2671	}
2688		2672
2689	void	2673	void
2690	object::play_sound (faceidx sound)	2674	object::play_sound (faceidx sound) const
2691	{	2675	{
2692	if (!sound)	2676	if (!sound)
2693	return;	2677	return;
2694		2678
2695	if (flag [FLAG_REMOVED])	2679	if (is_on_map ())
		2680	map->play_sound (sound, x, y);
		2681	else if (object *pl = in_player ())
		2682	pl->contr->play_sound (sound);
		2683	}
		2684
		2685	void
		2686	object::say_msg (const char *msg) const
		2687	{
		2688	if (is_on_map ())
		2689	map->say_msg (msg, x, y);
		2690	else if (object *pl = in_player ())
		2691	pl->contr->play_sound (sound);
		2692	}
		2693
		2694	void
		2695	object::make_noise ()
		2696	{
		2697	// we do not model noise in the map, so instead put
		2698	// a temporary light into the noise source
		2699	// could use the map instead, but that's less reliable for our
		2700	// goal, which is to make invisibility a bit harder to exploit
		2701
		2702	// currently only works sensibly for players
		2703	if (!is_player ())
2696	return;	2704	return;
2697		2705
2698	if (env)	2706	// find old force, or create new one
2699	{	2707	object *force = force_find (shstr_noise_force);
2700	if (object *pl = in_player ())	2708
2701	pl->contr->play_sound (sound);	2709	if (force)
2702	}	2710	force->speed_left = -1.f; // patch old speed up
2703	else	2711	else
2704	map->play_sound (sound, x, y);	2712	{
2705	}	2713	force = archetype::get (shstr_noise_force);
2706		2714
		2715	force->slaying = shstr_noise_force;
		2716	force->stats.food = 1;
		2717	force->speed_left = -1.f;
		2718
		2719	force->set_speed (1.f / 4.f);
		2720	force->flag [FLAG_IS_USED_UP] = true;
		2721	force->flag [FLAG_APPLIED] = true;
		2722
		2723	insert (force);
		2724	}
		2725	}
		2726
		2727	void object::change_move_type (MoveType mt)
		2728	{
		2729	if (move_type == mt)
		2730	return;
		2731
		2732	if (is_on_map ())
		2733	{
		2734	// we are on the map, so handle move_on/off effects
		2735	remove ();
		2736	move_type = mt;
		2737	map->insert (this, x, y, this);
		2738	}
		2739	else
		2740	move_type = mt;
		2741	}
		2742
		2743	/* object should be a player.
		2744	* we return the object the player has marked with the 'mark' command
		2745	* below. If no match is found (or object has changed), we return
		2746	* NULL. We leave it up to the calling function to print messages if
		2747	* nothing is found.
		2748	*/
		2749	object *
		2750	object::mark () const
		2751	{
		2752	if (contr && contr->mark && contr->mark->env == this)
		2753	return contr->mark;
		2754	else
		2755	return 0;
		2756	}
		2757

Diff Legend

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