ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.314 by root, Fri Mar 26 00:59:20 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
…		…
334		386
335	// find player who can see this object	387	// find player who can see this object
336	object *	388	object *
337	object::visible_to () const	389	object::visible_to () const
338	{	390	{
339	if (!flag [FLAG_REMOVED])	391	if (client_visible () && !flag [FLAG_REMOVED])
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 ())
		415	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		416	|| pl->container_ () == this)
363	return pl;	417	return pl;
364	}	418	}
365	}	419	}
366		420
367	return 0;	421	return 0;
368	}	422	}
369		423
370	// adjust weight per container type ("of holding")	424	// adjust weight per container type ("of holding")
371	static sint32	425	static sint32
372	weight_adjust (object *op, sint32 weight)	426	weight_adjust_for (object *op, sint32 weight)
373	{	427	{
374	return op->type == CONTAINER	428	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	429	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	430	: weight;
377	}	431	}
…		…
383	static void	437	static void
384	adjust_weight (object *op, sint32 weight)	438	adjust_weight (object *op, sint32 weight)
385	{	439	{
386	while (op)	440	while (op)
387	{	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
388	weight = weight_adjust (op, weight);	444	weight = weight_adjust_for (op, op->carrying)
		445	- weight_adjust_for (op, op->carrying - weight);
389		446
390	if (!weight)	447	if (!weight)
391	return;	448	return;
392		449
393	op->carrying += weight;	450	op->carrying += weight;
394		451
395	if (object *pl = op->visible_to ())	452	if (object *pl = op->visible_to ())
		453	if (pl != op) // player is handled lazily
396	esrv_update_item (UPD_WEIGHT, pl, op);	454	esrv_update_item (UPD_WEIGHT, pl, op);
397		455
398	op = op->env;	456	op = op->env;
399	}	457	}
400	}	458	}
401		459
…		…
415	op->update_weight ();	473	op->update_weight ();
416		474
417	sum += op->total_weight ();	475	sum += op->total_weight ();
418	}	476	}
419		477
420	sum = weight_adjust (this, sum);	478	sum = weight_adjust_for (this, sum);
421		479
422	if (sum != carrying)	480	if (sum != carrying)
423	{	481	{
424	carrying = sum;	482	carrying = sum;
425		483
426	if (object *pl = visible_to ())	484	if (object *pl = visible_to ())
		485	if (pl != this) // player is handled lazily
427	esrv_update_item (UPD_WEIGHT, pl, this);	486	esrv_update_item (UPD_WEIGHT, pl, this);
428	}	487	}
429	}	488	}
430		489
431	/*	490	/*
432	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	491	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
440	object_freezer freezer;	499	object_freezer freezer;
441	op->write (freezer);	500	op->write (freezer);
442	return freezer.as_string ();	501	return freezer.as_string ();
443	}	502	}
444		503
445	/*	504	char *
446	* get_nearest_part(multi-object, object 2) returns the part of the	505	object::as_string ()
447	* multi-object 1 which is closest to the second object.
448	* If it's not a multi-object, it is returned.
449	*/
450	object *
451	get_nearest_part (object *op, const object *pl)
452	{	506	{
453	object *tmp, *closest;	507	return dump_object (this);
454	int last_dist, i;
455
456	if (!op->more)
457	return op;
458
459	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
460	tmp;
461	tmp = tmp->more)
462	if ((i = distance (tmp, pl)) < last_dist)
463	closest = tmp, last_dist = i;
464
465	return closest;
466	}	508	}
467		509
468	/*	510	/*
469	* 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.
470	* VERRRY slow.	512	* VERRRY slow.
…		…
478		520
479	return 0;	521	return 0;
480	}	522	}
481		523
482	/*	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	/*
483	* 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.
484	* Used only by the patch command, but not all that useful.	541	* Used only by the patch command, but not all that useful.
485	* Enables features like "patch <name-of-other-player> food 999"	542	* Enables features like "patch <name-of-other-player> food 999"
486	*/	543	*/
487	object *	544	object *
488	find_object_name (const char *str)	545	find_object_name (const char *str)
489	{	546	{
490	shstr_cmp str_ (str);	547	shstr_cmp str_ (str);
491	object *op;
492		548
		549	if (str_)
493	for_all_objects (op)	550	for_all_objects (op)
494	if (op->name == str_)	551	if (op->name == str_)
495	break;	552	return op;
496		553
497	return op;	554	return 0;
498	}	555	}
499		556
500	/*	557	/*
501	* 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
502	* skill and experience objects.	559	* skill and experience objects.
…		…
564	update_stats ();	621	update_stats ();
565		622
566	new_draw_info_format (NDI_UNIQUE, 0, this,	623	new_draw_info_format (NDI_UNIQUE, 0, this,
567	"You try to balance all your items at once, "	624	"You try to balance all your items at once, "
568	"but the %s is just too much for your body. "	625	"but the %s is just too much for your body. "
569	"[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);
570	return false;	628	return false;
571	}	629	}
572		630
573	//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);
574	}	632	}
…		…
600	}	658	}
601		659
602	op->key_values = 0;	660	op->key_values = 0;
603	}	661	}
604		662
605	object &	663	/*
606	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)
607	{	673	{
608	bool is_freed = flag [FLAG_FREED];	674	dst->remove ();
609	bool is_removed = flag [FLAG_REMOVED];
610
611	*(object_copy *)this = src;	675	*(object_copy *)dst = *this;
612
613	flag [FLAG_FREED] = is_freed;
614	flag [FLAG_REMOVED] = is_removed;	676	dst->flag [FLAG_REMOVED] = true;
615		677
616	/* Copy over key_values, if any. */	678	/* Copy over key_values, if any. */
617	if (src.key_values)	679	if (key_values)
618	{	680	{
619	key_value *tail = 0;	681	key_value *tail = 0;
620	key_values = 0;	682	dst->key_values = 0;
621		683
622	for (key_value *i = src.key_values; i; i = i->next)	684	for (key_value *i = key_values; i; i = i->next)
623	{	685	{
624	key_value *new_link = new key_value;	686	key_value *new_link = new key_value;
625		687
626	new_link->next = 0;	688	new_link->next = 0;
627	new_link->key = i->key;	689	new_link->key = i->key;
628	new_link->value = i->value;	690	new_link->value = i->value;
629		691
630	/* Try and be clever here, too. */	692	/* Try and be clever here, too. */
631	if (!key_values)	693	if (!dst->key_values)
632	{	694	{
633	key_values = new_link;	695	dst->key_values = new_link;
634	tail = new_link;	696	tail = new_link;
635	}	697	}
636	else	698	else
637	{	699	{
638	tail->next = new_link;	700	tail->next = new_link;
639	tail = new_link;	701	tail = new_link;
640	}	702	}
641	}	703	}
642	}	704	}
643	}
644		705
645	/*	706	dst->activate ();
646	* copy_to first frees everything allocated by the dst object,
647	* and then copies the contents of itself into the second
648	* object, allocating what needs to be allocated. Basically, any
649	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
650	* if the first object is freed, the pointers in the new object
651	* will point at garbage.
652	*/
653	void
654	object::copy_to (object *dst)
655	{
656	*dst = *this;
657
658	if (speed < 0)
659	dst->speed_left -= rndm ();
660
661	dst->set_speed (dst->speed);
662	}	707	}
663		708
664	void	709	void
665	object::instantiate ()	710	object::instantiate ()
666	{	711	{
667	if (!uuid.seq) // HACK	712	if (!uuid.seq) // HACK
668	uuid = UUID::gen ();	713	uuid = UUID::gen ();
669		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
670	speed_left = -0.1f;	719	speed_left = -1.;
		720
671	/* 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
672	* 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.
673	* 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
674	* values for the body_used info, so when items are created	724	* values for the body_used info, so when items are created
675	* for it, they can be properly equipped.	725	* for it, they can be properly equipped.
…		…
683	object *	733	object *
684	object::clone ()	734	object::clone ()
685	{	735	{
686	object *neu = create ();	736	object *neu = create ();
687	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
688	return neu;	744	return neu;
689	}	745	}
690		746
691	/*	747	/*
692	* 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
…		…
709	* 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.
710	*/	766	*/
711	void	767	void
712	object::set_speed (float speed)	768	object::set_speed (float speed)
713	{	769	{
714	if (flag [FLAG_FREED] && speed)
715	{
716	LOG (llevError, "Object %s is freed but has speed.\n", &name);
717	speed = 0;
718	}
719
720	this->speed = speed;	770	this->speed = speed;
721		771
722	if (has_active_speed ())	772	if (has_active_speed ())
723	activate ();	773	activate ();
724	else	774	else
…		…
743	* UP_OBJ_FACE: only the objects face has changed.	793	* UP_OBJ_FACE: only the objects face has changed.
744	*/	794	*/
745	void	795	void
746	update_object (object *op, int action)	796	update_object (object *op, int action)
747	{	797	{
748	if (op == NULL)	798	if (!op)
749	{	799	{
750	/* this should never happen */	800	/* this should never happen */
751	LOG (llevDebug, "update_object() called for NULL object.\n");	801	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
752	return;	802	return;
753	}	803	}
754		804
755	if (op->env)	805	if (!op->is_on_map ())
756	{	806	{
757	/* Animation is currently handled by client, so nothing	807	/* Animation is currently handled by client, so nothing
758	* to do in this case.	808	* to do in this case.
759	*/	809	*/
760	return;	810	return;
761	}	811	}
762
763	/* If the map is saving, don't do anything as everything is
764	* going to get freed anyways.
765	*/
766	if (!op->map || op->map->in_memory == MAP_SAVING)
767	return;
768		812
769	/* make sure the object is within map boundaries */	813	/* make sure the object is within map boundaries */
770	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	814	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
771	{	815	{
772	LOG (llevError, "update_object() called for object out of map!\n");	816	LOG (llevError, "update_object() called for object out of map!\n");
…		…
780		824
781	if (!(m.flags_ & P_UPTODATE))	825	if (!(m.flags_ & P_UPTODATE))
782	/* nop */;	826	/* nop */;
783	else if (action == UP_OBJ_INSERT)	827	else if (action == UP_OBJ_INSERT)
784	{	828	{
		829	#if 0
785	// this is likely overkill, TODO: revisit (schmorp)	830	// this is likely overkill, TODO: revisit (schmorp)
786	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	831	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
787	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	832	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
788	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	833	|| (op->is_player () && !(m.flags_ & P_PLAYER))
789	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	834	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
790	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	835	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
791	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	836	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
792	|| (m.move_on | op->move_on ) != m.move_on	837	|| (m.move_on | op->move_on ) != m.move_on
793	|| (m.move_off | op->move_off ) != m.move_off	838	|| (m.move_off | op->move_off ) != m.move_off
794	|| (m.move_slow | op->move_slow) != m.move_slow	839	|| (m.move_slow | op->move_slow) != m.move_slow
795	/* 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
796	* to have move_allow right now.	841	* have move_allow right now.
797	*/	842	*/
798	|| ((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
799	|| 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)
800	m.flags_ = 0;	847	m.invalidate ();
		848	#endif
801	}	849	}
802	/* if the object is being removed, we can't make intelligent	850	/* if the object is being removed, we can't make intelligent
803	* decisions, because remove_ob can't really pass the object	851	* decisions, because remove_ob can't really pass the object
804	* that is being removed.	852	* that is being removed.
805	*/	853	*/
806	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	854	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
807	m.flags_ = 0;	855	m.invalidate ();
808	else if (action == UP_OBJ_FACE)	856	else if (action == UP_OBJ_FACE)
809	/* Nothing to do for that case */ ;	857	/* Nothing to do for that case */ ;
810	else	858	else
811	LOG (llevError, "update_object called with invalid action: %d\n", action);	859	LOG (llevError, "update_object called with invalid action: %d\n", action);
812		860
…		…
816		864
817	object::object ()	865	object::object ()
818	{	866	{
819	SET_FLAG (this, FLAG_REMOVED);	867	SET_FLAG (this, FLAG_REMOVED);
820		868
821	expmul = 1.0;	869	//expmul = 1.0; declared const for the time being
822	face = blank_face;	870	face = blank_face;
		871	material = MATERIAL_NULL;
823	}	872	}
824		873
825	object::~object ()	874	object::~object ()
826	{	875	{
827	unlink ();	876	unlink ();
…		…
856	/* If already on active list, don't do anything */	905	/* If already on active list, don't do anything */
857	if (active)	906	if (active)
858	return;	907	return;
859		908
860	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
861	actives.insert (this);	914	actives.insert (this);
		915	}
862	}	916	}
863		917
864	void	918	void
865	object::activate_recursive ()	919	object::activate_recursive ()
866	{	920	{
…		…
915	object::destroy_inv (bool drop_to_ground)	969	object::destroy_inv (bool drop_to_ground)
916	{	970	{
917	// need to check first, because the checks below might segfault	971	// need to check first, because the checks below might segfault
918	// as we might be on an invalid mapspace and crossfire code	972	// as we might be on an invalid mapspace and crossfire code
919	// is too buggy to ensure that the inventory is empty.	973	// is too buggy to ensure that the inventory is empty.
920	// corollary: if you create arrows etc. with stuff in tis inventory,	974	// corollary: if you create arrows etc. with stuff in its inventory,
921	// cf will crash below with off-map x and y	975	// cf will crash below with off-map x and y
922	if (!inv)	976	if (!inv)
923	return;	977	return;
924		978
925	/* Only if the space blocks everything do we not process -	979	/* Only if the space blocks everything do we not process -
…		…
927	* drop on that space.	981	* drop on that space.
928	*/	982	*/
929	if (!drop_to_ground	983	if (!drop_to_ground
930	|| !map	984	|| !map
931	|| map->in_memory != MAP_ACTIVE	985	|| map->in_memory != MAP_ACTIVE
932	|| map->nodrop	986	|| map->no_drop
933	|| ms ().move_block == MOVE_ALL)	987	|| ms ().move_block == MOVE_ALL)
934	{	988	{
935	while (inv)	989	while (inv)
936	{
937	inv->destroy_inv (drop_to_ground);
938	inv->destroy ();	990	inv->destroy ();
939	}
940	}	991	}
941	else	992	else
942	{ /* Put objects in inventory onto this space */	993	{ /* Put objects in inventory onto this space */
943	while (inv)	994	while (inv)
944	{	995	{
…		…
962	object *op = new object;	1013	object *op = new object;
963	op->link ();	1014	op->link ();
964	return op;	1015	return op;
965	}	1016	}
966		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
967	void	1039	void
968	object::do_destroy ()	1040	object::do_destroy ()
969	{	1041	{
970	if (flag [FLAG_IS_LINKED])	1042	if (flag [FLAG_IS_LINKED])
971	remove_button_link (this);	1043	remove_link ();
972		1044
973	if (flag [FLAG_FRIENDLY])	1045	if (flag [FLAG_FRIENDLY])
974	remove_friendly_object (this);	1046	remove_friendly_object (this);
975		1047
976	remove ();	1048	remove ();
977		1049
978	attachable::do_destroy ();	1050	attachable::do_destroy ();
979		1051
980	destroy_inv (true);
981
982	deactivate ();	1052	deactivate ();
983	unlink ();	1053	unlink ();
984		1054
985	flag [FLAG_FREED] = 1;	1055	flag [FLAG_FREED] = 1;
986		1056
987	// hack to ensure that freed objects still have a valid map	1057	// hack to ensure that freed objects still have a valid map
988	{
989	static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991	if (!freed_map)
992	{
993	freed_map = new maptile;
994
995	freed_map->path = "<freed objects map>";
996	freed_map->name = "/internal/freed_objects_map";
997	freed_map->width = 3;
998	freed_map->height = 3;
999	freed_map->nodrop = 1;
1000
1001	freed_map->alloc ();
1002	freed_map->in_memory = MAP_ACTIVE;
1003	}
1004
1005	map = freed_map;	1058	map = &freed_map;
1006	x = 1;	1059	x = 1;
1007	y = 1;	1060	y = 1;
1008	}
1009		1061
1010	if (more)	1062	if (more)
1011	{	1063	{
1012	more->destroy ();	1064	more->destroy ();
1013	more = 0;	1065	more = 0;
…		…
1021	attacked_by = 0;	1073	attacked_by = 0;
1022	current_weapon = 0;	1074	current_weapon = 0;
1023	}	1075	}
1024		1076
1025	void	1077	void
1026	object::destroy (bool destroy_inventory)	1078	object::destroy ()
1027	{	1079	{
1028	if (destroyed ())	1080	if (destroyed ())
1029	return;	1081	return;
1030		1082
1031	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
1032	destroy_inv (false);	1090	destroy_inv (false);
1033		1091
1034	if (is_head ())	1092	if (is_head ())
1035	if (sound_destroy)	1093	if (sound_destroy)
1036	play_sound (sound_destroy);	1094	play_sound (sound_destroy);
1037	else if (flag [FLAG_MONSTER])	1095	else if (flag [FLAG_MONSTER])
…		…
1048	* the previous environment.	1106	* the previous environment.
1049	*/	1107	*/
1050	void	1108	void
1051	object::do_remove ()	1109	object::do_remove ()
1052	{	1110	{
1053	object *tmp, *last = 0;
1054	object *otmp;
1055
1056	if (flag [FLAG_REMOVED])	1111	if (flag [FLAG_REMOVED])
1057	return;	1112	return;
1058		1113
1059	INVOKE_OBJECT (REMOVE, this);	1114	INVOKE_OBJECT (REMOVE, this);
1060
1061	if (object *pl = visible_to ())
1062	esrv_del_item (pl->contr, count);
1063		1115
1064	flag [FLAG_REMOVED] = true;	1116	flag [FLAG_REMOVED] = true;
1065		1117
1066	if (more)	1118	if (more)
1067	more->remove ();	1119	more->remove ();
…		…
1070	* In this case, the object to be removed is in someones	1122	* In this case, the object to be removed is in someones
1071	* inventory.	1123	* inventory.
1072	*/	1124	*/
1073	if (env)	1125	if (env)
1074	{	1126	{
		1127	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1128	if (object *pl = visible_to ())
		1129	esrv_del_item (pl->contr, count);
		1130	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1131
1075	adjust_weight (env, -total_weight ());	1132	adjust_weight (env, -total_weight ());
1076		1133
1077	*(above ? &above->below : &env->inv) = below;	1134	object *pl = in_player ();
1078
1079	if (below)
1080	below->above = above;
1081		1135
1082	/* we set up values so that it could be inserted into	1136	/* we set up values so that it could be inserted into
1083	* 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
1084	* to the caller to decide what we want to do.	1138	* to the caller to decide what we want to do.
1085	*/	1139	*/
1086	map = env->map;	1140	map = env->map;
1087	x = env->x;	1141	x = env->x;
1088	y = env->y;	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
1089	above = 0;	1148	above = 0;
1090	below = 0;	1149	below = 0;
1091	env = 0;	1150	env = 0;
1092		1151
1093	/* NO_FIX_PLAYER is set when a great many changes are being	1152	if (pl && pl->is_player ())
1094	* made to players inventory. If set, avoiding the call
1095	* to save cpu time.
1096	*/	1153	{
1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1154	pl->contr->queue_stats_update ();
1098	otmp->update_stats ();	1155
		1156	if (glow_radius && pl->is_on_map ())
		1157	update_all_los (pl->map, pl->x, pl->y);
		1158	}
1099	}	1159	}
1100	else if (map)	1160	else if (map)
1101	{	1161	{
1102	if (type == PLAYER)
1103	{
1104	// leaving a spot always closes any open container on the ground
1105	if (container && !container->env)
1106	// this causes spurious floorbox updates, but it ensures
1107	// that the CLOSE event is being sent.
1108	close_container ();
1109
1110	--map->players;
1111	map->touch ();
1112	}
1113
1114	map->dirty = true;	1162	map->dirty = true;
1115	mapspace &ms = this->ms ();	1163	mapspace &ms = this->ms ();
1116		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
1117	/* link the object above us */	1190	/* link the object above us */
1118	if (above)	1191	// re-link, make sure compiler can easily use cmove
1119	above->below = below;	1192	*(above ? &above->below : &ms.top) = below;
1120	else	1193	*(below ? &below->above : &ms.bot) = above;
1121	ms.top = below; /* we were top, set new top */
1122
1123	/* Relink the object below us, if there is one */
1124	if (below)
1125	below->above = above;
1126	else
1127	{
1128	/* Nothing below, which means we need to relink map object for this space
1129	* use translated coordinates in case some oddness with map tiling is
1130	* evident
1131	*/
1132	if (GET_MAP_OB (map, x, y) != this)
1133	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1134
1135	ms.bot = above; /* goes on above it. */
1136	}
1137		1194
1138	above = 0;	1195	above = 0;
1139	below = 0;	1196	below = 0;
1140		1197
		1198	ms.invalidate ();
		1199
1141	if (map->in_memory == MAP_SAVING)	1200	if (map->in_memory == MAP_SAVING)
1142	return;	1201	return;
1143		1202
1144	int check_walk_off = !flag [FLAG_NO_APPLY];	1203	int check_walk_off = !flag [FLAG_NO_APPLY];
1145		1204
1146	if (object *pl = ms.player ())	1205	if (object *pl = ms.player ())
1147	{	1206	{
1148	if (pl->container == this)	1207	if (pl->container_ () == this)
1149	/* If a container that the player is currently using somehow gets	1208	/* If a container that the player is currently using somehow gets
1150	* removed (most likely destroyed), update the player view	1209	* removed (most likely destroyed), update the player view
1151	* appropriately.	1210	* appropriately.
1152	*/	1211	*/
1153	pl->close_container ();	1212	pl->close_container ();
1154		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)
1155	pl->contr->ns->floorbox_update ();	1218	pl->contr->ns->floorbox_update ();
1156	}	1219	}
1157		1220
		1221	if (check_walk_off)
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1222	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1159	{	1223	{
		1224	above = tmp->above;
		1225
1160	/* 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
1161	* being removed.	1227	* being removed.
1162	*/	1228	*/
1163		1229
1164	/* See if object moving off should effect something */	1230	/* See if object moving off should effect something */
1165	if (check_walk_off
1166	&& ((move_type & tmp->move_off)	1231	if ((move_type & tmp->move_off)
1167	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1232	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1168	{
1169	move_apply (tmp, this, 0);	1233	move_apply (tmp, this, 0);
1170
1171	if (destroyed ())
1172	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1173	}	1234	}
1174		1235
1175	last = tmp;	1236	if (affects_los ())
1176	}
1177
1178	/* last == NULL if there are no objects on this space */
1179	//TODO: this makes little sense, why only update the topmost object?
1180	if (!last)
1181	map->at (x, y).flags_ = 0;
1182	else
1183	update_object (last, UP_OBJ_REMOVE);
1184
1185	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1186	update_all_los (map, x, y);	1237	update_all_los (map, x, y);
1187	}	1238	}
1188	}	1239	}
1189		1240
1190	/*	1241	/*
…		…
1214	esrv_update_item (UPD_NROF, pl, top);	1265	esrv_update_item (UPD_NROF, pl, top);
1215		1266
1216	op->weight = 0; // cancel the addition above	1267	op->weight = 0; // cancel the addition above
1217	op->carrying = 0; // must be 0 already	1268	op->carrying = 0; // must be 0 already
1218		1269
1219	op->destroy (1);	1270	op->destroy ();
1220		1271
1221	return top;	1272	return top;
1222	}	1273	}
1223		1274
1224	return 0;	1275	return 0;
…		…
1232		1283
1233	object *prev = this;	1284	object *prev = this;
1234		1285
1235	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1286	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1236	{	1287	{
1237	object *op = arch_to_object (at);	1288	object *op = at->instance ();
1238		1289
1239	op->name = name;	1290	op->name = name;
1240	op->name_pl = name_pl;	1291	op->name_pl = name_pl;
1241	op->title = title;	1292	op->title = title;
1242		1293
…		…
1252	* job preparing multi-part monsters.	1303	* job preparing multi-part monsters.
1253	*/	1304	*/
1254	object *	1305	object *
1255	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)
1256	{	1307	{
		1308	op->remove ();
		1309
1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1310	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1258	{	1311	{
1259	tmp->x = x + tmp->arch->x;	1312	tmp->x = x + tmp->arch->x;
1260	tmp->y = y + tmp->arch->y;	1313	tmp->y = y + tmp->arch->y;
1261	}	1314	}
…		…
1278	* 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
1279	* to be set if special handling is needed.	1332	* to be set if special handling is needed.
1280	*	1333	*
1281	* Return value:	1334	* Return value:
1282	* new object if 'op' was merged with other object	1335	* new object if 'op' was merged with other object
1283	* NULL if 'op' was destroyed	1336	* NULL if there was an error (destroyed, blocked etc.)
1284	* just 'op' otherwise	1337	* just 'op' otherwise
1285	*/	1338	*/
1286	object *	1339	object *
1287	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)
1288	{	1341	{
1289	assert (!op->flag [FLAG_FREED]);
1290
1291	object *top, *floor = NULL;
1292
1293	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
1294		1348
1295	/* Ideally, the caller figures this out. However, it complicates a lot	1349	/* Ideally, the caller figures this out. However, it complicates a lot
1296	* of areas of callers (eg, anything that uses find_free_spot would now	1350	* of areas of callers (eg, anything that uses find_free_spot would now
1297	* need extra work	1351	* need extra work
1298	*/	1352	*/
		1353	maptile *newmap = m;
1299	if (!xy_normalise (m, op->x, op->y))	1354	if (!xy_normalise (newmap, op->x, op->y))
1300	{	1355	{
1301	op->destroy ();	1356	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1302	return 0;	1357	return 0;
1303	}	1358	}
1304		1359
1305	if (object *more = op->more)	1360	if (object *more = op->more)
1306	if (!insert_ob_in_map (more, m, originator, flag))	1361	if (!insert_ob_in_map (more, m, originator, flag))
1307	return 0;	1362	return 0;
1308		1363
1309	CLEAR_FLAG (op, FLAG_REMOVED);	1364	op->flag [FLAG_REMOVED] = false;
1310		1365	op->env = 0;
1311	op->map = m;	1366	op->map = newmap;
		1367
1312	mapspace &ms = op->ms ();	1368	mapspace &ms = op->ms ();
1313		1369
1314	/* this has to be done after we translate the coordinates.	1370	/* this has to be done after we translate the coordinates.
1315	*/	1371	*/
1316	if (op->nrof && !(flag & INS_NO_MERGE))	1372	if (op->nrof && !(flag & INS_NO_MERGE))
1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1373	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1318	if (object::can_merge (op, tmp))	1374	if (object::can_merge (op, tmp))
1319	{	1375	{
		1376	// TODO: we actually want to update tmp, not op,
		1377	// but some caller surely breaks when we return tmp
		1378	// from here :/
1320	op->nrof += tmp->nrof;	1379	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1380	tmp->destroy ();
1322	}	1381	}
1323		1382
1324	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 */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1384	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1326		1385
…		…
1333	{	1392	{
1334	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");
1335	abort ();	1394	abort ();
1336	}	1395	}
1337		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
1338	op->above = originator;	1404	op->above = originator;
1339	op->below = originator->below;	1405	op->below = originator->below;
1340
1341	if (op->below)
1342	op->below->above = op;
1343	else
1344	ms.bot = op;
1345
1346	/* since *below* originator, no need to update top */
1347	originator->below = op;	1406	originator->below = op;
		1407
		1408	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1409	}
1349	else	1410	else
1350	{	1411	{
1351	top = ms.bot;	1412	object *floor = 0;
		1413	object *top = ms.top;
1352		1414
1353	/* If there are other objects, then */	1415	/* If there are other objects, then */
1354	if (top)	1416	if (top)
1355	{	1417	{
1356	object *last = 0;
1357
1358	/*	1418	/*
1359	* 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.
1360	* We've already dealt with merging if appropriate.	1420	* We've already dealt with merging if appropriate.
1361	* 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
1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1422	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1365	* once we get to them. This reduces the need to traverse over all of	1425	* once we get to them. This reduces the need to traverse over all of
1366	* them when adding another one - this saves quite a bit of cpu time	1426	* them when adding another one - this saves quite a bit of cpu time
1367	* when lots of spells are cast in one area. Currently, it is presumed	1427	* when lots of spells are cast in one area. Currently, it is presumed
1368	* that flying non pickable objects are spell objects.	1428	* that flying non pickable objects are spell objects.
1369	*/	1429	*/
1370	for (top = ms.bot; top; top = top->above)	1430	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1371	{	1431	{
1372	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))
1373	floor = top;	1433	floor = tmp;
1374		1434
1375	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))
1376	{	1436	{
1377	/* We insert above top, so we want this object below this */	1437	/* We insert above top, so we want this object below this */
1378	top = top->below;	1438	top = tmp->below;
1379	break;	1439	break;
1380	}	1440	}
1381		1441
1382	last = top;	1442	top = tmp;
1383	}	1443	}
1384
1385	/* Don't want top to be NULL, so set it to the last valid object */
1386	top = last;
1387		1444
1388	/* We let update_position deal with figuring out what the space	1445	/* We let update_position deal with figuring out what the space
1389	* looks like instead of lots of conditions here.	1446	* looks like instead of lots of conditions here.
1390	* makes things faster, and effectively the same result.	1447	* makes things faster, and effectively the same result.
1391	*/	1448	*/
…		…
1398	*/	1455	*/
1399	if (!(flag & INS_ON_TOP)	1456	if (!(flag & INS_ON_TOP)
1400	&& ms.flags () & P_BLOCKSVIEW	1457	&& ms.flags () & P_BLOCKSVIEW
1401	&& (op->face && !faces [op->face].visibility))	1458	&& (op->face && !faces [op->face].visibility))
1402	{	1459	{
		1460	object *last;
		1461
1403	for (last = top; last != floor; last = last->below)	1462	for (last = top; last != floor; last = last->below)
1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1463	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1405	break;	1464	break;
1406		1465
1407	/* Check to see if we found the object that blocks view,	1466	/* Check to see if we found the object that blocks view,
…		…
1415	} /* If objects on this space */	1474	} /* If objects on this space */
1416		1475
1417	if (flag & INS_ABOVE_FLOOR_ONLY)	1476	if (flag & INS_ABOVE_FLOOR_ONLY)
1418	top = floor;	1477	top = floor;
1419		1478
1420	/* 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
1421	*/
1422
1423	/* First object on this space */
1424	if (!top)	1480	if (!top)
1425	{	1481	{
		1482	op->below = 0;
1426	op->above = ms.bot;	1483	op->above = ms.bot;
1427
1428	if (op->above)
1429	op->above->below = op;
1430
1431	op->below = 0;
1432	ms.bot = op;	1484	ms.bot = op;
		1485
		1486	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1487	}
1434	else	1488	else
1435	{ /* get inserted into the stack above top */	1489	{
1436	op->above = top->above;	1490	op->above = top->above;
1437
1438	if (op->above)
1439	op->above->below = op;	1491	top->above = op;
1440		1492
1441	op->below = top;	1493	op->below = top;
1442	top->above = op;	1494	*(op->above ? &op->above->below : &ms.top) = op;
1443	}	1495	}
		1496	}
1444		1497
1445	if (!op->above)	1498	if (op->is_player ())
1446	ms.top = op;
1447	} /* else not INS_BELOW_ORIGINATOR */
1448
1449	if (op->type == PLAYER)
1450	{	1499	{
1451	op->contr->do_los = 1;	1500	op->contr->do_los = 1;
1452	++op->map->players;	1501	++op->map->players;
1453	op->map->touch ();	1502	op->map->touch ();
1454	}	1503	}
1455		1504
1456	op->map->dirty = true;	1505	op->map->dirty = true;
1457		1506
1458	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)
1459	pl->contr->ns->floorbox_update ();	1512	pl->contr->ns->floorbox_update ();
1460		1513
1461	/* If this object glows, it may affect lighting conditions that are	1514	/* If this object glows, it may affect lighting conditions that are
1462	* 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
1463	* 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
1464	* on the map will get recalculated. The players could very well	1517	* on the map will get recalculated. The players could very well
1465	* 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 -
1466	* this should get redone to only look for players within range,	1519	* this should get redone to only look for players within range,
1467	* or just updating the P_UPTODATE for spaces within this area	1520	* or just updating the P_UPTODATE for spaces within this area
1468	* of effect may be sufficient.	1521	* of effect may be sufficient.
1469	*/	1522	*/
1470	if (op->map->darkness && (op->glow_radius != 0))	1523	if (op->affects_los ())
		1524	{
		1525	op->ms ().invalidate ();
1471	update_all_los (op->map, op->x, op->y);	1526	update_all_los (op->map, op->x, op->y);
		1527	}
1472		1528
1473	/* updates flags (blocked, alive, no magic, etc) for this map space */	1529	/* updates flags (blocked, alive, no magic, etc) for this map space */
1474	update_object (op, UP_OBJ_INSERT);	1530	update_object (op, UP_OBJ_INSERT);
1475		1531
1476	INVOKE_OBJECT (INSERT, op);	1532	INVOKE_OBJECT (INSERT, op);
…		…
1483	* blocked() and wall() work properly), and these flags are updated by	1539	* blocked() and wall() work properly), and these flags are updated by
1484	* update_object().	1540	* update_object().
1485	*/	1541	*/
1486		1542
1487	/* 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 */
1488	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1544	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1489	{	1545	{
1490	if (check_move_on (op, originator))	1546	if (check_move_on (op, originator))
1491	return 0;	1547	return 0;
1492		1548
1493	/* 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
…		…
1504	/* this function inserts an object in the map, but if it	1560	/* this function inserts an object in the map, but if it
1505	* finds an object of its own type, it'll remove that one first.	1561	* finds an object of its own type, it'll remove that one first.
1506	* op is the object to insert it under: supplies x and the map.	1562	* op is the object to insert it under: supplies x and the map.
1507	*/	1563	*/
1508	void	1564	void
1509	replace_insert_ob_in_map (const char *arch_string, object *op)	1565	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1510	{	1566	{
1511	/* first search for itself and remove any old instances */	1567	/* first search for itself and remove any old instances */
1512		1568
1513	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1569	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1514	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1570	if (tmp->arch->archname == archname) /* same archetype */
1515	tmp->destroy (1);	1571	tmp->destroy ();
1516		1572
1517	object *tmp = arch_to_object (archetype::find (arch_string));	1573	object *tmp = archetype::find (archname)->instance ();
1518		1574
1519	tmp->x = op->x;	1575	tmp->x = op->x;
1520	tmp->y = op->y;	1576	tmp->y = op->y;
1521		1577
1522	insert_ob_in_map (tmp, op->map, op, 0);	1578	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1527	{	1583	{
1528	if (where->env)	1584	if (where->env)
1529	return where->env->insert (this);	1585	return where->env->insert (this);
1530	else	1586	else
1531	return where->map->insert (this, where->x, where->y, originator, flags);	1587	return where->map->insert (this, where->x, where->y, originator, flags);
		1588	}
		1589
		1590	// check whether we can put this into the map, respect max_volume, max_items
		1591	bool
		1592	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1593	{
		1594	mapspace &ms = m->at (x, y);
		1595
		1596	int items = ms.items ();
		1597
		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;
		1602
		1603	if (originator && originator->is_player ())
		1604	originator->contr->failmsg (format (
		1605	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1606	query_name ()
		1607	));
		1608
		1609	return false;
1532	}	1610	}
1533		1611
1534	/*	1612	/*
1535	* decrease(object, number) decreases a specified number from	1613	* decrease(object, number) decreases a specified number from
1536	* 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
…		…
1544	if (!nr)	1622	if (!nr)
1545	return true;	1623	return true;
1546		1624
1547	nr = min (nr, nrof);	1625	nr = min (nr, nrof);
1548		1626
		1627	if (nrof > nr)
		1628	{
1549	nrof -= nr;	1629	nrof -= nr;
1550
1551	if (nrof)
1552	{
1553	adjust_weight (env, -weight * nr); // carrying == 0	1630	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1554		1631
1555	if (object *pl = visible_to ())	1632	if (object *pl = visible_to ())
1556	esrv_update_item (UPD_NROF, pl, this);	1633	esrv_update_item (UPD_NROF, pl, this);
1557		1634
1558	return true;	1635	return true;
1559	}	1636	}
1560	else	1637	else
1561	{	1638	{
1562	destroy (1);	1639	destroy ();
1563	return false;	1640	return false;
1564	}	1641	}
1565	}	1642	}
1566		1643
1567	/*	1644	/*
…		…
1584	}	1661	}
1585	else	1662	else
1586	{	1663	{
1587	decrease (nr);	1664	decrease (nr);
1588		1665
1589	object *op = object_create_clone (this);	1666	object *op = deep_clone ();
1590	op->nrof = nr;	1667	op->nrof = nr;
1591	return op;	1668	return op;
1592	}	1669	}
1593	}	1670	}
1594		1671
…		…
1644	if (object *pl = tmp->visible_to ())	1721	if (object *pl = tmp->visible_to ())
1645	esrv_update_item (UPD_NROF, pl, tmp);	1722	esrv_update_item (UPD_NROF, pl, tmp);
1646		1723
1647	adjust_weight (this, op->total_weight ());	1724	adjust_weight (this, op->total_weight ());
1648		1725
1649	op->destroy (1);	1726	op->destroy ();
1650	op = tmp;	1727	op = tmp;
1651	goto inserted;	1728	goto inserted;
1652	}	1729	}
1653		1730
1654	op->owner = 0; // it's his/hers now. period.	1731	op->owner = 0; // it's his/hers now. period.
…		…
1672		1749
1673	adjust_weight (this, op->total_weight ());	1750	adjust_weight (this, op->total_weight ());
1674		1751
1675	inserted:	1752	inserted:
1676	/* 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 */
1677	if (op->glow_radius && map && map->darkness)	1754	if (op->glow_radius && is_on_map ())
		1755	{
		1756	update_stats ();
1678	update_all_los (map, x, y);	1757	update_all_los (map, x, y);
1679		1758	}
		1759	else if (is_player ())
1680	// if this is a player's inventory, update stats	1760	// if this is a player's inventory, update stats
1681	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1761	contr->queue_stats_update ();
1682	update_stats ();
1683		1762
1684	INVOKE_OBJECT (INSERT, this);	1763	INVOKE_OBJECT (INSERT, this);
1685		1764
1686	return op;	1765	return op;
1687	}	1766	}
…		…
1707	* on top.	1786	* on top.
1708	*/	1787	*/
1709	int	1788	int
1710	check_move_on (object *op, object *originator)	1789	check_move_on (object *op, object *originator)
1711	{	1790	{
		1791	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1792	return 0;
		1793
1712	object *tmp;	1794	object *tmp;
1713	maptile *m = op->map;	1795	maptile *m = op->map;
1714	int x = op->x, y = op->y;	1796	int x = op->x, y = op->y;
1715		1797
1716	MoveType move_on, move_slow, move_block;	1798	mapspace &ms = m->at (x, y);
1717		1799
1718	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1800	ms.update ();
1719	return 0;
1720		1801
1721	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1802	MoveType move_on = ms.move_on;
1722	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1803	MoveType move_slow = ms.move_slow;
1723	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1804	MoveType move_block = ms.move_block;
1724		1805
1725	/* 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,
1726	* 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
1727	* 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
1728	* as walking.	1809	* as walking.
…		…
1739	return 0;	1820	return 0;
1740		1821
1741	/* The objects have to be checked from top to bottom.	1822	/* The objects have to be checked from top to bottom.
1742	* Hence, we first go to the top:	1823	* Hence, we first go to the top:
1743	*/	1824	*/
1744		1825	for (object *next, *tmp = ms.top; tmp; tmp = next)
1745	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1746	{
1747	/* Trim the search when we find the first other spell effect
1748	* this helps performance so that if a space has 50 spell objects,
1749	* we don't need to check all of them.
1750	*/
1751	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1752	break;
1753	}	1826	{
		1827	next = tmp->below;
1754		1828
1755	for (; tmp; tmp = tmp->below)
1756	{
1757	if (tmp == op)	1829	if (tmp == op)
1758	continue; /* Can't apply yourself */	1830	continue; /* Can't apply yourself */
1759		1831
1760	/* 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.
1761	* Second check makes sure that the movement types not being slowed	1833	* Second check makes sure that the movement types not being slowed
…		…
1766	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1838	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1767	{	1839	{
1768	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1840	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1769	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1841	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1770	{	1842	{
1771
1772	float
1773	diff = tmp->move_slow_penalty * fabs (op->speed);	1843	float diff = tmp->move_slow_penalty * fabs (op->speed);
1774		1844
1775	if (op->type == PLAYER)	1845	if (op->is_player ())
1776	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)) ||
1777	(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)))
1778	diff /= 4.0;	1848	diff /= 4.0;
1779		1849
1780	op->speed_left -= diff;	1850	op->speed_left -= diff;
1781	}	1851	}
1782	}	1852	}
…		…
1815	LOG (llevError, "Present_arch called outside map.\n");	1885	LOG (llevError, "Present_arch called outside map.\n");
1816	return NULL;	1886	return NULL;
1817	}	1887	}
1818		1888
1819	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)
1820	if (tmp->arch == at)	1890	if (tmp->arch->archname == at->archname)
1821	return tmp;	1891	return tmp;
1822		1892
1823	return NULL;	1893	return NULL;
1824	}	1894	}
1825		1895
…		…
1889	* The first matching object is returned, or NULL if none.	1959	* The first matching object is returned, or NULL if none.
1890	*/	1960	*/
1891	object *	1961	object *
1892	present_arch_in_ob (const archetype *at, const object *op)	1962	present_arch_in_ob (const archetype *at, const object *op)
1893	{	1963	{
1894	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1964	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1895	if (tmp->arch == at)	1965	if (tmp->arch->archname == at->archname)
1896	return tmp;	1966	return tmp;
1897		1967
1898	return NULL;	1968	return NULL;
1899	}	1969	}
1900		1970
…		…
1988	* head of the object should correspond for the entire object.	2058	* head of the object should correspond for the entire object.
1989	*/	2059	*/
1990	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2060	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1991	continue;	2061	continue;
1992		2062
1993	if (ob->blocked (m, pos.x, pos.y))	2063	if (ob->blocked (pos.m, pos.x, pos.y))
1994	continue;	2064	continue;
1995		2065
1996	altern [index++] = i;	2066	altern [index++] = i;
1997	}	2067	}
1998		2068
…		…
2066	* there is capable of.	2136	* there is capable of.
2067	*/	2137	*/
2068	int	2138	int
2069	find_dir (maptile *m, int x, int y, object *exclude)	2139	find_dir (maptile *m, int x, int y, object *exclude)
2070	{	2140	{
2071	int i, max = SIZEOFFREE, mflags;	2141	int max = SIZEOFFREE, mflags;
2072
2073	sint16 nx, ny;
2074	object *tmp;
2075	maptile *mp;
2076
2077	MoveType blocked, move_type;	2142	MoveType move_type;
2078		2143
2079	if (exclude && exclude->head_ () != exclude)	2144	if (exclude && exclude->head_ () != exclude)
2080	{	2145	{
2081	exclude = exclude->head;	2146	exclude = exclude->head;
2082	move_type = exclude->move_type;	2147	move_type = exclude->move_type;
…		…
2085	{	2150	{
2086	/* 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. */
2087	move_type = MOVE_ALL;	2152	move_type = MOVE_ALL;
2088	}	2153	}
2089		2154
2090	for (i = 1; i < max; i++)	2155	for (int i = 1; i < max; i++)
2091	{	2156	{
2092	mp = m;	2157	mapxy pos (m, x, y);
2093	nx = x + freearr_x[i];	2158	pos.move (i);
2094	ny = y + freearr_y[i];
2095		2159
2096	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2160	if (!pos.normalise ())
2097
2098	if (mflags & P_OUT_OF_MAP)
2099	max = maxfree[i];	2161	max = maxfree[i];
2100	else	2162	else
2101	{	2163	{
2102	mapspace &ms = mp->at (nx, ny);	2164	mapspace &ms = *pos;
2103		2165
2104	blocked = ms.move_block;
2105
2106	if ((move_type & blocked) == move_type)	2166	if ((move_type & ms.move_block) == move_type)
2107	max = maxfree[i];	2167	max = maxfree [i];
2108	else if (mflags & P_IS_ALIVE)	2168	else if (ms.flags () & P_IS_ALIVE)
2109	{	2169	{
2110	for (tmp = ms.bot; tmp; tmp = tmp->above)	2170	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2111	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2171	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2112	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2172	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2113	break;
2114
2115	if (tmp)
2116	return freedir[i];	2173	return freedir [i];
2117	}	2174	}
2118	}	2175	}
2119	}	2176	}
2120		2177
2121	return 0;	2178	return 0;
…		…
2196	* 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
2197	* 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.
2198	* 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
2199	* functions.	2256	* functions.
2200	*/	2257	*/
2201	int reduction_dir[SIZEOFFREE][3] = {	2258	static const int reduction_dir[SIZEOFFREE][3] = {
2202	{0, 0, 0}, /* 0 */	2259	{0, 0, 0}, /* 0 */
2203	{0, 0, 0}, /* 1 */	2260	{0, 0, 0}, /* 1 */
2204	{0, 0, 0}, /* 2 */	2261	{0, 0, 0}, /* 2 */
2205	{0, 0, 0}, /* 3 */	2262	{0, 0, 0}, /* 3 */
2206	{0, 0, 0}, /* 4 */	2263	{0, 0, 0}, /* 4 */
…		…
2302	int	2359	int
2303	can_pick (const object *who, const object *item)	2360	can_pick (const object *who, const object *item)
2304	{	2361	{
2305	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2362	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2306	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2363	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2307	!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));
2308	}	2365	}
2309		2366
2310	/*	2367	/*
2311	* create clone from object to another	2368	* create clone from object to another
2312	*/	2369	*/
2313	object *	2370	object *
2314	object_create_clone (object *asrc)	2371	object::deep_clone ()
2315	{	2372	{
2316	object *dst = 0, *tmp, *src, *prev, *item;	2373	assert (("deep_clone called on non-head object", is_head ()));
2317		2374
2318	if (!asrc)	2375	object *dst = clone ();
2319	return 0;
2320		2376
2321	src = asrc->head_ ();	2377	object *prev = dst;
2322
2323	prev = 0;
2324	for (object *part = src; part; part = part->more)	2378	for (object *part = this->more; part; part = part->more)
2325	{	2379	{
2326	tmp = part->clone ();	2380	object *tmp = part->clone ();
2327	tmp->x -= src->x;
2328	tmp->y -= src->y;
2329
2330	if (!part->head)
2331	{
2332	dst = tmp;
2333	tmp->head = 0;
2334	}
2335	else
2336	tmp->head = dst;	2381	tmp->head = dst;
2337
2338	tmp->more = 0;
2339
2340	if (prev)
2341	prev->more = tmp;	2382	prev->more = tmp;
2342
2343	prev = tmp;	2383	prev = tmp;
2344	}	2384	}
2345		2385
2346	for (item = src->inv; item; item = item->below)	2386	for (object *item = inv; item; item = item->below)
2347	insert_ob_in_ob (object_create_clone (item), dst);	2387	insert_ob_in_ob (item->deep_clone (), dst);
2348		2388
2349	return dst;	2389	return dst;
2350	}	2390	}
2351		2391
2352	/* This returns the first object in who's inventory that	2392	/* This returns the first object in who's inventory that
…		…
2361	return tmp;	2401	return tmp;
2362		2402
2363	return 0;	2403	return 0;
2364	}	2404	}
2365		2405
2366	/* If ob has a field named key, return the link from the list,	2406	shstr_tmp
2367	* otherwise return NULL.	2407	object::kv_get (shstr_tmp key) const
2368	*
2369	* key must be a passed in shared string - otherwise, this won't
2370	* do the desired thing.
2371	*/
2372	key_value *
2373	get_ob_key_link (const object *ob, const char *key)
2374	{	2408	{
2375	for (key_value *link = ob->key_values; link; link = link->next)	2409	for (key_value *kv = key_values; kv; kv = kv->next)
2376	if (link->key == key)	2410	if (kv->key == key)
2377	return link;
2378
2379	return 0;
2380	}
2381
2382	/*
2383	* Returns the value of op has an extra_field for key, or NULL.
2384	*
2385	* The argument doesn't need to be a shared string.
2386	*
2387	* The returned string is shared.
2388	*/
2389	const char *
2390	get_ob_key_value (const object *op, const char *const key)
2391	{
2392	key_value *link;
2393	shstr_cmp canonical_key (key);
2394
2395	if (!canonical_key)
2396	{
2397	/* 1. There being a field named key on any object
2398	* implies there'd be a shared string to find.
2399	* 2. Since there isn't, no object has this field.
2400	* 3. Therefore, *this* object doesn't have this field.
2401	*/
2402	return 0;
2403	}
2404
2405	/* This is copied from get_ob_key_link() above -
2406	* only 4 lines, and saves the function call overhead.
2407	*/
2408	for (link = op->key_values; link; link = link->next)
2409	if (link->key == canonical_key)
2410	return link->value;	2411	return kv->value;
2411		2412
2412	return 0;	2413	return shstr ();
2413	}	2414	}
2414		2415
2415	/*	2416	void
2416	* Updates the canonical_key in op to value.	2417	object::kv_set (shstr_tmp key, shstr_tmp value)
2417	*
2418	* canonical_key is a shared string (value doesn't have to be).
2419	*
2420	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2421	* keys.
2422	*
2423	* Returns TRUE on success.
2424	*/
2425	int
2426	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2427	{	2418	{
2428	key_value *field = NULL, *last = NULL;	2419	for (key_value *kv = key_values; kv; kv = kv->next)
2429		2420	if (kv->key == key)
2430	for (field = op->key_values; field != NULL; field = field->next)
2431	{
2432	if (field->key != canonical_key)
2433	{	2421	{
2434	last = field;	2422	kv->value = value;
2435	continue;	2423	return;
2436	}	2424	}
2437		2425
2438	if (value)	2426	key_value *kv = new key_value;
2439	field->value = value;	2427
2440	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)
2441	{	2440	{
2442	/* Basically, if the archetype has this key set,	2441	key_value *kv = *kvp;
2443	* we need to store the null value so when we save	2442	*kvp = (*kvp)->next;
2444	* it, we save the empty value so that when we load,	2443	delete kv;
2445	* we get this value back again.	2444	return;
2446	*/
2447	if (get_ob_key_link (op->arch, canonical_key))
2448	field->value = 0;
2449	else
2450	{
2451	if (last)
2452	last->next = field->next;
2453	else
2454	op->key_values = field->next;
2455
2456	delete field;
2457	}
2458	}	2445	}
2459	return TRUE;
2460	}
2461	/* IF we get here, key doesn't exist */
2462
2463	/* No field, we'll have to add it. */
2464
2465	if (!add_key)
2466	return FALSE;
2467
2468	/* There isn't any good reason to store a null
2469	* value in the key/value list. If the archetype has
2470	* this key, then we should also have it, so shouldn't
2471	* be here. If user wants to store empty strings,
2472	* should pass in ""
2473	*/
2474	if (value == NULL)
2475	return TRUE;
2476
2477	field = new key_value;
2478
2479	field->key = canonical_key;
2480	field->value = value;
2481	/* Usual prepend-addition. */
2482	field->next = op->key_values;
2483	op->key_values = field;
2484
2485	return TRUE;
2486	}
2487
2488	/*
2489	* Updates the key in op to value.
2490	*
2491	* If add_key is FALSE, this will only update existing keys,
2492	* and not add new ones.
2493	* In general, should be little reason FALSE is ever passed in for add_key
2494	*
2495	* Returns TRUE on success.
2496	*/
2497	int
2498	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2499	{
2500	shstr key_ (key);
2501
2502	return set_ob_key_value_s (op, key_, value, add_key);
2503	}	2446	}
2504		2447
2505	object::depth_iterator::depth_iterator (object *container)	2448	object::depth_iterator::depth_iterator (object *container)
2506	: iterator_base (container)	2449	: iterator_base (container)
2507	{	2450	{
…		…
2557	{	2500	{
2558	char flagdesc[512];	2501	char flagdesc[512];
2559	char info2[256 * 4];	2502	char info2[256 * 4];
2560	char *p = info;	2503	char *p = info;
2561		2504
2562	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}",
2563	count,	2506	count,
2564	uuid.c_str (),	2507	uuid.c_str (),
2565	&name,	2508	&name,
2566	title ? "\",title:\"" : "",	2509	title ? ",title:\"" : "",
2567	title ? (const char *)title : "",	2510	title ? (const char *)title : "",
		2511	title ? "\"" : "",
2568	flag_desc (flagdesc, 512), type);	2512	flag_desc (flagdesc, 512), type);
2569		2513
2570	if (!this->flag[FLAG_REMOVED] && env)	2514	if (!flag[FLAG_REMOVED] && env)
2571	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2515	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2572		2516
2573	if (map)	2517	if (map)
2574	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);
2575		2519
…		…
2590	{	2534	{
2591	return map ? map->region (x, y)	2535	return map ? map->region (x, y)
2592	: region::default_region ();	2536	: region::default_region ();
2593	}	2537	}
2594		2538
2595	const materialtype_t *
2596	object::dominant_material () const
2597	{
2598	if (materialtype_t *mt = name_to_material (materialname))
2599	return mt;
2600
2601	return name_to_material (shstr_unknown);
2602	}
2603
2604	void	2539	void
2605	object::open_container (object *new_container)	2540	object::open_container (object *new_container)
2606	{	2541	{
2607	if (container == new_container)	2542	if (container == new_container)
2608	return;	2543	return;
2609		2544
2610	if (object *old_container = container)	2545	object *old_container = container;
		2546
		2547	if (old_container)
2611	{	2548	{
2612	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2549	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2613	return;	2550	return;
2614		2551
2615	#if 0	2552	#if 0
…		…
2617	if (object *closer = old_container->inv)	2554	if (object *closer = old_container->inv)
2618	if (closer->type == CLOSE_CON)	2555	if (closer->type == CLOSE_CON)
2619	closer->destroy ();	2556	closer->destroy ();
2620	#endif	2557	#endif
2621		2558
		2559	// make sure the container is available
		2560	esrv_send_item (this, old_container);
		2561
2622	old_container->flag [FLAG_APPLIED] = 0;	2562	old_container->flag [FLAG_APPLIED] = false;
2623	container = 0;	2563	container = 0;
2624		2564
		2565	// client needs item update to make it work, client bug requires this to be separate
2625	esrv_update_item (UPD_FLAGS, this, old_container);	2566	esrv_update_item (UPD_FLAGS, this, old_container);
		2567
2626	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 ());
2627	play_sound (sound_find ("chest_close"));	2569	play_sound (sound_find ("chest_close"));
2628	}	2570	}
2629		2571
2630	if (new_container)	2572	if (new_container)
2631	{	2573	{
…		…
2635	// TODO: this does not seem to serve any purpose anymore?	2577	// TODO: this does not seem to serve any purpose anymore?
2636	#if 0	2578	#if 0
2637	// insert the "Close Container" object.	2579	// insert the "Close Container" object.
2638	if (archetype *closer = new_container->other_arch)	2580	if (archetype *closer = new_container->other_arch)
2639	{	2581	{
2640	object *closer = arch_to_object (new_container->other_arch);	2582	object *closer = new_container->other_arch->instance ();
2641	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2583	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2642	new_container->insert (closer);	2584	new_container->insert (closer);
2643	}	2585	}
2644	#endif	2586	#endif
2645		2587
2646	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 ());
2647		2589
		2590	// make sure the container is available, client bug requires this to be separate
		2591	esrv_send_item (this, new_container);
		2592
2648	new_container->flag [FLAG_APPLIED] = 1;	2593	new_container->flag [FLAG_APPLIED] = true;
2649	container = new_container;	2594	container = new_container;
2650		2595
		2596	// client needs flag change
2651	esrv_update_item (UPD_FLAGS, this, new_container);	2597	esrv_update_item (UPD_FLAGS, this, new_container);
2652	esrv_send_inventory (this, new_container);	2598	esrv_send_inventory (this, new_container);
2653	play_sound (sound_find ("chest_open"));	2599	play_sound (sound_find ("chest_open"));
2654	}	2600	}
		2601	// else if (!old_container->env && contr && contr->ns)
		2602	// contr->ns->floorbox_reset ();
2655	}	2603	}
2656		2604
2657	object *	2605	object *
2658	object::force_find (const shstr name)	2606	object::force_find (shstr_tmp name)
2659	{	2607	{
2660	/* 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
2661	* place	2609	* place
2662	*/	2610	*/
2663	for (object *tmp = inv; tmp; tmp = tmp->below)	2611	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2665	return splay (tmp);	2613	return splay (tmp);
2666		2614
2667	return 0;	2615	return 0;
2668	}	2616	}
2669		2617
		2618	//-GPL
		2619
2670	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 *
2671	object::force_add (const shstr name, int duration)	2630	object::force_add (shstr_tmp name, int duration)
2672	{	2631	{
2673	if (object *force = force_find (name))	2632	if (object *force = force_find (name))
2674	force->destroy ();	2633	force->destroy ();
2675		2634
2676	object *force = get_archetype (FORCE_NAME);	2635	object *force = get_archetype (FORCE_NAME);
2677		2636
2678	force->slaying = name;	2637	force->slaying = name;
2679	force->stats.food = 1;	2638	force->force_set_timer (duration);
2680	force->speed_left = -1.f;
2681
2682	force->set_speed (duration ? 1.f / duration : 0.f);
2683	force->flag [FLAG_IS_USED_UP] = true;
2684	force->flag [FLAG_APPLIED] = true;	2639	force->flag [FLAG_APPLIED] = true;
2685		2640
2686	insert (force);	2641	return insert (force);
2687	}	2642	}
2688		2643
2689	void	2644	void
2690	object::play_sound (faceidx sound)	2645	object::play_sound (faceidx sound) const
2691	{	2646	{
2692	if (!sound)	2647	if (!sound)
2693	return;	2648	return;
2694		2649
2695	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 ())
2696	return;	2675	return;
2697		2676
2698	if (env)	2677	// find old force, or create new one
2699	{	2678	object *force = force_find (shstr_noise_force);
2700	if (object *pl = in_player ())	2679
2701	pl->contr->play_sound (sound);	2680	if (force)
2702	}	2681	force->speed_left = -1.f; // patch old speed up
2703	else	2682	else
2704	map->play_sound (sound, x, y);	2683	{
2705	}	2684	force = archetype::get (shstr_noise_force);
2706		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