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.223 by root, Wed Apr 30 08:29:31 2008 UTC vs.
Revision 1.323 by root, Sun Apr 11 23:56:09 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
216	* are not equal - just if it has been identified, the been_applied	268	* are not equal - just if it has been identified, the been_applied
217	* flags lose any meaning.	269	* flags lose any meaning.
218	*/	270	*/
219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	271	if (ob1->flag [FLAG_IDENTIFIED])
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	272	ob1->set_flag (FLAG_BEEN_APPLIED);
221		273
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	274	if (ob2->flag [FLAG_IDENTIFIED])
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	275	ob2->set_flag (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
…		…
277		329
278	/* Don't merge objects that are applied. With the new 'body' code,	330	/* Don't merge objects that are applied. With the new 'body' code,
279	* it is possible for most any character to have more than one of	331	* it is possible for most any character to have more than one of
280	* some items equipped, and we don't want those to merge.	332	* some items equipped, and we don't want those to merge.
281	*/	333	*/
282	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	334	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
283	return 0;	335	return 0;
284		336
285	/* Note sure why the following is the case - either the object has to	337	/* Note sure why the following is the case - either the object has to
286	* be animated or have a very low speed. Is this an attempted monster	338	* be animated or have a very low speed. Is this an attempted monster
287	* check?	339	* check?
288	*/	340	*/
289	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	341	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
290	return 0;	342	return 0;
291		343
292	switch (ob1->type)	344	switch (ob1->type)
293	{	345	{
294	case SCROLL:	346	case SCROLL:
…		…
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.
…		…
520	}	574	}
521		575
522	this->owner = owner;	576	this->owner = owner;
523	}	577	}
524		578
525	int
526	object::slottype () const
527	{
528	if (type == SKILL)
529	{
530	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
531	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
532	}
533	else
534	{
535	if (slot [body_combat].info) return slot_combat;
536	if (slot [body_range ].info) return slot_ranged;
537	}
538
539	return slot_none;
540	}
541
542	bool
543	object::change_weapon (object *ob)
544	{
545	if (current_weapon == ob)
546	return true;
547
548	if (chosen_skill)
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	}
578	else
579	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
580
581	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
582	{
583	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
584	&name, ob->debug_desc ());
585	return false;
586	}
587
588	return true;
589	}
590
591	/* Zero the key_values on op, decrementing the shared-string	579	/* Zero the key_values on op, decrementing the shared-string
592	* refcounts and freeing the links.	580	* refcounts and freeing the links.
593	*/	581	*/
594	static void	582	static void
595	free_key_values (object *op)	583	free_key_values (object *op)
…		…
603	}	591	}
604		592
605	op->key_values = 0;	593	op->key_values = 0;
606	}	594	}
607		595
608	object &	596	/*
609	object::operator =(const object &src)	597	* copy_to first frees everything allocated by the dst object,
		598	* and then copies the contents of itself into the second
		599	* object, allocating what needs to be allocated. Basically, any
		600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		601	* if the first object is freed, the pointers in the new object
		602	* will point at garbage.
		603	*/
		604	void
		605	object::copy_to (object *dst)
610	{	606	{
611	bool is_freed = flag [FLAG_FREED];	607	dst->remove ();
612	bool is_removed = flag [FLAG_REMOVED];
613
614	*(object_copy *)this = src;	608	*(object_copy *)dst = *this;
615
616	flag [FLAG_FREED] = is_freed;
617	flag [FLAG_REMOVED] = is_removed;	609	dst->flag [FLAG_REMOVED] = true;
618		610
619	/* Copy over key_values, if any. */	611	/* Copy over key_values, if any. */
620	if (src.key_values)	612	if (key_values)
621	{	613	{
622	key_value *tail = 0;	614	key_value *tail = 0;
623	key_values = 0;	615	dst->key_values = 0;
624		616
625	for (key_value *i = src.key_values; i; i = i->next)	617	for (key_value *i = key_values; i; i = i->next)
626	{	618	{
627	key_value *new_link = new key_value;	619	key_value *new_link = new key_value;
628		620
629	new_link->next = 0;	621	new_link->next = 0;
630	new_link->key = i->key;	622	new_link->key = i->key;
631	new_link->value = i->value;	623	new_link->value = i->value;
632		624
633	/* Try and be clever here, too. */	625	/* Try and be clever here, too. */
634	if (!key_values)	626	if (!dst->key_values)
635	{	627	{
636	key_values = new_link;	628	dst->key_values = new_link;
637	tail = new_link;	629	tail = new_link;
638	}	630	}
639	else	631	else
640	{	632	{
641	tail->next = new_link;	633	tail->next = new_link;
642	tail = new_link;	634	tail = new_link;
643	}	635	}
644	}	636	}
645	}	637	}
646	}
647		638
648	/*	639	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	}	640	}
666		641
667	void	642	void
668	object::instantiate ()	643	object::instantiate ()
669	{	644	{
670	if (!uuid.seq) // HACK	645	if (!uuid.seq) // HACK
671	uuid = UUID::gen ();	646	uuid = UUID::gen ();
672		647
		648	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		649	if (flag [FLAG_RANDOM_SPEED] && speed)
		650	speed_left = - speed - rndm (); // TODO animation
		651	else
673	speed_left = -0.1f;	652	speed_left = -1.;
		653
674	/* copy the body_info to the body_used - this is only really	654	/* 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.	655	* 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	656	* by doing so, when a monster is created, it has good starting
677	* values for the body_used info, so when items are created	657	* values for the body_used info, so when items are created
678	* for it, they can be properly equipped.	658	* for it, they can be properly equipped.
…		…
686	object *	666	object *
687	object::clone ()	667	object::clone ()
688	{	668	{
689	object *neu = create ();	669	object *neu = create ();
690	copy_to (neu);	670	copy_to (neu);
		671
		672	// TODO: unclean state changes, should not be done in clone AND instantiate
		673	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		674	neu->speed_left = - neu->speed - rndm (); // TODO animation
		675
		676	neu->map = map; // not copied by copy_to
691	return neu;	677	return neu;
692	}	678	}
693		679
694	/*	680	/*
695	* If an object with the IS_TURNABLE() flag needs to be turned due	681	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
697	* be called to update the face variable, _and_ how it looks on the map.	683	* be called to update the face variable, _and_ how it looks on the map.
698	*/	684	*/
699	void	685	void
700	update_turn_face (object *op)	686	update_turn_face (object *op)
701	{	687	{
702	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	688	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
703	return;	689	return;
704		690
705	SET_ANIMATION (op, op->direction);	691	SET_ANIMATION (op, op->direction);
706	update_object (op, UP_OBJ_FACE);	692	update_object (op, UP_OBJ_FACE);
707	}	693	}
…		…
712	* This function needs to be called whenever the speed of an object changes.	698	* This function needs to be called whenever the speed of an object changes.
713	*/	699	*/
714	void	700	void
715	object::set_speed (float speed)	701	object::set_speed (float speed)
716	{	702	{
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;	703	this->speed = speed;
724		704
725	if (has_active_speed ())	705	if (has_active_speed ())
726	activate ();	706	activate ();
727	else	707	else
…		…
777		757
778	if (!(m.flags_ & P_UPTODATE))	758	if (!(m.flags_ & P_UPTODATE))
779	/* nop */;	759	/* nop */;
780	else if (action == UP_OBJ_INSERT)	760	else if (action == UP_OBJ_INSERT)
781	{	761	{
		762	#if 0
782	// this is likely overkill, TODO: revisit (schmorp)	763	// this is likely overkill, TODO: revisit (schmorp)
783	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	764	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
784	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	765	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
785	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	766	|| (op->is_player () && !(m.flags_ & P_PLAYER))
786	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	767	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
787	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	768	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
788	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	769	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
789	|| (m.move_on | op->move_on ) != m.move_on	770	|| (m.move_on | op->move_on ) != m.move_on
790	|| (m.move_off | op->move_off ) != m.move_off	771	|| (m.move_off | op->move_off ) != m.move_off
791	|| (m.move_slow | op->move_slow) != m.move_slow	772	|| (m.move_slow | op->move_slow) != m.move_slow
792	/* This isn't perfect, but I don't expect a lot of objects to	773	/* This isn't perfect, but I don't expect a lot of objects to
793	* to have move_allow right now.	774	* have move_allow right now.
794	*/	775	*/
795	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	776	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		777	m.invalidate ();
		778	#else
796	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	779	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
797	m.flags_ = 0;	780	m.invalidate ();
		781	#endif
798	}	782	}
799	/* if the object is being removed, we can't make intelligent	783	/* if the object is being removed, we can't make intelligent
800	* decisions, because remove_ob can't really pass the object	784	* decisions, because remove_ob can't really pass the object
801	* that is being removed.	785	* that is being removed.
802	*/	786	*/
803	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	787	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
804	m.flags_ = 0;	788	m.invalidate ();
805	else if (action == UP_OBJ_FACE)	789	else if (action == UP_OBJ_FACE)
806	/* Nothing to do for that case */ ;	790	/* Nothing to do for that case */ ;
807	else	791	else
808	LOG (llevError, "update_object called with invalid action: %d\n", action);	792	LOG (llevError, "update_object called with invalid action: %d\n", action);
809		793
…		…
811	update_object (op->more, action);	795	update_object (op->more, action);
812	}	796	}
813		797
814	object::object ()	798	object::object ()
815	{	799	{
816	SET_FLAG (this, FLAG_REMOVED);	800	this->set_flag (FLAG_REMOVED);
817		801
818	expmul = 1.0;	802	//expmul = 1.0; declared const for the time being
819	face = blank_face;	803	face = blank_face;
		804	material = MATERIAL_NULL;
820	}	805	}
821		806
822	object::~object ()	807	object::~object ()
823	{	808	{
824	unlink ();	809	unlink ();
…		…
853	/* If already on active list, don't do anything */	838	/* If already on active list, don't do anything */
854	if (active)	839	if (active)
855	return;	840	return;
856		841
857	if (has_active_speed ())	842	if (has_active_speed ())
		843	{
		844	if (flag [FLAG_FREED])
		845	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		846
858	actives.insert (this);	847	actives.insert (this);
		848	}
859	}	849	}
860		850
861	void	851	void
862	object::activate_recursive ()	852	object::activate_recursive ()
863	{	853	{
…		…
924	* drop on that space.	914	* drop on that space.
925	*/	915	*/
926	if (!drop_to_ground	916	if (!drop_to_ground
927	|| !map	917	|| !map
928	|| map->in_memory != MAP_ACTIVE	918	|| map->in_memory != MAP_ACTIVE
929	|| map->nodrop	919	|| map->no_drop
930	|| ms ().move_block == MOVE_ALL)	920	|| ms ().move_block == MOVE_ALL)
931	{	921	{
932	while (inv)	922	while (inv)
933	{
934	inv->destroy_inv (false);
935	inv->destroy ();	923	inv->destroy ();
936	}
937	}	924	}
938	else	925	else
939	{ /* Put objects in inventory onto this space */	926	{ /* Put objects in inventory onto this space */
940	while (inv)	927	while (inv)
941	{	928	{
…		…
945	|| op->flag [FLAG_NO_DROP]	932	|| op->flag [FLAG_NO_DROP]
946	|| op->type == RUNE	933	|| op->type == RUNE
947	|| op->type == TRAP	934	|| op->type == TRAP
948	|| op->flag [FLAG_IS_A_TEMPLATE]	935	|| op->flag [FLAG_IS_A_TEMPLATE]
949	|| op->flag [FLAG_DESTROY_ON_DEATH])	936	|| op->flag [FLAG_DESTROY_ON_DEATH])
950	op->destroy (true);	937	op->destroy ();
951	else	938	else
952	map->insert (op, x, y);	939	map->insert (op, x, y);
953	}	940	}
954	}	941	}
955	}	942	}
956		943
		944	/*
		945	* Remove and free all objects in the inventory of the given object.
		946	* Unlike destroy_inv, this assumes the *this is destroyed as well
		947	* well, so we can (and have to!) take shortcuts.
		948	*/
		949	void
		950	object::destroy_inv_fast ()
		951	{
		952	while (object *op = inv)
		953	{
		954	// remove from object the fast way
		955	op->flag [FLAG_REMOVED] = true;
		956	op->env = 0;
		957	if ((inv = inv->below))
		958	inv->above = 0;
		959
		960	// then destroy
		961	op->destroy ();
		962	}
		963	}
		964
957	object *object::create ()	965	object *object::create ()
958	{	966	{
959	object *op = new object;	967	object *op = new object;
960	op->link ();	968	op->link ();
961	return op;	969	return op;
…		…
963		971
964	static struct freed_map : maptile	972	static struct freed_map : maptile
965	{	973	{
966	freed_map ()	974	freed_map ()
967	{	975	{
968	path = "<freed objects map>";	976	path = "<freed objects map>";
969	name = "/internal/freed_objects_map";	977	name = "/internal/freed_objects_map";
970	width = 3;	978	width = 3;
971	height = 3;	979	height = 3;
972	nodrop = 1;	980	no_drop = 1;
		981	no_reset = 1;
973		982
974	alloc ();	983	alloc ();
975	in_memory = MAP_ACTIVE;	984	in_memory = MAP_ACTIVE;
976	}	985	}
		986
		987	~freed_map ()
		988	{
		989	destroy ();
		990	}
977	} freed_map; // freed objects are moved here to avoid crashes	991	} freed_map; // freed objects are moved here to avoid crashes
978		992
979	void	993	void
980	object::do_destroy ()	994	object::do_destroy ()
981	{	995	{
982	if (flag [FLAG_IS_LINKED])	996	if (flag [FLAG_IS_LINKED])
983	remove_button_link (this);	997	remove_link ();
984		998
985	if (flag [FLAG_FRIENDLY])	999	if (flag [FLAG_FRIENDLY])
986	remove_friendly_object (this);	1000	remove_friendly_object (this);
987		1001
988	remove ();	1002	remove ();
…		…
1013	attacked_by = 0;	1027	attacked_by = 0;
1014	current_weapon = 0;	1028	current_weapon = 0;
1015	}	1029	}
1016		1030
1017	void	1031	void
1018	object::destroy (bool destroy_inventory)	1032	object::destroy ()
1019	{	1033	{
1020	if (destroyed ())	1034	if (destroyed ())
1021	return;	1035	return;
1022		1036
1023	if (!is_head () && !head->destroyed ())	1037	if (!is_head () && !head->destroyed ())
1024	{	1038	{
1025	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1039	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1026	head->destroy (destroy_inventory);	1040	head->destroy ();
1027	return;	1041	return;
1028	}	1042	}
1029		1043
1030	destroy_inv (!destroy_inventory);	1044	destroy_inv_fast ();
1031		1045
1032	if (is_head ())	1046	if (is_head ())
1033	if (sound_destroy)	1047	if (sound_destroy)
1034	play_sound (sound_destroy);	1048	play_sound (sound_destroy);
1035	else if (flag [FLAG_MONSTER])	1049	else if (flag [FLAG_MONSTER])
…		…
1046	* the previous environment.	1060	* the previous environment.
1047	*/	1061	*/
1048	void	1062	void
1049	object::do_remove ()	1063	object::do_remove ()
1050	{	1064	{
1051	object *tmp, *last = 0;
1052	object *otmp;
1053
1054	if (flag [FLAG_REMOVED])	1065	if (flag [FLAG_REMOVED])
1055	return;	1066	return;
1056		1067
1057	INVOKE_OBJECT (REMOVE, this);	1068	INVOKE_OBJECT (REMOVE, this);
1058		1069
…		…
1072	esrv_del_item (pl->contr, count);	1083	esrv_del_item (pl->contr, count);
1073	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1084	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1074		1085
1075	adjust_weight (env, -total_weight ());	1086	adjust_weight (env, -total_weight ());
1076		1087
1077	*(above ? &above->below : &env->inv) = below;	1088	object *pl = in_player ();
1078
1079	if (below)
1080	below->above = above;
1081		1089
1082	/* we set up values so that it could be inserted into	1090	/* we set up values so that it could be inserted into
1083	* the map, but we don't actually do that - it is up	1091	* the map, but we don't actually do that - it is up
1084	* to the caller to decide what we want to do.	1092	* to the caller to decide what we want to do.
1085	*/	1093	*/
1086	map = env->map;	1094	map = env->map;
1087	x = env->x;	1095	x = env->x;
1088	y = env->y;	1096	y = env->y;
		1097
		1098	// make sure cmov optimisation is applicable
		1099	*(above ? &above->below : &env->inv) = below;
		1100	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1101
1089	above = 0;	1102	above = 0;
1090	below = 0;	1103	below = 0;
1091	env = 0;	1104	env = 0;
1092		1105
1093	/* NO_FIX_PLAYER is set when a great many changes are being	1106	if (pl && pl->is_player ())
1094	* made to players inventory. If set, avoiding the call
1095	* to save cpu time.
1096	*/	1107	{
1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1108	if (expect_false (pl->contr->combat_ob == this))
1098	otmp->update_stats ();	1109	{
		1110	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1111	pl->contr->combat_ob = 0;
		1112	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1113	}
		1114
		1115	if (expect_false (pl->contr->ranged_ob == this))
		1116	{
		1117	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1118	pl->contr->ranged_ob = 0;
		1119	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1120	}
		1121
		1122	pl->contr->queue_stats_update ();
		1123
		1124	if (expect_false (glow_radius) && pl->is_on_map ())
		1125	update_all_los (pl->map, pl->x, pl->y);
		1126	}
1099	}	1127	}
1100	else if (map)	1128	else if (map)
1101	{	1129	{
1102	map->dirty = true;	1130	map->dirty = true;
1103	mapspace &ms = this->ms ();	1131	mapspace &ms = this->ms ();
1104		1132
1105	if (object *pl = ms.player ())	1133	if (object *pl = ms.player ())
1106	{	1134	{
1107	if (type == PLAYER) // this == pl(!)	1135	if (is_player ())
1108	{	1136	{
		1137	if (!flag [FLAG_WIZPASS])
		1138	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1139
1109	// leaving a spot always closes any open container on the ground	1140	// leaving a spot always closes any open container on the ground
1110	if (container && !container->env)	1141	if (container && !container->env)
1111	// this causes spurious floorbox updates, but it ensures	1142	// this causes spurious floorbox updates, but it ensures
1112	// that the CLOSE event is being sent.	1143	// that the CLOSE event is being sent.
1113	close_container ();	1144	close_container ();
1114		1145
1115	--map->players;	1146	--map->players;
1116	map->touch ();	1147	map->touch ();
1117	}	1148	}
1118	else if (pl->container == this)	1149	else if (pl->container_ () == this)
1119	{	1150	{
1120	// removing a container should close it	1151	// removing a container should close it
1121	close_container ();	1152	close_container ();
1122	}	1153	}
1123		1154	else
1124	esrv_del_item (pl->contr, count);	1155	esrv_del_item (pl->contr, count);
1125	}	1156	}
1126		1157
1127	/* link the object above us */	1158	/* link the object above us */
1128	if (above)	1159	// re-link, make sure compiler can easily use cmove
1129	above->below = below;	1160	*(above ? &above->below : &ms.top) = below;
1130	else	1161	*(below ? &below->above : &ms.bot) = above;
1131	ms.top = below; /* we were top, set new top */
1132
1133	/* Relink the object below us, if there is one */
1134	if (below)
1135	below->above = above;
1136	else
1137	{
1138	/* Nothing below, which means we need to relink map object for this space
1139	* use translated coordinates in case some oddness with map tiling is
1140	* evident
1141	*/
1142	if (GET_MAP_OB (map, x, y) != this)
1143	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 ());
1144
1145	ms.bot = above; /* goes on above it. */
1146	}
1147		1162
1148	above = 0;	1163	above = 0;
1149	below = 0;	1164	below = 0;
1150		1165
		1166	ms.invalidate ();
		1167
1151	if (map->in_memory == MAP_SAVING)	1168	if (map->in_memory == MAP_SAVING)
1152	return;	1169	return;
1153		1170
1154	int check_walk_off = !flag [FLAG_NO_APPLY];	1171	int check_walk_off = !flag [FLAG_NO_APPLY];
1155		1172
1156	if (object *pl = ms.player ())	1173	if (object *pl = ms.player ())
1157	{	1174	{
1158	if (pl->container == this)	1175	if (pl->container_ () == this)
1159	/* If a container that the player is currently using somehow gets	1176	/* If a container that the player is currently using somehow gets
1160	* removed (most likely destroyed), update the player view	1177	* removed (most likely destroyed), update the player view
1161	* appropriately.	1178	* appropriately.
1162	*/	1179	*/
1163	pl->close_container ();	1180	pl->close_container ();
1164		1181
1165	//TODO: the floorbox prev/next might need updating	1182	//TODO: the floorbox prev/next might need updating
1166	esrv_del_item (pl->contr, count);	1183	//esrv_del_item (pl->contr, count);
		1184	//TODO: update floorbox to preserve ordering
		1185	if (pl->contr->ns)
		1186	pl->contr->ns->floorbox_update ();
1167	}	1187	}
1168		1188
		1189	if (check_walk_off)
1169	for (tmp = ms.bot; tmp; tmp = tmp->above)	1190	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1170	{	1191	{
		1192	above = tmp->above;
		1193
1171	/* No point updating the players look faces if he is the object	1194	/* No point updating the players look faces if he is the object
1172	* being removed.	1195	* being removed.
1173	*/	1196	*/
1174		1197
1175	/* See if object moving off should effect something */	1198	/* See if object moving off should effect something */
1176	if (check_walk_off
1177	&& ((move_type & tmp->move_off)	1199	if ((move_type & tmp->move_off)
1178	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1200	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1179	{
1180	move_apply (tmp, this, 0);	1201	move_apply (tmp, this, 0);
1181
1182	if (destroyed ())
1183	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1184	}	1202	}
1185		1203
1186	last = tmp;	1204	if (affects_los ())
1187	}
1188
1189	/* last == NULL if there are no objects on this space */
1190	//TODO: this makes little sense, why only update the topmost object?
1191	if (!last)
1192	map->at (x, y).flags_ = 0;
1193	else
1194	update_object (last, UP_OBJ_REMOVE);
1195
1196	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1197	update_all_los (map, x, y);	1205	update_all_los (map, x, y);
1198	}	1206	}
1199	}	1207	}
1200		1208
1201	/*	1209	/*
…		…
1225	esrv_update_item (UPD_NROF, pl, top);	1233	esrv_update_item (UPD_NROF, pl, top);
1226		1234
1227	op->weight = 0; // cancel the addition above	1235	op->weight = 0; // cancel the addition above
1228	op->carrying = 0; // must be 0 already	1236	op->carrying = 0; // must be 0 already
1229		1237
1230	op->destroy (1);	1238	op->destroy ();
1231		1239
1232	return top;	1240	return top;
1233	}	1241	}
1234		1242
1235	return 0;	1243	return 0;
…		…
1243		1251
1244	object *prev = this;	1252	object *prev = this;
1245		1253
1246	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1254	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1247	{	1255	{
1248	object *op = arch_to_object (at);	1256	object *op = at->instance ();
1249		1257
1250	op->name = name;	1258	op->name = name;
1251	op->name_pl = name_pl;	1259	op->name_pl = name_pl;
1252	op->title = title;	1260	op->title = title;
1253		1261
…		…
1263	* job preparing multi-part monsters.	1271	* job preparing multi-part monsters.
1264	*/	1272	*/
1265	object *	1273	object *
1266	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1274	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1267	{	1275	{
		1276	op->remove ();
		1277
1268	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1278	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1269	{	1279	{
1270	tmp->x = x + tmp->arch->x;	1280	tmp->x = x + tmp->arch->x;
1271	tmp->y = y + tmp->arch->y;	1281	tmp->y = y + tmp->arch->y;
1272	}	1282	}
…		…
1289	* Passing 0 for flag gives proper default values, so flag really only needs	1299	* Passing 0 for flag gives proper default values, so flag really only needs
1290	* to be set if special handling is needed.	1300	* to be set if special handling is needed.
1291	*	1301	*
1292	* Return value:	1302	* Return value:
1293	* new object if 'op' was merged with other object	1303	* new object if 'op' was merged with other object
1294	* NULL if 'op' was destroyed	1304	* NULL if there was an error (destroyed, blocked etc.)
1295	* just 'op' otherwise	1305	* just 'op' otherwise
1296	*/	1306	*/
1297	object *	1307	object *
1298	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1308	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1299	{	1309	{
1300	assert (!op->flag [FLAG_FREED]);
1301
1302	op->remove ();	1310	op->remove ();
		1311
		1312	if (m == &freed_map)//D TODO: remove soon
		1313	{//D
		1314	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1315	}//D
1303		1316
1304	/* Ideally, the caller figures this out. However, it complicates a lot	1317	/* Ideally, the caller figures this out. However, it complicates a lot
1305	* of areas of callers (eg, anything that uses find_free_spot would now	1318	* of areas of callers (eg, anything that uses find_free_spot would now
1306	* need extra work	1319	* need extra work
1307	*/	1320	*/
		1321	maptile *newmap = m;
1308	if (!xy_normalise (m, op->x, op->y))	1322	if (!xy_normalise (newmap, op->x, op->y))
1309	{	1323	{
1310	op->destroy (1);	1324	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1311	return 0;	1325	return 0;
1312	}	1326	}
1313		1327
1314	if (object *more = op->more)	1328	if (object *more = op->more)
1315	if (!insert_ob_in_map (more, m, originator, flag))	1329	if (!insert_ob_in_map (more, m, originator, flag))
1316	return 0;	1330	return 0;
1317		1331
1318	CLEAR_FLAG (op, FLAG_REMOVED);	1332	op->flag [FLAG_REMOVED] = false;
1319		1333	op->env = 0;
1320	op->map = m;	1334	op->map = newmap;
		1335
1321	mapspace &ms = op->ms ();	1336	mapspace &ms = op->ms ();
1322		1337
1323	/* this has to be done after we translate the coordinates.	1338	/* this has to be done after we translate the coordinates.
1324	*/	1339	*/
1325	if (op->nrof && !(flag & INS_NO_MERGE))	1340	if (op->nrof && !(flag & INS_NO_MERGE))
1326	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1341	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1327	if (object::can_merge (op, tmp))	1342	if (object::can_merge (op, tmp))
1328	{	1343	{
1329	// TODO: we atcually want to update tmp, not op,	1344	// TODO: we actually want to update tmp, not op,
1330	// but some caller surely breaks when we return tmp	1345	// but some caller surely breaks when we return tmp
1331	// from here :/	1346	// from here :/
1332	op->nrof += tmp->nrof;	1347	op->nrof += tmp->nrof;
1333	tmp->destroy (1);	1348	tmp->destroy ();
1334	}	1349	}
1335		1350
1336	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1351	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1337	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1352	op->clr_flag (FLAG_INV_LOCKED);
1338		1353
1339	if (!QUERY_FLAG (op, FLAG_ALIVE))	1354	if (!op->flag [FLAG_ALIVE])
1340	CLEAR_FLAG (op, FLAG_NO_STEAL);	1355	op->clr_flag (FLAG_NO_STEAL);
1341		1356
1342	if (flag & INS_BELOW_ORIGINATOR)	1357	if (flag & INS_BELOW_ORIGINATOR)
1343	{	1358	{
1344	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1359	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1345	{	1360	{
1346	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1361	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1347	abort ();	1362	abort ();
1348	}	1363	}
1349		1364
		1365	if (!originator->is_on_map ())
		1366	{
		1367	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1368	op->debug_desc (), originator->debug_desc ());
		1369	abort ();
		1370	}
		1371
1350	op->above = originator;	1372	op->above = originator;
1351	op->below = originator->below;	1373	op->below = originator->below;
1352
1353	if (op->below)
1354	op->below->above = op;
1355	else
1356	ms.bot = op;
1357
1358	/* since *below* originator, no need to update top */
1359	originator->below = op;	1374	originator->below = op;
		1375
		1376	*(op->below ? &op->below->above : &ms.bot) = op;
1360	}	1377	}
1361	else	1378	else
1362	{	1379	{
1363	object *top, *floor = NULL;	1380	object *floor = 0;
1364		1381	object *top = ms.top;
1365	top = ms.bot;
1366		1382
1367	/* If there are other objects, then */	1383	/* If there are other objects, then */
1368	if (top)	1384	if (top)
1369	{	1385	{
1370	object *last = 0;
1371
1372	/*	1386	/*
1373	* If there are multiple objects on this space, we do some trickier handling.	1387	* If there are multiple objects on this space, we do some trickier handling.
1374	* We've already dealt with merging if appropriate.	1388	* We've already dealt with merging if appropriate.
1375	* Generally, we want to put the new object on top. But if	1389	* Generally, we want to put the new object on top. But if
1376	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1390	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1379	* once we get to them. This reduces the need to traverse over all of	1393	* once we get to them. This reduces the need to traverse over all of
1380	* them when adding another one - this saves quite a bit of cpu time	1394	* them when adding another one - this saves quite a bit of cpu time
1381	* when lots of spells are cast in one area. Currently, it is presumed	1395	* when lots of spells are cast in one area. Currently, it is presumed
1382	* that flying non pickable objects are spell objects.	1396	* that flying non pickable objects are spell objects.
1383	*/	1397	*/
1384	for (top = ms.bot; top; top = top->above)	1398	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1385	{	1399	{
1386	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1400	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1387	floor = top;	1401	floor = tmp;
1388		1402
1389	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1403	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1390	{	1404	{
1391	/* We insert above top, so we want this object below this */	1405	/* We insert above top, so we want this object below this */
1392	top = top->below;	1406	top = tmp->below;
1393	break;	1407	break;
1394	}	1408	}
1395		1409
1396	last = top;	1410	top = tmp;
1397	}	1411	}
1398
1399	/* Don't want top to be NULL, so set it to the last valid object */
1400	top = last;
1401		1412
1402	/* We let update_position deal with figuring out what the space	1413	/* We let update_position deal with figuring out what the space
1403	* looks like instead of lots of conditions here.	1414	* looks like instead of lots of conditions here.
1404	* makes things faster, and effectively the same result.	1415	* makes things faster, and effectively the same result.
1405	*/	1416	*/
…		…
1412	*/	1423	*/
1413	if (!(flag & INS_ON_TOP)	1424	if (!(flag & INS_ON_TOP)
1414	&& ms.flags () & P_BLOCKSVIEW	1425	&& ms.flags () & P_BLOCKSVIEW
1415	&& (op->face && !faces [op->face].visibility))	1426	&& (op->face && !faces [op->face].visibility))
1416	{	1427	{
		1428	object *last;
		1429
1417	for (last = top; last != floor; last = last->below)	1430	for (last = top; last != floor; last = last->below)
1418	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1431	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1419	break;	1432	break;
1420		1433
1421	/* Check to see if we found the object that blocks view,	1434	/* Check to see if we found the object that blocks view,
1422	* and make sure we have a below pointer for it so that	1435	* and make sure we have a below pointer for it so that
1423	* we can get inserted below this one, which requires we	1436	* we can get inserted below this one, which requires we
…		…
1429	} /* If objects on this space */	1442	} /* If objects on this space */
1430		1443
1431	if (flag & INS_ABOVE_FLOOR_ONLY)	1444	if (flag & INS_ABOVE_FLOOR_ONLY)
1432	top = floor;	1445	top = floor;
1433		1446
1434	/* Top is the object that our object (op) is going to get inserted above.	1447	// insert object above top, or bottom-most if top = 0
1435	*/
1436
1437	/* First object on this space */
1438	if (!top)	1448	if (!top)
1439	{	1449	{
		1450	op->below = 0;
1440	op->above = ms.bot;	1451	op->above = ms.bot;
1441
1442	if (op->above)
1443	op->above->below = op;
1444
1445	op->below = 0;
1446	ms.bot = op;	1452	ms.bot = op;
		1453
		1454	*(op->above ? &op->above->below : &ms.top) = op;
1447	}	1455	}
1448	else	1456	else
1449	{ /* get inserted into the stack above top */	1457	{
1450	op->above = top->above;	1458	op->above = top->above;
1451
1452	if (op->above)
1453	op->above->below = op;	1459	top->above = op;
1454		1460
1455	op->below = top;	1461	op->below = top;
1456	top->above = op;	1462	*(op->above ? &op->above->below : &ms.top) = op;
1457	}	1463	}
		1464	}
1458		1465
1459	if (!op->above)	1466	if (op->is_player ())
1460	ms.top = op;
1461	} /* else not INS_BELOW_ORIGINATOR */
1462
1463	if (op->type == PLAYER)
1464	{	1467	{
1465	op->contr->do_los = 1;	1468	op->contr->do_los = 1;
1466	++op->map->players;	1469	++op->map->players;
1467	op->map->touch ();	1470	op->map->touch ();
1468	}	1471	}
1469		1472
1470	op->map->dirty = true;	1473	op->map->dirty = true;
1471		1474
1472	if (object *pl = ms.player ())	1475	if (object *pl = ms.player ())
1473	//TODO: the floorbox prev/next might need updating	1476	//TODO: the floorbox prev/next might need updating
1474	esrv_send_item (pl, op);	1477	//esrv_send_item (pl, op);
		1478	//TODO: update floorbox to preserve ordering
		1479	if (pl->contr->ns)
		1480	pl->contr->ns->floorbox_update ();
1475		1481
1476	/* If this object glows, it may affect lighting conditions that are	1482	/* If this object glows, it may affect lighting conditions that are
1477	* visible to others on this map. But update_all_los is really	1483	* visible to others on this map. But update_all_los is really
1478	* an inefficient way to do this, as it means los for all players	1484	* an inefficient way to do this, as it means los for all players
1479	* on the map will get recalculated. The players could very well	1485	* on the map will get recalculated. The players could very well
1480	* be far away from this change and not affected in any way -	1486	* be far away from this change and not affected in any way -
1481	* this should get redone to only look for players within range,	1487	* this should get redone to only look for players within range,
1482	* or just updating the P_UPTODATE for spaces within this area	1488	* or just updating the P_UPTODATE for spaces within this area
1483	* of effect may be sufficient.	1489	* of effect may be sufficient.
1484	*/	1490	*/
1485	if (op->map->darkness && (op->glow_radius != 0))	1491	if (op->affects_los ())
		1492	{
		1493	op->ms ().invalidate ();
1486	update_all_los (op->map, op->x, op->y);	1494	update_all_los (op->map, op->x, op->y);
		1495	}
1487		1496
1488	/* updates flags (blocked, alive, no magic, etc) for this map space */	1497	/* updates flags (blocked, alive, no magic, etc) for this map space */
1489	update_object (op, UP_OBJ_INSERT);	1498	update_object (op, UP_OBJ_INSERT);
1490		1499
1491	INVOKE_OBJECT (INSERT, op);	1500	INVOKE_OBJECT (INSERT, op);
…		…
1498	* blocked() and wall() work properly), and these flags are updated by	1507	* blocked() and wall() work properly), and these flags are updated by
1499	* update_object().	1508	* update_object().
1500	*/	1509	*/
1501		1510
1502	/* if this is not the head or flag has been passed, don't check walk on status */	1511	/* if this is not the head or flag has been passed, don't check walk on status */
1503	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1512	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1504	{	1513	{
1505	if (check_move_on (op, originator))	1514	if (check_move_on (op, originator))
1506	return 0;	1515	return 0;
1507		1516
1508	/* If we are a multi part object, lets work our way through the check	1517	/* If we are a multi part object, lets work our way through the check
…		…
1519	/* this function inserts an object in the map, but if it	1528	/* this function inserts an object in the map, but if it
1520	* finds an object of its own type, it'll remove that one first.	1529	* finds an object of its own type, it'll remove that one first.
1521	* op is the object to insert it under: supplies x and the map.	1530	* op is the object to insert it under: supplies x and the map.
1522	*/	1531	*/
1523	void	1532	void
1524	replace_insert_ob_in_map (const char *arch_string, object *op)	1533	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1525	{	1534	{
1526	/* first search for itself and remove any old instances */	1535	/* first search for itself and remove any old instances */
1527		1536
1528	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1537	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1529	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1538	if (tmp->arch->archname == archname) /* same archetype */
1530	tmp->destroy (1);	1539	tmp->destroy ();
1531		1540
1532	object *tmp = arch_to_object (archetype::find (arch_string));	1541	object *tmp = archetype::find (archname)->instance ();
1533		1542
1534	tmp->x = op->x;	1543	tmp->x = op->x;
1535	tmp->y = op->y;	1544	tmp->y = op->y;
1536		1545
1537	insert_ob_in_map (tmp, op->map, op, 0);	1546	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1542	{	1551	{
1543	if (where->env)	1552	if (where->env)
1544	return where->env->insert (this);	1553	return where->env->insert (this);
1545	else	1554	else
1546	return where->map->insert (this, where->x, where->y, originator, flags);	1555	return where->map->insert (this, where->x, where->y, originator, flags);
		1556	}
		1557
		1558	// check whether we can put this into the map, respect max_volume, max_items
		1559	bool
		1560	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1561	{
		1562	mapspace &ms = m->at (x, y);
		1563
		1564	int items = ms.items ();
		1565
		1566	if (!items // testing !items ensures we can drop at least one item
		1567	|| (items < m->max_items
		1568	&& ms.volume () < m->max_volume))
		1569	return true;
		1570
		1571	if (originator && originator->is_player ())
		1572	originator->contr->failmsgf (
		1573	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1574	query_name ()
		1575	);
		1576
		1577	return false;
1547	}	1578	}
1548		1579
1549	/*	1580	/*
1550	* decrease(object, number) decreases a specified number from	1581	* decrease(object, number) decreases a specified number from
1551	* the amount of an object. If the amount reaches 0, the object	1582	* the amount of an object. If the amount reaches 0, the object
…		…
1559	if (!nr)	1590	if (!nr)
1560	return true;	1591	return true;
1561		1592
1562	nr = min (nr, nrof);	1593	nr = min (nr, nrof);
1563		1594
		1595	if (nrof > nr)
		1596	{
1564	nrof -= nr;	1597	nrof -= nr;
1565
1566	if (nrof)
1567	{
1568	adjust_weight (env, -weight * nr); // carrying == 0	1598	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1569		1599
1570	if (object *pl = visible_to ())	1600	if (object *pl = visible_to ())
1571	esrv_update_item (UPD_NROF, pl, this);	1601	esrv_update_item (UPD_NROF, pl, this);
1572		1602
1573	return true;	1603	return true;
1574	}	1604	}
1575	else	1605	else
1576	{	1606	{
1577	destroy (1);	1607	destroy ();
1578	return false;	1608	return false;
1579	}	1609	}
1580	}	1610	}
1581		1611
1582	/*	1612	/*
…		…
1599	}	1629	}
1600	else	1630	else
1601	{	1631	{
1602	decrease (nr);	1632	decrease (nr);
1603		1633
1604	object *op = object_create_clone (this);	1634	object *op = deep_clone ();
1605	op->nrof = nr;	1635	op->nrof = nr;
1606	return op;	1636	return op;
1607	}	1637	}
1608	}	1638	}
1609		1639
…		…
1659	if (object *pl = tmp->visible_to ())	1689	if (object *pl = tmp->visible_to ())
1660	esrv_update_item (UPD_NROF, pl, tmp);	1690	esrv_update_item (UPD_NROF, pl, tmp);
1661		1691
1662	adjust_weight (this, op->total_weight ());	1692	adjust_weight (this, op->total_weight ());
1663		1693
1664	op->destroy (1);	1694	op->destroy ();
1665	op = tmp;	1695	op = tmp;
1666	goto inserted;	1696	goto inserted;
1667	}	1697	}
1668		1698
1669	op->owner = 0; // it's his/hers now. period.	1699	op->owner = 0; // it's his/hers now. period.
…		…
1687		1717
1688	adjust_weight (this, op->total_weight ());	1718	adjust_weight (this, op->total_weight ());
1689		1719
1690	inserted:	1720	inserted:
1691	/* reset the light list and los of the players on the map */	1721	/* reset the light list and los of the players on the map */
1692	if (op->glow_radius && map && map->darkness)	1722	if (op->glow_radius && is_on_map ())
		1723	{
		1724	update_stats ();
1693	update_all_los (map, x, y);	1725	update_all_los (map, x, y);
1694		1726	}
		1727	else if (is_player ())
1695	// if this is a player's inventory, update stats	1728	// if this is a player's inventory, update stats
1696	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1729	contr->queue_stats_update ();
1697	update_stats ();
1698		1730
1699	INVOKE_OBJECT (INSERT, this);	1731	INVOKE_OBJECT (INSERT, this);
1700		1732
1701	return op;	1733	return op;
1702	}	1734	}
…		…
1722	* on top.	1754	* on top.
1723	*/	1755	*/
1724	int	1756	int
1725	check_move_on (object *op, object *originator)	1757	check_move_on (object *op, object *originator)
1726	{	1758	{
		1759	if (op->flag [FLAG_NO_APPLY])
		1760	return 0;
		1761
1727	object *tmp;	1762	object *tmp;
1728	maptile *m = op->map;	1763	maptile *m = op->map;
1729	int x = op->x, y = op->y;	1764	int x = op->x, y = op->y;
1730		1765
1731	MoveType move_on, move_slow, move_block;	1766	mapspace &ms = m->at (x, y);
1732		1767
1733	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1768	ms.update ();
1734	return 0;
1735		1769
1736	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1770	MoveType move_on = ms.move_on;
1737	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1771	MoveType move_slow = ms.move_slow;
1738	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1772	MoveType move_block = ms.move_block;
1739		1773
1740	/* if nothing on this space will slow op down or be applied,	1774	/* if nothing on this space will slow op down or be applied,
1741	* no need to do checking below. have to make sure move_type	1775	* no need to do checking below. have to make sure move_type
1742	* is set, as lots of objects don't have it set - we treat that	1776	* is set, as lots of objects don't have it set - we treat that
1743	* as walking.	1777	* as walking.
…		…
1754	return 0;	1788	return 0;
1755		1789
1756	/* The objects have to be checked from top to bottom.	1790	/* The objects have to be checked from top to bottom.
1757	* Hence, we first go to the top:	1791	* Hence, we first go to the top:
1758	*/	1792	*/
1759		1793	for (object *next, *tmp = ms.top; tmp; tmp = next)
1760	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1761	{
1762	/* Trim the search when we find the first other spell effect
1763	* this helps performance so that if a space has 50 spell objects,
1764	* we don't need to check all of them.
1765	*/
1766	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1767	break;
1768	}	1794	{
		1795	next = tmp->below;
1769		1796
1770	for (; tmp; tmp = tmp->below)
1771	{
1772	if (tmp == op)	1797	if (tmp == op)
1773	continue; /* Can't apply yourself */	1798	continue; /* Can't apply yourself */
1774		1799
1775	/* Check to see if one of the movement types should be slowed down.	1800	/* Check to see if one of the movement types should be slowed down.
1776	* Second check makes sure that the movement types not being slowed	1801	* Second check makes sure that the movement types not being slowed
1777	* (~slow_move) is not blocked on this space - just because the	1802	* (~slow_move) is not blocked on this space - just because the
1778	* space doesn't slow down swimming (for example), if you can't actually	1803	* space doesn't slow down swimming (for example), if you can't actually
1779	* swim on that space, can't use it to avoid the penalty.	1804	* swim on that space, can't use it to avoid the penalty.
1780	*/	1805	*/
1781	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1806	if (!op->flag [FLAG_WIZPASS])
1782	{	1807	{
1783	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1808	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1784	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1809	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1785	{	1810	{
1786
1787	float
1788	diff = tmp->move_slow_penalty * fabs (op->speed);	1811	float diff = tmp->move_slow_penalty * fabs (op->speed);
1789		1812
1790	if (op->type == PLAYER)	1813	if (op->is_player ())
1791	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1814	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1792	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1815	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1793	diff /= 4.0;	1816	diff /= 4.0;
1794		1817
1795	op->speed_left -= diff;	1818	op->speed_left -= diff;
1796	}	1819	}
1797	}	1820	}
…		…
1830	LOG (llevError, "Present_arch called outside map.\n");	1853	LOG (llevError, "Present_arch called outside map.\n");
1831	return NULL;	1854	return NULL;
1832	}	1855	}
1833		1856
1834	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1857	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1835	if (tmp->arch == at)	1858	if (tmp->arch->archname == at->archname)
1836	return tmp;	1859	return tmp;
1837		1860
1838	return NULL;	1861	return NULL;
1839	}	1862	}
1840		1863
…		…
1904	* The first matching object is returned, or NULL if none.	1927	* The first matching object is returned, or NULL if none.
1905	*/	1928	*/
1906	object *	1929	object *
1907	present_arch_in_ob (const archetype *at, const object *op)	1930	present_arch_in_ob (const archetype *at, const object *op)
1908	{	1931	{
1909	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1932	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1910	if (tmp->arch == at)	1933	if (tmp->arch->archname == at->archname)
1911	return tmp;	1934	return tmp;
1912		1935
1913	return NULL;	1936	return NULL;
1914	}	1937	}
1915		1938
…		…
1919	void	1942	void
1920	flag_inv (object *op, int flag)	1943	flag_inv (object *op, int flag)
1921	{	1944	{
1922	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1945	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1923	{	1946	{
1924	SET_FLAG (tmp, flag);	1947	tmp->set_flag (flag);
1925	flag_inv (tmp, flag);	1948	flag_inv (tmp, flag);
1926	}	1949	}
1927	}	1950	}
1928		1951
1929	/*	1952	/*
…		…
1932	void	1955	void
1933	unflag_inv (object *op, int flag)	1956	unflag_inv (object *op, int flag)
1934	{	1957	{
1935	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1958	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1936	{	1959	{
1937	CLEAR_FLAG (tmp, flag);	1960	tmp->clr_flag (flag);
1938	unflag_inv (tmp, flag);	1961	unflag_inv (tmp, flag);
1939	}	1962	}
1940	}	1963	}
1941		1964
1942	/*	1965	/*
…		…
2003	* head of the object should correspond for the entire object.	2026	* head of the object should correspond for the entire object.
2004	*/	2027	*/
2005	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2028	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2006	continue;	2029	continue;
2007		2030
2008	if (ob->blocked (m, pos.x, pos.y))	2031	if (ob->blocked (pos.m, pos.x, pos.y))
2009	continue;	2032	continue;
2010		2033
2011	altern [index++] = i;	2034	altern [index++] = i;
2012	}	2035	}
2013		2036
…		…
2081	* there is capable of.	2104	* there is capable of.
2082	*/	2105	*/
2083	int	2106	int
2084	find_dir (maptile *m, int x, int y, object *exclude)	2107	find_dir (maptile *m, int x, int y, object *exclude)
2085	{	2108	{
2086	int i, max = SIZEOFFREE, mflags;	2109	int max = SIZEOFFREE, mflags;
2087
2088	sint16 nx, ny;
2089	object *tmp;
2090	maptile *mp;
2091
2092	MoveType blocked, move_type;	2110	MoveType move_type;
2093		2111
2094	if (exclude && exclude->head_ () != exclude)	2112	if (exclude && exclude->head_ () != exclude)
2095	{	2113	{
2096	exclude = exclude->head;	2114	exclude = exclude->head;
2097	move_type = exclude->move_type;	2115	move_type = exclude->move_type;
…		…
2100	{	2118	{
2101	/* If we don't have anything, presume it can use all movement types. */	2119	/* If we don't have anything, presume it can use all movement types. */
2102	move_type = MOVE_ALL;	2120	move_type = MOVE_ALL;
2103	}	2121	}
2104		2122
2105	for (i = 1; i < max; i++)	2123	for (int i = 1; i < max; i++)
2106	{	2124	{
2107	mp = m;	2125	mapxy pos (m, x, y);
2108	nx = x + freearr_x[i];	2126	pos.move (i);
2109	ny = y + freearr_y[i];
2110		2127
2111	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2128	if (!pos.normalise ())
2112
2113	if (mflags & P_OUT_OF_MAP)
2114	max = maxfree[i];	2129	max = maxfree[i];
2115	else	2130	else
2116	{	2131	{
2117	mapspace &ms = mp->at (nx, ny);	2132	mapspace &ms = *pos;
2118		2133
2119	blocked = ms.move_block;
2120
2121	if ((move_type & blocked) == move_type)	2134	if ((move_type & ms.move_block) == move_type)
2122	max = maxfree[i];	2135	max = maxfree [i];
2123	else if (mflags & P_IS_ALIVE)	2136	else if (ms.flags () & P_IS_ALIVE)
2124	{	2137	{
2125	for (tmp = ms.bot; tmp; tmp = tmp->above)	2138	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2126	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2139	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2127	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2140	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2128	break;
2129
2130	if (tmp)
2131	return freedir[i];	2141	return freedir [i];
2132	}	2142	}
2133	}	2143	}
2134	}	2144	}
2135		2145
2136	return 0;	2146	return 0;
…		…
2211	* This basically means that if direction is 15, then it could either go	2221	* This basically means that if direction is 15, then it could either go
2212	* direction 4, 14, or 16 to get back to where we are.	2222	* direction 4, 14, or 16 to get back to where we are.
2213	* Moved from spell_util.c to object.c with the other related direction	2223	* Moved from spell_util.c to object.c with the other related direction
2214	* functions.	2224	* functions.
2215	*/	2225	*/
2216	int reduction_dir[SIZEOFFREE][3] = {	2226	static const int reduction_dir[SIZEOFFREE][3] = {
2217	{0, 0, 0}, /* 0 */	2227	{0, 0, 0}, /* 0 */
2218	{0, 0, 0}, /* 1 */	2228	{0, 0, 0}, /* 1 */
2219	{0, 0, 0}, /* 2 */	2229	{0, 0, 0}, /* 2 */
2220	{0, 0, 0}, /* 3 */	2230	{0, 0, 0}, /* 3 */
2221	{0, 0, 0}, /* 4 */	2231	{0, 0, 0}, /* 4 */
…		…
2315	* Add a check so we can't pick up invisible objects (0.93.8)	2325	* Add a check so we can't pick up invisible objects (0.93.8)
2316	*/	2326	*/
2317	int	2327	int
2318	can_pick (const object *who, const object *item)	2328	can_pick (const object *who, const object *item)
2319	{	2329	{
2320	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2330	return /*who->flag [FLAG_WIZ]|| */
2321	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2331	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2322	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2332	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2323	}	2333	}
2324		2334
2325	/*	2335	/*
2326	* create clone from object to another	2336	* create clone from object to another
2327	*/	2337	*/
2328	object *	2338	object *
2329	object_create_clone (object *asrc)	2339	object::deep_clone ()
2330	{	2340	{
2331	object *dst = 0, *tmp, *src, *prev, *item;	2341	assert (("deep_clone called on non-head object", is_head ()));
2332		2342
2333	if (!asrc)	2343	object *dst = clone ();
2334	return 0;
2335		2344
2336	src = asrc->head_ ();	2345	object *prev = dst;
2337
2338	prev = 0;
2339	for (object *part = src; part; part = part->more)	2346	for (object *part = this->more; part; part = part->more)
2340	{	2347	{
2341	tmp = part->clone ();	2348	object *tmp = part->clone ();
2342	tmp->x -= src->x;
2343	tmp->y -= src->y;
2344
2345	if (!part->head)
2346	{
2347	dst = tmp;
2348	tmp->head = 0;
2349	}
2350	else
2351	tmp->head = dst;	2349	tmp->head = dst;
2352
2353	tmp->more = 0;
2354
2355	if (prev)
2356	prev->more = tmp;	2350	prev->more = tmp;
2357
2358	prev = tmp;	2351	prev = tmp;
2359	}	2352	}
2360		2353
2361	for (item = src->inv; item; item = item->below)	2354	for (object *item = inv; item; item = item->below)
2362	insert_ob_in_ob (object_create_clone (item), dst);	2355	insert_ob_in_ob (item->deep_clone (), dst);
2363		2356
2364	return dst;	2357	return dst;
2365	}	2358	}
2366		2359
2367	/* This returns the first object in who's inventory that	2360	/* This returns the first object in who's inventory that
…		…
2376	return tmp;	2369	return tmp;
2377		2370
2378	return 0;	2371	return 0;
2379	}	2372	}
2380		2373
2381	/* If ob has a field named key, return the link from the list,	2374	shstr_tmp
2382	* otherwise return NULL.	2375	object::kv_get (shstr_tmp key) const
2383	*
2384	* key must be a passed in shared string - otherwise, this won't
2385	* do the desired thing.
2386	*/
2387	key_value *
2388	get_ob_key_link (const object *ob, const char *key)
2389	{	2376	{
2390	for (key_value *link = ob->key_values; link; link = link->next)	2377	for (key_value *kv = key_values; kv; kv = kv->next)
2391	if (link->key == key)	2378	if (kv->key == key)
2392	return link;
2393
2394	return 0;
2395	}
2396
2397	/*
2398	* Returns the value of op has an extra_field for key, or NULL.
2399	*
2400	* The argument doesn't need to be a shared string.
2401	*
2402	* The returned string is shared.
2403	*/
2404	const char *
2405	get_ob_key_value (const object *op, const char *const key)
2406	{
2407	key_value *link;
2408	shstr_cmp canonical_key (key);
2409
2410	if (!canonical_key)
2411	{
2412	/* 1. There being a field named key on any object
2413	* implies there'd be a shared string to find.
2414	* 2. Since there isn't, no object has this field.
2415	* 3. Therefore, *this* object doesn't have this field.
2416	*/
2417	return 0;
2418	}
2419
2420	/* This is copied from get_ob_key_link() above -
2421	* only 4 lines, and saves the function call overhead.
2422	*/
2423	for (link = op->key_values; link; link = link->next)
2424	if (link->key == canonical_key)
2425	return link->value;	2379	return kv->value;
2426		2380
2427	return 0;	2381	return shstr ();
2428	}	2382	}
2429		2383
2430	/*	2384	void
2431	* Updates the canonical_key in op to value.	2385	object::kv_set (shstr_tmp key, shstr_tmp value)
2432	*
2433	* canonical_key is a shared string (value doesn't have to be).
2434	*
2435	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2436	* keys.
2437	*
2438	* Returns TRUE on success.
2439	*/
2440	int
2441	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2442	{	2386	{
2443	key_value *field = NULL, *last = NULL;	2387	for (key_value *kv = key_values; kv; kv = kv->next)
2444		2388	if (kv->key == key)
2445	for (field = op->key_values; field != NULL; field = field->next)
2446	{
2447	if (field->key != canonical_key)
2448	{	2389	{
2449	last = field;	2390	kv->value = value;
2450	continue;	2391	return;
2451	}	2392	}
2452		2393
2453	if (value)	2394	key_value *kv = new key_value;
2454	field->value = value;	2395
2455	else	2396	kv->next = key_values;
		2397	kv->key = key;
		2398	kv->value = value;
		2399
		2400	key_values = kv;
		2401	}
		2402
		2403	void
		2404	object::kv_del (shstr_tmp key)
		2405	{
		2406	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2407	if ((*kvp)->key == key)
2456	{	2408	{
2457	/* Basically, if the archetype has this key set,	2409	key_value *kv = *kvp;
2458	* we need to store the null value so when we save	2410	*kvp = (*kvp)->next;
2459	* it, we save the empty value so that when we load,	2411	delete kv;
2460	* we get this value back again.	2412	return;
2461	*/
2462	if (get_ob_key_link (op->arch, canonical_key))
2463	field->value = 0;
2464	else
2465	{
2466	if (last)
2467	last->next = field->next;
2468	else
2469	op->key_values = field->next;
2470
2471	delete field;
2472	}
2473	}	2413	}
2474	return TRUE;
2475	}
2476	/* IF we get here, key doesn't exist */
2477
2478	/* No field, we'll have to add it. */
2479
2480	if (!add_key)
2481	return FALSE;
2482
2483	/* There isn't any good reason to store a null
2484	* value in the key/value list. If the archetype has
2485	* this key, then we should also have it, so shouldn't
2486	* be here. If user wants to store empty strings,
2487	* should pass in ""
2488	*/
2489	if (value == NULL)
2490	return TRUE;
2491
2492	field = new key_value;
2493
2494	field->key = canonical_key;
2495	field->value = value;
2496	/* Usual prepend-addition. */
2497	field->next = op->key_values;
2498	op->key_values = field;
2499
2500	return TRUE;
2501	}
2502
2503	/*
2504	* Updates the key in op to value.
2505	*
2506	* If add_key is FALSE, this will only update existing keys,
2507	* and not add new ones.
2508	* In general, should be little reason FALSE is ever passed in for add_key
2509	*
2510	* Returns TRUE on success.
2511	*/
2512	int
2513	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2514	{
2515	shstr key_ (key);
2516
2517	return set_ob_key_value_s (op, key_, value, add_key);
2518	}	2414	}
2519		2415
2520	object::depth_iterator::depth_iterator (object *container)	2416	object::depth_iterator::depth_iterator (object *container)
2521	: iterator_base (container)	2417	: iterator_base (container)
2522	{	2418	{
…		…
2572	{	2468	{
2573	char flagdesc[512];	2469	char flagdesc[512];
2574	char info2[256 * 4];	2470	char info2[256 * 4];
2575	char *p = info;	2471	char *p = info;
2576		2472
2577	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2473	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2578	count,	2474	count,
2579	uuid.c_str (),	2475	uuid.c_str (),
2580	&name,	2476	&name,
2581	title ? "\",title:\"" : "",	2477	title ? ",title:\"" : "",
2582	title ? (const char *)title : "",	2478	title ? (const char *)title : "",
		2479	title ? "\"" : "",
2583	flag_desc (flagdesc, 512), type);	2480	flag_desc (flagdesc, 512), type);
2584		2481
2585	if (!flag[FLAG_REMOVED] && env)	2482	if (!flag[FLAG_REMOVED] && env)
2586	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2483	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2587		2484
…		…
2603	struct region *	2500	struct region *
2604	object::region () const	2501	object::region () const
2605	{	2502	{
2606	return map ? map->region (x, y)	2503	return map ? map->region (x, y)
2607	: region::default_region ();	2504	: region::default_region ();
2608	}
2609
2610	const materialtype_t *
2611	object::dominant_material () const
2612	{
2613	if (materialtype_t *mt = name_to_material (materialname))
2614	return mt;
2615
2616	return name_to_material (shstr_unknown);
2617	}	2505	}
2618		2506
2619	void	2507	void
2620	object::open_container (object *new_container)	2508	object::open_container (object *new_container)
2621	{	2509	{
…		…
2643	container = 0;	2531	container = 0;
2644		2532
2645	// client needs item update to make it work, client bug requires this to be separate	2533	// client needs item update to make it work, client bug requires this to be separate
2646	esrv_update_item (UPD_FLAGS, this, old_container);	2534	esrv_update_item (UPD_FLAGS, this, old_container);
2647		2535
2648	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2536	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2649	play_sound (sound_find ("chest_close"));	2537	play_sound (sound_find ("chest_close"));
2650	}	2538	}
2651		2539
2652	if (new_container)	2540	if (new_container)
2653	{	2541	{
…		…
2657	// TODO: this does not seem to serve any purpose anymore?	2545	// TODO: this does not seem to serve any purpose anymore?
2658	#if 0	2546	#if 0
2659	// insert the "Close Container" object.	2547	// insert the "Close Container" object.
2660	if (archetype *closer = new_container->other_arch)	2548	if (archetype *closer = new_container->other_arch)
2661	{	2549	{
2662	object *closer = arch_to_object (new_container->other_arch);	2550	object *closer = new_container->other_arch->instance ();
2663	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2551	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2664	new_container->insert (closer);	2552	new_container->insert (closer);
2665	}	2553	}
2666	#endif	2554	#endif
2667		2555
2668	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2556	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2669		2557
2670	// make sure the container is available, client bug requires this to be separate	2558	// make sure the container is available, client bug requires this to be separate
2671	esrv_send_item (this, new_container);	2559	esrv_send_item (this, new_container);
2672		2560
2673	new_container->flag [FLAG_APPLIED] = true;	2561	new_container->flag [FLAG_APPLIED] = true;
…		…
2681	// else if (!old_container->env && contr && contr->ns)	2569	// else if (!old_container->env && contr && contr->ns)
2682	// contr->ns->floorbox_reset ();	2570	// contr->ns->floorbox_reset ();
2683	}	2571	}
2684		2572
2685	object *	2573	object *
2686	object::force_find (const shstr name)	2574	object::force_find (shstr_tmp name)
2687	{	2575	{
2688	/* cycle through his inventory to look for the MARK we want to	2576	/* cycle through his inventory to look for the MARK we want to
2689	* place	2577	* place
2690	*/	2578	*/
2691	for (object *tmp = inv; tmp; tmp = tmp->below)	2579	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2693	return splay (tmp);	2581	return splay (tmp);
2694		2582
2695	return 0;	2583	return 0;
2696	}	2584	}
2697		2585
		2586	//-GPL
		2587
2698	void	2588	void
		2589	object::force_set_timer (int duration)
		2590	{
		2591	this->duration = 1;
		2592	this->speed_left = -1.f;
		2593
		2594	this->set_speed (duration ? 1.f / duration : 0.f);
		2595	}
		2596
		2597	object *
2699	object::force_add (const shstr name, int duration)	2598	object::force_add (shstr_tmp name, int duration)
2700	{	2599	{
2701	if (object *force = force_find (name))	2600	if (object *force = force_find (name))
2702	force->destroy ();	2601	force->destroy ();
2703		2602
2704	object *force = get_archetype (FORCE_NAME);	2603	object *force = get_archetype (FORCE_NAME);
2705		2604
2706	force->slaying = name;	2605	force->slaying = name;
2707	force->stats.food = 1;	2606	force->force_set_timer (duration);
2708	force->speed_left = -1.f;
2709
2710	force->set_speed (duration ? 1.f / duration : 0.f);
2711	force->flag [FLAG_IS_USED_UP] = true;
2712	force->flag [FLAG_APPLIED] = true;	2607	force->flag [FLAG_APPLIED] = true;
2713		2608
2714	insert (force);	2609	return insert (force);
2715	}	2610	}
2716		2611
2717	void	2612	void
2718	object::play_sound (faceidx sound)	2613	object::play_sound (faceidx sound) const
2719	{	2614	{
2720	if (!sound)	2615	if (!sound)
2721	return;	2616	return;
2722		2617
2723	if (flag [FLAG_REMOVED])	2618	if (is_on_map ())
		2619	map->play_sound (sound, x, y);
		2620	else if (object *pl = in_player ())
		2621	pl->contr->play_sound (sound);
		2622	}
		2623
		2624	void
		2625	object::say_msg (const char *msg) const
		2626	{
		2627	if (is_on_map ())
		2628	map->say_msg (msg, x, y);
		2629	else if (object *pl = in_player ())
		2630	pl->contr->play_sound (sound);
		2631	}
		2632
		2633	void
		2634	object::make_noise ()
		2635	{
		2636	// we do not model noise in the map, so instead put
		2637	// a temporary light into the noise source
		2638	// could use the map instead, but that's less reliable for our
		2639	// goal, which is to make invisibility a bit harder to exploit
		2640
		2641	// currently only works sensibly for players
		2642	if (!is_player ())
2724	return;	2643	return;
2725		2644
2726	if (env)	2645	// find old force, or create new one
2727	{	2646	object *force = force_find (shstr_noise_force);
2728	if (object *pl = in_player ())	2647
2729	pl->contr->play_sound (sound);	2648	if (force)
2730	}	2649	force->speed_left = -1.f; // patch old speed up
2731	else	2650	else
2732	map->play_sound (sound, x, y);	2651	{
2733	}	2652	force = archetype::get (shstr_noise_force);
2734		2653
		2654	force->slaying = shstr_noise_force;
		2655	force->stats.food = 1;
		2656	force->speed_left = -1.f;
		2657
		2658	force->set_speed (1.f / 4.f);
		2659	force->flag [FLAG_IS_USED_UP] = true;
		2660	force->flag [FLAG_APPLIED] = true;
		2661
		2662	insert (force);
		2663	}
		2664	}
		2665
		2666	void object::change_move_type (MoveType mt)
		2667	{
		2668	if (move_type == mt)
		2669	return;
		2670
		2671	if (is_on_map ())
		2672	{
		2673	// we are on the map, so handle move_on/off effects
		2674	remove ();
		2675	move_type = mt;
		2676	map->insert (this, x, y, this);
		2677	}
		2678	else
		2679	move_type = mt;
		2680	}
		2681

Diff Legend

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