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.220 by root, Thu Apr 24 00:30:52 2008 UTC vs.
Revision 1.317 by root, Fri Apr 2 03:41:24 2010 UTC

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

Diff Legend

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