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.250 by root, Wed Jul 16 14:29:40 2008 UTC vs.
Revision 1.353 by root, Fri Jan 27 22:00:39 2012 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,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <sproto.h>	30	#include <sproto.h>
30	#include <loader.h>
31		31
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
		41
		42	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
		47
		48	//+GPL
40		49
41	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
42	0,	51	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	52	0, 1, 1, 1, 0, -1, -1, -1,
44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	57	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	58	-1, -1, 0, 1, 1, 1, 0, -1,
50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	59	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	60	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52	};	61	};
53	int maxfree[SIZEOFFREE] = {
54	0,
55	9, 10, 13, 14, 17, 18, 21, 22,
56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58	};
59	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
60	0,	63	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	64	1, 2, 3, 4, 5, 6, 7, 8,
62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
64	};	67	};
65		68
		69	static int maxfree[SIZEOFFREE] = {
		70	0,
		71	9, 10, 13, 14, 17, 18, 21, 22,
		72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		74	};
		75
		76	const char *wall_suffix[16] = {
		77	"0",
		78	"1_3",
		79	"1_4",
		80	"2_1_2",
		81	"1_2",
		82	"2_2_4",
		83	"2_2_1",
		84	"3_1",
		85	"1_1",
		86	"2_2_3",
		87	"2_2_2",
		88	"3_3",
		89	"2_1_1",
		90	"3_4",
		91	"3_2",
		92	"4"
		93	};
		94
66	static void	95	static void
67	write_uuid (uval64 skip, bool sync)	96	write_uuid (uval64 skip, bool sync)
68	{	97	{
69	CALL_BEGIN (2);	98	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	99	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	101	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	102	CALL_END;
74	}	103	}
75		104
76	static void	105	static void
77	read_uuid (void)	106	read_uuid ()
78	{	107	{
79	char filename[MAX_BUF];	108	char filename[MAX_BUF];
80		109
81	sprintf (filename, "%s/uuid", settings.localdir);	110	sprintf (filename, "%s/uuid", settings.localdir);
82		111
…		…
96		125
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	126	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	127	_exit (1);
99	}	128	}
100		129
101	UUID::BUF buf;	130	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	131	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	132	fgets (buf, sizeof (buf), fp);
104		133
105	if (!UUID::cur.parse (buf))	134	if (!UUID::cur.parse (buf))
106	{	135	{
…		…
133		162
134	void	163	void
135	UUID::init ()	164	UUID::init ()
136	{	165	{
137	read_uuid ();	166	read_uuid ();
		167	}
		168
		169	bool
		170	UUID::parse (const char *s)
		171	{
		172	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		173	return false;
		174
		175	seq = 0;
		176
		177	while (*s != '>')
		178	{
		179	if (*s < '0')
		180	return false;
		181
		182	// this gives nice branchless code with gcc
		183	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		184	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		185
		186	seq = (seq << 4) | digit;
		187
		188	++s;
		189	}
		190
		191	return true;
		192	}
		193
		194	char *
		195	UUID::append (char *buf) const
		196	{
		197	*buf++ = '<';
		198	*buf++ = '1';
		199	*buf++ = '.';
		200
		201	uint64_t seq = this->seq;
		202	const int bits = 64;
		203	char nz = 0;
		204	static const char tohex [] = "0123456789abcdef";
		205
		206	// assert (len >= 3 + bits / 4 + 1 + 1);
		207	for (int i = bits / 4; --i; )
		208	{
		209	uint8_t digit = seq >> (bits - 4);
		210
		211	*buf = tohex [digit];
		212	nz |= digit;
		213	buf += nz ? 1 : 0;
		214	seq <<= 4;
		215	}
		216
		217	// last digit is special - always emit
		218	uint8_t digit = seq >> (bits - 4);
		219	*buf++ = tohex [digit];
		220
		221	*buf++ = '>';
		222
		223	return buf;
		224	}
		225
		226	char *
		227	UUID::c_str () const
		228	{
		229	static char buf [MAX_LEN];
		230	*append (buf) = 0;
		231	return buf;
138	}	232	}
139		233
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	234	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	235	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	236	compare_ob_value_lists_one (const object *wants, const object *has)
143	{	237	{
144	/* n-squared behaviour (see kv_get), but I'm hoping both	238	/* n-squared behaviour (see kv.get), but I'm hoping both
145	* objects with lists are rare, and lists stay short. If not, use a	239	* objects with lists are rare, and lists stay short. If not, use a
146	* different structure or at least keep the lists sorted...	240	* different structure or at least keep the lists sorted...
147	*/	241	*/
148		242
149	/* For each field in wants, */	243	/* For each field in wants, */
150	for (key_value *kv = wants->key_values; kv; kv = kv->next)	244	for (key_value *kv = wants->kv.first; kv; kv = kv->next)
151	if (has->kv_get (kv->key) != kv->value)	245	if (has->kv.get (kv->key) != kv->value)
152	return false;	246	return false;
153		247
154	/* If we get here, every field in wants has a matching field in has. */	248	/* If we get here, every field in wants has a matching field in has. */
155	return true;	249	return true;
156	}	250	}
…		…
178	* Improvements made with merge: Better checking on potion, and also	272	* Improvements made with merge: Better checking on potion, and also
179	* check weight	273	* check weight
180	*/	274	*/
181	bool object::can_merge_slow (object *ob1, object *ob2)	275	bool object::can_merge_slow (object *ob1, object *ob2)
182	{	276	{
183	/* A couple quicksanity checks */	277	/* A couple quick sanity checks */
184	if (ob1 == ob2	278	if (ob1 == ob2
185	|| ob1->type != ob2->type	279	|| ob1->type != ob2->type
186	|| ob1->speed != ob2->speed
187	|| ob1->value != ob2->value	280	|| ob1->value != ob2->value
188	|| ob1->name != ob2->name)	281	|| ob1->name != ob2->name
		282	|| ob1->custom_name != ob2->custom_name
		283	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	284	return 0;
190		285
191	/* Do not merge objects if nrof would overflow. First part checks	286	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	287	* is always 0 .. 2**31-1 */
193	* would fit into a 32 bit signed int, which is often used to hold	288	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	289	return 0;
198		290
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	291	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	292	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	293	* just can't ignore the been applied or identified flags, as they
202	* are not equal - just if it has been identified, the been_applied	294	* are not equal - just if it has been identified, the been_applied
203	* flags lose any meaning.	295	* flags lose any meaning.
204	*/	296	*/
205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	297	if (ob1->flag [FLAG_IDENTIFIED])
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	298	ob1->set_flag (FLAG_BEEN_APPLIED);
207		299
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	300	if (ob2->flag [FLAG_IDENTIFIED])
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	301	ob2->set_flag (FLAG_BEEN_APPLIED);
210		302
211	if (ob1->arch->archname != ob2->arch->archname	303	if (ob1->arch->archname != ob2->arch->archname
212	|| ob1->name != ob2->name	304	|| ob1->name != ob2->name
213	|| ob1->title != ob2->title	305	|| ob1->title != ob2->title
214	|| ob1->msg != ob2->msg	306	|| ob1->msg != ob2->msg
…		…
217	|| ob1->magic != ob2->magic	309	|| ob1->magic != ob2->magic
218	|| ob1->slaying != ob2->slaying	310	|| ob1->slaying != ob2->slaying
219	|| ob1->skill != ob2->skill	311	|| ob1->skill != ob2->skill
220	|| ob1->value != ob2->value	312	|| ob1->value != ob2->value
221	|| ob1->animation_id != ob2->animation_id	313	|| ob1->animation_id != ob2->animation_id
222	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	314	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
223	|| ob1->client_type != ob2->client_type	315	|| ob1->client_type != ob2->client_type
224	|| ob1->materialname != ob2->materialname	316	|| ob1->material != ob2->material
225	|| ob1->lore != ob2->lore	317	|| ob1->lore != ob2->lore
226	|| ob1->subtype != ob2->subtype	318	|| ob1->subtype != ob2->subtype
227	|| ob1->move_type != ob2->move_type	319	|| ob1->move_type != ob2->move_type
228	|| ob1->move_block != ob2->move_block	320	|| ob1->move_block != ob2->move_block
229	|| ob1->move_allow != ob2->move_allow	321	|| ob1->move_allow != ob2->move_allow
230	|| ob1->move_on != ob2->move_on	322	|| ob1->move_on != ob2->move_on
231	|| ob1->move_off != ob2->move_off	323	|| ob1->move_off != ob2->move_off
232	|| ob1->move_slow != ob2->move_slow	324	|| ob1->move_slow != ob2->move_slow
233	|| ob1->move_slow_penalty != ob2->move_slow_penalty	325	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	326	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	327	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236	return 0;	328	return 0;
237		329
238	if ((ob1->flag ^ ob2->flag)	330	if ((ob1->flag ^ ob2->flag)
239	.reset (FLAG_INV_LOCKED)	331	.reset (FLAG_INV_LOCKED)
240	.reset (FLAG_CLIENT_SENT)
241	.reset (FLAG_REMOVED)	332	.reset (FLAG_REMOVED)
242	.any ())	333	.any ())
243	return 0;	334	return 0;
244		335
245	/* This is really a spellbook check - we should in general	336	/* This is really a spellbook check - we should in general
…		…
264		355
265	/* Don't merge objects that are applied. With the new 'body' code,	356	/* Don't merge objects that are applied. With the new 'body' code,
266	* it is possible for most any character to have more than one of	357	* it is possible for most any character to have more than one of
267	* some items equipped, and we don't want those to merge.	358	* some items equipped, and we don't want those to merge.
268	*/	359	*/
269	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	360	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
270	return 0;	361	return 0;
271		362
272	/* Note sure why the following is the case - either the object has to	363	/* Note sure why the following is the case - either the object has to
273	* be animated or have a very low speed. Is this an attempted monster	364	* be animated or have a very low speed. Is this an attempted monster
274	* check?	365	* check?
275	*/	366	*/
276	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	367	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
277	return 0;	368	return 0;
278		369
279	switch (ob1->type)	370	switch (ob1->type)
280	{	371	{
281	case SCROLL:	372	case SCROLL:
282	if (ob1->level != ob2->level)	373	if (ob1->level != ob2->level)
283	return 0;	374	return 0;
284	break;	375	break;
285	}	376	}
286		377
287	if (ob1->key_values || ob2->key_values)	378	if (!ob1->kv.empty () || !ob2->kv.empty ())
288	{	379	{
289	/* At least one of these has key_values. */	380	/* At least one of these has key_values. */
290	if ((!ob1->key_values) != (!ob2->key_values))	381	if (ob1->kv.empty () != ob2->kv.empty ())
291	return 0; /* One has fields, but the other one doesn't. */	382	return 0; /* One has fields, but the other one doesn't. */
292		383
293	if (!compare_ob_value_lists (ob1, ob2))	384	if (!compare_ob_value_lists (ob1, ob2))
294	return 0;	385	return 0;
295	}	386	}
…		…
327	{	418	{
328	// see if we are in a container of sorts	419	// see if we are in a container of sorts
329	if (env)	420	if (env)
330	{	421	{
331	// the player inventory itself is always visible	422	// the player inventory itself is always visible
332	if (env->type == PLAYER)	423	if (env->is_player ())
333	return env;	424	return env;
334		425
335	// else a player could have our env open	426	// else a player could have our env open
336	object *envest = env->outer_env ();	427	object *envest = env->outer_env_or_self ();
337		428
338	// the player itself is always on a map, so we will find him here	429	// the player itself is always on a map, so we will find him here
339	// even if our inv is in a player.	430	// even if our inv is in a player.
340	if (envest->is_on_map ())	431	if (envest->is_on_map ())
341	if (object *pl = envest->ms ().player ())	432	if (object *pl = envest->ms ().player ())
342	if (pl->container == env)	433	if (pl->container_ () == env)
343	return pl;	434	return pl;
344	}	435	}
345	else	436	else
346	{	437	{
347	// maybe there is a player standing on the same mapspace	438	// maybe there is a player standing on the same mapspace
348	// this will catch the case where "this" is a player	439	// this will catch the case where "this" is a player
349	if (object *pl = ms ().player ())	440	if (object *pl = ms ().player ())
350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	441	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
351	|| this == pl->container)	442	|| pl->container_ () == this)
352	return pl;	443	return pl;
353	}	444	}
354	}	445	}
355		446
356	return 0;	447	return 0;
357	}	448	}
358		449
359	// adjust weight per container type ("of holding")	450	// adjust weight per container type ("of holding")
360	static sint32	451	static uint32
361	weight_adjust_for (object *op, sint32 weight)	452	weight_adjust_for (object *op, uint32 weight)
362	{	453	{
363	return op->type == CONTAINER	454	return op->type == CONTAINER
364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	455	? weight - weight * op->stats.Str / 100
365	: weight;	456	: weight;
366	}	457	}
367		458
368	/*	459	/*
369	* adjust_weight(object, weight) adds the specified weight to an object,	460	* subtracts, then adds, the specified weight to an object,
370	* and also updates how much the environment(s) is/are carrying.	461	* and also updates how much the environment(s) is/are carrying.
371	*/	462	*/
372	static void	463	static void
373	adjust_weight (object *op, sint32 weight)	464	adjust_weight (object *op, sint32 sub, sint32 add)
374	{	465	{
375	while (op)	466	while (op)
376	{	467	{
377	// adjust by actual difference to account for rounding errors	468	sint32 ocarrying = op->carrying;
378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
379	weight = weight_adjust_for (op, op->carrying)
380	- weight_adjust_for (op, op->carrying - weight);
381		469
382	if (!weight)	470	op->carrying -= weight_adjust_for (op, sub);
383	return;	471	op->carrying += weight_adjust_for (op, add);
384
385	op->carrying += weight;
386		472
387	if (object *pl = op->visible_to ())	473	if (object *pl = op->visible_to ())
388	if (pl != op) // player is handled lazily	474	if (pl != op) // player is handled lazily
389	esrv_update_item (UPD_WEIGHT, pl, op);	475	esrv_update_item (UPD_WEIGHT, pl, op);
390		476
		477	sub = ocarrying;
		478	add = op->carrying;
		479
391	op = op->env;	480	op = op->env;
392	}	481	}
393	}	482	}
394		483
395	/*	484	/*
…		…
402	{	491	{
403	sint32 sum = 0;	492	sint32 sum = 0;
404		493
405	for (object *op = inv; op; op = op->below)	494	for (object *op = inv; op; op = op->below)
406	{	495	{
407	if (op->inv)
408	op->update_weight ();	496	op->update_weight ();
409		497
410	sum += op->total_weight ();	498	sum += weight_adjust_for (this, op->total_weight ());
411	}	499	}
412
413	sum = weight_adjust_for (this, sum);
414		500
415	if (sum != carrying)	501	if (sum != carrying)
416	{	502	{
		503	if (carrying != sum && carrying)//D
		504	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		505	(long long)sum, (long long)carrying, debug_desc ());
		506
417	carrying = sum;	507	carrying = sum;
418		508
419	if (object *pl = visible_to ())	509	if (object *pl = visible_to ())
420	if (pl != this) // player is handled lazily	510	if (pl != this) // player is handled lazily
421	esrv_update_item (UPD_WEIGHT, pl, this);	511	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
434	object_freezer freezer;	524	object_freezer freezer;
435	op->write (freezer);	525	op->write (freezer);
436	return freezer.as_string ();	526	return freezer.as_string ();
437	}	527	}
438		528
439	/*	529	char *
440	* get_nearest_part(multi-object, object 2) returns the part of the	530	object::as_string ()
441	* multi-object 1 which is closest to the second object.
442	* If it's not a multi-object, it is returned.
443	*/
444	object *
445	get_nearest_part (object *op, const object *pl)
446	{	531	{
447	object *tmp, *closest;	532	return dump_object (this);
448	int last_dist, i;
449
450	if (!op->more)
451	return op;
452
453	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
454	tmp;
455	tmp = tmp->more)
456	if ((i = distance (tmp, pl)) < last_dist)
457	closest = tmp, last_dist = i;
458
459	return closest;
460	}	533	}
461		534
462	/*	535	/*
463	* Returns the object which has the count-variable equal to the argument.	536	* Returns the object which has the count-variable equal to the argument.
464	* VERRRY slow.	537	* VERRRY slow.
…		…
466	object *	539	object *
467	find_object (tag_t i)	540	find_object (tag_t i)
468	{	541	{
469	for_all_objects (op)	542	for_all_objects (op)
470	if (op->count == i)	543	if (op->count == i)
		544	return op;
		545
		546	return 0;
		547	}
		548
		549	/*
		550	* Returns the object which has the uuid equal to the argument.
		551	* MOAR VERRRY slow.
		552	*/
		553
		554	object *
		555	find_object_uuid (UUID i)
		556	{
		557	for_all_objects (op)
		558	if (op->uuid == i)
471	return op;	559	return op;
472		560
473	return 0;	561	return 0;
474	}	562	}
475		563
…		…
509	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	597	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
510	return;	598	return;
511	}	599	}
512		600
513	this->owner = owner;	601	this->owner = owner;
514	}
515
516	int
517	object::slottype () const
518	{
519	if (type == SKILL)
520	{
521	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
522	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
523	}
524	else
525	{
526	if (slot [body_combat].info) return slot_combat;
527	if (slot [body_range ].info) return slot_ranged;
528	}
529
530	return slot_none;
531	}
532
533	bool
534	object::change_weapon (object *ob)
535	{
536	if (current_weapon == ob)
537	return true;
538
539	if (chosen_skill)
540	chosen_skill->flag [FLAG_APPLIED] = false;
541
542	current_weapon = ob;
543	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
544
545	if (chosen_skill)
546	chosen_skill->flag [FLAG_APPLIED] = true;
547
548	update_stats ();
549
550	if (ob)
551	{
552	// now check wether any body locations became invalid, in which case
553	// we cannot apply the weapon at the moment.
554	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
555	if (slot[i].used < 0)
556	{
557	current_weapon = chosen_skill = 0;
558	update_stats ();
559
560	new_draw_info_format (NDI_UNIQUE, 0, this,
561	"You try to balance all your items at once, "
562	"but the %s is just too much for your body. "
563	"[You need to unapply some items first.]", &ob->name);
564	return false;
565	}
566
567	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
568	}
569	else
570	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
571
572	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
573	{
574	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
575	&name, ob->debug_desc ());
576	return false;
577	}
578
579	return true;
580	}
581
582	/* Zero the key_values on op, decrementing the shared-string
583	* refcounts and freeing the links.
584	*/
585	static void
586	free_key_values (object *op)
587	{
588	for (key_value *i = op->key_values; i; )
589	{
590	key_value *next = i->next;
591	delete i;
592
593	i = next;
594	}
595
596	op->key_values = 0;
597	}	602	}
598		603
599	/*	604	/*
600	* copy_to first frees everything allocated by the dst object,	605	* copy_to first frees everything allocated by the dst object,
601	* and then copies the contents of itself into the second	606	* and then copies the contents of itself into the second
…		…
607	void	612	void
608	object::copy_to (object *dst)	613	object::copy_to (object *dst)
609	{	614	{
610	dst->remove ();	615	dst->remove ();
611	*(object_copy *)dst = *this;	616	*(object_copy *)dst = *this;
		617
		618	// maybe move to object_copy?
		619	dst->kv = kv;
		620
612	dst->flag [FLAG_REMOVED] = true;	621	dst->flag [FLAG_REMOVED] = true;
613		622	dst->activate ();
614	/* Copy over key_values, if any. */
615	if (key_values)
616	{
617	key_value *tail = 0;
618	dst->key_values = 0;
619
620	for (key_value *i = key_values; i; i = i->next)
621	{
622	key_value *new_link = new key_value;
623
624	new_link->next = 0;
625	new_link->key = i->key;
626	new_link->value = i->value;
627
628	/* Try and be clever here, too. */
629	if (!dst->key_values)
630	{
631	dst->key_values = new_link;
632	tail = new_link;
633	}
634	else
635	{
636	tail->next = new_link;
637	tail = new_link;
638	}
639	}
640	}
641
642	if (speed < 0)
643	dst->speed_left -= rndm ();
644
645	dst->set_speed (dst->speed);
646	}	623	}
647		624
648	void	625	void
649	object::instantiate ()	626	object::instantiate ()
650	{	627	{
651	if (!uuid.seq) // HACK	628	if (!uuid.seq) // HACK
652	uuid = UUID::gen ();	629	uuid = UUID::gen ();
653		630
		631	// TODO: unclean state changes, should not be done in copy_to AND instantiate
		632	if (flag [FLAG_RANDOM_SPEED] && speed)
		633	speed_left = - speed - rndm (); // TODO animation
		634	else
654	speed_left = -0.1f;	635	speed_left = -1.;
		636
655	/* copy the body_info to the body_used - this is only really	637	/* copy the body_info to the body_used - this is only really
656	* need for monsters, but doesn't hurt to do it for everything.	638	* need for monsters, but doesn't hurt to do it for everything.
657	* by doing so, when a monster is created, it has good starting	639	* by doing so, when a monster is created, it has good starting
658	* values for the body_used info, so when items are created	640	* values for the body_used info, so when items are created
659	* for it, they can be properly equipped.	641	* for it, they can be properly equipped.
…		…
667	object *	649	object *
668	object::clone ()	650	object::clone ()
669	{	651	{
670	object *neu = create ();	652	object *neu = create ();
671	copy_to (neu);	653	copy_to (neu);
		654
		655	// TODO: unclean state changes, should not be done in clone AND instantiate
		656	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		657	neu->speed_left = - neu->speed - rndm (); // TODO animation
		658
672	neu->map = map; // not copied by copy_to	659	neu->map = map; // not copied by copy_to
673	return neu;	660	return neu;
674	}	661	}
675		662
676	/*	663	/*
…		…
679	* be called to update the face variable, _and_ how it looks on the map.	666	* be called to update the face variable, _and_ how it looks on the map.
680	*/	667	*/
681	void	668	void
682	update_turn_face (object *op)	669	update_turn_face (object *op)
683	{	670	{
684	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	671	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
685	return;	672	return;
686		673
687	SET_ANIMATION (op, op->direction);	674	SET_ANIMATION (op, op->direction);
688	update_object (op, UP_OBJ_FACE);	675	update_object (op, UP_OBJ_FACE);
689	}	676	}
…		…
694	* This function needs to be called whenever the speed of an object changes.	681	* This function needs to be called whenever the speed of an object changes.
695	*/	682	*/
696	void	683	void
697	object::set_speed (float speed)	684	object::set_speed (float speed)
698	{	685	{
699	if (flag [FLAG_FREED] && speed)
700	{
701	LOG (llevError, "Object %s is freed but has speed.\n", &name);
702	speed = 0;
703	}
704
705	this->speed = speed;	686	this->speed = speed;
706		687
707	if (has_active_speed ())	688	if (has_active_speed ())
708	activate ();	689	activate ();
709	else	690	else
…		…
756	}	737	}
757		738
758	mapspace &m = op->ms ();	739	mapspace &m = op->ms ();
759		740
760	if (!(m.flags_ & P_UPTODATE))	741	if (!(m.flags_ & P_UPTODATE))
761	/* nop */;	742	m.update_up (); // nothing to do except copy up
762	else if (action == UP_OBJ_INSERT)	743	else if (action == UP_OBJ_INSERT)
763	{	744	{
		745	#if 0
764	// this is likely overkill, TODO: revisit (schmorp)	746	// this is likely overkill, TODO: revisit (schmorp)
765	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	747	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
766	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	748	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
767	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	749	|| (op->is_player () && !(m.flags_ & P_PLAYER))
768	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	750	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
769	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	751	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
770	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	752	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
771	|| (m.move_on | op->move_on ) != m.move_on	753	|| (m.move_on | op->move_on ) != m.move_on
772	|| (m.move_off | op->move_off ) != m.move_off	754	|| (m.move_off | op->move_off ) != m.move_off
773	|| (m.move_slow | op->move_slow) != m.move_slow	755	|| (m.move_slow | op->move_slow) != m.move_slow
774	/* This isn't perfect, but I don't expect a lot of objects to	756	/* This isn't perfect, but I don't expect a lot of objects to
775	* to have move_allow right now.	757	* have move_allow right now.
776	*/	758	*/
777	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	759	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		760	m.invalidate ();
		761	#else
778	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	762	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
779	m.flags_ = 0;	763	m.invalidate ();
		764	#endif
780	}	765	}
781	/* if the object is being removed, we can't make intelligent	766	/* if the object is being removed, we can't make intelligent
782	* decisions, because remove_ob can't really pass the object	767	* decisions, because remove_ob can't really pass the object
783	* that is being removed.	768	* that is being removed.
784	*/	769	*/
785	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	770	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
786	m.flags_ = 0;	771	m.invalidate ();
787	else if (action == UP_OBJ_FACE)	772	else if (action == UP_OBJ_FACE)
788	/* Nothing to do for that case */ ;	773	m.update_up (); // nothing to do for that case, except copy up
789	else	774	else
790	LOG (llevError, "update_object called with invalid action: %d\n", action);	775	LOG (llevError, "update_object called with invalid action: %d\n", action);
791		776
792	if (op->more)	777	if (op->more)
793	update_object (op->more, action);	778	update_object (op->more, action);
794	}	779	}
795		780
796	object::object ()	781	object::object ()
797	{	782	{
798	SET_FLAG (this, FLAG_REMOVED);	783	this->set_flag (FLAG_REMOVED);
799		784
800	expmul = 1.0;	785	//expmul = 1.0; declared const for the time being
801	face = blank_face;	786	face = blank_face;
		787	material = MATERIAL_NULL;
802	}	788	}
803		789
804	object::~object ()	790	object::~object ()
805	{	791	{
806	unlink ();	792	unlink ();
807		793
808	free_key_values (this);	794	kv.clear ();
809	}	795	}
810
811	static int object_count;
812		796
813	void object::link ()	797	void object::link ()
814	{	798	{
815	assert (!index);//D	799	assert (!index);//D
816	uuid = UUID::gen ();	800	uuid = UUID::gen ();
817	count = ++object_count;
818		801
819	refcnt_inc ();	802	refcnt_inc ();
820	objects.insert (this);	803	objects.insert (this);
		804
		805	++create_count;
		806
821	}	807	}
822		808
823	void object::unlink ()	809	void object::unlink ()
824	{	810	{
825	if (!index)	811	if (!index)
826	return;	812	return;
		813
		814	++destroy_count;
827		815
828	objects.erase (this);	816	objects.erase (this);
829	refcnt_dec ();	817	refcnt_dec ();
830	}	818	}
831		819
…		…
835	/* If already on active list, don't do anything */	823	/* If already on active list, don't do anything */
836	if (active)	824	if (active)
837	return;	825	return;
838		826
839	if (has_active_speed ())	827	if (has_active_speed ())
		828	{
		829	if (flag [FLAG_FREED])
		830	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		831
840	actives.insert (this);	832	actives.insert (this);
		833	}
841	}	834	}
842		835
843	void	836	void
844	object::activate_recursive ()	837	object::activate_recursive ()
845	{	838	{
…		…
905	* if some form of movement is allowed, let objects	898	* if some form of movement is allowed, let objects
906	* drop on that space.	899	* drop on that space.
907	*/	900	*/
908	if (!drop_to_ground	901	if (!drop_to_ground
909	|| !map	902	|| !map
910	|| map->in_memory != MAP_ACTIVE	903	|| !map->linkable ()
911	|| map->no_drop	904	|| map->no_drop
912	|| ms ().move_block == MOVE_ALL)	905	|| ms ().move_block == MOVE_ALL)
913	{	906	{
914	while (inv)	907	while (inv)
915	inv->destroy (true);	908	inv->destroy ();
916	}	909	}
917	else	910	else
918	{ /* Put objects in inventory onto this space */	911	{ /* Put objects in inventory onto this space */
919	while (inv)	912	while (inv)
920	{	913	{
…		…
924	|| op->flag [FLAG_NO_DROP]	917	|| op->flag [FLAG_NO_DROP]
925	|| op->type == RUNE	918	|| op->type == RUNE
926	|| op->type == TRAP	919	|| op->type == TRAP
927	|| op->flag [FLAG_IS_A_TEMPLATE]	920	|| op->flag [FLAG_IS_A_TEMPLATE]
928	|| op->flag [FLAG_DESTROY_ON_DEATH])	921	|| op->flag [FLAG_DESTROY_ON_DEATH])
929	op->destroy (true);	922	op->destroy ();
930	else	923	else
931	map->insert (op, x, y);	924	map->insert (op, x, y);
932	}	925	}
933	}	926	}
934	}	927	}
935		928
		929	/*
		930	* Remove and free all objects in the inventory of the given object.
		931	* Unlike destroy_inv, this assumes the *this is destroyed as well
		932	* well, so we can (and have to!) take shortcuts.
		933	*/
		934	void
		935	object::destroy_inv_fast ()
		936	{
		937	while (object *op = inv)
		938	{
		939	// remove from object the fast way
		940	op->flag [FLAG_REMOVED] = true;
		941	op->env = 0;
		942	if ((inv = inv->below))
		943	inv->above = 0;
		944
		945	// then destroy
		946	op->destroy ();
		947	}
		948	}
		949
		950	void
		951	object::freelist_free (int count)
		952	{
		953	while (count-- && freelist)
		954	{
		955	freelist_item *next = freelist->next;
		956	// count is being "destroyed"
		957
		958	sfree ((char *)freelist, sizeof (object));
		959
		960	freelist = next;
		961	--free_count;
		962	}
		963	}
		964
		965	object *
936	object *object::create ()	966	object::create ()
937	{	967	{
938	object *op = new object;	968	object *op;
		969
		970	if (freelist)
		971	{
		972	freelist_item li = *freelist;
		973	memset (freelist, 0, sizeof (object));
		974
		975	op = new (freelist) object;
		976	op->count = li.count;
		977
		978	freelist = li.next;
		979	--free_count;
		980	}
		981	else
		982	{
		983	void *ni = salloc0<char> (sizeof (object));
		984
		985	op = new(ni) object;
		986
		987	op->count = ++object_count;
		988	}
		989
939	op->link ();	990	op->link ();
		991
940	return op;	992	return op;
941	}	993	}
942		994
943	static struct freed_map : maptile	995	void
		996	object::do_delete ()
944	{	997	{
945	freed_map ()	998	uint32_t count = this->count;
946	{
947	path = "<freed objects map>";
948	name = "/internal/freed_objects_map";
949	width = 3;
950	height = 3;
951	no_drop = 1;
952	no_reset = 1;
953		999
954	alloc ();	1000	this->~object ();
955	in_memory = MAP_ACTIVE;
956	}
957		1001
958	~freed_map ()	1002	freelist_item *li = (freelist_item *)this;
959	{	1003	li->next = freelist;
960	destroy ();	1004	li->count = count;
961	}	1005
962	} freed_map; // freed objects are moved here to avoid crashes	1006	freelist = li;
		1007	++free_count;
		1008	}
963		1009
964	void	1010	void
965	object::do_destroy ()	1011	object::do_destroy ()
966	{	1012	{
967	if (flag [FLAG_IS_LINKED])	1013	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	1014	remove_link ();
969		1015
970	if (flag [FLAG_FRIENDLY])	1016	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	1017	remove_friendly_object (this);
972		1018
973	remove ();	1019	remove ();
…		…
998	attacked_by = 0;	1044	attacked_by = 0;
999	current_weapon = 0;	1045	current_weapon = 0;
1000	}	1046	}
1001		1047
1002	void	1048	void
1003	object::destroy (bool destroy_inventory)	1049	object::destroy ()
1004	{	1050	{
1005	if (destroyed ())	1051	if (destroyed ())
1006	return;	1052	return;
1007		1053
1008	if (!is_head () && !head->destroyed ())	1054	if (!is_head () && !head->destroyed ())
1009	{	1055	{
1010	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1056	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy (destroy_inventory);	1057	head->destroy ();
1012	return;	1058	return;
1013	}	1059	}
1014		1060
1015	destroy_inv (!destroy_inventory);	1061	destroy_inv_fast ();
1016		1062
1017	if (is_head ())	1063	if (is_head ())
1018	if (sound_destroy)	1064	if (sound_destroy)
1019	play_sound (sound_destroy);	1065	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1066	else if (flag [FLAG_MONSTER])
…		…
1031	* the previous environment.	1077	* the previous environment.
1032	*/	1078	*/
1033	void	1079	void
1034	object::do_remove ()	1080	object::do_remove ()
1035	{	1081	{
1036	object *tmp, *last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1082	if (flag [FLAG_REMOVED])
1040	return;	1083	return;
1041		1084
1042	INVOKE_OBJECT (REMOVE, this);	1085	INVOKE_OBJECT (REMOVE, this);
1043		1086
…		…
1055	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1098	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1056	if (object *pl = visible_to ())	1099	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1100	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1101	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1102
1060	adjust_weight (env, -total_weight ());	1103	adjust_weight (env, total_weight (), 0);
		1104
		1105	object *pl = in_player ();
1061		1106
1062	/* we set up values so that it could be inserted into	1107	/* we set up values so that it could be inserted into
1063	* the map, but we don't actually do that - it is up	1108	* the map, but we don't actually do that - it is up
1064	* to the caller to decide what we want to do.	1109	* to the caller to decide what we want to do.
1065	*/	1110	*/
…		…
1073		1118
1074	above = 0;	1119	above = 0;
1075	below = 0;	1120	below = 0;
1076	env = 0;	1121	env = 0;
1077		1122
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1123	if (pl && pl->is_player ())
1079	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.
1081	*/	1124	{
1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1125	if (expect_false (pl->contr->combat_ob == this))
1083	otmp->update_stats ();	1126	{
		1127	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1128	pl->contr->combat_ob = 0;
		1129	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1130	}
		1131
		1132	if (expect_false (pl->contr->ranged_ob == this))
		1133	{
		1134	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1135	pl->contr->ranged_ob = 0;
		1136	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1137	}
		1138
		1139	pl->contr->queue_stats_update ();
		1140
		1141	if (expect_false (glow_radius) && pl->is_on_map ())
		1142	update_all_los (pl->map, pl->x, pl->y);
		1143	}
1084	}	1144	}
1085	else if (map)	1145	else if (map)
1086	{	1146	{
1087	map->dirty = true;	1147	map->dirty = true;
1088	mapspace &ms = this->ms ();	1148	mapspace &ms = this->ms ();
1089		1149
1090	if (object *pl = ms.player ())	1150	if (object *pl = ms.player ())
1091	{	1151	{
1092	if (type == PLAYER) // this == pl(!)	1152	if (is_player ())
1093	{	1153	{
		1154	if (!flag [FLAG_WIZPASS])
		1155	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1156
1094	// leaving a spot always closes any open container on the ground	1157	// leaving a spot always closes any open container on the ground
1095	if (container && !container->env)	1158	if (container && !container->env)
1096	// this causes spurious floorbox updates, but it ensures	1159	// this causes spurious floorbox updates, but it ensures
1097	// that the CLOSE event is being sent.	1160	// that the CLOSE event is being sent.
1098	close_container ();	1161	close_container ();
1099		1162
1100	--map->players;	1163	--map->players;
1101	map->touch ();	1164	map->touch ();
1102	}	1165	}
1103	else if (pl->container == this)	1166	else if (pl->container_ () == this)
1104	{	1167	{
1105	// removing a container should close it	1168	// removing a container should close it
1106	close_container ();	1169	close_container ();
1107	}	1170	}
1108		1171	else
1109	esrv_del_item (pl->contr, count);	1172	esrv_del_item (pl->contr, count);
1110	}	1173	}
1111		1174
1112	/* link the object above us */	1175	/* link the object above us */
1113	// re-link, make sure compiler can easily use cmove	1176	// re-link, make sure compiler can easily use cmove
1114	*(above ? &above->below : &ms.top) = below;	1177	*(above ? &above->below : &ms.top) = below;
1115	*(below ? &below->above : &ms.bot) = above;	1178	*(below ? &below->above : &ms.bot) = above;
1116		1179
1117	above = 0;	1180	above = 0;
1118	below = 0;	1181	below = 0;
1119		1182
1120	if (map->in_memory == MAP_SAVING)	1183	ms.invalidate ();
1121	return;
1122		1184
1123	int check_walk_off = !flag [FLAG_NO_APPLY];	1185	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1186
1125	if (object *pl = ms.player ())	1187	if (object *pl = ms.player ())
1126	{	1188	{
1127	if (pl->container == this)	1189	if (pl->container_ () == this)
1128	/* If a container that the player is currently using somehow gets	1190	/* If a container that the player is currently using somehow gets
1129	* removed (most likely destroyed), update the player view	1191	* removed (most likely destroyed), update the player view
1130	* appropriately.	1192	* appropriately.
1131	*/	1193	*/
1132	pl->close_container ();	1194	pl->close_container ();
…		…
1136	//TODO: update floorbox to preserve ordering	1198	//TODO: update floorbox to preserve ordering
1137	if (pl->contr->ns)	1199	if (pl->contr->ns)
1138	pl->contr->ns->floorbox_update ();	1200	pl->contr->ns->floorbox_update ();
1139	}	1201	}
1140		1202
		1203	if (check_walk_off)
1141	for (tmp = ms.bot; tmp; tmp = tmp->above)	1204	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1142	{	1205	{
		1206	above = tmp->above;
		1207
1143	/* No point updating the players look faces if he is the object	1208	/* No point updating the players look faces if he is the object
1144	* being removed.	1209	* being removed.
1145	*/	1210	*/
1146		1211
1147	/* See if object moving off should effect something */	1212	/* See if object moving off should effect something */
1148	if (check_walk_off
1149	&& ((move_type & tmp->move_off)	1213	if ((move_type & tmp->move_off)
1150	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1214	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1151	{
1152	move_apply (tmp, this, 0);	1215	move_apply (tmp, this, 0);
1153
1154	if (destroyed ())
1155	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1156	}	1216	}
1157		1217
1158	last = tmp;	1218	if (affects_los ())
1159	}
1160
1161	/* last == NULL if there are no objects on this space */
1162	//TODO: this makes little sense, why only update the topmost object?
1163	if (!last)
1164	map->at (x, y).flags_ = 0;
1165	else
1166	update_object (last, UP_OBJ_REMOVE);
1167
1168	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1169	update_all_los (map, x, y);	1219	update_all_los (map, x, y);
1170	}	1220	}
1171	}	1221	}
1172		1222
1173	/*	1223	/*
…		…
1197	esrv_update_item (UPD_NROF, pl, top);	1247	esrv_update_item (UPD_NROF, pl, top);
1198		1248
1199	op->weight = 0; // cancel the addition above	1249	op->weight = 0; // cancel the addition above
1200	op->carrying = 0; // must be 0 already	1250	op->carrying = 0; // must be 0 already
1201		1251
1202	op->destroy (1);	1252	op->destroy ();
1203		1253
1204	return top;	1254	return top;
1205	}	1255	}
1206		1256
1207	return 0;	1257	return 0;
…		…
1215		1265
1216	object *prev = this;	1266	object *prev = this;
1217		1267
1218	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1268	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1219	{	1269	{
1220	object *op = arch_to_object (at);	1270	object *op = at->instance ();
1221		1271
1222	op->name = name;	1272	op->name = name;
1223	op->name_pl = name_pl;	1273	op->name_pl = name_pl;
1224	op->title = title;	1274	op->title = title;
1225		1275
…		…
1263	* Passing 0 for flag gives proper default values, so flag really only needs	1313	* Passing 0 for flag gives proper default values, so flag really only needs
1264	* to be set if special handling is needed.	1314	* to be set if special handling is needed.
1265	*	1315	*
1266	* Return value:	1316	* Return value:
1267	* new object if 'op' was merged with other object	1317	* new object if 'op' was merged with other object
1268	* NULL if 'op' was destroyed	1318	* NULL if there was an error (destroyed, blocked etc.)
1269	* just 'op' otherwise	1319	* just 'op' otherwise
1270	*/	1320	*/
1271	object *	1321	object *
1272	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1322	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1273	{	1323	{
1274	if (op->is_on_map ())
1275	{
1276	LOG (llevError, "insert_ob_in_map called for object already on map");
1277	abort ();
1278	}
1279
1280	if (op->env)
1281	{
1282	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1283	op->remove ();	1324	op->remove ();
1284	}
1285		1325
1286	if (op->face && !face_info (op->face))//D TODO: remove soon	1326	if (m == &freed_map)//D TODO: remove soon
1287	{//D	1327	{//D
1288	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1328	LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1289	op->face = 1;//D
1290	}//D	1329	}//D
1291		1330
1292	/* Ideally, the caller figures this out. However, it complicates a lot	1331	/* Ideally, the caller figures this out. However, it complicates a lot
1293	* of areas of callers (eg, anything that uses find_free_spot would now	1332	* of areas of callers (eg, anything that uses find_free_spot would now
1294	* need extra work	1333	* need extra work
1295	*/	1334	*/
		1335	maptile *newmap = m;
1296	if (!xy_normalise (m, op->x, op->y))	1336	if (!xy_normalise (newmap, op->x, op->y))
1297	{	1337	{
1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1338	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1299	return 0;	1339	return 0;
1300	}	1340	}
1301		1341
1302	if (object *more = op->more)	1342	if (object *more = op->more)
1303	if (!insert_ob_in_map (more, m, originator, flag))	1343	if (!insert_ob_in_map (more, m, originator, flag))
1304	return 0;	1344	return 0;
1305		1345
1306	CLEAR_FLAG (op, FLAG_REMOVED);	1346	op->flag [FLAG_REMOVED] = false;
1307		1347	op->env = 0;
1308	op->map = m;	1348	op->map = newmap;
		1349
1309	mapspace &ms = op->ms ();	1350	mapspace &ms = op->ms ();
1310		1351
1311	/* this has to be done after we translate the coordinates.	1352	/* this has to be done after we translate the coordinates.
1312	*/	1353	*/
1313	if (op->nrof && !(flag & INS_NO_MERGE))	1354	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1316	{	1357	{
1317	// TODO: we actually want to update tmp, not op,	1358	// TODO: we actually want to update tmp, not op,
1318	// but some caller surely breaks when we return tmp	1359	// but some caller surely breaks when we return tmp
1319	// from here :/	1360	// from here :/
1320	op->nrof += tmp->nrof;	1361	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1362	tmp->destroy ();
1322	}	1363	}
1323		1364
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1365	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1366	op->clr_flag (FLAG_INV_LOCKED);
1326		1367
1327	if (!QUERY_FLAG (op, FLAG_ALIVE))	1368	if (!op->flag [FLAG_ALIVE])
1328	CLEAR_FLAG (op, FLAG_NO_STEAL);	1369	op->clr_flag (FLAG_NO_STEAL);
1329		1370
1330	if (flag & INS_BELOW_ORIGINATOR)	1371	if (flag & INS_BELOW_ORIGINATOR)
1331	{	1372	{
1332	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1373	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1333	{	1374	{
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1375	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1376	abort ();
1336	}	1377	}
1337		1378
1338	if (!originator->is_on_map ())	1379	if (!originator->is_on_map ())
		1380	{
1339	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1381	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1340	op->debug_desc (), originator->debug_desc ());	1382	op->debug_desc (), originator->debug_desc ());
		1383	abort ();
		1384	}
1341		1385
1342	op->above = originator;	1386	op->above = originator;
1343	op->below = originator->below;	1387	op->below = originator->below;
1344	originator->below = op;	1388	originator->below = op;
1345		1389
…		…
1365	* when lots of spells are cast in one area. Currently, it is presumed	1409	* when lots of spells are cast in one area. Currently, it is presumed
1366	* that flying non pickable objects are spell objects.	1410	* that flying non pickable objects are spell objects.
1367	*/	1411	*/
1368	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1412	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1369	{	1413	{
1370	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1414	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1371	floor = tmp;	1415	floor = tmp;
1372		1416
1373	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1417	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1374	{	1418	{
1375	/* We insert above top, so we want this object below this */	1419	/* We insert above top, so we want this object below this */
1376	top = tmp->below;	1420	top = tmp->below;
1377	break;	1421	break;
1378	}	1422	}
…		…
1396	&& (op->face && !faces [op->face].visibility))	1440	&& (op->face && !faces [op->face].visibility))
1397	{	1441	{
1398	object *last;	1442	object *last;
1399		1443
1400	for (last = top; last != floor; last = last->below)	1444	for (last = top; last != floor; last = last->below)
1401	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1445	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1402	break;	1446	break;
1403		1447
1404	/* Check to see if we found the object that blocks view,	1448	/* Check to see if we found the object that blocks view,
1405	* and make sure we have a below pointer for it so that	1449	* and make sure we have a below pointer for it so that
1406	* we can get inserted below this one, which requires we	1450	* we can get inserted below this one, which requires we
…		…
1431	op->below = top;	1475	op->below = top;
1432	*(op->above ? &op->above->below : &ms.top) = op;	1476	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1477	}
1434	}	1478	}
1435		1479
1436	if (op->type == PLAYER)	1480	if (op->is_player ())
1437	{	1481	{
1438	op->contr->do_los = 1;	1482	op->contr->do_los = 1;
1439	++op->map->players;	1483	++op->map->players;
1440	op->map->touch ();	1484	op->map->touch ();
1441	}	1485	}
…		…
1456	* be far away from this change and not affected in any way -	1500	* be far away from this change and not affected in any way -
1457	* this should get redone to only look for players within range,	1501	* this should get redone to only look for players within range,
1458	* or just updating the P_UPTODATE for spaces within this area	1502	* or just updating the P_UPTODATE for spaces within this area
1459	* of effect may be sufficient.	1503	* of effect may be sufficient.
1460	*/	1504	*/
1461	if (op->map->darkness && (op->glow_radius != 0))	1505	if (op->affects_los ())
		1506	{
		1507	op->ms ().invalidate ();
1462	update_all_los (op->map, op->x, op->y);	1508	update_all_los (op->map, op->x, op->y);
		1509	}
1463		1510
1464	/* updates flags (blocked, alive, no magic, etc) for this map space */	1511	/* updates flags (blocked, alive, no magic, etc) for this map space */
1465	update_object (op, UP_OBJ_INSERT);	1512	update_object (op, UP_OBJ_INSERT);
1466		1513
1467	INVOKE_OBJECT (INSERT, op);	1514	INVOKE_OBJECT (INSERT, op);
…		…
1474	* blocked() and wall() work properly), and these flags are updated by	1521	* blocked() and wall() work properly), and these flags are updated by
1475	* update_object().	1522	* update_object().
1476	*/	1523	*/
1477		1524
1478	/* if this is not the head or flag has been passed, don't check walk on status */	1525	/* if this is not the head or flag has been passed, don't check walk on status */
1479	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1526	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1480	{	1527	{
1481	if (check_move_on (op, originator))	1528	if (check_move_on (op, originator, flag))
1482	return 0;	1529	return 0;
1483		1530
1484	/* If we are a multi part object, lets work our way through the check	1531	/* If we are a multi part object, let's work our way through the check
1485	* walk on's.	1532	* walk on's.
1486	*/	1533	*/
1487	for (object *tmp = op->more; tmp; tmp = tmp->more)	1534	for (object *tmp = op->more; tmp; tmp = tmp->more)
1488	if (check_move_on (tmp, originator))	1535	if (check_move_on (tmp, originator, flag))
1489	return 0;	1536	return 0;
1490	}	1537	}
1491		1538
1492	return op;	1539	return op;
1493	}	1540	}
…		…
1495	/* this function inserts an object in the map, but if it	1542	/* this function inserts an object in the map, but if it
1496	* finds an object of its own type, it'll remove that one first.	1543	* finds an object of its own type, it'll remove that one first.
1497	* op is the object to insert it under: supplies x and the map.	1544	* op is the object to insert it under: supplies x and the map.
1498	*/	1545	*/
1499	void	1546	void
1500	replace_insert_ob_in_map (const char *arch_string, object *op)	1547	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1501	{	1548	{
1502	/* first search for itself and remove any old instances */	1549	/* first search for itself and remove any old instances */
1503		1550
1504	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1551	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1505	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1552	if (tmp->arch->archname == archname) /* same archetype */
1506	tmp->destroy (1);	1553	tmp->destroy ();
1507		1554
1508	object *tmp = arch_to_object (archetype::find (arch_string));	1555	object *tmp = archetype::find (archname)->instance ();
1509		1556
1510	tmp->x = op->x;	1557	tmp->x = op->x;
1511	tmp->y = op->y;	1558	tmp->y = op->y;
1512		1559
1513	insert_ob_in_map (tmp, op->map, op, 0);	1560	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1518	{	1565	{
1519	if (where->env)	1566	if (where->env)
1520	return where->env->insert (this);	1567	return where->env->insert (this);
1521	else	1568	else
1522	return where->map->insert (this, where->x, where->y, originator, flags);	1569	return where->map->insert (this, where->x, where->y, originator, flags);
		1570	}
		1571
		1572	// check whether we can put this into the map, respect max_volume, max_items
		1573	bool
		1574	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1575	{
		1576	mapspace &ms = m->at (x, y);
		1577
		1578	int items = ms.items ();
		1579
		1580	if (!items // testing !items ensures we can drop at least one item
		1581	|| (items < m->max_items
		1582	&& ms.volume () < m->max_volume))
		1583	return true;
		1584
		1585	if (originator && originator->is_player ())
		1586	originator->contr->failmsgf (
		1587	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1588	query_name ()
		1589	);
		1590
		1591	return false;
1523	}	1592	}
1524		1593
1525	/*	1594	/*
1526	* decrease(object, number) decreases a specified number from	1595	* decrease(object, number) decreases a specified number from
1527	* the amount of an object. If the amount reaches 0, the object	1596	* the amount of an object. If the amount reaches 0, the object
…		…
1535	if (!nr)	1604	if (!nr)
1536	return true;	1605	return true;
1537		1606
1538	nr = min (nr, nrof);	1607	nr = min (nr, nrof);
1539		1608
		1609	if (nrof > nr)
		1610	{
		1611	sint64 oweight = total_weight ();
		1612
1540	nrof -= nr;	1613	nrof -= nr;
1541
1542	if (nrof)
1543	{
1544	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1545		1614
1546	if (object *pl = visible_to ())	1615	if (object *pl = visible_to ())
1547	esrv_update_item (UPD_NROF, pl, this);	1616	esrv_update_item (UPD_NROF, pl, this);
		1617
		1618	adjust_weight (env, oweight, total_weight ());
1548		1619
1549	return true;	1620	return true;
1550	}	1621	}
1551	else	1622	else
1552	{	1623	{
…		…
1627	if (op->nrof)	1698	if (op->nrof)
1628	for (object *tmp = inv; tmp; tmp = tmp->below)	1699	for (object *tmp = inv; tmp; tmp = tmp->below)
1629	if (object::can_merge (tmp, op))	1700	if (object::can_merge (tmp, op))
1630	{	1701	{
1631	/* return the original object and remove inserted object	1702	/* return the original object and remove inserted object
1632	(client needs the original object) */	1703	(client prefers the original object) */
		1704
		1705	// carring must be 0 for mergable objects
		1706	sint64 oweight = tmp->weight * tmp->nrof;
		1707
1633	tmp->nrof += op->nrof;	1708	tmp->nrof += op->nrof;
1634		1709
1635	if (object *pl = tmp->visible_to ())	1710	if (object *pl = tmp->visible_to ())
1636	esrv_update_item (UPD_NROF, pl, tmp);	1711	esrv_update_item (UPD_NROF, pl, tmp);
1637		1712
1638	adjust_weight (this, op->total_weight ());	1713	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1639		1714
1640	op->destroy (1);	1715	op->destroy ();
1641	op = tmp;	1716	op = tmp;
1642	goto inserted;	1717	goto inserted;
1643	}	1718	}
1644		1719
1645	op->owner = 0; // it's his/hers now. period.	1720	op->owner = 0; // it's his/hers now. period.
…		…
1659	op->flag [FLAG_REMOVED] = 0;	1734	op->flag [FLAG_REMOVED] = 0;
1660		1735
1661	if (object *pl = op->visible_to ())	1736	if (object *pl = op->visible_to ())
1662	esrv_send_item (pl, op);	1737	esrv_send_item (pl, op);
1663		1738
1664	adjust_weight (this, op->total_weight ());	1739	adjust_weight (this, 0, op->total_weight ());
1665		1740
1666	inserted:	1741	inserted:
1667	/* reset the light list and los of the players on the map */	1742	/* reset the light list and los of the players on the map */
1668	if (op->glow_radius && map && map->darkness)	1743	if (op->glow_radius && is_on_map ())
		1744	{
		1745	update_stats ();
1669	update_all_los (map, x, y);	1746	update_all_los (map, x, y);
1670		1747	}
		1748	else if (is_player ())
1671	// if this is a player's inventory, update stats	1749	// if this is a player's inventory, update stats
1672	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1750	contr->queue_stats_update ();
1673	update_stats ();
1674		1751
1675	INVOKE_OBJECT (INSERT, this);	1752	INVOKE_OBJECT (INSERT, this);
1676		1753
1677	return op;	1754	return op;
1678	}	1755	}
…		…
1696	* MSW 2001-07-08: Check all objects on space, not just those below	1773	* MSW 2001-07-08: Check all objects on space, not just those below
1697	* object being inserted. insert_ob_in_map may not put new objects	1774	* object being inserted. insert_ob_in_map may not put new objects
1698	* on top.	1775	* on top.
1699	*/	1776	*/
1700	int	1777	int
1701	check_move_on (object *op, object *originator)	1778	check_move_on (object *op, object *originator, int flags)
1702	{	1779	{
		1780	if (op->flag [FLAG_NO_APPLY])
		1781	return 0;
		1782
1703	object *tmp;	1783	object *tmp;
1704	maptile *m = op->map;	1784	maptile *m = op->map;
1705	int x = op->x, y = op->y;	1785	int x = op->x, y = op->y;
1706		1786
1707	MoveType move_on, move_slow, move_block;	1787	mapspace &ms = m->at (x, y);
1708		1788
1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1789	ms.update ();
1710	return 0;
1711		1790
1712	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1791	MoveType move_on = ms.move_on;
1713	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1792	MoveType move_slow = ms.move_slow;
1714	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1793	MoveType move_block = ms.move_block;
1715		1794
1716	/* if nothing on this space will slow op down or be applied,	1795	/* if nothing on this space will slow op down or be applied,
1717	* no need to do checking below. have to make sure move_type	1796	* no need to do checking below. have to make sure move_type
1718	* is set, as lots of objects don't have it set - we treat that	1797	* is set, as lots of objects don't have it set - we treat that
1719	* as walking.	1798	* as walking.
…		…
1730	return 0;	1809	return 0;
1731		1810
1732	/* The objects have to be checked from top to bottom.	1811	/* The objects have to be checked from top to bottom.
1733	* Hence, we first go to the top:	1812	* Hence, we first go to the top:
1734	*/	1813	*/
1735		1814	for (object *next, *tmp = ms.top; tmp; tmp = next)
1736	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737	{
1738	/* Trim the search when we find the first other spell effect
1739	* this helps performance so that if a space has 50 spell objects,
1740	* we don't need to check all of them.
1741	*/
1742	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743	break;
1744	}	1815	{
		1816	next = tmp->below;
1745		1817
1746	for (; tmp; tmp = tmp->below)
1747	{
1748	if (tmp == op)	1818	if (tmp == op)
1749	continue; /* Can't apply yourself */	1819	continue; /* Can't apply yourself */
1750		1820
1751	/* Check to see if one of the movement types should be slowed down.	1821	/* Check to see if one of the movement types should be slowed down.
1752	* Second check makes sure that the movement types not being slowed	1822	* Second check makes sure that the movement types not being slowed
1753	* (~slow_move) is not blocked on this space - just because the	1823	* (~slow_move) is not blocked on this space - just because the
1754	* space doesn't slow down swimming (for example), if you can't actually	1824	* space doesn't slow down swimming (for example), if you can't actually
1755	* swim on that space, can't use it to avoid the penalty.	1825	* swim on that space, can't use it to avoid the penalty.
1756	*/	1826	*/
1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1827	if (!op->flag [FLAG_WIZPASS])
1758	{	1828	{
1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1829	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1760	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1830	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761	{	1831	{
1762
1763	float
1764	diff = tmp->move_slow_penalty * fabs (op->speed);	1832	float diff = tmp->move_slow_penalty * fabs (op->speed);
1765		1833
1766	if (op->type == PLAYER)	1834	if (op->is_player ())
1767	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1835	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1768	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1836	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769	diff /= 4.0;	1837	diff /= 4.0;
1770		1838
1771	op->speed_left -= diff;	1839	op->speed_left -= diff;
1772	}	1840	}
1773	}	1841	}
1774		1842
1775	/* Basically same logic as above, except now for actual apply. */	1843	/* Basically same logic as above, except now for actual apply. */
1776	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1844	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1777	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1845	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1778	{	1846	{
		1847	if ((flags & INS_NO_AUTO_EXIT)
		1848	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1849	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1850	continue;
		1851
1779	move_apply (tmp, op, originator);	1852	move_apply (tmp, op, originator);
1780		1853
1781	if (op->destroyed ())	1854	if (op->destroyed ())
1782	return 1;	1855	return 1;
1783		1856
…		…
1895	void	1968	void
1896	flag_inv (object *op, int flag)	1969	flag_inv (object *op, int flag)
1897	{	1970	{
1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1971	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1899	{	1972	{
1900	SET_FLAG (tmp, flag);	1973	tmp->set_flag (flag);
1901	flag_inv (tmp, flag);	1974	flag_inv (tmp, flag);
1902	}	1975	}
1903	}	1976	}
1904		1977
1905	/*	1978	/*
…		…
1908	void	1981	void
1909	unflag_inv (object *op, int flag)	1982	unflag_inv (object *op, int flag)
1910	{	1983	{
1911	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1984	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1912	{	1985	{
1913	CLEAR_FLAG (tmp, flag);	1986	tmp->clr_flag (flag);
1914	unflag_inv (tmp, flag);	1987	unflag_inv (tmp, flag);
1915	}	1988	}
1916	}	1989	}
1917		1990
1918	/*	1991	/*
…		…
1935	*/	2008	*/
1936	int	2009	int
1937	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2010	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1938	{	2011	{
1939	int altern[SIZEOFFREE];	2012	int altern[SIZEOFFREE];
1940	int index = 0, flag;	2013	int index = 0;
1941		2014
1942	for (int i = start; i < stop; i++)	2015	for (int i = start; i < stop; i++)
1943	{	2016	{
1944	mapxy pos (m, x, y); pos.move (i);	2017	mapxy pos (m, x, y); pos.move (i);
1945		2018
…		…
1979	* head of the object should correspond for the entire object.	2052	* head of the object should correspond for the entire object.
1980	*/	2053	*/
1981	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2054	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1982	continue;	2055	continue;
1983		2056
1984	if (ob->blocked (m, pos.x, pos.y))	2057	if (ob->blocked (pos.m, pos.x, pos.y))
1985	continue;	2058	continue;
1986		2059
1987	altern [index++] = i;	2060	altern [index++] = i;
1988	}	2061	}
1989		2062
…		…
2057	* there is capable of.	2130	* there is capable of.
2058	*/	2131	*/
2059	int	2132	int
2060	find_dir (maptile *m, int x, int y, object *exclude)	2133	find_dir (maptile *m, int x, int y, object *exclude)
2061	{	2134	{
2062	int i, max = SIZEOFFREE, mflags;	2135	int max = SIZEOFFREE;
2063
2064	sint16 nx, ny;
2065	object *tmp;
2066	maptile *mp;
2067
2068	MoveType blocked, move_type;	2136	MoveType move_type;
2069		2137
2070	if (exclude && exclude->head_ () != exclude)	2138	if (exclude && exclude->head_ () != exclude)
2071	{	2139	{
2072	exclude = exclude->head;	2140	exclude = exclude->head;
2073	move_type = exclude->move_type;	2141	move_type = exclude->move_type;
…		…
2076	{	2144	{
2077	/* If we don't have anything, presume it can use all movement types. */	2145	/* If we don't have anything, presume it can use all movement types. */
2078	move_type = MOVE_ALL;	2146	move_type = MOVE_ALL;
2079	}	2147	}
2080		2148
2081	for (i = 1; i < max; i++)	2149	for (int i = 1; i < max; i++)
2082	{	2150	{
2083	mp = m;	2151	mapxy pos (m, x, y);
2084	nx = x + freearr_x[i];	2152	pos.move (i);
2085	ny = y + freearr_y[i];
2086		2153
2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2154	if (!pos.normalise ())
2088
2089	if (mflags & P_OUT_OF_MAP)
2090	max = maxfree[i];	2155	max = maxfree[i];
2091	else	2156	else
2092	{	2157	{
2093	mapspace &ms = mp->at (nx, ny);	2158	mapspace &ms = *pos;
2094		2159
2095	blocked = ms.move_block;
2096
2097	if ((move_type & blocked) == move_type)	2160	if ((move_type & ms.move_block) == move_type)
2098	max = maxfree[i];	2161	max = maxfree [i];
2099	else if (mflags & P_IS_ALIVE)	2162	else if (ms.flags () & P_IS_ALIVE)
2100	{	2163	{
2101	for (tmp = ms.bot; tmp; tmp = tmp->above)	2164	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2102	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2165	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2103	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2166	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104	break;
2105
2106	if (tmp)
2107	return freedir[i];	2167	return freedir [i];
2108	}	2168	}
2109	}	2169	}
2110	}	2170	}
2111		2171
2112	return 0;	2172	return 0;
…		…
2121	{	2181	{
2122	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2182	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2123	}	2183	}
2124		2184
2125	/*	2185	/*
2126	* find_dir_2(delta-x,delta-y) will return a direction in which	2186	* find_dir_2(delta-x,delta-y) will return a direction value
2127	* an object which has subtracted the x and y coordinates of another	2187	* for running into direct [dx, dy].
2128	* object, needs to travel toward it.	2188	* (the opposite of crossfire's find_dir_2!)
2129	*/	2189	*/
2130	int	2190	int
2131	find_dir_2 (int x, int y)	2191	find_dir_2 (int x, int y)
2132	{	2192	{
		2193	#if 1 // new algorithm
		2194	// this works by putting x, y into 16 sectors, which
		2195	// are not equal sized, but are a better approximation
		2196	// then the old algorithm, and then using a mapping
		2197	// table to map it into a direction value.
		2198	// basically, it maps these comparisons to each bit
		2199	// bit #3: x < 0
		2200	// bit #2: y < 0
		2201	// bit #1: x > y
		2202	// bit #0: x > 2y
		2203
		2204	static const uint8 dir[16] = {
		2205	4, 5, 4, 3,
		2206	2, 1, 2, 3,
		2207	6, 5, 6, 7,
		2208	8, 1, 8, 7,
		2209	};
		2210	int sector = 0;
		2211
		2212	// this is a bit ugly, but more likely to result in branchless code
		2213	sector |= x < 0 ? 8 : 0;
		2214	x = x < 0 ? -x : x; // abs
		2215
		2216	sector |= y < 0 ? 4 : 0;
		2217	y = y < 0 ? -y : y; // abs
		2218
		2219	if (x > y)
		2220	{
		2221	sector |= 2;
		2222
		2223	if (x > y * 2)
		2224	sector |= 1;
		2225	}
		2226	else
		2227	{
		2228	if (y > x * 2)
		2229	sector |= 1;
		2230	else if (!y)
		2231	return 0; // x == 0 here
		2232	}
		2233
		2234	return dir [sector];
		2235	#else // old algorithm
2133	int q;	2236	int q;
2134		2237
2135	if (y)	2238	if (y)
2136	q = x * 100 / y;	2239	q = 128 * x / y;
2137	else if (x)	2240	else if (x)
2138	q = -300 * x;	2241	q = -512 * x; // to make it > 309
2139	else	2242	else
2140	return 0;	2243	return 0;
2141		2244
2142	if (y > 0)	2245	if (y > 0)
2143	{	2246	{
2144	if (q < -242)	2247	if (q < -309) return 7;
		2248	if (q < -52) return 6;
		2249	if (q < 52) return 5;
		2250	if (q < 309) return 4;
		2251
2145	return 3;	2252	return 3;
2146	if (q < -41)	2253	}
2147	return 2;	2254	else
2148	if (q < 41)	2255	{
2149	return 1;	2256	if (q < -309) return 3;
2150	if (q < 242)	2257	if (q < -52) return 2;
2151	return 8;	2258	if (q < 52) return 1;
		2259	if (q < 309) return 8;
		2260
2152	return 7;	2261	return 7;
2153	}	2262	}
2154		2263	#endif
2155	if (q < -242)
2156	return 7;
2157	if (q < -41)
2158	return 6;
2159	if (q < 41)
2160	return 5;
2161	if (q < 242)
2162	return 4;
2163
2164	return 3;
2165	}	2264	}
2166		2265
2167	/*	2266	/*
2168	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2267	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2169	* between two directions (which are expected to be absolute (see absdir())	2268	* between two directions (which are expected to be absolute (see absdir())
2170	*/	2269	*/
2171	int	2270	int
2172	dirdiff (int dir1, int dir2)	2271	dirdiff (int dir1, int dir2)
2173	{	2272	{
2174	int d;
2175
2176	d = abs (dir1 - dir2);	2273	int d = abs (dir1 - dir2);
2177	if (d > 4)
2178	d = 8 - d;
2179		2274
2180	return d;	2275	return d > 4 ? 8 - d : d;
2181	}	2276	}
2182		2277
2183	/* peterm:	2278	/* peterm:
2184	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2279	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2185	* Basically, this is a table of directions, and what directions	2280	* Basically, this is a table of directions, and what directions
…		…
2187	* This basically means that if direction is 15, then it could either go	2282	* This basically means that if direction is 15, then it could either go
2188	* direction 4, 14, or 16 to get back to where we are.	2283	* direction 4, 14, or 16 to get back to where we are.
2189	* Moved from spell_util.c to object.c with the other related direction	2284	* Moved from spell_util.c to object.c with the other related direction
2190	* functions.	2285	* functions.
2191	*/	2286	*/
2192	int reduction_dir[SIZEOFFREE][3] = {	2287	static const int reduction_dir[SIZEOFFREE][3] = {
2193	{0, 0, 0}, /* 0 */	2288	{0, 0, 0}, /* 0 */
2194	{0, 0, 0}, /* 1 */	2289	{0, 0, 0}, /* 1 */
2195	{0, 0, 0}, /* 2 */	2290	{0, 0, 0}, /* 2 */
2196	{0, 0, 0}, /* 3 */	2291	{0, 0, 0}, /* 3 */
2197	{0, 0, 0}, /* 4 */	2292	{0, 0, 0}, /* 4 */
…		…
2291	* Add a check so we can't pick up invisible objects (0.93.8)	2386	* Add a check so we can't pick up invisible objects (0.93.8)
2292	*/	2387	*/
2293	int	2388	int
2294	can_pick (const object *who, const object *item)	2389	can_pick (const object *who, const object *item)
2295	{	2390	{
2296	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2391	return /*who->flag [FLAG_WIZ]|| */
2297	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2392	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2298	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2393	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2299	}	2394	}
		2395
		2396	//-GPL
2300		2397
2301	/*	2398	/*
2302	* create clone from object to another	2399	* create clone from object to another
2303	*/	2400	*/
2304	object *	2401	object *
…		…
2335	return tmp;	2432	return tmp;
2336		2433
2337	return 0;	2434	return 0;
2338	}	2435	}
2339		2436
2340	const shstr &	2437	/* Zero the key_values on op, decrementing the shared-string
2341	object::kv_get (const shstr &key) const	2438	* refcounts and freeing the links.
		2439	*/
		2440	void
		2441	key_values::clear ()
2342	{	2442	{
		2443	for (key_value *kvp = first; kvp; )
		2444	{
		2445	key_value *next = kvp->next;
		2446	delete kvp;
		2447	kvp = next;
		2448	}
		2449
		2450	first = 0;
		2451	}
		2452
		2453	shstr_tmp
		2454	key_values::get (shstr_tmp key) const
		2455	{
2343	for (key_value *kv = key_values; kv; kv = kv->next)	2456	for (key_value *kv = first; kv; kv = kv->next)
2344	if (kv->key == key)	2457	if (kv->key == key)
2345	return kv->value;	2458	return kv->value;
2346		2459
2347	return shstr_null;	2460	return shstr ();
2348	}	2461	}
2349		2462
2350	void	2463	void
2351	object::kv_set (const shstr &key, const shstr &value)	2464	key_values::add (shstr_tmp key, shstr_tmp value)
2352	{	2465	{
		2466	key_value *kv = new key_value;
		2467
		2468	kv->next = first;
		2469	kv->key = key;
		2470	kv->value = value;
		2471
		2472	first = kv;
		2473	}
		2474
		2475	void
		2476	key_values::set (shstr_tmp key, shstr_tmp value)
		2477	{
2353	for (key_value *kv = key_values; kv; kv = kv->next)	2478	for (key_value *kv = first; kv; kv = kv->next)
2354	if (kv->key == key)	2479	if (kv->key == key)
2355	{	2480	{
2356	kv->value = value;	2481	kv->value = value;
2357	return;	2482	return;
2358	}	2483	}
2359		2484
2360	key_value *kv = new key_value;	2485	add (key, value);
2361
2362	kv->next = key_values;
2363	kv->key = key;
2364	kv->value = value;
2365
2366	key_values = kv;
2367	}	2486	}
2368		2487
2369	void	2488	void
2370	object::kv_del (const shstr &key)	2489	key_values::del (shstr_tmp key)
2371	{	2490	{
2372	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2491	for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2373	if ((*kvp)->key == key)	2492	if ((*kvp)->key == key)
2374	{	2493	{
2375	key_value *kv = *kvp;	2494	key_value *kv = *kvp;
2376	*kvp = (*kvp)->next;	2495	*kvp = (*kvp)->next;
2377	delete kv;	2496	delete kv;
2378	return;	2497	return;
2379	}	2498	}
		2499	}
		2500
		2501	void
		2502	key_values::reverse ()
		2503	{
		2504	key_value *prev = 0;
		2505	key_value *head = first;
		2506
		2507	while (head)
		2508	{
		2509	key_value *node = head;
		2510	head = head->next;
		2511	node->next = prev;
		2512	prev = node;
		2513	}
		2514
		2515	first = prev;
		2516	}
		2517
		2518	key_values &
		2519	key_values::operator =(const key_values &kv)
		2520	{
		2521	clear ();
		2522
		2523	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2524	add (kvp->key, kvp->value);
		2525
		2526	reverse ();
2380	}	2527	}
2381		2528
2382	object::depth_iterator::depth_iterator (object *container)	2529	object::depth_iterator::depth_iterator (object *container)
2383	: iterator_base (container)	2530	: iterator_base (container)
2384	{	2531	{
…		…
2468	{	2615	{
2469	return map ? map->region (x, y)	2616	return map ? map->region (x, y)
2470	: region::default_region ();	2617	: region::default_region ();
2471	}	2618	}
2472		2619
2473	const materialtype_t *	2620	//+GPL
2474	object::dominant_material () const
2475	{
2476	if (materialtype_t *mt = name_to_material (materialname))
2477	return mt;
2478
2479	return name_to_material (shstr_unknown);
2480	}
2481		2621
2482	void	2622	void
2483	object::open_container (object *new_container)	2623	object::open_container (object *new_container)
2484	{	2624	{
2485	if (container == new_container)	2625	if (container == new_container)
…		…
2506	container = 0;	2646	container = 0;
2507		2647
2508	// client needs item update to make it work, client bug requires this to be separate	2648	// client needs item update to make it work, client bug requires this to be separate
2509	esrv_update_item (UPD_FLAGS, this, old_container);	2649	esrv_update_item (UPD_FLAGS, this, old_container);
2510		2650
2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2651	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2512	play_sound (sound_find ("chest_close"));	2652	play_sound (sound_find ("chest_close"));
2513	}	2653	}
2514		2654
2515	if (new_container)	2655	if (new_container)
2516	{	2656	{
…		…
2520	// TODO: this does not seem to serve any purpose anymore?	2660	// TODO: this does not seem to serve any purpose anymore?
2521	#if 0	2661	#if 0
2522	// insert the "Close Container" object.	2662	// insert the "Close Container" object.
2523	if (archetype *closer = new_container->other_arch)	2663	if (archetype *closer = new_container->other_arch)
2524	{	2664	{
2525	object *closer = arch_to_object (new_container->other_arch);	2665	object *closer = new_container->other_arch->instance ();
2526	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2666	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2527	new_container->insert (closer);	2667	new_container->insert (closer);
2528	}	2668	}
2529	#endif	2669	#endif
2530		2670
2531	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2671	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2532		2672
2533	// make sure the container is available, client bug requires this to be separate	2673	// make sure the container is available, client bug requires this to be separate
2534	esrv_send_item (this, new_container);	2674	esrv_send_item (this, new_container);
2535		2675
2536	new_container->flag [FLAG_APPLIED] = true;	2676	new_container->flag [FLAG_APPLIED] = true;
…		…
2543	}	2683	}
2544	// else if (!old_container->env && contr && contr->ns)	2684	// else if (!old_container->env && contr && contr->ns)
2545	// contr->ns->floorbox_reset ();	2685	// contr->ns->floorbox_reset ();
2546	}	2686	}
2547		2687
		2688	//-GPL
		2689
		2690	// prefetch some flat area around the player
		2691	static void
		2692	prefetch_surrounding_area (object *op, maptile *map, int range)
		2693	{
		2694	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2695	op->x - range , op->y - range ,
		2696	op->x + range + 1, op->y + range + 1);
		2697	rect->m;
		2698	++rect)
		2699	{
		2700	rect->m->touch ();
		2701	rect->m->activate ();
		2702	}
		2703	}
		2704
		2705	// prefetch a generous area around the player, also up and down
		2706	void
		2707	object::prefetch_surrounding_maps ()
		2708	{
		2709	prefetch_surrounding_area (this, map, 40);
		2710
		2711	if (maptile *m = map->tile_available (TILE_DOWN))
		2712	prefetch_surrounding_area (this, m, 20);
		2713
		2714	if (maptile *m = map->tile_available (TILE_UP))
		2715	prefetch_surrounding_area (this, m, 20);
		2716	}
		2717
		2718	//+GPL
		2719
2548	object *	2720	object *
2549	object::force_find (const shstr name)	2721	object::force_find (shstr_tmp name)
2550	{	2722	{
2551	/* cycle through his inventory to look for the MARK we want to	2723	/* cycle through his inventory to look for the MARK we want to
2552	* place	2724	* place
2553	*/	2725	*/
2554	for (object *tmp = inv; tmp; tmp = tmp->below)	2726	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2557		2729
2558	return 0;	2730	return 0;
2559	}	2731	}
2560		2732
2561	void	2733	void
		2734	object::force_set_timer (int duration)
		2735	{
		2736	this->duration = 1;
		2737	this->speed_left = -1.f;
		2738
		2739	this->set_speed (duration ? 1.f / duration : 0.f);
		2740	}
		2741
		2742	object *
2562	object::force_add (const shstr name, int duration)	2743	object::force_add (shstr_tmp name, int duration)
2563	{	2744	{
2564	if (object *force = force_find (name))	2745	if (object *force = force_find (name))
2565	force->destroy ();	2746	force->destroy ();
2566		2747
2567	object *force = get_archetype (FORCE_NAME);	2748	object *force = archetype::get (FORCE_NAME);
2568		2749
2569	force->slaying = name;	2750	force->slaying = name;
2570	force->stats.food = 1;	2751	force->force_set_timer (duration);
2571	force->speed_left = -1.f;
2572
2573	force->set_speed (duration ? 1.f / duration : 0.f);
2574	force->flag [FLAG_IS_USED_UP] = true;
2575	force->flag [FLAG_APPLIED] = true;	2752	force->flag [FLAG_APPLIED] = true;
2576		2753
2577	insert (force);	2754	return insert (force);
2578	}	2755	}
2579		2756
2580	void	2757	void
2581	object::play_sound (faceidx sound)	2758	object::play_sound (faceidx sound) const
2582	{	2759	{
2583	if (!sound)	2760	if (!sound)
2584	return;	2761	return;
2585		2762
2586	if (flag [FLAG_REMOVED])	2763	if (is_on_map ())
		2764	map->play_sound (sound, x, y);
		2765	else if (object *pl = in_player ())
		2766	pl->contr->play_sound (sound);
		2767	}
		2768
		2769	void
		2770	object::say_msg (const char *msg) const
		2771	{
		2772	if (is_on_map ())
		2773	map->say_msg (msg, x, y);
		2774	else if (object *pl = in_player ())
		2775	pl->contr->play_sound (sound);
		2776	}
		2777
		2778	void
		2779	object::make_noise ()
		2780	{
		2781	// we do not model noise in the map, so instead put
		2782	// a temporary light into the noise source
		2783	// could use the map instead, but that's less reliable for our
		2784	// goal, which is to make invisibility a bit harder to exploit
		2785
		2786	// currently only works sensibly for players
		2787	if (!is_player ())
2587	return;	2788	return;
2588		2789
2589	if (env)	2790	// find old force, or create new one
2590	{	2791	object *force = force_find (shstr_noise_force);
2591	if (object *pl = in_player ())	2792
2592	pl->contr->play_sound (sound);	2793	if (force)
2593	}	2794	force->speed_left = -1.f; // patch old speed up
2594	else	2795	else
2595	map->play_sound (sound, x, y);	2796	{
2596	}	2797	force = archetype::get (shstr_noise_force);
2597		2798
		2799	force->slaying = shstr_noise_force;
		2800	force->stats.food = 1;
		2801	force->speed_left = -1.f;
		2802
		2803	force->set_speed (1.f / 4.f);
		2804	force->flag [FLAG_IS_USED_UP] = true;
		2805	force->flag [FLAG_APPLIED] = true;
		2806
		2807	insert (force);
		2808	}
		2809	}
		2810
		2811	void object::change_move_type (MoveType mt)
		2812	{
		2813	if (move_type == mt)
		2814	return;
		2815
		2816	if (is_on_map ())
		2817	{
		2818	// we are on the map, so handle move_on/off effects
		2819	remove ();
		2820	move_type = mt;
		2821	map->insert (this, x, y, this);
		2822	}
		2823	else
		2824	move_type = mt;
		2825	}
		2826
		2827	/* object should be a player.
		2828	* we return the object the player has marked with the 'mark' command
		2829	* below. If no match is found (or object has changed), we return
		2830	* NULL. We leave it up to the calling function to print messages if
		2831	* nothing is found.
		2832	*/
		2833	object *
		2834	object::mark () const
		2835	{
		2836	if (contr && contr->mark && contr->mark->env == this)
		2837	return contr->mark;
		2838	else
		2839	return 0;
		2840	}
		2841
		2842	// put marked object first in the inventory
		2843	// this is used by identify-like spells so players can influence
		2844	// the order a bit.
		2845	void
		2846	object::splay_marked ()
		2847	{
		2848	if (object *marked = mark ())
		2849	splay (marked);
		2850	}
		2851

Diff Legend

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