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.207 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.313 by root, Fri Mar 26 00:05:45 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 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,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27		24
28	#include <global.h>	25	#include <global.h>
29	#include <stdio.h>	26	#include <stdio.h>
30	#include <sys/types.h>	27	#include <sys/types.h>
31	#include <sys/uio.h>	28	#include <sys/uio.h>
32	#include <object.h>	29	#include <object.h>
33	#include <funcpoint.h>
34	#include <sproto.h>	30	#include <sproto.h>
35	#include <loader.h>
36		31
37	#include <bitset>	32	#include <bitset>
38		33
39	UUID UUID::cur;	34	UUID UUID::cur;
40	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
41	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
42		38
43	objectvec objects;	39	objectvec objects;
44	activevec actives;	40	activevec actives;
		41
		42	//+GPL
45		43
46	short freearr_x[SIZEOFFREE] = {	44	short freearr_x[SIZEOFFREE] = {
47	0,	45	0,
48	0, 1, 1, 1, 0, -1, -1, -1,	46	0, 1, 1, 1, 0, -1, -1, -1,
49	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
53	0,	51	0,
54	-1, -1, 0, 1, 1, 1, 0, -1,	52	-1, -1, 0, 1, 1, 1, 0, -1,
55	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	53	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
56	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	54	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
57	};	55	};
58	int maxfree[SIZEOFFREE] = {
59	0,
60	9, 10, 13, 14, 17, 18, 21, 22,
61	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
62	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
63	};
64	int freedir[SIZEOFFREE] = {	56	int freedir[SIZEOFFREE] = {
65	0,	57	0,
66	1, 2, 3, 4, 5, 6, 7, 8,	58	1, 2, 3, 4, 5, 6, 7, 8,
67	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	59	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
68	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	60	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
69	};	61	};
70		62
		63	static int maxfree[SIZEOFFREE] = {
		64	0,
		65	9, 10, 13, 14, 17, 18, 21, 22,
		66	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		67	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		68	};
		69
71	static void	70	static void
72	write_uuid (uval64 skip, bool sync)	71	write_uuid (uval64 skip, bool sync)
73	{	72	{
74	CALL_BEGIN (2);	73	CALL_BEGIN (2);
75	CALL_ARG_SV (newSVval64 (skip));	74	CALL_ARG_SV (newSVval64 (skip));
…		…
77	CALL_CALL ("cf::write_uuid", G_DISCARD);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
78	CALL_END;	77	CALL_END;
79	}	78	}
80		79
81	static void	80	static void
82	read_uuid (void)	81	read_uuid ()
83	{	82	{
84	char filename[MAX_BUF];	83	char filename[MAX_BUF];
85		84
86	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
87		86
…		…
101		100
102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
103	_exit (1);	102	_exit (1);
104	}	103	}
105		104
106	UUID::BUF buf;	105	char buf [UUID::MAX_LEN];
107	buf[0] = 0;	106	buf[0] = 0;
108	fgets (buf, sizeof (buf), fp);	107	fgets (buf, sizeof (buf), fp);
109		108
110	if (!UUID::cur.parse (buf))	109	if (!UUID::cur.parse (buf))
111	{	110	{
…		…
138		137
139	void	138	void
140	UUID::init ()	139	UUID::init ()
141	{	140	{
142	read_uuid ();	141	read_uuid ();
		142	}
		143
		144	bool
		145	UUID::parse (const char *s)
		146	{
		147	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		148	return false;
		149
		150	seq = 0;
		151
		152	while (*s != '>')
		153	{
		154	if (*s < '0')
		155	return false;
		156
		157	// this gives nice branchless code with gcc
		158	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		159	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		160
		161	seq = (seq << 4) | digit;
		162
		163	++s;
		164	}
		165
		166	return true;
		167	}
		168
		169	char *
		170	UUID::append (char *buf) const
		171	{
		172	*buf++ = '<';
		173	*buf++ = '1';
		174	*buf++ = '.';
		175
		176	uint64_t seq = this->seq;
		177	const int bits = 64;
		178	char nz = 0;
		179	static const char tohex [] = "0123456789abcdef";
		180
		181	// assert (len >= 3 + bits / 4 + 1 + 1);
		182	for (int i = bits / 4; --i; )
		183	{
		184	uint8_t digit = seq >> (bits - 4);
		185
		186	*buf = tohex [digit];
		187	nz |= digit;
		188	buf += nz ? 1 : 0;
		189	seq <<= 4;
		190	}
		191
		192	// last digit is special - always emit
		193	uint8_t digit = seq >> (bits - 4);
		194	*buf++ = tohex [digit];
		195
		196	*buf++ = '>';
		197
		198	return buf;
		199	}
		200
		201	char *
		202	UUID::c_str () const
		203	{
		204	static char buf [MAX_LEN];
		205	*append (buf) = 0;
		206	return buf;
143	}	207	}
144		208
145	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	209	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
146	static bool	210	static bool
147	compare_ob_value_lists_one (const object *wants, const object *has)	211	compare_ob_value_lists_one (const object *wants, const object *has)
148	{	212	{
149	key_value *wants_field;
150
151	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	213	/* n-squared behaviour (see kv_get), but I'm hoping both
152	* objects with lists are rare, and lists stay short. If not, use a	214	* objects with lists are rare, and lists stay short. If not, use a
153	* different structure or at least keep the lists sorted...	215	* different structure or at least keep the lists sorted...
154	*/	216	*/
155		217
156	/* For each field in wants, */	218	/* For each field in wants, */
157	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	219	for (key_value *kv = wants->key_values; kv; kv = kv->next)
158	{	220	if (has->kv_get (kv->key) != kv->value)
159	key_value *has_field;	221	return false;
160
161	/* Look for a field in has with the same key. */
162	has_field = get_ob_key_link (has, wants_field->key);
163
164	if (!has_field)
165	return 0; /* No field with that name. */
166
167	/* Found the matching field. */
168	if (has_field->value != wants_field->value)
169	return 0; /* Values don't match, so this half of the comparison is false. */
170
171	/* If we get here, we found a match. Now for the next field in wants. */
172	}
173		222
174	/* If we get here, every field in wants has a matching field in has. */	223	/* If we get here, every field in wants has a matching field in has. */
175	return 1;	224	return true;
176	}	225	}
177		226
178	/* Returns TRUE if ob1 has the same key_values as ob2. */	227	/* Returns TRUE if ob1 has the same key_values as ob2. */
179	static bool	228	static bool
180	compare_ob_value_lists (const object *ob1, const object *ob2)	229	compare_ob_value_lists (const object *ob1, const object *ob2)
181	{	230	{
182	/* However, there may be fields in has which aren't partnered in wants,	231	/* However, there may be fields in has which aren't partnered in wants,
183	* so we need to run the comparison *twice*. :(	232	* so we need to run the comparison *twice*. :(
184	*/	233	*/
185	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	234	return compare_ob_value_lists_one (ob1, ob2)
		235	&& compare_ob_value_lists_one (ob2, ob1);
186	}	236	}
187		237
188	/* Function examines the 2 objects given to it, and returns true if	238	/* Function examines the 2 objects given to it, and returns true if
189	* they can be merged together.	239	* they can be merged together.
190	*	240	*
…		…
197	* Improvements made with merge: Better checking on potion, and also	247	* Improvements made with merge: Better checking on potion, and also
198	* check weight	248	* check weight
199	*/	249	*/
200	bool object::can_merge_slow (object *ob1, object *ob2)	250	bool object::can_merge_slow (object *ob1, object *ob2)
201	{	251	{
202	/* A couple quicksanity checks */	252	/* A couple quick sanity checks */
203	if (ob1 == ob2	253	if (ob1 == ob2
204	|| ob1->type != ob2->type	254	|| ob1->type != ob2->type
205	|| ob1->speed != ob2->speed
206	|| ob1->value != ob2->value	255	|| ob1->value != ob2->value
207	|| ob1->name != ob2->name)	256	|| ob1->name != ob2->name
		257	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
208	return 0;	258	return 0;
209		259
210	/* Do not merge objects if nrof would overflow. First part checks	260	/* Do not merge objects if nrof would overflow, assume nrof
211	* for unsigned overflow (2c), second part checks wether the result	261	* is always 0 .. 2**31-1 */
212	* would fit into a 32 bit signed int, which is often used to hold	262	if (ob1->nrof > 0x7fffffff - ob2->nrof)
213	* nrof values.
214	*/
215	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
216	return 0;	263	return 0;
217		264
218	/* If the objects have been identified, set the BEEN_APPLIED flag.	265	/* If the objects have been identified, set the BEEN_APPLIED flag.
219	* This is to the comparison of the flags below will be OK. We	266	* This is to the comparison of the flags below will be OK. We
220	* just can't ignore the been applied or identified flags, as they	267	* just can't ignore the been applied or identified flags, as they
…		…
225	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	272	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
226		273
227	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	274	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
228	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	275	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
229		276
230	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	277	if (ob1->arch->archname != ob2->arch->archname
231	|| ob1->arch != ob2->arch
232	|| ob1->name != ob2->name	278	|| ob1->name != ob2->name
233	|| ob1->title != ob2->title	279	|| ob1->title != ob2->title
234	|| ob1->msg != ob2->msg	280	|| ob1->msg != ob2->msg
235	|| ob1->weight != ob2->weight	281	|| ob1->weight != ob2->weight
236	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	|| ob1->attacktype != ob2->attacktype	282	|| ob1->attacktype != ob2->attacktype
239	|| ob1->magic != ob2->magic	283	|| ob1->magic != ob2->magic
240	|| ob1->slaying != ob2->slaying	284	|| ob1->slaying != ob2->slaying
241	|| ob1->skill != ob2->skill	285	|| ob1->skill != ob2->skill
242	|| ob1->value != ob2->value	286	|| ob1->value != ob2->value
243	|| ob1->animation_id != ob2->animation_id	287	|| ob1->animation_id != ob2->animation_id
		288	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
244	|| ob1->client_type != ob2->client_type	289	|| ob1->client_type != ob2->client_type
245	|| ob1->materialname != ob2->materialname	290	|| ob1->material != ob2->material
246	|| ob1->lore != ob2->lore	291	|| ob1->lore != ob2->lore
247	|| ob1->subtype != ob2->subtype	292	|| ob1->subtype != ob2->subtype
248	|| ob1->move_type != ob2->move_type	293	|| ob1->move_type != ob2->move_type
249	|| ob1->move_block != ob2->move_block	294	|| ob1->move_block != ob2->move_block
250	|| ob1->move_allow != ob2->move_allow	295	|| ob1->move_allow != ob2->move_allow
251	|| ob1->move_on != ob2->move_on	296	|| ob1->move_on != ob2->move_on
252	|| ob1->move_off != ob2->move_off	297	|| ob1->move_off != ob2->move_off
253	|| ob1->move_slow != ob2->move_slow	298	|| ob1->move_slow != ob2->move_slow
254	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	299	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
		300	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		301	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
		302	return 0;
		303
		304	if ((ob1->flag ^ ob2->flag)
		305	.reset (FLAG_INV_LOCKED)
		306	.reset (FLAG_REMOVED)
		307	.any ())
255	return 0;	308	return 0;
256		309
257	/* This is really a spellbook check - we should in general	310	/* This is really a spellbook check - we should in general
258	* not merge objects with real inventories, as splitting them	311	* not merge objects with real inventories, as splitting them
259	* is hard.	312	* is hard.
…		…
298		351
299	if (ob1->key_values || ob2->key_values)	352	if (ob1->key_values || ob2->key_values)
300	{	353	{
301	/* At least one of these has key_values. */	354	/* At least one of these has key_values. */
302	if ((!ob1->key_values) != (!ob2->key_values))	355	if ((!ob1->key_values) != (!ob2->key_values))
303	/* One has fields, but the other one doesn't. */	356	return 0; /* One has fields, but the other one doesn't. */
304	return 0;	357
305	else if (!compare_ob_value_lists (ob1, ob2))	358	if (!compare_ob_value_lists (ob1, ob2))
306	return 0;	359	return 0;
307	}	360	}
308		361
309	if (ob1->self || ob2->self)	362	if (ob1->self || ob2->self)
310	{	363	{
…		…
316	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	369	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
317	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	370	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
318		371
319	if (k1 != k2)	372	if (k1 != k2)
320	return 0;	373	return 0;
		374
321	else if (k1 == 0)	375	if (k1 == 0)
322	return 1;	376	return 1;
		377
323	else if (!cfperl_can_merge (ob1, ob2))	378	if (!cfperl_can_merge (ob1, ob2))
324	return 0;	379	return 0;
325	}	380	}
326	}	381	}
327		382
328	/* Everything passes, must be OK. */	383	/* Everything passes, must be OK. */
329	return 1;	384	return 1;
330	}	385	}
331		386
		387	// find player who can see this object
		388	object *
		389	object::visible_to () const
		390	{
		391	if (client_visible () && !flag [FLAG_REMOVED])
		392	{
		393	// see if we are in a container of sorts
		394	if (env)
		395	{
		396	// the player inventory itself is always visible
		397	if (env->is_player ())
		398	return env;
		399
		400	// else a player could have our env open
		401	object *envest = env->outer_env_or_self ();
		402
		403	// the player itself is always on a map, so we will find him here
		404	// even if our inv is in a player.
		405	if (envest->is_on_map ())
		406	if (object *pl = envest->ms ().player ())
		407	if (pl->container_ () == env)
		408	return pl;
		409	}
		410	else
		411	{
		412	// maybe there is a player standing on the same mapspace
		413	// this will catch the case where "this" is a player
		414	if (object *pl = ms ().player ())
		415	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		416	|| pl->container_ () == this)
		417	return pl;
		418	}
		419	}
		420
		421	return 0;
		422	}
		423
		424	// adjust weight per container type ("of holding")
332	static sint32	425	static sint32
333	weight_adjust (object *op, sint32 weight)	426	weight_adjust_for (object *op, sint32 weight)
334	{	427	{
335	return op->type == CONTAINER	428	return op->type == CONTAINER
336	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	429	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
337	: weight;	430	: weight;
338	}	431	}
339		432
340	/*	433	/*
341	* add_weight(object, weight) adds the specified weight to an object,	434	* adjust_weight(object, weight) adds the specified weight to an object,
342	* and also updates how much the environment(s) is/are carrying.	435	* and also updates how much the environment(s) is/are carrying.
343	*/	436	*/
344	static void	437	static void
345	add_weight (object *op, sint32 weight)	438	adjust_weight (object *op, sint32 weight)
346	{	439	{
347	while (op)	440	while (op)
348	{	441	{
		442	// adjust by actual difference to account for rounding errors
		443	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
349	weight = weight_adjust (op, weight);	444	weight = weight_adjust_for (op, op->carrying)
		445	- weight_adjust_for (op, op->carrying - weight);
		446
		447	if (!weight)
		448	return;
350		449
351	op->carrying += weight;	450	op->carrying += weight;
		451
		452	if (object *pl = op->visible_to ())
		453	if (pl != op) // player is handled lazily
		454	esrv_update_item (UPD_WEIGHT, pl, op);
		455
352	op = op->env;	456	op = op->env;
353	}	457	}
354	}
355
356	/*
357	* sub_weight() recursively (outwards) subtracts a number from the
358	* weight of an object (and what is carried by it's environment(s)).
359	*/
360	static void
361	sub_weight (object *op, long weight)
362	{
363	add_weight (op, -weight);
364	}	458	}
365		459
366	/*	460	/*
367	* this is a recursive function which calculates the weight	461	* this is a recursive function which calculates the weight
368	* an object is carrying. It goes through op and figures out how much	462	* an object is carrying. It goes through op and figures out how much
…		…
379	op->update_weight ();	473	op->update_weight ();
380		474
381	sum += op->total_weight ();	475	sum += op->total_weight ();
382	}	476	}
383		477
384	carrying = weight_adjust (this, sum);	478	sum = weight_adjust_for (this, sum);
385	}
386		479
		480	if (sum != carrying)
		481	{
		482	carrying = sum;
		483
		484	if (object *pl = visible_to ())
		485	if (pl != this) // player is handled lazily
		486	esrv_update_item (UPD_WEIGHT, pl, this);
		487	}
		488	}
		489
387	/*	490	/*
388	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	491	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
389	* Some error messages.
390	* The result of the dump is stored in the static global errmsg array.
391	*/	492	*/
392	char *	493	char *
393	dump_object (object *op)	494	dump_object (object *op)
394	{	495	{
395	if (!op)	496	if (!op)
…		…
398	object_freezer freezer;	499	object_freezer freezer;
399	op->write (freezer);	500	op->write (freezer);
400	return freezer.as_string ();	501	return freezer.as_string ();
401	}	502	}
402		503
403	/*	504	char *
404	* get_nearest_part(multi-object, object 2) returns the part of the	505	object::as_string ()
405	* multi-object 1 which is closest to the second object.
406	* If it's not a multi-object, it is returned.
407	*/
408	object *
409	get_nearest_part (object *op, const object *pl)
410	{	506	{
411	object *tmp, *closest;	507	return dump_object (this);
412	int last_dist, i;
413
414	if (op->more == NULL)
415	return op;
416	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
417	if ((i = distance (tmp, pl)) < last_dist)
418	closest = tmp, last_dist = i;
419	return closest;
420	}	508	}
421		509
422	/*	510	/*
423	* Returns the object which has the count-variable equal to the argument.	511	* Returns the object which has the count-variable equal to the argument.
		512	* VERRRY slow.
424	*/	513	*/
425	object *	514	object *
426	find_object (tag_t i)	515	find_object (tag_t i)
427	{	516	{
428	for_all_objects (op)	517	for_all_objects (op)
…		…
431		520
432	return 0;	521	return 0;
433	}	522	}
434		523
435	/*	524	/*
		525	* Returns the object which has the uuid equal to the argument.
		526	* MOAR VERRRY slow.
		527	*/
		528
		529	object *
		530	find_object_uuid (UUID i)
		531	{
		532	for_all_objects (op)
		533	if (op->uuid == i)
		534	return op;
		535
		536	return 0;
		537	}
		538
		539	/*
436	* Returns the first object which has a name equal to the argument.	540	* Returns the first object which has a name equal to the argument.
437	* Used only by the patch command, but not all that useful.	541	* Used only by the patch command, but not all that useful.
438	* Enables features like "patch <name-of-other-player> food 999"	542	* Enables features like "patch <name-of-other-player> food 999"
439	*/	543	*/
440	object *	544	object *
441	find_object_name (const char *str)	545	find_object_name (const char *str)
442	{	546	{
443	shstr_cmp str_ (str);	547	shstr_cmp str_ (str);
444	object *op;
445		548
		549	if (str_)
446	for_all_objects (op)	550	for_all_objects (op)
447	if (op->name == str_)	551	if (op->name == str_)
448	break;	552	return op;
449		553
450	return op;	554	return 0;
451	}	555	}
452		556
453	/*	557	/*
454	* Sets the owner and sets the skill and exp pointers to owner's current	558	* Sets the owner and sets the skill and exp pointers to owner's current
455	* skill and experience objects.	559	* skill and experience objects.
…		…
517	update_stats ();	621	update_stats ();
518		622
519	new_draw_info_format (NDI_UNIQUE, 0, this,	623	new_draw_info_format (NDI_UNIQUE, 0, this,
520	"You try to balance all your items at once, "	624	"You try to balance all your items at once, "
521	"but the %s is just too much for your body. "	625	"but the %s is just too much for your body. "
522	"[You need to unapply some items first.]", &ob->name);	626	"[You need to unapply some items first - use the 'body' command to see "
		627	"how many items you cna wera on a specific body part.]", &ob->name);
523	return false;	628	return false;
524	}	629	}
525		630
526	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	631	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
527	}	632	}
…		…
553	}	658	}
554		659
555	op->key_values = 0;	660	op->key_values = 0;
556	}	661	}
557		662
558	object &	663	/*
559	object::operator =(const object &src)	664	* copy_to first frees everything allocated by the dst object,
		665	* and then copies the contents of itself into the second
		666	* object, allocating what needs to be allocated. Basically, any
		667	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		668	* if the first object is freed, the pointers in the new object
		669	* will point at garbage.
		670	*/
		671	void
		672	object::copy_to (object *dst)
560	{	673	{
561	bool is_freed = flag [FLAG_FREED];	674	dst->remove ();
562	bool is_removed = flag [FLAG_REMOVED];
563
564	*(object_copy *)this = src;	675	*(object_copy *)dst = *this;
565
566	flag [FLAG_FREED] = is_freed;
567	flag [FLAG_REMOVED] = is_removed;	676	dst->flag [FLAG_REMOVED] = true;
568		677
569	/* Copy over key_values, if any. */	678	/* Copy over key_values, if any. */
570	if (src.key_values)	679	if (key_values)
571	{	680	{
572	key_value *tail = 0;	681	key_value *tail = 0;
573	key_values = 0;	682	dst->key_values = 0;
574		683
575	for (key_value *i = src.key_values; i; i = i->next)	684	for (key_value *i = key_values; i; i = i->next)
576	{	685	{
577	key_value *new_link = new key_value;	686	key_value *new_link = new key_value;
578		687
579	new_link->next = 0;	688	new_link->next = 0;
580	new_link->key = i->key;	689	new_link->key = i->key;
581	new_link->value = i->value;	690	new_link->value = i->value;
582		691
583	/* Try and be clever here, too. */	692	/* Try and be clever here, too. */
584	if (!key_values)	693	if (!dst->key_values)
585	{	694	{
586	key_values = new_link;	695	dst->key_values = new_link;
587	tail = new_link;	696	tail = new_link;
588	}	697	}
589	else	698	else
590	{	699	{
591	tail->next = new_link;	700	tail->next = new_link;
592	tail = new_link;	701	tail = new_link;
593	}	702	}
594	}	703	}
595	}	704	}
596	}
597		705
598	/*	706	dst->activate ();
599	* copy_to first frees everything allocated by the dst object,
600	* and then copies the contents of itself into the second
601	* object, allocating what needs to be allocated. Basically, any
602	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
603	* if the first object is freed, the pointers in the new object
604	* will point at garbage.
605	*/
606	void
607	object::copy_to (object *dst)
608	{
609	*dst = *this;
610
611	if (speed < 0)
612	dst->speed_left -= rndm ();
613
614	dst->set_speed (dst->speed);
615	}	707	}
616		708
617	void	709	void
618	object::instantiate ()	710	object::instantiate ()
619	{	711	{
620	if (!uuid.seq) // HACK	712	if (!uuid.seq) // HACK
621	uuid = UUID::gen ();	713	uuid = UUID::gen ();
622		714
		715	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		716	if (flag [FLAG_RANDOM_SPEED] && speed)
		717	speed_left = - speed - rndm (); // TODO animation
		718	else
623	speed_left = -0.1f;	719	speed_left = -1.;
		720
624	/* copy the body_info to the body_used - this is only really	721	/* copy the body_info to the body_used - this is only really
625	* need for monsters, but doesn't hurt to do it for everything.	722	* need for monsters, but doesn't hurt to do it for everything.
626	* by doing so, when a monster is created, it has good starting	723	* by doing so, when a monster is created, it has good starting
627	* values for the body_used info, so when items are created	724	* values for the body_used info, so when items are created
628	* for it, they can be properly equipped.	725	* for it, they can be properly equipped.
…		…
636	object *	733	object *
637	object::clone ()	734	object::clone ()
638	{	735	{
639	object *neu = create ();	736	object *neu = create ();
640	copy_to (neu);	737	copy_to (neu);
		738
		739	// TODO: unclean state changes, should not be done in clone AND instantiate
		740	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		741	neu->speed_left = - neu->speed - rndm (); // TODO animation
		742
		743	neu->map = map; // not copied by copy_to
641	return neu;	744	return neu;
642	}	745	}
643		746
644	/*	747	/*
645	* If an object with the IS_TURNABLE() flag needs to be turned due	748	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
662	* This function needs to be called whenever the speed of an object changes.	765	* This function needs to be called whenever the speed of an object changes.
663	*/	766	*/
664	void	767	void
665	object::set_speed (float speed)	768	object::set_speed (float speed)
666	{	769	{
667	if (flag [FLAG_FREED] && speed)
668	{
669	LOG (llevError, "Object %s is freed but has speed.\n", &name);
670	speed = 0;
671	}
672
673	this->speed = speed;	770	this->speed = speed;
674		771
675	if (has_active_speed ())	772	if (has_active_speed ())
676	activate ();	773	activate ();
677	else	774	else
…		…
696	* UP_OBJ_FACE: only the objects face has changed.	793	* UP_OBJ_FACE: only the objects face has changed.
697	*/	794	*/
698	void	795	void
699	update_object (object *op, int action)	796	update_object (object *op, int action)
700	{	797	{
701	if (op == NULL)	798	if (!op)
702	{	799	{
703	/* this should never happen */	800	/* this should never happen */
704	LOG (llevDebug, "update_object() called for NULL object.\n");	801	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
705	return;	802	return;
706	}	803	}
707		804
708	if (op->env)	805	if (!op->is_on_map ())
709	{	806	{
710	/* Animation is currently handled by client, so nothing	807	/* Animation is currently handled by client, so nothing
711	* to do in this case.	808	* to do in this case.
712	*/	809	*/
713	return;	810	return;
714	}	811	}
715
716	/* If the map is saving, don't do anything as everything is
717	* going to get freed anyways.
718	*/
719	if (!op->map || op->map->in_memory == MAP_SAVING)
720	return;
721		812
722	/* make sure the object is within map boundaries */	813	/* make sure the object is within map boundaries */
723	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	814	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
724	{	815	{
725	LOG (llevError, "update_object() called for object out of map!\n");	816	LOG (llevError, "update_object() called for object out of map!\n");
…		…
733		824
734	if (!(m.flags_ & P_UPTODATE))	825	if (!(m.flags_ & P_UPTODATE))
735	/* nop */;	826	/* nop */;
736	else if (action == UP_OBJ_INSERT)	827	else if (action == UP_OBJ_INSERT)
737	{	828	{
		829	#if 0
738	// this is likely overkill, TODO: revisit (schmorp)	830	// this is likely overkill, TODO: revisit (schmorp)
739	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	831	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
740	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	832	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
741	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	833	|| (op->is_player () && !(m.flags_ & P_PLAYER))
742	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	834	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
743	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	835	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
744	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	836	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
745	|| (m.move_on | op->move_on ) != m.move_on	837	|| (m.move_on | op->move_on ) != m.move_on
746	|| (m.move_off | op->move_off ) != m.move_off	838	|| (m.move_off | op->move_off ) != m.move_off
747	|| (m.move_slow | op->move_slow) != m.move_slow	839	|| (m.move_slow | op->move_slow) != m.move_slow
748	/* This isn't perfect, but I don't expect a lot of objects to	840	/* This isn't perfect, but I don't expect a lot of objects to
749	* to have move_allow right now.	841	* have move_allow right now.
750	*/	842	*/
751	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	843	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		844	m.invalidate ();
		845	#else
752	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	846	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
753	m.flags_ = 0;	847	m.invalidate ();
		848	#endif
754	}	849	}
755	/* if the object is being removed, we can't make intelligent	850	/* if the object is being removed, we can't make intelligent
756	* decisions, because remove_ob can't really pass the object	851	* decisions, because remove_ob can't really pass the object
757	* that is being removed.	852	* that is being removed.
758	*/	853	*/
759	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	854	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
760	m.flags_ = 0;	855	m.invalidate ();
761	else if (action == UP_OBJ_FACE)	856	else if (action == UP_OBJ_FACE)
762	/* Nothing to do for that case */ ;	857	/* Nothing to do for that case */ ;
763	else	858	else
764	LOG (llevError, "update_object called with invalid action: %d\n", action);	859	LOG (llevError, "update_object called with invalid action: %d\n", action);
765		860
…		…
769		864
770	object::object ()	865	object::object ()
771	{	866	{
772	SET_FLAG (this, FLAG_REMOVED);	867	SET_FLAG (this, FLAG_REMOVED);
773		868
774	expmul = 1.0;	869	//expmul = 1.0; declared const for the time being
775	face = blank_face;	870	face = blank_face;
		871	material = MATERIAL_NULL;
776	}	872	}
777		873
778	object::~object ()	874	object::~object ()
779	{	875	{
780	unlink ();	876	unlink ();
…		…
809	/* If already on active list, don't do anything */	905	/* If already on active list, don't do anything */
810	if (active)	906	if (active)
811	return;	907	return;
812		908
813	if (has_active_speed ())	909	if (has_active_speed ())
		910	{
		911	if (flag [FLAG_FREED])
		912	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		913
814	actives.insert (this);	914	actives.insert (this);
		915	}
815	}	916	}
816		917
817	void	918	void
818	object::activate_recursive ()	919	object::activate_recursive ()
819	{	920	{
…		…
868	object::destroy_inv (bool drop_to_ground)	969	object::destroy_inv (bool drop_to_ground)
869	{	970	{
870	// need to check first, because the checks below might segfault	971	// need to check first, because the checks below might segfault
871	// as we might be on an invalid mapspace and crossfire code	972	// as we might be on an invalid mapspace and crossfire code
872	// is too buggy to ensure that the inventory is empty.	973	// is too buggy to ensure that the inventory is empty.
873	// corollary: if you create arrows etc. with stuff in tis inventory,	974	// corollary: if you create arrows etc. with stuff in its inventory,
874	// cf will crash below with off-map x and y	975	// cf will crash below with off-map x and y
875	if (!inv)	976	if (!inv)
876	return;	977	return;
877		978
878	/* Only if the space blocks everything do we not process -	979	/* Only if the space blocks everything do we not process -
…		…
880	* drop on that space.	981	* drop on that space.
881	*/	982	*/
882	if (!drop_to_ground	983	if (!drop_to_ground
883	|| !map	984	|| !map
884	|| map->in_memory != MAP_ACTIVE	985	|| map->in_memory != MAP_ACTIVE
885	|| map->nodrop	986	|| map->no_drop
886	|| ms ().move_block == MOVE_ALL)	987	|| ms ().move_block == MOVE_ALL)
887	{	988	{
888	while (inv)	989	while (inv)
889	{
890	inv->destroy_inv (drop_to_ground);
891	inv->destroy ();	990	inv->destroy ();
892	}
893	}	991	}
894	else	992	else
895	{ /* Put objects in inventory onto this space */	993	{ /* Put objects in inventory onto this space */
896	while (inv)	994	while (inv)
897	{	995	{
…		…
915	object *op = new object;	1013	object *op = new object;
916	op->link ();	1014	op->link ();
917	return op;	1015	return op;
918	}	1016	}
919		1017
		1018	static struct freed_map : maptile
		1019	{
		1020	freed_map ()
		1021	{
		1022	path = "<freed objects map>";
		1023	name = "/internal/freed_objects_map";
		1024	width = 3;
		1025	height = 3;
		1026	no_drop = 1;
		1027	no_reset = 1;
		1028
		1029	alloc ();
		1030	in_memory = MAP_ACTIVE;
		1031	}
		1032
		1033	~freed_map ()
		1034	{
		1035	destroy ();
		1036	}
		1037	} freed_map; // freed objects are moved here to avoid crashes
		1038
920	void	1039	void
921	object::do_destroy ()	1040	object::do_destroy ()
922	{	1041	{
923	attachable::do_destroy ();
924
925	if (flag [FLAG_IS_LINKED])	1042	if (flag [FLAG_IS_LINKED])
926	remove_button_link (this);	1043	remove_link ();
927		1044
928	if (flag [FLAG_FRIENDLY])	1045	if (flag [FLAG_FRIENDLY])
929	remove_friendly_object (this);	1046	remove_friendly_object (this);
930		1047
931	if (!flag [FLAG_REMOVED])
932	remove ();	1048	remove ();
933		1049
934	destroy_inv (true);	1050	attachable::do_destroy ();
935		1051
936	deactivate ();	1052	deactivate ();
937	unlink ();	1053	unlink ();
938		1054
939	flag [FLAG_FREED] = 1;	1055	flag [FLAG_FREED] = 1;
940		1056
941	// hack to ensure that freed objects still have a valid map	1057	// hack to ensure that freed objects still have a valid map
942	{
943	static maptile *freed_map; // freed objects are moved here to avoid crashes
944
945	if (!freed_map)
946	{
947	freed_map = new maptile;
948
949	freed_map->path = "<freed objects map>";
950	freed_map->name = "/internal/freed_objects_map";
951	freed_map->width = 3;
952	freed_map->height = 3;
953	freed_map->nodrop = 1;
954
955	freed_map->alloc ();
956	freed_map->in_memory = MAP_ACTIVE;
957	}
958
959	map = freed_map;	1058	map = &freed_map;
960	x = 1;	1059	x = 1;
961	y = 1;	1060	y = 1;
962	}
963		1061
964	if (more)	1062	if (more)
965	{	1063	{
966	more->destroy ();	1064	more->destroy ();
967	more = 0;	1065	more = 0;
…		…
975	attacked_by = 0;	1073	attacked_by = 0;
976	current_weapon = 0;	1074	current_weapon = 0;
977	}	1075	}
978		1076
979	void	1077	void
980	object::destroy (bool destroy_inventory)	1078	object::destroy ()
981	{	1079	{
982	if (destroyed ())	1080	if (destroyed ())
983	return;	1081	return;
984		1082
985	if (destroy_inventory)	1083	if (!is_head () && !head->destroyed ())
		1084	{
		1085	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1086	head->destroy ();
		1087	return;
		1088	}
		1089
986	destroy_inv (false);	1090	destroy_inv (false);
987		1091
988	if (is_head ())	1092	if (is_head ())
989	if (sound_destroy)	1093	if (sound_destroy)
990	play_sound (sound_destroy);	1094	play_sound (sound_destroy);
991	else if (flag [FLAG_MONSTER])	1095	else if (flag [FLAG_MONSTER])
…		…
1002	* the previous environment.	1106	* the previous environment.
1003	*/	1107	*/
1004	void	1108	void
1005	object::do_remove ()	1109	object::do_remove ()
1006	{	1110	{
1007	object *tmp, *last = 0;	1111	if (flag [FLAG_REMOVED])
1008	object *otmp;
1009
1010	if (QUERY_FLAG (this, FLAG_REMOVED))
1011	return;	1112	return;
1012		1113
1013	SET_FLAG (this, FLAG_REMOVED);
1014	INVOKE_OBJECT (REMOVE, this);	1114	INVOKE_OBJECT (REMOVE, this);
		1115
		1116	flag [FLAG_REMOVED] = true;
1015		1117
1016	if (more)	1118	if (more)
1017	more->remove ();	1119	more->remove ();
1018		1120
1019	/*	1121	/*
1020	* In this case, the object to be removed is in someones	1122	* In this case, the object to be removed is in someones
1021	* inventory.	1123	* inventory.
1022	*/	1124	*/
1023	if (env)	1125	if (env)
1024	{	1126	{
1025	if (nrof)	1127	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1026	sub_weight (env, weight * nrof);	1128	if (object *pl = visible_to ())
1027	else	1129	esrv_del_item (pl->contr, count);
1028	sub_weight (env, weight + carrying);	1130	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1029		1131
1030	/* NO_FIX_PLAYER is set when a great many changes are being	1132	adjust_weight (env, -total_weight ());
1031	* made to players inventory. If set, avoiding the call
1032	* to save cpu time.
1033	*/
1034	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1035	otmp->update_stats ();
1036		1133
1037	if (above)	1134	object *pl = in_player ();
1038	above->below = below;
1039	else
1040	env->inv = below;
1041
1042	if (below)
1043	below->above = above;
1044		1135
1045	/* we set up values so that it could be inserted into	1136	/* we set up values so that it could be inserted into
1046	* the map, but we don't actually do that - it is up	1137	* the map, but we don't actually do that - it is up
1047	* to the caller to decide what we want to do.	1138	* to the caller to decide what we want to do.
1048	*/	1139	*/
1049	x = env->x, y = env->y;
1050	map = env->map;	1140	map = env->map;
1051	above = 0, below = 0;	1141	x = env->x;
		1142	y = env->y;
		1143
		1144	// make sure cmov optimisation is applicable
		1145	*(above ? &above->below : &env->inv) = below;
		1146	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1147
		1148	above = 0;
		1149	below = 0;
1052	env = 0;	1150	env = 0;
		1151
		1152	if (pl && pl->is_player ())
		1153	{
		1154	pl->contr->queue_stats_update ();
		1155
		1156	if (glow_radius && pl->is_on_map ())
		1157	update_all_los (pl->map, pl->x, pl->y);
		1158	}
1053	}	1159	}
1054	else if (map)	1160	else if (map)
1055	{	1161	{
1056	if (type == PLAYER)
1057	{
1058	// leaving a spot always closes any open container on the ground
1059	if (container && !container->env)
1060	// this causes spurious floorbox updates, but it ensures
1061	// that the CLOSE event is being sent.
1062	close_container ();
1063
1064	--map->players;
1065	map->touch ();
1066	}
1067
1068	map->dirty = true;	1162	map->dirty = true;
1069	mapspace &ms = this->ms ();	1163	mapspace &ms = this->ms ();
1070		1164
		1165	if (object *pl = ms.player ())
		1166	{
		1167	if (is_player ())
		1168	{
		1169	if (!flag [FLAG_WIZPASS])
		1170	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1171
		1172	// leaving a spot always closes any open container on the ground
		1173	if (container && !container->env)
		1174	// this causes spurious floorbox updates, but it ensures
		1175	// that the CLOSE event is being sent.
		1176	close_container ();
		1177
		1178	--map->players;
		1179	map->touch ();
		1180	}
		1181	else if (pl->container_ () == this)
		1182	{
		1183	// removing a container should close it
		1184	close_container ();
		1185	}
		1186
		1187	esrv_del_item (pl->contr, count);
		1188	}
		1189
1071	/* link the object above us */	1190	/* link the object above us */
1072	if (above)	1191	// re-link, make sure compiler can easily use cmove
1073	above->below = below;	1192	*(above ? &above->below : &ms.top) = below;
1074	else	1193	*(below ? &below->above : &ms.bot) = above;
1075	ms.top = below; /* we were top, set new top */
1076
1077	/* Relink the object below us, if there is one */
1078	if (below)
1079	below->above = above;
1080	else
1081	{
1082	/* Nothing below, which means we need to relink map object for this space
1083	* use translated coordinates in case some oddness with map tiling is
1084	* evident
1085	*/
1086	if (GET_MAP_OB (map, x, y) != this)
1087	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 ());
1088
1089	ms.bot = above; /* goes on above it. */
1090	}
1091		1194
1092	above = 0;	1195	above = 0;
1093	below = 0;	1196	below = 0;
1094		1197
		1198	ms.invalidate ();
		1199
1095	if (map->in_memory == MAP_SAVING)	1200	if (map->in_memory == MAP_SAVING)
1096	return;	1201	return;
1097		1202
1098	int check_walk_off = !flag [FLAG_NO_APPLY];	1203	int check_walk_off = !flag [FLAG_NO_APPLY];
1099		1204
1100	if (object *pl = ms.player ())	1205	if (object *pl = ms.player ())
1101	{	1206	{
1102	if (pl->container == this)	1207	if (pl->container_ () == this)
1103	/* If a container that the player is currently using somehow gets	1208	/* If a container that the player is currently using somehow gets
1104	* removed (most likely destroyed), update the player view	1209	* removed (most likely destroyed), update the player view
1105	* appropriately.	1210	* appropriately.
1106	*/	1211	*/
1107	pl->close_container ();	1212	pl->close_container ();
1108		1213
		1214	//TODO: the floorbox prev/next might need updating
		1215	//esrv_del_item (pl->contr, count);
		1216	//TODO: update floorbox to preserve ordering
		1217	if (pl->contr->ns)
1109	pl->contr->ns->floorbox_update ();	1218	pl->contr->ns->floorbox_update ();
1110	}	1219	}
1111		1220
		1221	if (check_walk_off)
1112	for (tmp = ms.bot; tmp; tmp = tmp->above)	1222	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1113	{	1223	{
		1224	above = tmp->above;
		1225
1114	/* No point updating the players look faces if he is the object	1226	/* No point updating the players look faces if he is the object
1115	* being removed.	1227	* being removed.
1116	*/	1228	*/
1117		1229
1118	/* See if object moving off should effect something */	1230	/* See if object moving off should effect something */
1119	if (check_walk_off
1120	&& ((move_type & tmp->move_off)	1231	if ((move_type & tmp->move_off)
1121	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1232	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1122	{
1123	move_apply (tmp, this, 0);	1233	move_apply (tmp, this, 0);
1124
1125	if (destroyed ())
1126	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1127	}	1234	}
1128		1235
1129	last = tmp;	1236	if (affects_los ())
1130	}
1131
1132	/* last == NULL if there are no objects on this space */
1133	//TODO: this makes little sense, why only update the topmost object?
1134	if (!last)
1135	map->at (x, y).flags_ = 0;
1136	else
1137	update_object (last, UP_OBJ_REMOVE);
1138
1139	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1140	update_all_los (map, x, y);	1237	update_all_los (map, x, y);
1141	}	1238	}
1142	}	1239	}
1143		1240
1144	/*	1241	/*
…		…
1158	if (!top)	1255	if (!top)
1159	for (top = op; top && top->above; top = top->above)	1256	for (top = op; top && top->above; top = top->above)
1160	;	1257	;
1161		1258
1162	for (; top; top = top->below)	1259	for (; top; top = top->below)
1163	{
1164	if (top == op)
1165	continue;
1166
1167	if (object::can_merge (op, top))	1260	if (object::can_merge (op, top))
1168	{	1261	{
1169	top->nrof += op->nrof;	1262	top->nrof += op->nrof;
1170		1263
1171	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1264	if (object *pl = top->visible_to ())
1172	op->weight = 0; /* Don't want any adjustements now */	1265	esrv_update_item (UPD_NROF, pl, top);
		1266
		1267	op->weight = 0; // cancel the addition above
		1268	op->carrying = 0; // must be 0 already
		1269
1173	op->destroy ();	1270	op->destroy ();
		1271
1174	return top;	1272	return top;
1175	}	1273	}
1176	}
1177		1274
1178	return 0;	1275	return 0;
1179	}	1276	}
1180		1277
1181	void	1278	void
…		…
1186		1283
1187	object *prev = this;	1284	object *prev = this;
1188		1285
1189	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1286	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1190	{	1287	{
1191	object *op = arch_to_object (at);	1288	object *op = at->instance ();
1192		1289
1193	op->name = name;	1290	op->name = name;
1194	op->name_pl = name_pl;	1291	op->name_pl = name_pl;
1195	op->title = title;	1292	op->title = title;
1196		1293
…		…
1206	* job preparing multi-part monsters.	1303	* job preparing multi-part monsters.
1207	*/	1304	*/
1208	object *	1305	object *
1209	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1306	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1210	{	1307	{
		1308	op->remove ();
		1309
1211	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1310	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1212	{	1311	{
1213	tmp->x = x + tmp->arch->x;	1312	tmp->x = x + tmp->arch->x;
1214	tmp->y = y + tmp->arch->y;	1313	tmp->y = y + tmp->arch->y;
1215	}	1314	}
…		…
1232	* Passing 0 for flag gives proper default values, so flag really only needs	1331	* Passing 0 for flag gives proper default values, so flag really only needs
1233	* to be set if special handling is needed.	1332	* to be set if special handling is needed.
1234	*	1333	*
1235	* Return value:	1334	* Return value:
1236	* new object if 'op' was merged with other object	1335	* new object if 'op' was merged with other object
1237	* NULL if 'op' was destroyed	1336	* NULL if there was an error (destroyed, blocked etc.)
1238	* just 'op' otherwise	1337	* just 'op' otherwise
1239	*/	1338	*/
1240	object *	1339	object *
1241	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1340	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1242	{	1341	{
1243	assert (!op->flag [FLAG_FREED]);
1244
1245	object *top, *floor = NULL;
1246
1247	op->remove ();	1342	op->remove ();
		1343
		1344	if (m == &freed_map)//D TODO: remove soon
		1345	{//D
		1346	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1347	}//D
1248		1348
1249	/* Ideally, the caller figures this out. However, it complicates a lot	1349	/* Ideally, the caller figures this out. However, it complicates a lot
1250	* of areas of callers (eg, anything that uses find_free_spot would now	1350	* of areas of callers (eg, anything that uses find_free_spot would now
1251	* need extra work	1351	* need extra work
1252	*/	1352	*/
		1353	maptile *newmap = m;
1253	if (!xy_normalise (m, op->x, op->y))	1354	if (!xy_normalise (newmap, op->x, op->y))
1254	{	1355	{
1255	op->destroy ();	1356	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1256	return 0;	1357	return 0;
1257	}	1358	}
1258		1359
1259	if (object *more = op->more)	1360	if (object *more = op->more)
1260	if (!insert_ob_in_map (more, m, originator, flag))	1361	if (!insert_ob_in_map (more, m, originator, flag))
1261	return 0;	1362	return 0;
1262		1363
1263	CLEAR_FLAG (op, FLAG_REMOVED);	1364	op->flag [FLAG_REMOVED] = false;
1264		1365	op->env = 0;
1265	op->map = m;	1366	op->map = newmap;
		1367
1266	mapspace &ms = op->ms ();	1368	mapspace &ms = op->ms ();
1267		1369
1268	/* this has to be done after we translate the coordinates.	1370	/* this has to be done after we translate the coordinates.
1269	*/	1371	*/
1270	if (op->nrof && !(flag & INS_NO_MERGE))	1372	if (op->nrof && !(flag & INS_NO_MERGE))
1271	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1373	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1272	if (object::can_merge (op, tmp))	1374	if (object::can_merge (op, tmp))
1273	{	1375	{
		1376	// TODO: we actually want to update tmp, not op,
		1377	// but some caller surely breaks when we return tmp
		1378	// from here :/
1274	op->nrof += tmp->nrof;	1379	op->nrof += tmp->nrof;
1275	tmp->destroy ();	1380	tmp->destroy ();
1276	}	1381	}
1277		1382
1278	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1383	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1287	{	1392	{
1288	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1393	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1289	abort ();	1394	abort ();
1290	}	1395	}
1291		1396
		1397	if (!originator->is_on_map ())
		1398	{
		1399	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1400	op->debug_desc (), originator->debug_desc ());
		1401	abort ();
		1402	}
		1403
1292	op->above = originator;	1404	op->above = originator;
1293	op->below = originator->below;	1405	op->below = originator->below;
1294
1295	if (op->below)
1296	op->below->above = op;
1297	else
1298	ms.bot = op;
1299
1300	/* since *below* originator, no need to update top */
1301	originator->below = op;	1406	originator->below = op;
		1407
		1408	*(op->below ? &op->below->above : &ms.bot) = op;
1302	}	1409	}
1303	else	1410	else
1304	{	1411	{
1305	top = ms.bot;	1412	object *floor = 0;
		1413	object *top = ms.top;
1306		1414
1307	/* If there are other objects, then */	1415	/* If there are other objects, then */
1308	if (top)	1416	if (top)
1309	{	1417	{
1310	object *last = 0;
1311
1312	/*	1418	/*
1313	* If there are multiple objects on this space, we do some trickier handling.	1419	* If there are multiple objects on this space, we do some trickier handling.
1314	* We've already dealt with merging if appropriate.	1420	* We've already dealt with merging if appropriate.
1315	* Generally, we want to put the new object on top. But if	1421	* Generally, we want to put the new object on top. But if
1316	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1422	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1319	* once we get to them. This reduces the need to traverse over all of	1425	* once we get to them. This reduces the need to traverse over all of
1320	* them when adding another one - this saves quite a bit of cpu time	1426	* them when adding another one - this saves quite a bit of cpu time
1321	* when lots of spells are cast in one area. Currently, it is presumed	1427	* when lots of spells are cast in one area. Currently, it is presumed
1322	* that flying non pickable objects are spell objects.	1428	* that flying non pickable objects are spell objects.
1323	*/	1429	*/
1324	for (top = ms.bot; top; top = top->above)	1430	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1325	{	1431	{
1326	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1432	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1327	floor = top;	1433	floor = tmp;
1328		1434
1329	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1435	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1330	{	1436	{
1331	/* We insert above top, so we want this object below this */	1437	/* We insert above top, so we want this object below this */
1332	top = top->below;	1438	top = tmp->below;
1333	break;	1439	break;
1334	}	1440	}
1335		1441
1336	last = top;	1442	top = tmp;
1337	}	1443	}
1338
1339	/* Don't want top to be NULL, so set it to the last valid object */
1340	top = last;
1341		1444
1342	/* We let update_position deal with figuring out what the space	1445	/* We let update_position deal with figuring out what the space
1343	* looks like instead of lots of conditions here.	1446	* looks like instead of lots of conditions here.
1344	* makes things faster, and effectively the same result.	1447	* makes things faster, and effectively the same result.
1345	*/	1448	*/
…		…
1352	*/	1455	*/
1353	if (!(flag & INS_ON_TOP)	1456	if (!(flag & INS_ON_TOP)
1354	&& ms.flags () & P_BLOCKSVIEW	1457	&& ms.flags () & P_BLOCKSVIEW
1355	&& (op->face && !faces [op->face].visibility))	1458	&& (op->face && !faces [op->face].visibility))
1356	{	1459	{
		1460	object *last;
		1461
1357	for (last = top; last != floor; last = last->below)	1462	for (last = top; last != floor; last = last->below)
1358	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1463	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1359	break;	1464	break;
1360		1465
1361	/* Check to see if we found the object that blocks view,	1466	/* Check to see if we found the object that blocks view,
…		…
1369	} /* If objects on this space */	1474	} /* If objects on this space */
1370		1475
1371	if (flag & INS_ABOVE_FLOOR_ONLY)	1476	if (flag & INS_ABOVE_FLOOR_ONLY)
1372	top = floor;	1477	top = floor;
1373		1478
1374	/* Top is the object that our object (op) is going to get inserted above.	1479	// insert object above top, or bottom-most if top = 0
1375	*/
1376
1377	/* First object on this space */
1378	if (!top)	1480	if (!top)
1379	{	1481	{
		1482	op->below = 0;
1380	op->above = ms.bot;	1483	op->above = ms.bot;
1381
1382	if (op->above)
1383	op->above->below = op;
1384
1385	op->below = 0;
1386	ms.bot = op;	1484	ms.bot = op;
		1485
		1486	*(op->above ? &op->above->below : &ms.top) = op;
1387	}	1487	}
1388	else	1488	else
1389	{ /* get inserted into the stack above top */	1489	{
1390	op->above = top->above;	1490	op->above = top->above;
1391
1392	if (op->above)
1393	op->above->below = op;	1491	top->above = op;
1394		1492
1395	op->below = top;	1493	op->below = top;
1396	top->above = op;	1494	*(op->above ? &op->above->below : &ms.top) = op;
1397	}	1495	}
		1496	}
1398		1497
1399	if (!op->above)	1498	if (op->is_player ())
1400	ms.top = op;
1401	} /* else not INS_BELOW_ORIGINATOR */
1402
1403	if (op->type == PLAYER)
1404	{	1499	{
1405	op->contr->do_los = 1;	1500	op->contr->do_los = 1;
1406	++op->map->players;	1501	++op->map->players;
1407	op->map->touch ();	1502	op->map->touch ();
1408	}	1503	}
1409		1504
1410	op->map->dirty = true;	1505	op->map->dirty = true;
1411		1506
1412	if (object *pl = ms.player ())	1507	if (object *pl = ms.player ())
		1508	//TODO: the floorbox prev/next might need updating
		1509	//esrv_send_item (pl, op);
		1510	//TODO: update floorbox to preserve ordering
		1511	if (pl->contr->ns)
1413	pl->contr->ns->floorbox_update ();	1512	pl->contr->ns->floorbox_update ();
1414		1513
1415	/* If this object glows, it may affect lighting conditions that are	1514	/* If this object glows, it may affect lighting conditions that are
1416	* visible to others on this map. But update_all_los is really	1515	* visible to others on this map. But update_all_los is really
1417	* an inefficient way to do this, as it means los for all players	1516	* an inefficient way to do this, as it means los for all players
1418	* on the map will get recalculated. The players could very well	1517	* on the map will get recalculated. The players could very well
1419	* be far away from this change and not affected in any way -	1518	* be far away from this change and not affected in any way -
1420	* this should get redone to only look for players within range,	1519	* this should get redone to only look for players within range,
1421	* or just updating the P_UPTODATE for spaces within this area	1520	* or just updating the P_UPTODATE for spaces within this area
1422	* of effect may be sufficient.	1521	* of effect may be sufficient.
1423	*/	1522	*/
1424	if (op->map->darkness && (op->glow_radius != 0))	1523	if (op->affects_los ())
		1524	{
		1525	op->ms ().invalidate ();
1425	update_all_los (op->map, op->x, op->y);	1526	update_all_los (op->map, op->x, op->y);
		1527	}
1426		1528
1427	/* updates flags (blocked, alive, no magic, etc) for this map space */	1529	/* updates flags (blocked, alive, no magic, etc) for this map space */
1428	update_object (op, UP_OBJ_INSERT);	1530	update_object (op, UP_OBJ_INSERT);
1429		1531
1430	INVOKE_OBJECT (INSERT, op);	1532	INVOKE_OBJECT (INSERT, op);
…		…
1437	* blocked() and wall() work properly), and these flags are updated by	1539	* blocked() and wall() work properly), and these flags are updated by
1438	* update_object().	1540	* update_object().
1439	*/	1541	*/
1440		1542
1441	/* if this is not the head or flag has been passed, don't check walk on status */	1543	/* if this is not the head or flag has been passed, don't check walk on status */
1442	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1544	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1443	{	1545	{
1444	if (check_move_on (op, originator))	1546	if (check_move_on (op, originator))
1445	return 0;	1547	return 0;
1446		1548
1447	/* If we are a multi part object, lets work our way through the check	1549	/* If we are a multi part object, lets work our way through the check
…		…
1458	/* this function inserts an object in the map, but if it	1560	/* this function inserts an object in the map, but if it
1459	* finds an object of its own type, it'll remove that one first.	1561	* finds an object of its own type, it'll remove that one first.
1460	* op is the object to insert it under: supplies x and the map.	1562	* op is the object to insert it under: supplies x and the map.
1461	*/	1563	*/
1462	void	1564	void
1463	replace_insert_ob_in_map (const char *arch_string, object *op)	1565	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1464	{	1566	{
1465	object *tmp, *tmp1;
1466
1467	/* first search for itself and remove any old instances */	1567	/* first search for itself and remove any old instances */
1468		1568
1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1569	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1570	if (tmp->arch->archname == archname) /* same archetype */
1471	tmp->destroy ();	1571	tmp->destroy ();
1472		1572
1473	tmp1 = arch_to_object (archetype::find (arch_string));	1573	object *tmp = archetype::find (archname)->instance ();
1474		1574
1475	tmp1->x = op->x;	1575	tmp->x = op->x;
1476	tmp1->y = op->y;	1576	tmp->y = op->y;
		1577
1477	insert_ob_in_map (tmp1, op->map, op, 0);	1578	insert_ob_in_map (tmp, op->map, op, 0);
1478	}	1579	}
1479		1580
1480	object *	1581	object *
1481	object::insert_at (object *where, object *originator, int flags)	1582	object::insert_at (object *where, object *originator, int flags)
1482	{	1583	{
…		…
1484	return where->env->insert (this);	1585	return where->env->insert (this);
1485	else	1586	else
1486	return where->map->insert (this, where->x, where->y, originator, flags);	1587	return where->map->insert (this, where->x, where->y, originator, flags);
1487	}	1588	}
1488		1589
1489	/*	1590	// check whether we can put this into the map, respect max_volume, max_items
1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1591	bool
1491	* is returned contains nr objects, and the remaining parts contains	1592	object::can_drop_at (maptile *m, int x, int y, object *originator)
1492	* the rest (or is removed and freed if that number is 0).
1493	* On failure, NULL is returned, and the reason put into the
1494	* global static errmsg array.
1495	*/
1496	object *
1497	get_split_ob (object *orig_ob, uint32 nr)
1498	{	1593	{
1499	object *newob;	1594	mapspace &ms = m->at (x, y);
1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501		1595
1502	if (orig_ob->nrof < nr)	1596	int items = ms.items ();
1503	{
1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1505	return NULL;
1506	}
1507		1597
1508	newob = object_create_clone (orig_ob);	1598	if (!items // testing !items ensures we can drop at least one item
		1599	|| (items < m->max_items
		1600	&& ms.volume () < m->max_volume))
		1601	return true;
1509		1602
1510	if ((orig_ob->nrof -= nr) < 1)	1603	if (originator && originator->is_player ())
1511	orig_ob->destroy (1);	1604	originator->contr->failmsg (format (
1512	else if (!is_removed)	1605	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1513	{	1606	query_name ()
1514	if (orig_ob->env != NULL)	1607	));
1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1517	{
1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1520	return NULL;
1521	}
1522	}
1523		1608
1524	newob->nrof = nr;	1609	return false;
1525
1526	return newob;
1527	}	1610	}
1528		1611
1529	/*	1612	/*
1530	* decrease_ob_nr(object, number) decreases a specified number from	1613	* decrease(object, number) decreases a specified number from
1531	* the amount of an object. If the amount reaches 0, the object	1614	* the amount of an object. If the amount reaches 0, the object
1532	* is subsequently removed and freed.	1615	* is subsequently removed and freed.
1533	*	1616	*
1534	* Return value: 'op' if something is left, NULL if the amount reached 0	1617	* Return value: 'op' if something is left, NULL if the amount reached 0
1535	*/	1618	*/
		1619	bool
		1620	object::decrease (sint32 nr)
		1621	{
		1622	if (!nr)
		1623	return true;
		1624
		1625	nr = min (nr, nrof);
		1626
		1627	if (nrof > nr)
		1628	{
		1629	nrof -= nr;
		1630	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1631
		1632	if (object *pl = visible_to ())
		1633	esrv_update_item (UPD_NROF, pl, this);
		1634
		1635	return true;
		1636	}
		1637	else
		1638	{
		1639	destroy ();
		1640	return false;
		1641	}
		1642	}
		1643
		1644	/*
		1645	* split(ob,nr) splits up ob into two parts. The part which
		1646	* is returned contains nr objects, and the remaining parts contains
		1647	* the rest (or is removed and returned if that number is 0).
		1648	* On failure, NULL is returned.
		1649	*/
1536	object *	1650	object *
1537	decrease_ob_nr (object *op, uint32 i)	1651	object::split (sint32 nr)
1538	{	1652	{
1539	object *tmp;	1653	int have = number_of ();
1540		1654
1541	if (i == 0) /* objects with op->nrof require this check */	1655	if (have < nr)
1542	return op;	1656	return 0;
1543		1657	else if (have == nr)
1544	if (i > op->nrof)
1545	i = op->nrof;
1546
1547	if (QUERY_FLAG (op, FLAG_REMOVED))
1548	op->nrof -= i;
1549	else if (op->env)
1550	{	1658	{
1551	/* is this object in the players inventory, or sub container
1552	* therein?
1553	*/
1554	tmp = op->in_player ();
1555	/* nope. Is this a container the player has opened?
1556	* If so, set tmp to that player.
1557	* IMO, searching through all the players will mostly
1558	* likely be quicker than following op->env to the map,
1559	* and then searching the map for a player.
1560	*/
1561	if (!tmp)
1562	for_all_players (pl)
1563	if (pl->ob->container == op->env)
1564	{
1565	tmp = pl->ob;
1566	break;
1567	}
1568
1569	if (i < op->nrof)
1570	{
1571	sub_weight (op->env, op->weight * i);
1572	op->nrof -= i;
1573	if (tmp)
1574	esrv_send_item (tmp, op);
1575	}
1576	else
1577	{
1578	op->remove ();	1659	remove ();
1579	op->nrof = 0;	1660	return this;
1580	if (tmp)
1581	esrv_del_item (tmp->contr, op->count);
1582	}
1583	}	1661	}
1584	else	1662	else
1585	{	1663	{
1586	object *above = op->above;	1664	decrease (nr);
1587		1665
1588	if (i < op->nrof)	1666	object *op = deep_clone ();
1589	op->nrof -= i;	1667	op->nrof = nr;
1590	else
1591	{
1592	op->remove ();
1593	op->nrof = 0;
1594	}
1595
1596	/* Since we just removed op, op->above is null */
1597	for (tmp = above; tmp; tmp = tmp->above)
1598	if (tmp->type == PLAYER)
1599	{
1600	if (op->nrof)
1601	esrv_send_item (tmp, op);
1602	else
1603	esrv_del_item (tmp->contr, op->count);
1604	}
1605	}
1606
1607	if (op->nrof)
1608	return op;	1668	return op;
1609	else
1610	{
1611	op->destroy ();
1612	return 0;
1613	}	1669	}
1614	}	1670	}
1615		1671
1616	object *	1672	object *
1617	insert_ob_in_ob (object *op, object *where)	1673	insert_ob_in_ob (object *op, object *where)
…		…
1642	* be != op, if items are merged. -Tero	1698	* be != op, if items are merged. -Tero
1643	*/	1699	*/
1644	object *	1700	object *
1645	object::insert (object *op)	1701	object::insert (object *op)
1646	{	1702	{
1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
1648	op->remove ();
1649
1650	if (op->more)	1703	if (op->more)
1651	{	1704	{
1652	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1705	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1653	return op;	1706	return op;
1654	}	1707	}
1655		1708
1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1709	op->remove ();
1657	CLEAR_FLAG (op, FLAG_REMOVED);	1710
		1711	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1658		1712
1659	if (op->nrof)	1713	if (op->nrof)
1660	{
1661	for (object *tmp = inv; tmp; tmp = tmp->below)	1714	for (object *tmp = inv; tmp; tmp = tmp->below)
1662	if (object::can_merge (tmp, op))	1715	if (object::can_merge (tmp, op))
1663	{	1716	{
1664	/* return the original object and remove inserted object	1717	/* return the original object and remove inserted object
1665	(client needs the original object) */	1718	(client needs the original object) */
1666	tmp->nrof += op->nrof;	1719	tmp->nrof += op->nrof;
1667	/* Weight handling gets pretty funky. Since we are adding to	1720
1668	* tmp->nrof, we need to increase the weight.	1721	if (object *pl = tmp->visible_to ())
1669	*/	1722	esrv_update_item (UPD_NROF, pl, tmp);
		1723
1670	add_weight (this, op->weight * op->nrof);	1724	adjust_weight (this, op->total_weight ());
1671	SET_FLAG (op, FLAG_REMOVED);	1725
1672	op->destroy (); /* free the inserted object */	1726	op->destroy ();
1673	op = tmp;	1727	op = tmp;
1674	op->remove (); /* and fix old object's links */	1728	goto inserted;
1675	CLEAR_FLAG (op, FLAG_REMOVED);
1676	break;
1677	}	1729	}
1678		1730
1679	/* I assume combined objects have no inventory
1680	* We add the weight - this object could have just been removed
1681	* (if it was possible to merge). calling remove_ob will subtract
1682	* the weight, so we need to add it in again, since we actually do
1683	* the linking below
1684	*/
1685	add_weight (this, op->weight * op->nrof);
1686	}
1687	else
1688	add_weight (this, (op->weight + op->carrying));
1689
1690	if (object *otmp = this->in_player ())
1691	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1692	otmp->update_stats ();
1693
1694	op->owner = 0; // its his/hers now. period.	1731	op->owner = 0; // it's his/hers now. period.
1695	op->map = 0;	1732	op->map = 0;
		1733	op->x = 0;
		1734	op->y = 0;
		1735
		1736	op->above = 0;
		1737	op->below = inv;
1696	op->env = this;	1738	op->env = this;
1697	op->above = 0;
1698	op->below = 0;
1699	op->x = op->y = 0;
1700		1739
		1740	if (inv)
		1741	inv->above = op;
		1742
		1743	inv = op;
		1744
		1745	op->flag [FLAG_REMOVED] = 0;
		1746
		1747	if (object *pl = op->visible_to ())
		1748	esrv_send_item (pl, op);
		1749
		1750	adjust_weight (this, op->total_weight ());
		1751
		1752	inserted:
1701	/* reset the light list and los of the players on the map */	1753	/* reset the light list and los of the players on the map */
1702	if (op->glow_radius && map)	1754	if (op->glow_radius && is_on_map ())
1703	{	1755	{
1704	#ifdef DEBUG_LIGHTS	1756	update_stats ();
1705	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1706	#endif /* DEBUG_LIGHTS */
1707	if (map->darkness)
1708	update_all_los (map, x, y);	1757	update_all_los (map, x, y);
1709	}
1710
1711	/* Client has no idea of ordering so lets not bother ordering it here.
1712	* It sure simplifies this function...
1713	*/
1714	if (!inv)
1715	inv = op;
1716	else
1717	{	1758	}
1718	op->below = inv;	1759	else if (is_player ())
1719	op->below->above = op;	1760	// if this is a player's inventory, update stats
1720	inv = op;	1761	contr->queue_stats_update ();
1721	}
1722		1762
1723	INVOKE_OBJECT (INSERT, this);	1763	INVOKE_OBJECT (INSERT, this);
1724		1764
1725	return op;	1765	return op;
1726	}	1766	}
…		…
1746	* on top.	1786	* on top.
1747	*/	1787	*/
1748	int	1788	int
1749	check_move_on (object *op, object *originator)	1789	check_move_on (object *op, object *originator)
1750	{	1790	{
		1791	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1792	return 0;
		1793
1751	object *tmp;	1794	object *tmp;
1752	maptile *m = op->map;	1795	maptile *m = op->map;
1753	int x = op->x, y = op->y;	1796	int x = op->x, y = op->y;
1754		1797
1755	MoveType move_on, move_slow, move_block;	1798	mapspace &ms = m->at (x, y);
1756		1799
1757	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1800	ms.update ();
1758	return 0;
1759		1801
1760	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1802	MoveType move_on = ms.move_on;
1761	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1803	MoveType move_slow = ms.move_slow;
1762	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1804	MoveType move_block = ms.move_block;
1763		1805
1764	/* if nothing on this space will slow op down or be applied,	1806	/* if nothing on this space will slow op down or be applied,
1765	* no need to do checking below. have to make sure move_type	1807	* no need to do checking below. have to make sure move_type
1766	* is set, as lots of objects don't have it set - we treat that	1808	* is set, as lots of objects don't have it set - we treat that
1767	* as walking.	1809	* as walking.
…		…
1778	return 0;	1820	return 0;
1779		1821
1780	/* The objects have to be checked from top to bottom.	1822	/* The objects have to be checked from top to bottom.
1781	* Hence, we first go to the top:	1823	* Hence, we first go to the top:
1782	*/	1824	*/
1783		1825	for (object *next, *tmp = ms.top; tmp; tmp = next)
1784	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1785	{
1786	/* Trim the search when we find the first other spell effect
1787	* this helps performance so that if a space has 50 spell objects,
1788	* we don't need to check all of them.
1789	*/
1790	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1791	break;
1792	}	1826	{
		1827	next = tmp->below;
1793		1828
1794	for (; tmp; tmp = tmp->below)
1795	{
1796	if (tmp == op)	1829	if (tmp == op)
1797	continue; /* Can't apply yourself */	1830	continue; /* Can't apply yourself */
1798		1831
1799	/* Check to see if one of the movement types should be slowed down.	1832	/* Check to see if one of the movement types should be slowed down.
1800	* Second check makes sure that the movement types not being slowed	1833	* Second check makes sure that the movement types not being slowed
…		…
1805	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1838	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1806	{	1839	{
1807	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1840	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1808	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1841	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1809	{	1842	{
1810
1811	float
1812	diff = tmp->move_slow_penalty * fabs (op->speed);	1843	float diff = tmp->move_slow_penalty * fabs (op->speed);
1813		1844
1814	if (op->type == PLAYER)	1845	if (op->is_player ())
1815	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1846	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1816	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1847	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1817	diff /= 4.0;	1848	diff /= 4.0;
1818		1849
1819	op->speed_left -= diff;	1850	op->speed_left -= diff;
1820	}	1851	}
1821	}	1852	}
…		…
1854	LOG (llevError, "Present_arch called outside map.\n");	1885	LOG (llevError, "Present_arch called outside map.\n");
1855	return NULL;	1886	return NULL;
1856	}	1887	}
1857		1888
1858	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1889	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->arch == at)	1890	if (tmp->arch->archname == at->archname)
1860	return tmp;	1891	return tmp;
1861		1892
1862	return NULL;	1893	return NULL;
1863	}	1894	}
1864		1895
…		…
1928	* The first matching object is returned, or NULL if none.	1959	* The first matching object is returned, or NULL if none.
1929	*/	1960	*/
1930	object *	1961	object *
1931	present_arch_in_ob (const archetype *at, const object *op)	1962	present_arch_in_ob (const archetype *at, const object *op)
1932	{	1963	{
1933	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1964	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1934	if (tmp->arch == at)	1965	if (tmp->arch->archname == at->archname)
1935	return tmp;	1966	return tmp;
1936		1967
1937	return NULL;	1968	return NULL;
1938	}	1969	}
1939		1970
…		…
2027	* head of the object should correspond for the entire object.	2058	* head of the object should correspond for the entire object.
2028	*/	2059	*/
2029	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2060	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2030	continue;	2061	continue;
2031		2062
2032	if (ob->blocked (m, pos.x, pos.y))	2063	if (ob->blocked (pos.m, pos.x, pos.y))
2033	continue;	2064	continue;
2034		2065
2035	altern [index++] = i;	2066	altern [index++] = i;
2036	}	2067	}
2037		2068
…		…
2105	* there is capable of.	2136	* there is capable of.
2106	*/	2137	*/
2107	int	2138	int
2108	find_dir (maptile *m, int x, int y, object *exclude)	2139	find_dir (maptile *m, int x, int y, object *exclude)
2109	{	2140	{
2110	int i, max = SIZEOFFREE, mflags;	2141	int max = SIZEOFFREE, mflags;
2111
2112	sint16 nx, ny;
2113	object *tmp;
2114	maptile *mp;
2115
2116	MoveType blocked, move_type;	2142	MoveType move_type;
2117		2143
2118	if (exclude && exclude->head_ () != exclude)	2144	if (exclude && exclude->head_ () != exclude)
2119	{	2145	{
2120	exclude = exclude->head;	2146	exclude = exclude->head;
2121	move_type = exclude->move_type;	2147	move_type = exclude->move_type;
…		…
2124	{	2150	{
2125	/* If we don't have anything, presume it can use all movement types. */	2151	/* If we don't have anything, presume it can use all movement types. */
2126	move_type = MOVE_ALL;	2152	move_type = MOVE_ALL;
2127	}	2153	}
2128		2154
2129	for (i = 1; i < max; i++)	2155	for (int i = 1; i < max; i++)
2130	{	2156	{
2131	mp = m;	2157	mapxy pos (m, x, y);
2132	nx = x + freearr_x[i];	2158	pos.move (i);
2133	ny = y + freearr_y[i];
2134		2159
2135	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2160	if (!pos.normalise ())
2136
2137	if (mflags & P_OUT_OF_MAP)
2138	max = maxfree[i];	2161	max = maxfree[i];
2139	else	2162	else
2140	{	2163	{
2141	mapspace &ms = mp->at (nx, ny);	2164	mapspace &ms = *pos;
2142		2165
2143	blocked = ms.move_block;
2144
2145	if ((move_type & blocked) == move_type)	2166	if ((move_type & ms.move_block) == move_type)
2146	max = maxfree[i];	2167	max = maxfree [i];
2147	else if (mflags & P_IS_ALIVE)	2168	else if (ms.flags () & P_IS_ALIVE)
2148	{	2169	{
2149	for (tmp = ms.bot; tmp; tmp = tmp->above)	2170	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2150	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2171	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2151	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2172	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2152	break;
2153
2154	if (tmp)
2155	return freedir[i];	2173	return freedir [i];
2156	}	2174	}
2157	}	2175	}
2158	}	2176	}
2159		2177
2160	return 0;	2178	return 0;
…		…
2235	* This basically means that if direction is 15, then it could either go	2253	* This basically means that if direction is 15, then it could either go
2236	* direction 4, 14, or 16 to get back to where we are.	2254	* direction 4, 14, or 16 to get back to where we are.
2237	* Moved from spell_util.c to object.c with the other related direction	2255	* Moved from spell_util.c to object.c with the other related direction
2238	* functions.	2256	* functions.
2239	*/	2257	*/
2240	int reduction_dir[SIZEOFFREE][3] = {	2258	static const int reduction_dir[SIZEOFFREE][3] = {
2241	{0, 0, 0}, /* 0 */	2259	{0, 0, 0}, /* 0 */
2242	{0, 0, 0}, /* 1 */	2260	{0, 0, 0}, /* 1 */
2243	{0, 0, 0}, /* 2 */	2261	{0, 0, 0}, /* 2 */
2244	{0, 0, 0}, /* 3 */	2262	{0, 0, 0}, /* 3 */
2245	{0, 0, 0}, /* 4 */	2263	{0, 0, 0}, /* 4 */
…		…
2341	int	2359	int
2342	can_pick (const object *who, const object *item)	2360	can_pick (const object *who, const object *item)
2343	{	2361	{
2344	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2362	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2345	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2363	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2346	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2364	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2347	}	2365	}
2348		2366
2349	/*	2367	/*
2350	* create clone from object to another	2368	* create clone from object to another
2351	*/	2369	*/
2352	object *	2370	object *
2353	object_create_clone (object *asrc)	2371	object::deep_clone ()
2354	{	2372	{
2355	object *dst = 0, *tmp, *src, *prev, *item;	2373	assert (("deep_clone called on non-head object", is_head ()));
2356		2374
2357	if (!asrc)	2375	object *dst = clone ();
2358	return 0;
2359		2376
2360	src = asrc->head_ ();	2377	object *prev = dst;
2361
2362	prev = 0;
2363	for (object *part = src; part; part = part->more)	2378	for (object *part = this->more; part; part = part->more)
2364	{	2379	{
2365	tmp = part->clone ();	2380	object *tmp = part->clone ();
2366	tmp->x -= src->x;
2367	tmp->y -= src->y;
2368
2369	if (!part->head)
2370	{
2371	dst = tmp;
2372	tmp->head = 0;
2373	}
2374	else
2375	tmp->head = dst;	2381	tmp->head = dst;
2376
2377	tmp->more = 0;
2378
2379	if (prev)
2380	prev->more = tmp;	2382	prev->more = tmp;
2381
2382	prev = tmp;	2383	prev = tmp;
2383	}	2384	}
2384		2385
2385	for (item = src->inv; item; item = item->below)	2386	for (object *item = inv; item; item = item->below)
2386	insert_ob_in_ob (object_create_clone (item), dst);	2387	insert_ob_in_ob (item->deep_clone (), dst);
2387		2388
2388	return dst;	2389	return dst;
2389	}	2390	}
2390		2391
2391	/* This returns the first object in who's inventory that	2392	/* This returns the first object in who's inventory that
…		…
2400	return tmp;	2401	return tmp;
2401		2402
2402	return 0;	2403	return 0;
2403	}	2404	}
2404		2405
2405	/* If ob has a field named key, return the link from the list,	2406	shstr_tmp
2406	* otherwise return NULL.	2407	object::kv_get (shstr_tmp key) const
2407	*
2408	* key must be a passed in shared string - otherwise, this won't
2409	* do the desired thing.
2410	*/
2411	key_value *
2412	get_ob_key_link (const object *ob, const char *key)
2413	{	2408	{
2414	for (key_value *link = ob->key_values; link; link = link->next)	2409	for (key_value *kv = key_values; kv; kv = kv->next)
2415	if (link->key == key)	2410	if (kv->key == key)
2416	return link;
2417
2418	return 0;
2419	}
2420
2421	/*
2422	* Returns the value of op has an extra_field for key, or NULL.
2423	*
2424	* The argument doesn't need to be a shared string.
2425	*
2426	* The returned string is shared.
2427	*/
2428	const char *
2429	get_ob_key_value (const object *op, const char *const key)
2430	{
2431	key_value *link;
2432	shstr_cmp canonical_key (key);
2433
2434	if (!canonical_key)
2435	{
2436	/* 1. There being a field named key on any object
2437	* implies there'd be a shared string to find.
2438	* 2. Since there isn't, no object has this field.
2439	* 3. Therefore, *this* object doesn't have this field.
2440	*/
2441	return 0;
2442	}
2443
2444	/* This is copied from get_ob_key_link() above -
2445	* only 4 lines, and saves the function call overhead.
2446	*/
2447	for (link = op->key_values; link; link = link->next)
2448	if (link->key == canonical_key)
2449	return link->value;	2411	return kv->value;
2450		2412
2451	return 0;	2413	return shstr ();
2452	}	2414	}
2453		2415
2454	/*	2416	void
2455	* Updates the canonical_key in op to value.	2417	object::kv_set (shstr_tmp key, shstr_tmp value)
2456	*
2457	* canonical_key is a shared string (value doesn't have to be).
2458	*
2459	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2460	* keys.
2461	*
2462	* Returns TRUE on success.
2463	*/
2464	int
2465	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2466	{	2418	{
2467	key_value *field = NULL, *last = NULL;	2419	for (key_value *kv = key_values; kv; kv = kv->next)
2468		2420	if (kv->key == key)
2469	for (field = op->key_values; field != NULL; field = field->next)
2470	{
2471	if (field->key != canonical_key)
2472	{	2421	{
2473	last = field;	2422	kv->value = value;
2474	continue;	2423	return;
2475	}	2424	}
2476		2425
2477	if (value)	2426	key_value *kv = new key_value;
2478	field->value = value;	2427
2479	else	2428	kv->next = key_values;
		2429	kv->key = key;
		2430	kv->value = value;
		2431
		2432	key_values = kv;
		2433	}
		2434
		2435	void
		2436	object::kv_del (shstr_tmp key)
		2437	{
		2438	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2439	if ((*kvp)->key == key)
2480	{	2440	{
2481	/* Basically, if the archetype has this key set,	2441	key_value *kv = *kvp;
2482	* we need to store the null value so when we save	2442	*kvp = (*kvp)->next;
2483	* it, we save the empty value so that when we load,	2443	delete kv;
2484	* we get this value back again.	2444	return;
2485	*/
2486	if (get_ob_key_link (op->arch, canonical_key))
2487	field->value = 0;
2488	else
2489	{
2490	if (last)
2491	last->next = field->next;
2492	else
2493	op->key_values = field->next;
2494
2495	delete field;
2496	}
2497	}	2445	}
2498	return TRUE;
2499	}
2500	/* IF we get here, key doesn't exist */
2501
2502	/* No field, we'll have to add it. */
2503
2504	if (!add_key)
2505	return FALSE;
2506
2507	/* There isn't any good reason to store a null
2508	* value in the key/value list. If the archetype has
2509	* this key, then we should also have it, so shouldn't
2510	* be here. If user wants to store empty strings,
2511	* should pass in ""
2512	*/
2513	if (value == NULL)
2514	return TRUE;
2515
2516	field = new key_value;
2517
2518	field->key = canonical_key;
2519	field->value = value;
2520	/* Usual prepend-addition. */
2521	field->next = op->key_values;
2522	op->key_values = field;
2523
2524	return TRUE;
2525	}
2526
2527	/*
2528	* Updates the key in op to value.
2529	*
2530	* If add_key is FALSE, this will only update existing keys,
2531	* and not add new ones.
2532	* In general, should be little reason FALSE is ever passed in for add_key
2533	*
2534	* Returns TRUE on success.
2535	*/
2536	int
2537	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2538	{
2539	shstr key_ (key);
2540
2541	return set_ob_key_value_s (op, key_, value, add_key);
2542	}	2446	}
2543		2447
2544	object::depth_iterator::depth_iterator (object *container)	2448	object::depth_iterator::depth_iterator (object *container)
2545	: iterator_base (container)	2449	: iterator_base (container)
2546	{	2450	{
…		…
2596	{	2500	{
2597	char flagdesc[512];	2501	char flagdesc[512];
2598	char info2[256 * 4];	2502	char info2[256 * 4];
2599	char *p = info;	2503	char *p = info;
2600		2504
2601	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2505	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2602	count,	2506	count,
2603	uuid.c_str (),	2507	uuid.c_str (),
2604	&name,	2508	&name,
2605	title ? "\",title:\"" : "",	2509	title ? ",title:\"" : "",
2606	title ? (const char *)title : "",	2510	title ? (const char *)title : "",
		2511	title ? "\"" : "",
2607	flag_desc (flagdesc, 512), type);	2512	flag_desc (flagdesc, 512), type);
2608		2513
2609	if (!this->flag[FLAG_REMOVED] && env)	2514	if (!flag[FLAG_REMOVED] && env)
2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2515	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2611		2516
2612	if (map)	2517	if (map)
2613	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2518	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2614		2519
…		…
2629	{	2534	{
2630	return map ? map->region (x, y)	2535	return map ? map->region (x, y)
2631	: region::default_region ();	2536	: region::default_region ();
2632	}	2537	}
2633		2538
2634	const materialtype_t *
2635	object::dominant_material () const
2636	{
2637	if (materialtype_t *mt = name_to_material (materialname))
2638	return mt;
2639
2640	return name_to_material (shstr_unknown);
2641	}
2642
2643	void	2539	void
2644	object::open_container (object *new_container)	2540	object::open_container (object *new_container)
2645	{	2541	{
2646	if (container == new_container)	2542	if (container == new_container)
2647	return;	2543	return;
2648		2544
2649	if (object *old_container = container)	2545	object *old_container = container;
		2546
		2547	if (old_container)
2650	{	2548	{
2651	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2549	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2652	return;	2550	return;
2653		2551
2654	#if 0	2552	#if 0
…		…
2656	if (object *closer = old_container->inv)	2554	if (object *closer = old_container->inv)
2657	if (closer->type == CLOSE_CON)	2555	if (closer->type == CLOSE_CON)
2658	closer->destroy ();	2556	closer->destroy ();
2659	#endif	2557	#endif
2660		2558
		2559	// make sure the container is available
		2560	esrv_send_item (this, old_container);
		2561
2661	old_container->flag [FLAG_APPLIED] = 0;	2562	old_container->flag [FLAG_APPLIED] = false;
2662	container = 0;	2563	container = 0;
2663		2564
		2565	// client needs item update to make it work, client bug requires this to be separate
2664	esrv_update_item (UPD_FLAGS, this, old_container);	2566	esrv_update_item (UPD_FLAGS, this, old_container);
		2567
2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2568	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2666	play_sound (sound_find ("chest_close"));	2569	play_sound (sound_find ("chest_close"));
2667	}	2570	}
2668		2571
2669	if (new_container)	2572	if (new_container)
2670	{	2573	{
…		…
2674	// TODO: this does not seem to serve any purpose anymore?	2577	// TODO: this does not seem to serve any purpose anymore?
2675	#if 0	2578	#if 0
2676	// insert the "Close Container" object.	2579	// insert the "Close Container" object.
2677	if (archetype *closer = new_container->other_arch)	2580	if (archetype *closer = new_container->other_arch)
2678	{	2581	{
2679	object *closer = arch_to_object (new_container->other_arch);	2582	object *closer = new_container->other_arch->instance ();
2680	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2583	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2681	new_container->insert (closer);	2584	new_container->insert (closer);
2682	}	2585	}
2683	#endif	2586	#endif
2684		2587
2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2588	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2686		2589
		2590	// make sure the container is available, client bug requires this to be separate
		2591	esrv_send_item (this, new_container);
		2592
2687	new_container->flag [FLAG_APPLIED] = 1;	2593	new_container->flag [FLAG_APPLIED] = true;
2688	container = new_container;	2594	container = new_container;
2689		2595
		2596	// client needs flag change
2690	esrv_update_item (UPD_FLAGS, this, new_container);	2597	esrv_update_item (UPD_FLAGS, this, new_container);
2691	esrv_send_inventory (this, new_container);	2598	esrv_send_inventory (this, new_container);
2692	play_sound (sound_find ("chest_open"));	2599	play_sound (sound_find ("chest_open"));
2693	}	2600	}
		2601	// else if (!old_container->env && contr && contr->ns)
		2602	// contr->ns->floorbox_reset ();
2694	}	2603	}
2695		2604
2696	object *	2605	object *
2697	object::force_find (const shstr name)	2606	object::force_find (shstr_tmp name)
2698	{	2607	{
2699	/* cycle through his inventory to look for the MARK we want to	2608	/* cycle through his inventory to look for the MARK we want to
2700	* place	2609	* place
2701	*/	2610	*/
2702	for (object *tmp = inv; tmp; tmp = tmp->below)	2611	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2704	return splay (tmp);	2613	return splay (tmp);
2705		2614
2706	return 0;	2615	return 0;
2707	}	2616	}
2708		2617
		2618	//-GPL
		2619
2709	void	2620	void
		2621	object::force_set_timer (int duration)
		2622	{
		2623	this->duration = 1;
		2624	this->speed_left = -1.f;
		2625
		2626	this->set_speed (duration ? 1.f / duration : 0.f);
		2627	}
		2628
		2629	object *
2710	object::force_add (const shstr name, int duration)	2630	object::force_add (shstr_tmp name, int duration)
2711	{	2631	{
2712	if (object *force = force_find (name))	2632	if (object *force = force_find (name))
2713	force->destroy ();	2633	force->destroy ();
2714		2634
2715	object *force = get_archetype (FORCE_NAME);	2635	object *force = get_archetype (FORCE_NAME);
2716		2636
2717	force->slaying = name;	2637	force->slaying = name;
2718	force->stats.food = 1;	2638	force->force_set_timer (duration);
2719	force->speed_left = -1.f;
2720
2721	force->set_speed (duration ? 1.f / duration : 0.f);
2722	force->flag [FLAG_IS_USED_UP] = true;
2723	force->flag [FLAG_APPLIED] = true;	2639	force->flag [FLAG_APPLIED] = true;
2724		2640
2725	insert (force);	2641	return insert (force);
2726	}	2642	}
2727		2643
2728	void	2644	void
2729	object::play_sound (faceidx sound) const	2645	object::play_sound (faceidx sound) const
2730	{	2646	{
2731	if (!sound)	2647	if (!sound)
2732	return;	2648	return;
2733		2649
2734	if (flag [FLAG_REMOVED])	2650	if (is_on_map ())
		2651	map->play_sound (sound, x, y);
		2652	else if (object *pl = in_player ())
		2653	pl->contr->play_sound (sound);
		2654	}
		2655
		2656	void
		2657	object::say_msg (const char *msg) const
		2658	{
		2659	if (is_on_map ())
		2660	map->say_msg (msg, x, y);
		2661	else if (object *pl = in_player ())
		2662	pl->contr->play_sound (sound);
		2663	}
		2664
		2665	void
		2666	object::make_noise ()
		2667	{
		2668	// we do not model noise in the map, so instead put
		2669	// a temporary light into the noise source
		2670	// could use the map instead, but that's less reliable for our
		2671	// goal, which is to make invisibility a bit harder to exploit
		2672
		2673	// currently only works sensibly for players
		2674	if (!is_player ())
2735	return;	2675	return;
2736		2676
2737	if (env)	2677	// find old force, or create new one
2738	{	2678	object *force = force_find (shstr_noise_force);
2739	if (object *pl = in_player ())	2679
2740	pl->contr->play_sound (sound);	2680	if (force)
2741	}	2681	force->speed_left = -1.f; // patch old speed up
2742	else	2682	else
2743	map->play_sound (sound, x, y);	2683	{
2744	}	2684	force = archetype::get (shstr_noise_force);
2745		2685
		2686	force->slaying = shstr_noise_force;
		2687	force->stats.food = 1;
		2688	force->speed_left = -1.f;
		2689
		2690	force->set_speed (1.f / 4.f);
		2691	force->flag [FLAG_IS_USED_UP] = true;
		2692	force->flag [FLAG_APPLIED] = true;
		2693
		2694	insert (force);
		2695	}
		2696	}
		2697
		2698	void object::change_move_type (MoveType mt)
		2699	{
		2700	if (move_type == mt)
		2701	return;
		2702
		2703	if (is_on_map ())
		2704	{
		2705	// we are on the map, so handle move_on/off effects
		2706	remove ();
		2707	move_type = mt;
		2708	map->insert (this, x, y, this);
		2709	}
		2710	else
		2711	move_type = mt;
		2712	}
		2713

Diff Legend

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